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/12/24 21:30:24 UTC
[maven] branch maven-3.8.x-resolver-1.8.x updated (59f2fc14e -> d3e67b210)
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
discard 59f2fc14e Set version to 3.8.6-resolver-1.8.2
discard 0907019a1 [MNG-7522] Upgrade Maven Resolver to 1.8.2
discard aa98f38d1 Set version to 3.8.6-resolver-1.8.x
discard dc6e4d349 Upgrade Maven Compiler Plugin to 3.10.1 due to MCOMPILER-485
discard 024c02859 [MNG-7499] Upgrade Maven Resolver to 1.8.1
discard aa1e969d5 [MNG-7151] Upgrade Maven Resolver to 1.7.0
discard cade31b3a [MNG-6399] Lift JDK minimum to JDK 8
add 162d3b920 [maven-release-plugin] prepare for next development iteration
add 200e2d3d7 Update DOAP with Maven 3.8.6 release
add c49d314c5 [MNG-7529] Maven resolver makes bad repository choices
add dc745c43a [MNG-7529] Maven resolver makes bad repository choices (#797)
add b89495ea6 [MNG-7537] Point to the old IT branch when building 3.8.x (#799)
add 3b7972396 Make sure RAT plugin ignores files in the target folder (#813) (#814)
add 6bb2a74cb [MNG-7568] Consider inactive profiles for validation
add b850b3b5d simplify build and get rid of withMaven (#908)
add 8f4217991 fix file name
add e82c41c30 simplify
add 64aad3f5c fix unstash path
add 006ea1490 [MNG-7621] Parameter '-f' causes ignoring any 'maven.config' (only on Windows)
add 4fbbcc322 [MNG-7637] Possible NPE in MavenProject#hashCode()
add 8c65fcf01 [MNG-7636] Partially revert MNG-5868 to restore backward compatibility (see MNG-7316)
add 6c53b28ec Implement some #toString() methods
add 15619b5c9 Directories, not folders
add a020540c5 [MNG-7578] Fallback on Linux executable in Windows for findTool utility (#861)
add 13d82830e [MNG-7106] Accept same lower and upper bound in version spec string
add a67713a4a Add missing dependency
add 398a43414 [MNG-7019] Notify also at start when profile is missing
add ed8493332 [MNG-7506] Upgrade Maven Wagon to 3.5.2
add 8fd8a05aa [MNG-7600] LocalRepositoryManager is created too early
add 61f1f0160 [MNG-7590] Allow to configure resolver by properties in settings.xml
add 7db942b2f [MNG-7634] Revert MNG-5982 and MNG-7417
add ba058ee39 [MNG-7513] Address commons-io_commons-io vulnerability found in maven latest version
add 7d4589426 Update bundled license for SLF4J
add da4246ad2 [MNG-7644] Fix version comparison where .X1 < -X2 for any string qualifier X
add 91ddc3744 [MNG-7641] Upgrade Maven Wagon to 3.5.3
add 6e8b4ffc4 [MNG-7352] org.apache.maven.toolchain.java.JavaToolchainImpl should be public
add b89d5959f [maven-release-plugin] prepare release maven-3.8.7
new b5d4b2074 [MNG-6399] Lift JDK minimum to JDK 8
new 43e685044 [MNG-7151] Upgrade Maven Resolver to 1.7.0
new 57c5f19cb [MNG-7499] Upgrade Maven Resolver to 1.8.1
new 415017648 Upgrade Maven Compiler Plugin to 3.10.1 due to MCOMPILER-485
new 43c764d4d Set version to 3.8.7-resolver-1.8.x
new 530aa7602 [MNG-7522] Upgrade Maven Resolver to 1.8.2
new d3e67b210 Set version to 3.8.2-resolver-1.8.2
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 (59f2fc14e)
\
N -- N -- N refs/heads/maven-3.8.x-resolver-1.8.x (d3e67b210)
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 7 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:
.github/workflows/maven.yml | 2 +-
.gitignore | 3 +-
Jenkinsfile | 56 +++----
apache-maven/pom.xml | 2 +-
apache-maven/src/bin/mvn.cmd | 3 +-
.../licenses/MIT-slf4j-api-1.7.36.txt | 7 +-
doap_Maven.rdf | 34 ++++
maven-artifact/pom.xml | 2 +-
.../artifact/versioning/ComparableVersion.java | 21 ++-
.../maven/artifact/versioning/VersionRange.java | 12 +-
.../artifact/versioning/ComparableVersionTest.java | 21 ++-
.../artifact/versioning/VersionRangeTest.java | 7 +
maven-builder-support/pom.xml | 2 +-
maven-compat/pom.xml | 2 +-
maven-core/pom.xml | 2 +-
.../main/java/org/apache/maven/DefaultMaven.java | 14 +-
.../DefaultRepositorySystemSessionFactory.java | 69 +++++---
.../org/apache/maven/project/MavenProject.java | 20 +--
.../maven/toolchain/java/JavaToolchainImpl.java | 19 ++-
.../java/org/apache/maven/DefaultMavenTest.java | 8 +
maven-embedder/pom.xml | 6 +-
maven-model-builder/pom.xml | 2 +-
maven-model/pom.xml | 2 +-
maven-model/src/main/mdo/maven.mdo | 174 ++++++++++++++++++++-
.../java/org/apache/maven/model/BuildTest.java | 8 +
.../java/org/apache/maven/model/DeveloperTest.java | 11 ++
.../apache/maven/model/IssueManagementTest.java | 10 ++
.../java/org/apache/maven/model/LicenseTest.java | 10 ++
.../org/apache/maven/model/MailingListTest.java | 9 ++
.../org/apache/maven/model/OrganizationTest.java | 32 ++++
.../test/java/org/apache/maven/model/ScmTest.java | 9 ++
maven-plugin-api/pom.xml | 2 +-
maven-repository-metadata/pom.xml | 2 +-
maven-resolver-provider/pom.xml | 2 +-
.../internal/DefaultArtifactDescriptorReader.java | 18 ++-
.../internal/DefaultVersionRangeResolver.java | 26 ++-
maven-settings-builder/pom.xml | 2 +-
maven-settings/pom.xml | 2 +-
maven-slf4j-provider/pom.xml | 2 +-
pom.xml | 49 ++++--
40 files changed, 563 insertions(+), 121 deletions(-)
[maven] 06/07: [MNG-7522] Upgrade Maven Resolver to 1.8.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.8.x-resolver-1.8.x
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 530aa760223e626345e50445422df3672b9ebbc9
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Thu Jul 28 21:24:43 2022 +0200
[MNG-7522] Upgrade Maven Resolver to 1.8.2
This closes #779
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 1f84cff4b..a2e5f3f97 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.8.1</resolverVersion>
+ <resolverVersion>1.8.2</resolverVersion>
<slf4jVersion>1.7.36</slf4jVersion>
<xmlunitVersion>2.2.1</xmlunitVersion>
<powermockVersion>1.7.4</powermockVersion>
[maven] 02/07: [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 43e6850442710397e20e55bb20d3d4c329df256a
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 | 21 +++++-
6 files changed, 23 insertions(+), 84 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 b4abce4f4..491376f67 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
@@ -29,7 +29,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;
@@ -43,6 +42,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 bcef8213c..eb0f02057 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>
@@ -533,6 +533,23 @@ under the License.
<artifactId>buildnumber-maven-plugin</artifactId>
<version>1.4</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>src/test/resources*/**</exclude>
+ <exclude>src/test/projects/**</exclude>
+ <exclude>src/test/remote-repo/**</exclude>
+ <exclude>**/*.odg</exclude>
+ <!--
+ ! 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.3.2.txt</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin>
<groupId>org.eclipse.m2e</groupId>
[maven] 03/07: [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 57c5f19cb1bc15b4f6d294277065243b5ad42bb1
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 eb0f02057..f15e9c0f9 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>
[maven] 05/07: Set version to 3.8.7-resolver-1.8.x
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 43c764d4d63af5d5646faf0f2b699f235a4d6d79
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Jul 23 23:43:57 2022 +0200
Set version to 3.8.7-resolver-1.8.x
---
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 03bc0ed24..b74f69537 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.7</version>
+ <version>3.8.7-resolver-1.8.1</version>
</parent>
<artifactId>apache-maven</artifactId>
diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml
index cda4b658f..4cf43068b 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.7</version>
+ <version>3.8.7-resolver-1.8.1</version>
</parent>
<artifactId>maven-artifact</artifactId>
diff --git a/maven-builder-support/pom.xml b/maven-builder-support/pom.xml
index 55f534dca..d1ed81375 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.7</version>
+ <version>3.8.7-resolver-1.8.1</version>
</parent>
<artifactId>maven-builder-support</artifactId>
diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index e8f0853be..dec048aaf 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.7</version>
+ <version>3.8.7-resolver-1.8.1</version>
</parent>
<artifactId>maven-compat</artifactId>
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index f2ff80fdf..c89cb7402 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.7</version>
+ <version>3.8.7-resolver-1.8.1</version>
</parent>
<artifactId>maven-core</artifactId>
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 507c9ac15..d60fac1f6 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.7</version>
+ <version>3.8.7-resolver-1.8.1</version>
</parent>
<artifactId>maven-embedder</artifactId>
diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml
index 36f5b9a03..fc51851e4 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.7</version>
+ <version>3.8.7-resolver-1.8.1</version>
</parent>
<artifactId>maven-model-builder</artifactId>
diff --git a/maven-model/pom.xml b/maven-model/pom.xml
index c4bb325ed..f16f72347 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.7</version>
+ <version>3.8.7-resolver-1.8.1</version>
</parent>
<artifactId>maven-model</artifactId>
diff --git a/maven-plugin-api/pom.xml b/maven-plugin-api/pom.xml
index 9774d1d38..0b099d1cf 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.7</version>
+ <version>3.8.7-resolver-1.8.1</version>
</parent>
<artifactId>maven-plugin-api</artifactId>
diff --git a/maven-repository-metadata/pom.xml b/maven-repository-metadata/pom.xml
index 9a4b15067..a35001587 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.7</version>
+ <version>3.8.7-resolver-1.8.1</version>
</parent>
<artifactId>maven-repository-metadata</artifactId>
diff --git a/maven-resolver-provider/pom.xml b/maven-resolver-provider/pom.xml
index ce3e221e0..4e27a1c6f 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.7</version>
+ <version>3.8.7-resolver-1.8.1</version>
</parent>
<artifactId>maven-resolver-provider</artifactId>
diff --git a/maven-settings-builder/pom.xml b/maven-settings-builder/pom.xml
index b972e9ca2..6ee375a79 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.7</version>
+ <version>3.8.7-resolver-1.8.1</version>
</parent>
<artifactId>maven-settings-builder</artifactId>
diff --git a/maven-settings/pom.xml b/maven-settings/pom.xml
index 51787540c..49e1744eb 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.7</version>
+ <version>3.8.7-resolver-1.8.1</version>
</parent>
<artifactId>maven-settings</artifactId>
diff --git a/maven-slf4j-provider/pom.xml b/maven-slf4j-provider/pom.xml
index 511e851cd..1dfa22fc0 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.7</version>
+ <version>3.8.7-resolver-1.8.1</version>
</parent>
<artifactId>maven-slf4j-provider</artifactId>
diff --git a/pom.xml b/pom.xml
index 27e42c501..1f84cff4b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@ under the License.
</parent>
<artifactId>maven</artifactId>
- <version>3.8.7</version>
+ <version>3.8.7-resolver-1.8.1</version>
<packaging>pom</packaging>
<name>Apache Maven</name>
[maven] 07/07: Set version to 3.8.2-resolver-1.8.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.8.x-resolver-1.8.x
in repository https://gitbox.apache.org/repos/asf/maven.git
commit d3e67b210e5b419aab60632098f14b609fc9cf3f
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Thu Jul 28 22:30:17 2022 +0200
Set version to 3.8.2-resolver-1.8.2
---
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 b74f69537..f85f2e3df 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.7-resolver-1.8.1</version>
+ <version>3.8.7-resolver-1.8.2</version>
</parent>
<artifactId>apache-maven</artifactId>
diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml
index 4cf43068b..29fe84eec 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.7-resolver-1.8.1</version>
+ <version>3.8.7-resolver-1.8.2</version>
</parent>
<artifactId>maven-artifact</artifactId>
diff --git a/maven-builder-support/pom.xml b/maven-builder-support/pom.xml
index d1ed81375..298fb43a3 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.7-resolver-1.8.1</version>
+ <version>3.8.7-resolver-1.8.2</version>
</parent>
<artifactId>maven-builder-support</artifactId>
diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index dec048aaf..93fa039ac 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.7-resolver-1.8.1</version>
+ <version>3.8.7-resolver-1.8.2</version>
</parent>
<artifactId>maven-compat</artifactId>
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index c89cb7402..01d39fe74 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.7-resolver-1.8.1</version>
+ <version>3.8.7-resolver-1.8.2</version>
</parent>
<artifactId>maven-core</artifactId>
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index d60fac1f6..3d1c0b84d 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.7-resolver-1.8.1</version>
+ <version>3.8.7-resolver-1.8.2</version>
</parent>
<artifactId>maven-embedder</artifactId>
diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml
index fc51851e4..50685f9a4 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.7-resolver-1.8.1</version>
+ <version>3.8.7-resolver-1.8.2</version>
</parent>
<artifactId>maven-model-builder</artifactId>
diff --git a/maven-model/pom.xml b/maven-model/pom.xml
index f16f72347..976cefcac 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.7-resolver-1.8.1</version>
+ <version>3.8.7-resolver-1.8.2</version>
</parent>
<artifactId>maven-model</artifactId>
diff --git a/maven-plugin-api/pom.xml b/maven-plugin-api/pom.xml
index 0b099d1cf..fdc25cf86 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.7-resolver-1.8.1</version>
+ <version>3.8.7-resolver-1.8.2</version>
</parent>
<artifactId>maven-plugin-api</artifactId>
diff --git a/maven-repository-metadata/pom.xml b/maven-repository-metadata/pom.xml
index a35001587..ef0616993 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.7-resolver-1.8.1</version>
+ <version>3.8.7-resolver-1.8.2</version>
</parent>
<artifactId>maven-repository-metadata</artifactId>
diff --git a/maven-resolver-provider/pom.xml b/maven-resolver-provider/pom.xml
index 4e27a1c6f..e1ff97be7 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.7-resolver-1.8.1</version>
+ <version>3.8.7-resolver-1.8.2</version>
</parent>
<artifactId>maven-resolver-provider</artifactId>
diff --git a/maven-settings-builder/pom.xml b/maven-settings-builder/pom.xml
index 6ee375a79..97342dfeb 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.7-resolver-1.8.1</version>
+ <version>3.8.7-resolver-1.8.2</version>
</parent>
<artifactId>maven-settings-builder</artifactId>
diff --git a/maven-settings/pom.xml b/maven-settings/pom.xml
index 49e1744eb..b5f072e83 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.7-resolver-1.8.1</version>
+ <version>3.8.7-resolver-1.8.2</version>
</parent>
<artifactId>maven-settings</artifactId>
diff --git a/maven-slf4j-provider/pom.xml b/maven-slf4j-provider/pom.xml
index 1dfa22fc0..a6ba99008 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.7-resolver-1.8.1</version>
+ <version>3.8.7-resolver-1.8.2</version>
</parent>
<artifactId>maven-slf4j-provider</artifactId>
diff --git a/pom.xml b/pom.xml
index a2e5f3f97..6fc412817 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@ under the License.
</parent>
<artifactId>maven</artifactId>
- <version>3.8.7-resolver-1.8.1</version>
+ <version>3.8.7-resolver-1.8.2</version>
<packaging>pom</packaging>
<name>Apache Maven</name>
[maven] 01/07: [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 b5d4b2074368eb5abdbbb45c5de2850eadc3431c
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 0e080eea2..bcef8213c 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>
@@ -564,11 +564,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] 04/07: 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 41501764838c81879b542a23d0f259bdcad11cb6
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 f15e9c0f9..27e42c501 100644
--- a/pom.xml
+++ b/pom.xml
@@ -462,6 +462,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>