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 09:04:07 UTC
[maven] branch maven-3.8.x-resolver-1.7.x updated (afcf559 -> 15a95f0)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch maven-3.8.x-resolver-1.7.x
in repository https://gitbox.apache.org/repos/asf/maven.git.
discard afcf559 [MNG-7247] Upgrade Maven Resolver to 1.7.2
discard 474b62a [MNG-7175] Upgrade Maven Resolver to 1.7.1
discard 9a84b92 [MNG-7151] Upgrade Maven Resolver to 1.7.0
discard 440cd16 Require Java 8 due to Maven Resolver 1.7.0
add 21e597e [maven-release-plugin] prepare for next development iteration
add b6186e2 Remove swap file
add fb5f3f5 [MNG-7270] Switch to shell alternative to "which"
add 5c36bf5 [MNG-7312] Revert ThreadLocal approach from MNG-6843 and MNG-7251
add 19c3b91 [MNG-7331] Upgrade Jansi to 2.4.0
add 9b656c7 [maven-release-plugin] prepare release maven-3.8.4
add 8af0a67 [maven-release-plugin] prepare for next development iteration
add ed32798 Update DOAP with Maven 3.8.3 release
add f568170 Update DOAP with Maven 3.8.4 release
add 5bc395f Add github checks to maven-3.8.x branch
add 803c215 Fix github checks
add 10a72f3 [MNG-7156][MNG-7285] Add locking in MojoExecutor (#628)
add 4ff27db [MNG-7156][MNG-7285] Fix typo in test
add 6ae4f7e Bump Java to 17
add 8348d2b Fix SLF4J license link
add 100b17e [MNG-7370] Upgrade Maven Wagon to 3.5.1
add e09baa8 Improve PR template
add d173bf9 [MNG-7377] Add .vscode/ to .gitignore
add ef74a62 [MNG-7374] Mutating RelocatedArtifact does not retain type
add 05b748f [MNG-5561] Plugin relocation loses configuration
add 0f3c39b [MNG-6802] FileProfileActivator changes FileProfileActivator.exists which lets flattened resolveCiFriendliesOnly depending fail activating profile
add f4fd031 Fix checkstyle issue
add 8456294 [MNG-6326] Make the build fail if core extensions can not be loaded (#648)
add b4518b5 [MNG-7347] SessionScoped beans should be singletons for a given session (#653)
add 84cbe1a [MNG-7362] DefaultArtifactResolver has spurious "Failure detected" INFO log
add 99de6b4 [MNG-7380] Don't log non-threadsafe warning if only building a single module
add 72c483b [MNG-7384] Upgrade Maven JAR Plugin to 3.2.2
add 67ff805 [MNG-7381] Shorten parallel builder thread name to artifactId, conditionally with groupId
add 2775512 [MNG-7385] improve repository metadata documentation
add 0cda424 [MNG-7386] Make sure the ModelMerger$MergingList can be serialized
add 83257bf [MNG-7349] Limit relocation warning message to direct dependencies only
add d79485f [MNG-6727] Using version range in parent and CI Friendly Version fails
add 0a118d6 [MNG-7408] explain Maven 3 reporting plugin version selection
add 6f14196 [MNG-7400] Allow more WorkspaceReaders to participate
add 2bb1228 [MNG-7407] Introduce a ModelVersionProcessor component to make CI Friendly Versions pluggable
add a5acd3e [MNG-7395] Support interpolation in extensions.xml
add 395411f [MNG-7417] Several classes do not set properties properly for building requests
add d29af90 [MNG-7402] BuildListCalculator never detaches the classloader
add 05e96da [MNG-5180] Versioning's snapshot version list is not included in metadata merge
add f0caf9c [MNG-6960] Use RuntimeInformation instead of reading properties
add 572d526 [MNG-7428] Upgrade Maven Parent to 35
add cfeea9d Remove unused imports
add 3599d34 [maven-release-plugin] prepare release maven-3.8.5
add 0a6f12f [maven-release-plugin] prepare for next development iteration
new 6f87c39 Require Java 8 due to Maven Resolver 1.7.0
new 8bb32d8 [MNG-7151] Upgrade Maven Resolver to 1.7.0
new a6d3529 [MNG-7175] Upgrade Maven Resolver to 1.7.1
new 15a95f0 [MNG-7247] Upgrade Maven Resolver to 1.7.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 (afcf559)
\
N -- N -- N refs/heads/maven-3.8.x-resolver-1.7.x (15a95f0)
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 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.
Summary of changes:
.github/pull_request_template.md | 19 +-
.github/workflows/maven.yml | 121 +++++++++
.gitignore | 1 +
Jenkinsfile | 2 +-
apache-maven/pom.xml | 10 +-
apache-maven/src/bin/mvn | 2 +-
.../licenses/MIT-jsoup-1.12.1.txt | 23 --
.../licenses/MIT-slf4j-api-1.7.32.txt | 2 +-
apache-maven/src/main/assembly/.component.xml.swp | Bin 12288 -> 0 bytes
apache-maven/src/main/assembly/component.xml | 1 -
doap_Maven.rdf | 18 ++
maven-artifact/pom.xml | 2 +-
.../legacy/metadata/ArtifactMetadata.java | 9 +-
maven-builder-support/pom.xml | 2 +-
maven-compat/pom.xml | 2 +-
.../artifact/resolver/DefaultArtifactResolver.java | 1 -
maven-core/pom.xml | 2 +-
.../main/java/org/apache/maven/DefaultMaven.java | 85 +++---
.../DefaultRepositorySystemSessionFactory.java | 31 +--
.../lifecycle/internal/BuildListCalculator.java | 16 +-
.../internal/DefaultMojoExecutionConfigurator.java | 4 +-
.../lifecycle/internal/LifecycleModuleBuilder.java | 13 +-
.../maven/lifecycle/internal/LifecycleStarter.java | 3 +-
.../maven/lifecycle/internal/MojoExecutor.java | 91 +++++++
.../maven/lifecycle/internal/ReactorContext.java | 14 +-
.../lifecycle/internal/builder/BuilderCommon.java | 2 +-
.../multithreaded/MultiThreadedBuilder.java | 38 ++-
.../DefaultPluginDependenciesResolver.java | 12 +
.../DefaultProjectDependenciesResolver.java | 16 ++
.../org/apache/maven/project/MavenProject.java | 102 ++++----
.../project/artifact/MavenMetadataSource.java | 1 +
.../maven/session/scope/internal/SessionScope.java | 159 +++++------
.../maven/AbstractCoreMavenComponentTestCase.java | 3 +-
.../internal/stub/BuildPluginManagerStub.java | 2 +-
.../lifecycle/internal/stub/MojoExecutorStub.java | 9 +-
.../project/DefaultMavenProjectBuilderTest.java | 135 +++++++++-
.../org/apache/maven/project/MavenProjectTest.java | 43 ---
.../apache/maven/project/PomConstructionTest.java | 22 +-
.../apache/maven/project/ProjectBuilderTest.java | 13 +
.../session/scope/internal/SessionScopeTest.java | 132 ++++++++++
.../pom.xml | 3 +-
.../pom.xml | 4 +-
.../pom.xml | 3 +-
.../pom.xml | 3 +-
.../pom.xml | 5 +-
.../child/pom.xml | 3 +-
.../pom.xml | 7 +
.../child/pom.xml | 4 +-
.../pom.xml | 7 +
.../child/pom.xml | 5 +-
.../pom.xml | 0
maven-embedder/pom.xml | 2 +-
.../main/java/org/apache/maven/cli/MavenCli.java | 86 +++---
.../internal/BootstrapCoreExtensionManager.java | 66 +++--
.../cli/internal/ExtensionResolutionException.java | 20 +-
maven-embedder/src/main/mdo/core-extensions.mdo | 26 ++
maven-model-builder/pom.xml | 2 +-
.../maven/model/building/DefaultModelBuilder.java | 87 ++++++-
.../model/building/DefaultModelBuilderFactory.java | 22 +-
.../AbstractStringBasedModelInterpolator.java | 32 +--
.../DefaultModelVersionProcessor.java | 69 +++++
.../ModelVersionProcessor.java} | 29 ++-
.../ProfileActivationFilePathInterpolator.java | 103 ++++++++
.../profile/activation/FileProfileActivator.java | 66 +----
.../model/validation/DefaultModelValidator.java | 27 +-
.../building/DefaultModelBuilderFactoryTest.java | 36 ++-
.../StringSearchModelInterpolatorTest.java | 5 +-
.../activation/FileProfileActivatorTest.java | 131 ++++++++++
.../validation/DefaultModelValidatorTest.java | 3 +-
maven-model/pom.xml | 2 +-
.../org/apache/maven/model/merge/ModelMerger.java | 9 +-
maven-model/src/main/mdo/maven.mdo | 7 +-
.../apache/maven/model/merge/ModelMergerTest.java | 49 ++++
maven-plugin-api/pom.xml | 2 +-
maven-repository-metadata/pom.xml | 7 +-
.../src/main/mdo/metadata.mdo | 115 +++++---
maven-repository-metadata/src/site/apt/index.apt | 32 ++-
.../artifact/repository/metadata/MetadataTest.java | 290 +++++++++++++++++++++
maven-resolver-provider/pom.xml | 2 +-
.../internal/DefaultArtifactDescriptorReader.java | 35 +--
.../repository/internal/RelocatedArtifact.java | 45 +++-
maven-settings-builder/pom.xml | 2 +-
maven-settings/pom.xml | 2 +-
maven-slf4j-provider/pom.xml | 2 +-
pom.xml | 28 +-
85 files changed, 2014 insertions(+), 634 deletions(-)
create mode 100644 .github/workflows/maven.yml
delete mode 100644 apache-maven/src/main/appended-resources/licenses/MIT-jsoup-1.12.1.txt
delete mode 100644 apache-maven/src/main/assembly/.component.xml.swp
create mode 100644 maven-core/src/test/java/org/apache/maven/session/scope/internal/SessionScopeTest.java
copy maven-core/src/test/resources/projects/{parent-version-range-external-child-without-version => parent-version-range-external-child-pom-parent-version-expression}/pom.xml (67%)
rename maven-core/src/test/resources/projects/{parent-version-range-external-child-version-expression => parent-version-range-external-child-pom-version-expression}/pom.xml (69%)
copy maven-core/src/test/resources/projects/{parent-version-range-external-child-without-version => parent-version-range-external-child-project-parent-version-expression}/pom.xml (67%)
copy maven-core/src/test/resources/projects/{parent-version-range-external-child-without-version => parent-version-range-external-child-project-version-expression}/pom.xml (69%)
copy maven-core/src/test/resources/projects/{parent-version-range-external-child-without-version => parent-version-range-external-child-revision-expression}/pom.xml (70%)
copy maven-core/src/test/resources/projects/{parent-version-range-local-child-without-version => parent-version-range-local-child-project-parent-version-expression}/child/pom.xml (68%)
create mode 100644 maven-core/src/test/resources/projects/parent-version-range-local-child-project-parent-version-expression/pom.xml
rename maven-core/src/test/resources/projects/{parent-version-range-local-child-version-expression => parent-version-range-local-child-project-version-expression}/child/pom.xml (70%)
create mode 100644 maven-core/src/test/resources/projects/parent-version-range-local-child-project-version-expression/pom.xml
copy maven-core/src/test/resources/projects/{parent-version-range-local-child-without-version => parent-version-range-local-child-revision-expression}/child/pom.xml (71%)
rename maven-core/src/test/resources/projects/{parent-version-range-local-child-version-expression => parent-version-range-local-child-revision-expression}/pom.xml (100%)
copy maven-core/src/main/java/org/apache/maven/plugin/PluginResolutionException.java => maven-embedder/src/main/java/org/apache/maven/cli/internal/ExtensionResolutionException.java (64%)
create mode 100644 maven-model-builder/src/main/java/org/apache/maven/model/interpolation/DefaultModelVersionProcessor.java
copy maven-model-builder/src/main/java/org/apache/maven/model/{path/ModelUrlNormalizer.java => interpolation/ModelVersionProcessor.java} (55%)
create mode 100644 maven-model-builder/src/main/java/org/apache/maven/model/path/ProfileActivationFilePathInterpolator.java
create mode 100644 maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/FileProfileActivatorTest.java
create mode 100644 maven-model/src/test/java/org/apache/maven/model/merge/ModelMergerTest.java
create mode 100644 maven-repository-metadata/src/test/java/org/apache/maven/artifact/repository/metadata/MetadataTest.java
[maven] 01/04: Require Java 8 due to Maven Resolver 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.7.x
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 6f87c39178ac100ee484f1566846c5121a03ee14
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Aug 28 21:45:23 2021 +0200
Require Java 8 due to Maven Resolver 1.7.0
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 528306d..877cd0b 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] 03/04: [MNG-7175] Upgrade Maven Resolver to 1.7.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.7.x
in repository https://gitbox.apache.org/repos/asf/maven.git
commit a6d3529cfb1fac93d5b60a4b1af4942286b5a623
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Fri Jun 18 15:36:04 2021 +0200
[MNG-7175] Upgrade Maven Resolver to 1.7.1
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 9adf0f4..0f668ea 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.7.1</resolverVersion>
<slf4jVersion>1.7.32</slf4jVersion>
<xmlunitVersion>2.2.1</xmlunitVersion>
<powermockVersion>1.7.4</powermockVersion>
[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.7.x
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 8bb32d86b3ca2e55e3aaec62e6ac00e2490f168a
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 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 877cd0b..9adf0f4 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.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] 04/04: [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.8.x-resolver-1.7.x
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 15a95f0dfced2cec429a7282d89f3aef03f3083d
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun Sep 12 12:10:35 2021 +0200
[MNG-7247] Upgrade Maven Resolver to 1.7.2
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 0f668ea..f5f3e76 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.1</resolverVersion>
+ <resolverVersion>1.7.2</resolverVersion>
<slf4jVersion>1.7.32</slf4jVersion>
<xmlunitVersion>2.2.1</xmlunitVersion>
<powermockVersion>1.7.4</powermockVersion>