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 2022/09/10 19:33:14 UTC
[maven] branch MNG-7531 updated (d54576822 -> 89673e80a)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch MNG-7531
in repository https://gitbox.apache.org/repos/asf/maven.git
omit d54576822 [MNG-7531] Upgrade to SLF4J 2.0.0
add 20f539a3f [MNG-7520] Simplify integration of Redisson and Hazelcast for Maven Resolver
add 9fe564cdc [MNG-7529] Maven resolver makes bad repository choices (#787)
add 55a2182a6 [MNG-7530] Upgrade Apache Maven parent POM to version 37
add d1bc037cc [MNG-7529] Maven resolver makes bad repository choices (#796)
new 89673e80a [MNG-7502] Upgrade to Guice 5.1.0
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 (d54576822)
\
N -- N -- N refs/heads/MNG-7531 (89673e80a)
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 1 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:
.../assembly/maven/lib/ext/hazelcast/README.txt | 6 +
.../src/assembly/maven/lib/ext/redisson/README.txt | 6 +
apache-maven/src/bin/m2.conf | 2 +
apache-maven/src/lib/ext/README.txt | 2 +-
.../src/main/appended-resources/META-INF/NOTICE.vm | 4 +-
...lf4j-api-2.0.0.txt => MIT-slf4j-api-1.7.36.txt} | 4 +-
.../licenses/unrecognized-aopalliance-1.0.txt | 1 +
maven-core/pom.xml | 1 -
maven-embedder/pom.xml | 5 -
.../cli/logging/impl/Slf4jSimpleConfiguration.java | 2 +-
.../{simple => impl}/MavenSlf4jSimpleFriend.java | 2 +-
.../META-INF/maven/slf4j-configuration.properties | 4 +-
maven-model-builder/pom.xml | 1 -
maven-resolver-provider/pom.xml | 1 -
.../internal/DefaultVersionRangeResolver.java | 26 +-
maven-slf4j-provider/pom.xml | 4 +-
.../java/org/slf4j/impl/MavenSimpleLogger.java | 120 +++++++++
.../{simple => impl}/MavenSimpleLoggerFactory.java | 4 +-
.../StaticLoggerBinder.java} | 77 +++---
.../java/org/slf4j/simple/MavenSimpleLogger.java | 269 ---------------------
.../services/org.slf4j.spi.SLF4JServiceProvider | 1 -
pom.xml | 16 +-
22 files changed, 221 insertions(+), 337 deletions(-)
create mode 100644 apache-maven/src/assembly/maven/lib/ext/hazelcast/README.txt
create mode 100644 apache-maven/src/assembly/maven/lib/ext/redisson/README.txt
rename apache-maven/src/main/appended-resources/licenses/{MIT-slf4j-api-2.0.0.txt => MIT-slf4j-api-1.7.36.txt} (90%)
create mode 100644 apache-maven/src/main/appended-resources/licenses/unrecognized-aopalliance-1.0.txt
rename maven-embedder/src/main/java/org/slf4j/{simple => impl}/MavenSlf4jSimpleFriend.java (98%)
create mode 100644 maven-slf4j-provider/src/main/java/org/slf4j/impl/MavenSimpleLogger.java
rename maven-slf4j-provider/src/main/java/org/slf4j/{simple => impl}/MavenSimpleLoggerFactory.java (95%)
rename maven-slf4j-provider/src/main/java/org/slf4j/{simple/MavenSimpleServiceProvider.java => impl/StaticLoggerBinder.java} (50%)
delete mode 100644 maven-slf4j-provider/src/main/java/org/slf4j/simple/MavenSimpleLogger.java
delete mode 100644 maven-slf4j-provider/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider
[maven] 01/01: [MNG-7502] Upgrade to Guice 5.1.0
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MNG-7531
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 89673e80a3a9074d255f6450d4ad8b2330e9b7d3
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Tue Aug 23 16:46:31 2022 +0200
[MNG-7502] Upgrade to Guice 5.1.0
(cherry picked from commit 5502c0c8dba03c7241bd9dd1bb5ba023ab6f2670)
---
apache-maven/src/main/appended-resources/META-INF/NOTICE.vm | 4 ++--
.../appended-resources/licenses/unrecognized-aopalliance-1.0.txt | 1 +
maven-core/pom.xml | 1 -
maven-embedder/pom.xml | 5 -----
maven-model-builder/pom.xml | 1 -
maven-resolver-provider/pom.xml | 1 -
pom.xml | 4 ++--
7 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/apache-maven/src/main/appended-resources/META-INF/NOTICE.vm b/apache-maven/src/main/appended-resources/META-INF/NOTICE.vm
index 3cfd92583..37b174a2d 100644
--- a/apache-maven/src/main/appended-resources/META-INF/NOTICE.vm
+++ b/apache-maven/src/main/appended-resources/META-INF/NOTICE.vm
@@ -18,9 +18,9 @@
##
This software bundles the following NOTICE files from third party library providers:
-META-INF/NOTICE in archive lib/guice-4.2.1-no_aop.jar
+META-INF/NOTICE in archive lib/guice-5.1.0.jar
Google Guice - Core Library
-Copyright 2006-2018 Google, Inc.
+Copyright 2006-2022 Google, Inc.
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/apache-maven/src/main/appended-resources/licenses/unrecognized-aopalliance-1.0.txt b/apache-maven/src/main/appended-resources/licenses/unrecognized-aopalliance-1.0.txt
new file mode 100644
index 000000000..a7a158b93
--- /dev/null
+++ b/apache-maven/src/main/appended-resources/licenses/unrecognized-aopalliance-1.0.txt
@@ -0,0 +1 @@
+Public Domain
\ No newline at end of file
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 77d17a0e9..3488b404c 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -103,7 +103,6 @@ under the License.
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
- <classifier>no_aop</classifier>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index d991ffaa2..ab7f45b44 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -77,12 +77,7 @@ under the License.
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
- <classifier>no_aop</classifier>
<exclusions>
- <exclusion>
- <groupId>aopalliance</groupId>
- <artifactId>aopalliance</artifactId>
- </exclusion>
<!-- MNG-7068 Active dependency management for Google Guice / Google Guava. Excludes of Guava are managed in parent POM -->
<exclusion>
<groupId>com.google.guava</groupId>
diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml
index cd432cb11..1d7bd169f 100644
--- a/maven-model-builder/pom.xml
+++ b/maven-model-builder/pom.xml
@@ -71,7 +71,6 @@ under the License.
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
- <classifier>no_aop</classifier>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/maven-resolver-provider/pom.xml b/maven-resolver-provider/pom.xml
index d273a738f..6b3321020 100644
--- a/maven-resolver-provider/pom.xml
+++ b/maven-resolver-provider/pom.xml
@@ -73,7 +73,6 @@ under the License.
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
- <classifier>no_aop</classifier>
<optional>true</optional>
<exclusions>
<exclusion>
diff --git a/pom.xml b/pom.xml
index 99a711e2c..53c9fd51a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@ under the License.
<plexusVersion>2.1.0</plexusVersion>
<plexusInterpolationVersion>1.26</plexusInterpolationVersion>
<plexusUtilsVersion>3.4.2</plexusUtilsVersion>
- <guiceVersion>4.2.3</guiceVersion>
+ <guiceVersion>5.1.0</guiceVersion>
<guavaVersion>30.1-jre</guavaVersion>
<guavafailureaccessVersion>1.0.1</guavafailureaccessVersion>
<wagonVersion>3.5.2</wagonVersion>
@@ -242,7 +242,6 @@ under the License.
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>${guiceVersion}</version>
- <classifier>no_aop</classifier>
<exclusions>
<exclusion>
<groupId>com.google.guava</groupId>
@@ -598,6 +597,7 @@ under the License.
! Excluded the license files itself cause they do not have have a license of themselves.
-->
<exclude>src/main/appended-resources/licenses/EPL-1.0.txt</exclude>
+ <exclude>src/main/appended-resources/licenses/unrecognized-aopalliance-1.0.txt</exclude>
<exclude>src/main/appended-resources/licenses/unrecognized-javax.annotation-api-1.3.2.txt</exclude>
</excludes>
</configuration>