You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2023/05/09 17:53:54 UTC
[maven] branch MNG-7777-guice6 updated (1b8964f37 -> 766505697)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch MNG-7777-guice6
in repository https://gitbox.apache.org/repos/asf/maven.git
discard 1b8964f37 [MNG-7777] Upgrade Guice to 6 - adds support to jakarta.inject (WIP)
discard 3fbe0d789 [MNG-7743] Make the build work on JDK 20
add 7cb87a668 [MNG-7769] Update Resolver to 1.9.10 (#1101)
add 79556ddc6 [MNG-7774] Maven config and command line interpolation (#1098)
add c2331d37f [MNG-7778] - Include suppressed exceptions when logging failures (#1103)
add c9616018c [maven-release-plugin] prepare release maven-3.9.2
add 42594643c [maven-release-plugin] prepare for next development iteration
new 24f11f331 [MNG-7743] Make the build work on JDK 20
new 766505697 [MNG-7777] Upgrade Guice to 6.0.0-rc2 - adds support to jakarta.inject (WIP)
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (1b8964f37)
\
N -- N -- N refs/heads/MNG-7777-guice6 (766505697)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
apache-maven/pom.xml | 2 +-
maven-artifact/pom.xml | 2 +-
maven-builder-support/pom.xml | 2 +-
maven-compat/pom.xml | 2 +-
maven-core/pom.xml | 2 +-
maven-embedder/pom.xml | 2 +-
.../main/java/org/apache/maven/cli/CliRequest.java | 5 +
.../main/java/org/apache/maven/cli/MavenCli.java | 207 +++++++++++++++++----
.../java/org/apache/maven/cli/MavenCliTest.java | 36 ++++
maven-model-builder/pom.xml | 2 +-
maven-model/pom.xml | 2 +-
maven-plugin-api/pom.xml | 2 +-
maven-repository-metadata/pom.xml | 2 +-
maven-resolver-provider/pom.xml | 2 +-
maven-settings-builder/pom.xml | 2 +-
maven-settings/pom.xml | 2 +-
maven-slf4j-provider/pom.xml | 2 +-
.../java/org/slf4j/impl/MavenSimpleLogger.java | 45 +++--
.../java/org/slf4j/impl/MavenSimpleLoggerTest.java | 61 ++++++
pom.xml | 8 +-
20 files changed, 323 insertions(+), 67 deletions(-)
create mode 100644 maven-slf4j-provider/src/test/java/org/slf4j/impl/MavenSimpleLoggerTest.java
[maven] 02/02: [MNG-7777] Upgrade Guice to 6.0.0-rc2 - adds support to jakarta.inject (WIP)
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MNG-7777-guice6
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 7665056978302b815a310735bcac075f77628936
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sat Apr 29 13:33:44 2023 +0200
[MNG-7777] Upgrade Guice to 6.0.0-rc2 - adds support to jakarta.inject (WIP)
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index cb1f4c742..86c38a7df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,7 +135,7 @@ under the License.
<plexusInterpolationVersion>1.26</plexusInterpolationVersion>
<!-- Blocked by 3.4.0+ changes, see MNG-7710 -->
<plexusUtilsVersion>3.5.1</plexusUtilsVersion>
- <guiceVersion>5.1.0</guiceVersion>
+ <guiceVersion>6.0.0-rc4</guiceVersion>
<guavaVersion>31.1-jre</guavaVersion>
<guavafailureaccessVersion>1.0.1</guavafailureaccessVersion>
<wagonVersion>3.5.3</wagonVersion>
[maven] 01/02: [MNG-7743] Make the build work on JDK 20
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MNG-7777-guice6
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 24f11f331b33308c5fcdebd7f2f38d1c77dd0f14
Author: Petr Široký <pe...@pm.me>
AuthorDate: Sat Mar 18 21:42:15 2023 +0100
[MNG-7743] Make the build work on JDK 20
* the behaviour before the fix was already pretty confusing. JDK 19 and
older do not check the presense of '{' in the constructor, so the
URL object got created, but when converting to file the result would
be e.g. '/../../src/test/remote-repo' which is completely wrong.
But it seems the affected tests did not really care, as all of them
were passing
---
.../apache/maven/repository/TestRepositoryConnector.java | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/maven-core/src/test/java/org/apache/maven/repository/TestRepositoryConnector.java b/maven-core/src/test/java/org/apache/maven/repository/TestRepositoryConnector.java
index 4fd761003..89c749eb9 100644
--- a/maven-core/src/test/java/org/apache/maven/repository/TestRepositoryConnector.java
+++ b/maven-core/src/test/java/org/apache/maven/repository/TestRepositoryConnector.java
@@ -49,10 +49,17 @@ public class TestRepositoryConnector implements RepositoryConnector {
public TestRepositoryConnector(RemoteRepository repository) {
this.repository = repository;
- try {
- basedir = FileUtils.toFile(new URL(repository.getUrl()));
- } catch (MalformedURLException e) {
- throw new IllegalStateException(e);
+ String repositoryUrl = repository.getUrl();
+ if (repositoryUrl.contains("${")) {
+ // the repository url contains unresolved properties and getting the basedir is not possible
+ // in JDK 20+ 'new URL(string)' will fail if the string contains a curly brace
+ this.basedir = null;
+ } else {
+ try {
+ basedir = FileUtils.toFile(new URL(repositoryUrl));
+ } catch (MalformedURLException e) {
+ throw new IllegalStateException(e);
+ }
}
}