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/07/23 21:07:31 UTC
[maven] branch maven-3.8.x-resolver-1.8.x created (now 1cfb71bde)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch maven-3.8.x-resolver-1.8.x
in repository https://gitbox.apache.org/repos/asf/maven.git
at 1cfb71bde Upgrade Maven Compiler Plugin to 3.10.1 due to MCOMPILER-485
This branch includes the following new commits:
new 97a4fab1e [MNG-6399] Lift JDK minimum to JDK 8
new e9ad32493 [MNG-7151] Upgrade Maven Resolver to 1.7.0
new 3b01035f7 [MNG-7499] Upgrade Maven Resolver to 1.8.1
new 1cfb71bde Upgrade Maven Compiler Plugin to 3.10.1 due to MCOMPILER-485
The 4 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] 01/04: [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.8.x-resolver-1.8.x
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 97a4fab1e57604f8b99411879f57085adff9cd3b
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 3a8e16b48..1e30c745d 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] 02/04: [MNG-7151] Upgrade Maven Resolver to 1.7.0
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.8.x-resolver-1.8.x
in repository https://gitbox.apache.org/repos/asf/maven.git
commit e9ad324931959568e673f8b4675797c3c4d4b868
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun Apr 25 22:51:01 2021 +0200
[MNG-7151] Upgrade Maven Resolver to 1.7.0
---
...=> 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 83c82a038..d870fbb95 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 d307c55a6..9f1680726 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 41e98aaea..000000000
--- 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 97035b3cc..b073e2d1e 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 1e30c745d..5139a3b0e 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.0</resolverVersion>
<slf4jVersion>1.7.36</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] 04/04: Upgrade Maven Compiler Plugin to 3.10.1 due to MCOMPILER-485
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.8.x-resolver-1.8.x
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 1cfb71bde7a1d455dba418b842ab06d8e566e713
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Jul 23 23:06:51 2022 +0200
Upgrade Maven Compiler Plugin to 3.10.1 due to MCOMPILER-485
---
pom.xml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/pom.xml b/pom.xml
index 9099246db..4c4a223bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -461,6 +461,11 @@ under the License.
<build>
<pluginManagement>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.10.1</version>
+ </plugin>
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
[maven] 03/04: [MNG-7499] Upgrade Maven Resolver to 1.8.1
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.8.x-resolver-1.8.x
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 3b01035f7011f43a3d8a7dc9f18a0be8ade6b949
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Fri Jun 17 10:41:01 2022 +0200
[MNG-7499] Upgrade Maven Resolver to 1.8.1
This closes #754
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 5139a3b0e..9099246db 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.7.0</resolverVersion>
+ <resolverVersion>1.8.1</resolverVersion>
<slf4jVersion>1.7.36</slf4jVersion>
<xmlunitVersion>2.2.1</xmlunitVersion>
<powermockVersion>1.7.4</powermockVersion>