Commit Graph

15149 Commits

Author SHA1 Message Date
Tamas Cservenak deaa82b7bd
Tidy up generated BOMs (#1828)
Make the usable with xinclude (properties).
2024-10-21 15:35:48 +02:00
Tamas Cservenak 3753743ee6
[MNG-8335] The mvnenc command is busted (#1825)
Fixing the 3 new script params.

---

https://issues.apache.org/jira/browse/MNG-8335
2024-10-21 10:03:39 +02:00
Tamas Cservenak 4b9e350985 [maven-release-plugin] prepare for next development iteration 2024-10-19 20:11:20 +02:00
Tamas Cservenak 6e78fcf6f5 [maven-release-plugin] prepare release maven-4.0.0-beta-5 2024-10-19 20:10:56 +02:00
Tamas Cservenak 3ecf9124ca Revert "[maven-release-plugin] prepare release maven-4.0.0-beta-5"
This reverts commit d82ef1a372.
2024-10-19 20:08:03 +02:00
Tamas Cservenak 87912b6554 Revert "[maven-release-plugin] prepare for next development iteration"
This reverts commit f4eeca2472.
2024-10-19 20:07:37 +02:00
Jan-Jelle Kester 84ed8bea95
[MNG-8331] Sometimes versioned dependencies disappear (#1821)
Ensure all dependencies end up in the model. Avoid work when there are no dependencies. Extract method, re-introduce optimization to return original model

---

https://issues.apache.org/jira/browse/MNG-8331
2024-10-19 20:01:42 +02:00
Maarten Mulders fc444a4dec [MNG-8331] Demonstrate the problem with disappearing dependencies
Closes 393.
2024-10-19 19:53:52 +02:00
Tamas Cservenak f4eeca2472 [maven-release-plugin] prepare for next development iteration 2024-10-18 17:54:38 +02:00
Tamas Cservenak d82ef1a372 [maven-release-plugin] prepare release maven-4.0.0-beta-5 2024-10-18 17:54:23 +02:00
Tamas Cservenak ea21dc1060
Fix BOMs location (#1820)
Make them reside within apache-maven A
2024-10-18 17:50:24 +02:00
Tamas Cservenak 076c4dfeb7 Revert "[maven-release-plugin] prepare release maven-4.0.0-beta-5"
This reverts commit 2bcd571b56.
2024-10-18 17:05:06 +02:00
Tamas Cservenak ec2a8054c1 Revert "[maven-release-plugin] prepare for next development iteration"
This reverts commit 1813f06f86.
2024-10-18 17:04:56 +02:00
Tamas Cservenak 1813f06f86 [maven-release-plugin] prepare for next development iteration 2024-10-18 16:34:31 +02:00
Tamas Cservenak 2bcd571b56 [maven-release-plugin] prepare release maven-4.0.0-beta-5 2024-10-18 16:34:04 +02:00
Tamas Cservenak 583efaa1cf
Sort out dependency issues (#1819)
Changes:
* fix typo, assertj is not compile dependency
* exclude error_prone_annos that come in via gson in Resolver
  SPI (RFC 9457)
2024-10-18 13:48:19 +02:00
Guillaume Nodet 35a7b31dc4
[MNG-8310] Use --debug option instead of a specific mvnDebug script (#1812)
Use --debug option instead of a specific mvnDebug script. Deprecate existing mvnDebug script, drop newly added mvnencDebug (as it was not released).
2024-10-18 13:01:21 +02:00
Guillaume Nodet 9b407d57dc [MNG-8327] Failure when building the consumer POM 2024-10-18 12:59:35 +02:00
Guillaume Nodet 2f7b9623fc [MNG-8325] The ReactorReader should know about build/consumer POMs 2024-10-18 12:59:35 +02:00
Guillaume Nodet c06965db88 [MNG-8326] The ModelBuilder cannot import BOM with classifiers 2024-10-18 12:59:35 +02:00
dependabot[bot] 912c1177ee
Bump net.bytebuddy:byte-buddy from 1.15.4 to 1.15.5 (#1817)
Bumps [net.bytebuddy:byte-buddy](https://github.com/raphw/byte-buddy) from 1.15.4 to 1.15.5.
- [Release notes](https://github.com/raphw/byte-buddy/releases)
- [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md)
- [Commits](https://github.com/raphw/byte-buddy/compare/byte-buddy-1.15.4...byte-buddy-1.15.5)

---
updated-dependencies:
- dependency-name: net.bytebuddy:byte-buddy
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-10-18 05:24:44 +02:00
Guillaume Nodet 8a0e1785af Revert "[MNG-8320] Bump jakarta.inject:jakarta.inject-api from 2.0.1 to 2.0.1.MR (#1729)"
This reverts commit 2e518f34dc.
2024-10-18 05:17:31 +02:00
Guillaume Nodet d5c8280658
[MNG-8312] Generate the BOM automatically (#1797)
Generate both skinny and fat BOMs BOM automatically
Add support for import a BOM w/ classifier in Model 4.1.0+
---------

Co-authored-by: Tamas Cservenak <tamas@cservenak.net>
2024-10-17 17:07:55 +02:00
Sergey Ponomarev 989f798c9f
[MNG-8258] Change the fixed reproducible build outputTimestamp to 1 Feb 1980 (#1813)
The Maven used the year 2001 (beginning of 21st century).
But the Gradle already use the 1 Feb 1980 for preserveFileTimestamps.

The 1 Jan 1980 is a minimal date in Zip archive but the 1 Jan has some special treatment by Java that's why the Gradle team used the 1 Feb.

See more detailed description in CONSTANT_TIME_FOR_ZIP_ENTRIES
https://github.com/gradle/gradle/blob/master/platforms/core-runtime/files/src/main/java/org/gradle/api/internal/file/archive/ZipEntryConstants.java#L39

Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
2024-10-17 17:05:39 +02:00
Guillaume Nodet 314e983f74 [MNG-8258] Change the fixed reproducible build outputTimestamp to 1 Feb 1980 (#392) 2024-10-17 16:52:40 +02:00
Guillaume Nodet 107f81da51 Avoid double profile injection 2024-10-17 16:35:42 +02:00
Guillaume Nodet 4da2eb9622 Fix superpom info location 2024-10-17 16:35:42 +02:00
Guillaume Nodet c504c83b99 [MNG-8306] Fix wrong order when merging xml nodes 2024-10-17 16:35:42 +02:00
Tamas Cservenak 520be39bff
Get rid of Slf4j warning (#1816)
maven-docgen module warns about multiple providers being on classpath. As Maven logging that is a slf4j provider already present, simple not needed.
2024-10-17 16:35:01 +02:00
Tamas Cservenak b6d1427732
Remove unused exclusions (#1814)
These exclusions were here for historical reasons, but
are not needed anymore.
2024-10-17 16:28:11 +02:00
Guillaume Nodet eda9aa6982
[MNG-8315] Fix MAVEN_PROJECTBASEDIR in mvn.cmd when .mvn is at drive root (#1808)
fixes https://issues.apache.org/jira/browse/MNG-8315

Co-authored-by: Francois Marot <fmarot@users.noreply.github.com>
2024-10-17 11:28:11 +02:00
Guillaume Nodet 69b34f4f3c
[MNG-8322] Use the new ToolchainsBuilder and SettingsBuilder (#1778) 2024-10-17 11:25:53 +02:00
Guillaume Nodet d8f9b3f40b [MNG-8322] The EventSpy receives the new settings request/result (#391) 2024-10-17 11:25:42 +02:00
Tamas Cservenak 95e59f2437
[MNG-8302] Warn when appropriate (#1810)
First, `rootDirectory` is nullable, CLIng code was not assuming this, fixed.
Second, emit the "no root found" warning ONLY when appropriate (when we have a POM in picture).

---

https://issues.apache.org/jira/browse/MNG-8302
2024-10-17 10:06:47 +02:00
Tamas Cservenak aafd6910b1
[MNG-8313] Upgrade to Resolver 2.0.2 (#1796)
Using latest Resolver 2.0.2

---

https://issues.apache.org/jira/browse/MNG-8313
2024-10-17 10:06:00 +02:00
dependabot[bot] 2e518f34dc
[MNG-8320] Bump jakarta.inject:jakarta.inject-api from 2.0.1 to 2.0.1.MR (#1729)
Bumps [jakarta.inject:jakarta.inject-api](https://github.com/eclipse-ee4j/injection-api) from 2.0.1 to 2.0.1.MR.
- [Release notes](https://github.com/eclipse-ee4j/injection-api/releases)
- [Commits](https://github.com/eclipse-ee4j/injection-api/compare/2.0.1...2.0.1.MR)

---
updated-dependencies:
- dependency-name: jakarta.inject:jakarta.inject-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-10-16 22:47:58 +02:00
Guillaume Nodet 1cff5947ac
Revert "Make rootDirectory really mandatory" (#1800)
This reverts commit 608a99fb08.

---

https://issues.apache.org/jira/browse/MNG-8302
2024-10-16 16:22:26 +02:00
dan1st 9b9f720181
[MNG-8311] empty but existing <localRepository/> in settings.xml (#1801)
Use default when empty as well

---

https://issues.apache.org/jira/browse/MNG-8311
2024-10-16 16:20:30 +02:00
Guillaume Nodet 4e5c89c403
[MNG-8299] Fix ordering of phases from custom lifecycles (#1802)
---

https://issues.apache.org/jira/browse/MNG-8299
2024-10-16 16:19:33 +02:00
Guillaume Nodet eff246a5bf [MNG-8299] IT for custom lifecycle phase ordering (#389)
Main PR: https://github.com/apache/maven/pull/1802

---

https://issues.apache.org/jira/browse/MNG-8299
2024-10-16 16:19:22 +02:00
dependabot[bot] eafb2fb8b1
[MNG-8317] Bump ch.qos.logback:logback-classic from 1.5.10 to 1.5.11 (#1804)
Bumps [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) from 1.5.10 to 1.5.11.
- [Commits](https://github.com/qos-ch/logback/compare/v_1.5.10...v_1.5.11)

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-classic
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

---

https://issues.apache.org/jira/browse/MNG-8317
2024-10-16 16:18:04 +02:00
dependabot[bot] 401be33e7b
[MNG-8316] Bump jlineVersion from 3.27.0 to 3.27.1 (#1803)
Bumps `jlineVersion` from 3.27.0 to 3.27.1.

Updates `org.jline:jline-reader` from 3.27.0 to 3.27.1
- [Release notes](https://github.com/jline/jline3/releases)
- [Changelog](https://github.com/jline/jline3/blob/master/changelog.md)
- [Commits](https://github.com/jline/jline3/compare/jline-3.27.0...jline-3.27.1)

Updates `org.jline:jline-style` from 3.27.0 to 3.27.1
- [Release notes](https://github.com/jline/jline3/releases)
- [Changelog](https://github.com/jline/jline3/blob/master/changelog.md)
- [Commits](https://github.com/jline/jline3/compare/jline-3.27.0...jline-3.27.1)

Updates `org.jline:jline-builtins` from 3.27.0 to 3.27.1
- [Release notes](https://github.com/jline/jline3/releases)
- [Changelog](https://github.com/jline/jline3/blob/master/changelog.md)
- [Commits](https://github.com/jline/jline3/compare/jline-3.27.0...jline-3.27.1)

Updates `org.jline:jline-console-ui` from 3.27.0 to 3.27.1
- [Release notes](https://github.com/jline/jline3/releases)
- [Changelog](https://github.com/jline/jline3/blob/master/changelog.md)
- [Commits](https://github.com/jline/jline3/compare/jline-3.27.0...jline-3.27.1)

Updates `org.jline:jline-terminal-ffm` from 3.27.0 to 3.27.1
- [Release notes](https://github.com/jline/jline3/releases)
- [Changelog](https://github.com/jline/jline3/blob/master/changelog.md)
- [Commits](https://github.com/jline/jline3/compare/jline-3.27.0...jline-3.27.1)

Updates `org.jline:jline-terminal-jni` from 3.27.0 to 3.27.1
- [Release notes](https://github.com/jline/jline3/releases)
- [Changelog](https://github.com/jline/jline3/blob/master/changelog.md)
- [Commits](https://github.com/jline/jline3/compare/jline-3.27.0...jline-3.27.1)

Updates `org.jline:jansi-core` from 3.27.0 to 3.27.1
- [Release notes](https://github.com/jline/jline3/releases)
- [Changelog](https://github.com/jline/jline3/blob/master/changelog.md)
- [Commits](https://github.com/jline/jline3/compare/jline-3.27.0...jline-3.27.1)

---
updated-dependencies:
- dependency-name: org.jline:jline-reader
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.jline:jline-style
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.jline:jline-builtins
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.jline:jline-console-ui
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.jline:jline-terminal-ffm
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.jline:jline-terminal-jni
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.jline:jansi-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

---

https://issues.apache.org/jira/browse/MNG-8316
2024-10-16 16:17:17 +02:00
dependabot[bot] e5190e7e9f
[MNG-8318] Bump mockitoVersion from 5.14.1 to 5.14.2 (#1805)
Bumps `mockitoVersion` from 5.14.1 to 5.14.2.

Updates `org.mockito:mockito-bom` from 5.14.1 to 5.14.2
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v5.14.1...v5.14.2)

Updates `org.mockito:mockito-junit-jupiter` from 5.14.1 to 5.14.2
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v5.14.1...v5.14.2)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.mockito:mockito-junit-jupiter
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

---

https://issues.apache.org/jira/browse/MNG-8318
2024-10-16 16:16:18 +02:00
Guillaume Nodet 0d04bb9a21
[MNG-8041] Move PathScope into the dependency collection request (#1807)
JIRA issue: [MNG-8041](https://issues.apache.org/jira/browse/MNG-8041)
IT PR: https://github.com/apache/maven-integration-testing/pull/390
2024-10-16 16:15:37 +02:00
Guillaume Nodet ee29050d0f
[MNG-8296] Support creating unknown Language on the fly (#1809)
---

https://issues.apache.org/jira/browse/MNG-8296
2024-10-16 16:14:07 +02:00
Tamas Cservenak a293822852
Minor fixes: proper help syntax and ability to extend core exports (#1799)
Display proper syntax on help, ability to extend core exports.
2024-10-15 20:03:27 +02:00
Tamas Cservenak 66b7e2c0be
Cleanup after last commit (#1798)
LookupInvoker does terminal stuff now, remove them
from "early" entry classes, also adopt mvnenc
2024-10-15 18:02:29 +02:00
Guillaume Nodet 740100b50c
[MNG-8309] Improve log infrastructure (first step toward multi-threading log view support) (#1792)
Move logging infrastructure to support multi threaded output from mvnd to maven.
Refactor a bit the terminal/log creation done by Cling.
2024-10-15 15:30:39 +02:00
Guillaume Nodet d742fd624c
[MNG-8295] Dependency Manager Transitivity (now default) handles dependency management inconsistently (#1788)
Actually use TransitiveDependencyManager when maven.resolver.dependencyManagerTransitivity=true

Co-authored-by: DidierLoiseau <didierloiseau+github@gmail.com>
2024-10-15 14:26:16 +02:00
Guillaume Nodet d98fe8e9f0 [MNG-8295] Add IT for Dependency Manager Transitivity (#384)
Co-authored-by: DidierLoiseau <didierloiseau+github@gmail.com>
2024-10-15 14:25:54 +02:00