You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/03/06 21:08:18 UTC
[maven] branch maven-3.9.x created (now a55300a)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch maven-3.9.x
in repository https://gitbox.apache.org/repos/asf/maven.git.
at a55300a [MNG-6972] Allow access to org.apache.maven.graph
This branch includes the following new commits:
new 78ca83e Bump version to 3.9.0-SNAPSHOT
new 52b7186 [MNG-6399] Lift JDK minimum to JDK 8
new 453c173 [MNG-7247] Upgrade Maven Resolver to 1.7.2
new 6ddb751 Remove unnecessary plugin dependency
new e820dbb [MNG-6878] Upgrade Guice to 4.2.3
new e1b46e2 [MNG-7068] Active dependency management for Google Guice/Guava
new 7d6f281 [MNG-6826] Remove condition check for JDK8+ in FileSizeFormatTest
new 6b7beb4 [MNG-7019] Notify also at start when profile is missing
new a55300a [MNG-6972] Allow access to org.apache.maven.graph
The 9 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.
[maven] 08/09: [MNG-7019] Notify also at start when profile is missing
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch maven-3.9.x
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 6b7beb4db8ad15f1ed26c08df32d6ac1ae96ac0c
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Fri Nov 13 19:49:35 2020 +0100
[MNG-7019] Notify also at start when profile is missing
---
maven-core/src/main/java/org/apache/maven/DefaultMaven.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
index 12b8f4a..7447b8c 100644
--- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
+++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
@@ -291,6 +291,8 @@ public class DefaultMaven
validatePrerequisitesForNonMavenPluginProjects( session.getProjects() );
+ validateActivatedProfiles( session.getProjects(), request.getActiveProfiles() );
+
lifecycleStarter.execute( session );
validateActivatedProfiles( session.getProjects(), request.getActiveProfiles() );
[maven] 04/09: Remove unnecessary plugin dependency
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch maven-3.9.x
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 6ddb75138dd6bb41b77fae6d5b3ae789a0c4377d
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun Mar 6 11:08:52 2022 +0100
Remove unnecessary plugin dependency
---
pom.xml | 7 -------
1 file changed, 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index f6f9b6c..c0ec2d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -626,13 +626,6 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>extra-enforcer-rules</artifactId>
- <version>1.4</version>
- </dependency>
- </dependencies>
<executions>
<execution>
<goals>
[maven] 03/09: [MNG-7247] Upgrade Maven Resolver to 1.7.2
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch maven-3.9.x
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 453c17371319e985d3a6caba84ae240bb33d6870
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun Apr 25 22:51:01 2021 +0200
[MNG-7247] Upgrade Maven Resolver to 1.7.2
---
...=> unrecognized-javax.annotation-api-1.3.2.txt} | 0
.../internal/DefaultVersionRangeResolver.java | 2 +-
.../internal/DefaultVersionResolver.java | 2 +-
.../repository/internal/MavenAetherModule.java | 80 ----------------------
.../internal/MavenRepositorySystemUtils.java | 2 +
pom.xml | 6 +-
6 files changed, 7 insertions(+), 85 deletions(-)
diff --git a/apache-maven/src/main/appended-resources/licenses/unrecognized-javax.annotation-api-1.2.txt b/apache-maven/src/main/appended-resources/licenses/unrecognized-javax.annotation-api-1.3.2.txt
similarity index 100%
rename from apache-maven/src/main/appended-resources/licenses/unrecognized-javax.annotation-api-1.2.txt
rename to apache-maven/src/main/appended-resources/licenses/unrecognized-javax.annotation-api-1.3.2.txt
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
index 83c82a0..d870fbb 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
@@ -28,7 +28,6 @@ import org.eclipse.aether.RequestTrace;
import org.eclipse.aether.SyncContext;
import org.eclipse.aether.impl.MetadataResolver;
import org.eclipse.aether.impl.RepositoryEventDispatcher;
-import org.eclipse.aether.impl.SyncContextFactory;
import org.eclipse.aether.impl.VersionRangeResolver;
import org.eclipse.aether.metadata.DefaultMetadata;
import org.eclipse.aether.metadata.Metadata;
@@ -42,6 +41,7 @@ import org.eclipse.aether.resolution.VersionRangeResolutionException;
import org.eclipse.aether.resolution.VersionRangeResult;
import org.eclipse.aether.spi.locator.Service;
import org.eclipse.aether.spi.locator.ServiceLocator;
+import org.eclipse.aether.spi.synccontext.SyncContextFactory;
import org.eclipse.aether.util.version.GenericVersionScheme;
import org.eclipse.aether.version.InvalidVersionSpecificationException;
import org.eclipse.aether.version.Version;
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
index d307c55..9f16807 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
@@ -33,7 +33,6 @@ import org.eclipse.aether.SyncContext;
import org.eclipse.aether.artifact.Artifact;
import org.eclipse.aether.impl.MetadataResolver;
import org.eclipse.aether.impl.RepositoryEventDispatcher;
-import org.eclipse.aether.impl.SyncContextFactory;
import org.eclipse.aether.impl.VersionResolver;
import org.eclipse.aether.metadata.DefaultMetadata;
import org.eclipse.aether.metadata.Metadata;
@@ -49,6 +48,7 @@ import org.eclipse.aether.resolution.VersionResolutionException;
import org.eclipse.aether.resolution.VersionResult;
import org.eclipse.aether.spi.locator.Service;
import org.eclipse.aether.spi.locator.ServiceLocator;
+import org.eclipse.aether.spi.synccontext.SyncContextFactory;
import org.eclipse.aether.util.ConfigUtils;
import javax.inject.Inject;
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenAetherModule.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenAetherModule.java
deleted file mode 100644
index 41e98aa..0000000
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenAetherModule.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.apache.maven.repository.internal;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.inject.Named;
-import javax.inject.Singleton;
-
-import org.apache.maven.model.building.DefaultModelBuilderFactory;
-import org.apache.maven.model.building.ModelBuilder;
-import org.eclipse.aether.impl.AetherModule;
-import org.eclipse.aether.impl.ArtifactDescriptorReader;
-import org.eclipse.aether.impl.MetadataGeneratorFactory;
-import org.eclipse.aether.impl.VersionRangeResolver;
-import org.eclipse.aether.impl.VersionResolver;
-
-import com.google.inject.AbstractModule;
-import com.google.inject.Provides;
-import com.google.inject.name.Names;
-
-/**
- * @deprecated As of Maven Resolver 1.0.3, please use class {@link MavenResolverModule}.
- */
-@Deprecated
-public final class MavenAetherModule
- extends AbstractModule
-{
-
- @Override
- protected void configure()
- {
- install( new AetherModule() );
- bind( ArtifactDescriptorReader.class ) //
- .to( DefaultArtifactDescriptorReader.class ).in( Singleton.class );
- bind( VersionResolver.class ) //
- .to( DefaultVersionResolver.class ).in( Singleton.class );
- bind( VersionRangeResolver.class ) //
- .to( DefaultVersionRangeResolver.class ).in( Singleton.class );
- bind( MetadataGeneratorFactory.class ).annotatedWith( Names.named( "snapshot" ) ) //
- .to( SnapshotMetadataGeneratorFactory.class ).in( Singleton.class );
- bind( MetadataGeneratorFactory.class ).annotatedWith( Names.named( "versions" ) ) //
- .to( VersionsMetadataGeneratorFactory.class ).in( Singleton.class );
- bind( ModelBuilder.class ) //
- .toInstance( new DefaultModelBuilderFactory().newInstance() );
- }
-
- @Provides
- @Singleton
- Set<MetadataGeneratorFactory> provideMetadataGeneratorFactories( @Named( "snapshot" )
- MetadataGeneratorFactory snapshot,
- @Named( "versions" )
- MetadataGeneratorFactory versions )
- {
- Set<MetadataGeneratorFactory> factories = new HashSet<>();
- factories.add( snapshot );
- factories.add( versions );
- return Collections.unmodifiableSet( factories );
- }
-
-}
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
index 97035b3..b073e2d 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
@@ -68,7 +68,9 @@ public final class MavenRepositorySystemUtils
* acquire a complete repository system, clients need to add some repository connectors for remote transfers.
*
* @return The new service locator, never {@code null}.
+ * @deprecated This method is deprecated along with {@link DefaultServiceLocator} (since Maven Resolver 1.7.0).
*/
+ @Deprecated
public static DefaultServiceLocator newServiceLocator()
{
DefaultServiceLocator locator = new DefaultServiceLocator();
diff --git a/pom.xml b/pom.xml
index f9d3055..f6f9b6c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@ under the License.
<cipherVersion>2.0</cipherVersion>
<modelloVersion>1.11</modelloVersion>
<jxpathVersion>1.3</jxpathVersion>
- <resolverVersion>1.6.3</resolverVersion>
+ <resolverVersion>1.7.2</resolverVersion>
<slf4jVersion>1.7.32</slf4jVersion>
<xmlunitVersion>2.2.1</xmlunitVersion>
<powermockVersion>1.7.4</powermockVersion>
@@ -268,7 +268,7 @@ under the License.
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
- <version>1.2</version>
+ <version>1.3.2</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -545,7 +545,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-javax.annotation-api-1.2.txt</exclude>
+ <exclude>src/main/appended-resources/licenses/unrecognized-javax.annotation-api-1.3.2.txt</exclude>
</excludes>
</configuration>
</plugin>
[maven] 02/09: [MNG-6399] Lift JDK minimum to JDK 8
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch maven-3.9.x
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 52b718614ab379dd909e70e4db3b00da54b91263
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Aug 28 21:45:23 2021 +0200
[MNG-6399] Lift JDK minimum to JDK 8
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index bc0377b..f9d3055 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,8 +47,8 @@ under the License.
<properties>
<maven.version>3.0.5</maven.version>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
<classWorldsVersion>2.6.0</classWorldsVersion>
<commonsCliVersion>1.4</commonsCliVersion>
<commonsLangVersion>3.8.1</commonsLangVersion>
@@ -580,11 +580,11 @@ under the License.
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
- <version>1.17</version><!-- latest for Java 7 -->
+ <version>1.20</version>
<configuration>
<signature>
<groupId>org.codehaus.mojo.signature</groupId>
- <artifactId>java17</artifactId>
+ <artifactId>java18</artifactId>
<version>1.0</version>
</signature>
</configuration>
[maven] 09/09: [MNG-6972] Allow access to org.apache.maven.graph
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch maven-3.9.x
in repository https://gitbox.apache.org/repos/asf/maven.git
commit a55300a588d3694966fd797323304e1ed0bc6de1
Author: mickroll <mi...@users.noreply.github.com>
AuthorDate: Mon Aug 3 12:38:34 2020 +0200
[MNG-6972] Allow access to org.apache.maven.graph
This is, for example, needed for rebuilding the dependency graph during build
extension execution after changing dependencies.
This closes #368
---
maven-core/src/main/resources/META-INF/maven/extension.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/maven-core/src/main/resources/META-INF/maven/extension.xml b/maven-core/src/main/resources/META-INF/maven/extension.xml
index 73bee38..905e132 100644
--- a/maven-core/src/main/resources/META-INF/maven/extension.xml
+++ b/maven-core/src/main/resources/META-INF/maven/extension.xml
@@ -30,6 +30,7 @@ under the License.
<exportedPackage>org.apache.maven.exception</exportedPackage>
<exportedPackage>org.apache.maven.execution</exportedPackage>
<exportedPackage>org.apache.maven.execution.scope</exportedPackage>
+ <exportedPackage>org.apache.maven.graph</exportedPackage>
<exportedPackage>org.apache.maven.lifecycle</exportedPackage>
<exportedPackage>org.apache.maven.model</exportedPackage>
<exportedPackage>org.apache.maven.monitor</exportedPackage>
[maven] 07/09: [MNG-6826] Remove condition check for JDK8+ in FileSizeFormatTest
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch maven-3.9.x
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 7d6f281fe3a4ccdc532c84d421c2680cfb79a68d
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sun Dec 15 04:15:13 2019 +0100
[MNG-6826] Remove condition check for JDK8+ in FileSizeFormatTest
---
.../maven/cli/transfer/FileSizeFormatTest.java | 21 +++++----------------
1 file changed, 5 insertions(+), 16 deletions(-)
diff --git a/maven-embedder/src/test/java/org/apache/maven/cli/transfer/FileSizeFormatTest.java b/maven-embedder/src/test/java/org/apache/maven/cli/transfer/FileSizeFormatTest.java
index a870411..e595ace 100644
--- a/maven-embedder/src/test/java/org/apache/maven/cli/transfer/FileSizeFormatTest.java
+++ b/maven-embedder/src/test/java/org/apache/maven/cli/transfer/FileSizeFormatTest.java
@@ -21,13 +21,11 @@ package org.apache.maven.cli.transfer;
import java.util.Locale;
-import org.apache.commons.lang3.JavaVersion;
-import org.apache.commons.lang3.SystemUtils;
import org.apache.maven.cli.transfer.AbstractMavenTransferListener.FileSizeFormat;
import org.apache.maven.cli.transfer.AbstractMavenTransferListener.FileSizeFormat.ScaleUnit;
+import org.junit.Test;
import static org.junit.Assert.assertEquals;
-import org.junit.Test;
public class FileSizeFormatTest {
@@ -136,10 +134,7 @@ public class FileSizeFormatTest {
long _50_bytes = 50L;
assertEquals( "50 B", format.format( _50_bytes ) );
assertEquals( "50 B", format.format( _50_bytes, ScaleUnit.BYTE ) );
- if ( SystemUtils.isJavaVersionAtLeast( JavaVersion.JAVA_1_8 ) )
- {
- assertEquals( "0.1 kB", format.format( _50_bytes, ScaleUnit.KILOBYTE ) );
- }
+ assertEquals( "0.1 kB", format.format( _50_bytes, ScaleUnit.KILOBYTE ) );
assertEquals( "0 MB", format.format( _50_bytes, ScaleUnit.MEGABYTE ) );
assertEquals( "0 GB", format.format( _50_bytes, ScaleUnit.GIGABYTE ) );
@@ -168,10 +163,7 @@ public class FileSizeFormatTest {
assertEquals( "50 kB", format.format( _50_kilobytes ) );
assertEquals( "50000 B", format.format( _50_kilobytes, ScaleUnit.BYTE ) );
assertEquals( "50 kB", format.format( _50_kilobytes, ScaleUnit.KILOBYTE ) );
- if ( SystemUtils.isJavaVersionAtLeast( JavaVersion.JAVA_1_8 ) )
- {
- assertEquals( "0.1 MB", format.format( _50_kilobytes, ScaleUnit.MEGABYTE ) );
- }
+ assertEquals( "0.1 MB", format.format( _50_kilobytes, ScaleUnit.MEGABYTE ) );
assertEquals( "0 GB", format.format( _50_kilobytes, ScaleUnit.GIGABYTE ) );
long _999_kilobytes = 999L * 1000L;
@@ -200,10 +192,7 @@ public class FileSizeFormatTest {
assertEquals( "50000000 B", format.format( _50_megabytes, ScaleUnit.BYTE ) );
assertEquals( "50000 kB", format.format( _50_megabytes, ScaleUnit.KILOBYTE ) );
assertEquals( "50 MB", format.format( _50_megabytes, ScaleUnit.MEGABYTE ) );
- if ( SystemUtils.isJavaVersionAtLeast( JavaVersion.JAVA_1_8 ) )
- {
- assertEquals( "0.1 GB", format.format( _50_megabytes, ScaleUnit.GIGABYTE ) );
- }
+ assertEquals( "0.1 GB", format.format( _50_megabytes, ScaleUnit.GIGABYTE ) );
long _999_megabytes = 999L * 1000L * 1000L;
assertEquals( "999 MB", format.format( _999_megabytes ) );
@@ -310,4 +299,4 @@ public class FileSizeFormatTest {
assertEquals( "15 GB", format.formatProgress( _15_gigabytes, _15_gigabytes ) );
}
-}
+}
\ No newline at end of file
[maven] 05/09: [MNG-6878] Upgrade Guice to 4.2.3
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch maven-3.9.x
in repository https://gitbox.apache.org/repos/asf/maven.git
commit e820dbb24e22e12fa058c59c6b3cf555da07abb5
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun Mar 6 12:16:03 2022 +0100
[MNG-6878] Upgrade Guice to 4.2.3
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index c0ec2d8..9781f29 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.3.0</plexusUtilsVersion>
- <guiceVersion>4.2.2</guiceVersion>
+ <guiceVersion>4.2.3</guiceVersion>
<sisuVersion>0.3.5</sisuVersion>
<wagonVersion>3.5.1</wagonVersion>
<securityDispatcherVersion>2.0</securityDispatcherVersion>
[maven] 06/09: [MNG-7068] Active dependency management for Google Guice/Guava
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch maven-3.9.x
in repository https://gitbox.apache.org/repos/asf/maven.git
commit e1b46e233930b46f83bc47c373beb41681bb6972
Author: boris-unckel <bu...@mail.unckel.net>
AuthorDate: Tue Jan 5 23:00:26 2021 +0100
[MNG-7068] Active dependency management for Google Guice/Guava
This closes #462
---
maven-core/pom.xml | 8 ++++++
maven-embedder/pom.xml | 58 ++++++++++++++++-------------------------
maven-model-builder/pom.xml | 10 +++++++
maven-resolver-provider/pom.xml | 14 ++++++++++
pom.xml | 46 ++++++++++++++++++++++++++++++++
5 files changed, 101 insertions(+), 35 deletions(-)
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 522f066..5d7c10a 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -106,6 +106,14 @@ under the License.
<classifier>no_aop</classifier>
</dependency>
<dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>failureaccess</artifactId>
+ </dependency>
+ <dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index a8bcc51..6792e62 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -75,41 +75,29 @@ under the License.
<artifactId>maven-shared-utils</artifactId>
</dependency>
<dependency>
- <groupId>com.google.inject</groupId>
- <artifactId>guice</artifactId>
- <classifier>no_aop</classifier>
- <exclusions>
- <exclusion>
- <groupId>aopalliance</groupId>
- <artifactId>aopalliance</artifactId>
- </exclusion>
- <!-- MNG-6549 remove unused transitive dependencies of Guava, that is a dependency of Guice -->
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.checkerframework</groupId>
- <artifactId>checker-compat-qual</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.google.errorprone</groupId>
- <artifactId>error_prone_annotations</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.google.j2objc</groupId>
- <artifactId>j2objc-annotations</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-annotations</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.checkerframework</groupId>
- <artifactId>checker-qual</artifactId>
- </exclusion>
- </exclusions>
- </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>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>failureaccess</artifactId>
+ </dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml
index a2ba1b0..cd432cb 100644
--- a/maven-model-builder/pom.xml
+++ b/maven-model-builder/pom.xml
@@ -75,6 +75,16 @@ under the License.
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>failureaccess</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-core</artifactId>
<scope>test</scope>
diff --git a/maven-resolver-provider/pom.xml b/maven-resolver-provider/pom.xml
index 06c8383..2b9422c 100644
--- a/maven-resolver-provider/pom.xml
+++ b/maven-resolver-provider/pom.xml
@@ -80,8 +80,22 @@ under the License.
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>failureaccess</artifactId>
+ <optional>true</optional>
+ </dependency>
<!-- Testing -->
<dependency>
<groupId>org.apache.maven.resolver</groupId>
diff --git a/pom.xml b/pom.xml
index 9781f29..0815f33 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,6 +58,8 @@ under the License.
<plexusInterpolationVersion>1.26</plexusInterpolationVersion>
<plexusUtilsVersion>3.3.0</plexusUtilsVersion>
<guiceVersion>4.2.3</guiceVersion>
+ <guavaVersion>30.1-jre</guavaVersion>
+ <guavafailureaccessVersion>1.0.1</guavafailureaccessVersion>
<sisuVersion>0.3.5</sisuVersion>
<wagonVersion>3.5.1</wagonVersion>
<securityDispatcherVersion>2.0</securityDispatcherVersion>
@@ -243,6 +245,50 @@ under the License.
<artifactId>guice</artifactId>
<version>${guiceVersion}</version>
<classifier>no_aop</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <!-- This is a transitive dep of com.google.inject:guice -->
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guavaVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_annotations</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>failureaccess</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>listenablefuture</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.j2objc</groupId>
+ <artifactId>j2objc-annotations</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.checkerframework</groupId>
+ <artifactId>checker-qual</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <!-- This is a transitive dep of com.google.guava:guava -->
+ <groupId>com.google.guava</groupId>
+ <artifactId>failureaccess</artifactId>
+ <version>${guavafailureaccessVersion}</version>
</dependency>
<dependency>
<groupId>org.eclipse.sisu</groupId>
[maven] 01/09: Bump version to 3.9.0-SNAPSHOT
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch maven-3.9.x
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 78ca83e2a4271421aa3fc4f8153f8f061b09d52f
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun Mar 6 10:44:32 2022 +0100
Bump version to 3.9.0-SNAPSHOT
---
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 +-
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 +-
pom.xml | 2 +-
15 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index faa32dd..07add7e 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.8.6-SNAPSHOT</version>
+ <version>3.9.0-SNAPSHOT</version>
</parent>
<artifactId>apache-maven</artifactId>
diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml
index 7866401..212e886 100644
--- a/maven-artifact/pom.xml
+++ b/maven-artifact/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.8.6-SNAPSHOT</version>
+ <version>3.9.0-SNAPSHOT</version>
</parent>
<artifactId>maven-artifact</artifactId>
diff --git a/maven-builder-support/pom.xml b/maven-builder-support/pom.xml
index 87cda74..c01cc7c 100644
--- a/maven-builder-support/pom.xml
+++ b/maven-builder-support/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.8.6-SNAPSHOT</version>
+ <version>3.9.0-SNAPSHOT</version>
</parent>
<artifactId>maven-builder-support</artifactId>
diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index 8aad743..4f79ac8 100644
--- a/maven-compat/pom.xml
+++ b/maven-compat/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.8.6-SNAPSHOT</version>
+ <version>3.9.0-SNAPSHOT</version>
</parent>
<artifactId>maven-compat</artifactId>
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index ec04490..522f066 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.8.6-SNAPSHOT</version>
+ <version>3.9.0-SNAPSHOT</version>
</parent>
<artifactId>maven-core</artifactId>
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 50e8373..a8bcc51 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.8.6-SNAPSHOT</version>
+ <version>3.9.0-SNAPSHOT</version>
</parent>
<artifactId>maven-embedder</artifactId>
diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml
index 253ac21..a2ba1b0 100644
--- a/maven-model-builder/pom.xml
+++ b/maven-model-builder/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.8.6-SNAPSHOT</version>
+ <version>3.9.0-SNAPSHOT</version>
</parent>
<artifactId>maven-model-builder</artifactId>
diff --git a/maven-model/pom.xml b/maven-model/pom.xml
index 34ad8c4..702c985 100644
--- a/maven-model/pom.xml
+++ b/maven-model/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.8.6-SNAPSHOT</version>
+ <version>3.9.0-SNAPSHOT</version>
</parent>
<artifactId>maven-model</artifactId>
diff --git a/maven-plugin-api/pom.xml b/maven-plugin-api/pom.xml
index ee9e3a8..4f94861 100644
--- a/maven-plugin-api/pom.xml
+++ b/maven-plugin-api/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.8.6-SNAPSHOT</version>
+ <version>3.9.0-SNAPSHOT</version>
</parent>
<artifactId>maven-plugin-api</artifactId>
diff --git a/maven-repository-metadata/pom.xml b/maven-repository-metadata/pom.xml
index ca59f0b..7567df5 100644
--- a/maven-repository-metadata/pom.xml
+++ b/maven-repository-metadata/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.8.6-SNAPSHOT</version>
+ <version>3.9.0-SNAPSHOT</version>
</parent>
<artifactId>maven-repository-metadata</artifactId>
diff --git a/maven-resolver-provider/pom.xml b/maven-resolver-provider/pom.xml
index 124e5cb..06c8383 100644
--- a/maven-resolver-provider/pom.xml
+++ b/maven-resolver-provider/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.8.6-SNAPSHOT</version>
+ <version>3.9.0-SNAPSHOT</version>
</parent>
<artifactId>maven-resolver-provider</artifactId>
diff --git a/maven-settings-builder/pom.xml b/maven-settings-builder/pom.xml
index 24d8170..80d361c 100644
--- a/maven-settings-builder/pom.xml
+++ b/maven-settings-builder/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.8.6-SNAPSHOT</version>
+ <version>3.9.0-SNAPSHOT</version>
</parent>
<artifactId>maven-settings-builder</artifactId>
diff --git a/maven-settings/pom.xml b/maven-settings/pom.xml
index 5113a4f..cbdc405 100644
--- a/maven-settings/pom.xml
+++ b/maven-settings/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.8.6-SNAPSHOT</version>
+ <version>3.9.0-SNAPSHOT</version>
</parent>
<artifactId>maven-settings</artifactId>
diff --git a/maven-slf4j-provider/pom.xml b/maven-slf4j-provider/pom.xml
index bc1369d..1ffc40f 100644
--- a/maven-slf4j-provider/pom.xml
+++ b/maven-slf4j-provider/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.8.6-SNAPSHOT</version>
+ <version>3.9.0-SNAPSHOT</version>
</parent>
<artifactId>maven-slf4j-provider</artifactId>
diff --git a/pom.xml b/pom.xml
index 528306d..bc0377b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@ under the License.
</parent>
<artifactId>maven</artifactId>
- <version>3.8.6-SNAPSHOT</version>
+ <version>3.9.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Maven</name>