You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2022/03/10 07:12:29 UTC
[maven-resolver] branch mvn4 updated (91ee277 -> 8ff5a93)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git.
discard 91ee277 Switch a few core plugins to the new api
discard e8f9a6a mvn4 aggregator
add fb94663 Revert "[MRESOLVER-233] Add protected abstract org.e.a.artifact.AbstractArtifact.newInstance()"
add 375a290 [MRESOLVER-230] Make supported checksum algorithms extensible
add 9faba55 [MRESOLVER-231] Extend "smart checksum" feature (#140)
add e61c081 [MRESOLVER-234] Provided checksums (#141)
add 2807538 [MRESOLVER-237] Make all checksum mismatches handled same (#148)
add 253871b Fix bad requireNonNull checks
add bc29a85 Shared GitHub actions v2
add 3bc884c Fix bad requireNonNull checks, part2 (#152)
add 3be8802 [MRESOLVER-239] Update dependencies (#153)
add d941ee7 Align Hazelcast and Redisson ITs profile name
add 1c79c4f [MRESOLVER-244] Deprecate FileTransformer API
add 69aeda6 [MRESOLVER-240] Using breadth-first approach to resolve Maven dependencies
add 9f19f5a prefer running jdk 17 rather than dead jdk 15
new 98cc824 mvn4 aggregator
new 8ff5a93 Switch a few core plugins to the new api
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 (91ee277)
\
N -- N -- N refs/heads/mvn4 (8ff5a93)
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 2 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-verify.yml | 4 +-
Jenkinsfile | 2 +-
.../eclipse/aether/artifact/AbstractArtifact.java | 18 +-
.../eclipse/aether/artifact/DefaultArtifact.java | 25 +--
.../aether/transfer/ChecksumFailureException.java | 41 ++++-
.../eclipse/aether/transform/FileTransformer.java | 3 +
.../aether/transform/FileTransformerManager.java | 3 +
.../aether/transform/TransformException.java | 4 +
.../connector/basic/BasicRepositoryConnector.java | 177 +++++++++++--------
.../basic/BasicRepositoryConnectorFactory.java | 37 +++-
.../aether/connector/basic/ChecksumCalculator.java | 102 ++++-------
.../aether/connector/basic/ChecksumValidator.java | 103 +++++++----
.../connector/basic/ChecksumCalculatorTest.java | 33 ++--
.../connector/basic/ChecksumValidatorTest.java | 85 +++++----
.../basic/TestChecksumAlgorithmSelector.java | 124 ++++++++++++++
.../maven-resolver-demo-maven-plugin/pom.xml | 6 +-
.../maven-resolver-demo-snippets/pom.xml | 1 -
.../examples/guice/DemoResolverModule.java | 12 ++
maven-resolver-demos/pom.xml | 4 +
maven-resolver-impl/pom.xml | 2 +-
.../eclipse/aether/impl/DefaultServiceLocator.java | 3 +
.../eclipse/aether/impl/guice/AetherModule.java | 122 +++++++++----
.../internal/impl/AbstractChecksumPolicy.java | 28 +--
.../aether/internal/impl/DefaultFileProcessor.java | 28 +--
.../internal/impl/DefaultTransporterProvider.java | 4 +-
.../aether/internal/impl/FailChecksumPolicy.java | 1 +
.../internal/impl/FileProvidedChecksumsSource.java | 169 ++++++++++++++++++
.../impl/Maven2RepositoryLayoutFactory.java | 88 +++++++---
.../impl/SimpleLocalRepositoryManagerFactory.java | 4 +-
.../aether/internal/impl/WarnChecksumPolicy.java | 1 +
.../DefaultChecksumAlgorithmFactorySelector.java | 92 ++++++++++
.../Md5ChecksumAlgorithmFactory.java} | 28 ++-
...ssageDigestChecksumAlgorithmFactorySupport.java | 71 ++++++++
.../Sha1ChecksumAlgorithmFactory.java} | 28 ++-
.../Sha256ChecksumAlgorithmFactory.java} | 28 ++-
.../Sha512ChecksumAlgorithmFactory.java} | 28 ++-
.../impl/collect/DefaultDependencyCollector.java | 190 ++++++++++-----------
.../impl/collect/DefaultDependencyCycle.java | 55 +++++-
.../impl/collect/DependencyProcessingContext.java | 77 +++++++++
.../aether/internal/impl/collect/NodeStack.java | 127 --------------
.../internal/impl/DefaultArtifactResolverTest.java | 2 -
.../internal/impl/FailChecksumPolicyTest.java | 30 +++-
.../impl/FileProvidedChecksumsSourceTest.java | 107 ++++++++++++
.../impl/Maven2RepositoryLayoutFactoryTest.java | 119 +++++++++----
.../internal/impl/WarnChecksumPolicyTest.java | 30 +++-
.../impl/collect/DefaultDependencyCycleTest.java | 10 +-
maven-resolver-named-locks-hazelcast/pom.xml | 4 +-
maven-resolver-named-locks-redisson/pom.xml | 2 +-
.../spi/connector/checksum/ChecksumAlgorithm.java | 46 +++++
.../checksum/ChecksumAlgorithmFactory.java | 48 ++++++
.../checksum/ChecksumAlgorithmFactorySelector.java | 45 +++++
.../checksum/ChecksumAlgorithmFactorySupport.java | 36 ++--
.../checksum/ChecksumAlgorithmHelper.java | 103 +++++++++++
.../spi/connector/checksum/ChecksumPolicy.java | 86 ++++++----
.../checksum/ProvidedChecksumsSource.java | 47 +++++
.../spi/connector/layout/RepositoryLayout.java | 118 ++++++-------
.../connector/transport/AbstractTransporter.java | 18 +-
.../aether/spi/connector/transport/GetTask.java | 10 +-
.../org/eclipse/aether/spi/io/FileProcessor.java | 16 ++
.../spi/connector/layout/ChecksumLocationTest.java | 95 +++++++++++
.../aether/spi/connector/layout/ChecksumTest.java | 65 -------
.../internal/test/util/TestFileProcessor.java | 12 ++
.../classpath/ClasspathTransporterFactory.java | 4 +-
.../transport/file/FileTransporterFactory.java | 4 +-
maven-resolver-transport-http/pom.xml | 2 +-
.../{HttpMkCol.java => ChecksumExtractor.java} | 33 ++--
.../aether/transport/http/HttpTransporter.java | 86 +++++++---
.../transport/http/HttpTransporterFactory.java | 38 ++++-
.../transport/http/Nexus2ChecksumExtractor.java | 59 +++++++
.../transport/http/XChecksumChecksumExtractor.java | 91 ++++++++++
.../eclipse/aether/transport/http/HttpServer.java | 6 +-
.../aether/transport/http/HttpTransporterTest.java | 11 ++
maven-resolver-transport-wagon/pom.xml | 4 +-
.../aether/transport/wagon/WagonTransporter.java | 2 +-
.../transport/wagon/WagonTransporterFactory.java | 4 +-
.../org/eclipse/aether/util/ChecksumUtils.java | 43 ++++-
.../aether/util/artifact/DelegatingArtifact.java | 6 +-
.../eclipse/aether/util/artifact/SubArtifact.java | 37 ++--
.../org/eclipse/aether/util/ChecksumUtilTest.java | 11 +-
pom.xml | 2 +-
src/site/markdown/about-checksums.md | 73 ++++++++
src/site/markdown/configuration.md | 4 +-
src/site/markdown/included-checksum-strategies.md | 51 ++++++
src/site/site.xml | 2 +
84 files changed, 2620 insertions(+), 960 deletions(-)
create mode 100644 maven-resolver-connector-basic/src/test/java/org/eclipse/aether/connector/basic/TestChecksumAlgorithmSelector.java
create mode 100644 maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/FileProvidedChecksumsSource.java
create mode 100644 maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/checksum/DefaultChecksumAlgorithmFactorySelector.java
copy maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/{LoggerFactoryProvider.java => checksum/Md5ChecksumAlgorithmFactory.java} (68%)
create mode 100644 maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/checksum/MessageDigestChecksumAlgorithmFactorySupport.java
copy maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/{LoggerFactoryProvider.java => checksum/Sha1ChecksumAlgorithmFactory.java} (68%)
copy maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/{LoggerFactoryProvider.java => checksum/Sha256ChecksumAlgorithmFactory.java} (68%)
copy maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/{LoggerFactoryProvider.java => checksum/Sha512ChecksumAlgorithmFactory.java} (68%)
create mode 100644 maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DependencyProcessingContext.java
delete mode 100644 maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/NodeStack.java
create mode 100644 maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/FileProvidedChecksumsSourceTest.java
create mode 100644 maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/checksum/ChecksumAlgorithm.java
create mode 100644 maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/checksum/ChecksumAlgorithmFactory.java
create mode 100644 maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/checksum/ChecksumAlgorithmFactorySelector.java
copy maven-resolver-named-locks/src/main/java/org/eclipse/aether/named/support/NamedLockSupport.java => maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/checksum/ChecksumAlgorithmFactorySupport.java (53%)
create mode 100644 maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/checksum/ChecksumAlgorithmHelper.java
create mode 100644 maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/checksum/ProvidedChecksumsSource.java
create mode 100644 maven-resolver-spi/src/test/java/org/eclipse/aether/spi/connector/layout/ChecksumLocationTest.java
delete mode 100644 maven-resolver-spi/src/test/java/org/eclipse/aether/spi/connector/layout/ChecksumTest.java
copy maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/{HttpMkCol.java => ChecksumExtractor.java} (50%)
create mode 100644 maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/Nexus2ChecksumExtractor.java
create mode 100644 maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/XChecksumChecksumExtractor.java
create mode 100644 src/site/markdown/about-checksums.md
create mode 100644 src/site/markdown/included-checksum-strategies.md
[maven-resolver] 02/02: Switch a few core plugins to the new api
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git
commit 8ff5a93933825486b47a1a0e3b4b95bea70c33c2
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Thu Feb 24 17:00:55 2022 +0100
Switch a few core plugins to the new api
---
maven-resolver-api/pom.xml | 4 ++
maven-resolver-connector-basic/pom.xml | 4 ++
.../examples/maven/ResolveArtifactMojo.java | 5 +-
maven-resolver-impl/pom.xml | 4 ++
maven-resolver-named-locks-hazelcast/pom.xml | 4 ++
maven-resolver-named-locks-redisson/pom.xml | 4 ++
maven-resolver-named-locks/pom.xml | 4 ++
maven-resolver-spi/pom.xml | 4 ++
maven-resolver-test-util/pom.xml | 4 ++
maven-resolver-transport-classpath/pom.xml | 4 ++
maven-resolver-transport-file/pom.xml | 4 ++
maven-resolver-transport-http/pom.xml | 4 ++
maven-resolver-transport-wagon/pom.xml | 4 ++
maven-resolver-util/pom.xml | 4 ++
pom.xml | 54 ++++++++++++++++++++--
15 files changed, 105 insertions(+), 6 deletions(-)
diff --git a/maven-resolver-api/pom.xml b/maven-resolver-api/pom.xml
index 73ded30..ecfd86f 100644
--- a/maven-resolver-api/pom.xml
+++ b/maven-resolver-api/pom.xml
@@ -66,6 +66,10 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
diff --git a/maven-resolver-connector-basic/pom.xml b/maven-resolver-connector-basic/pom.xml
index b164bc8..fd907ca 100644
--- a/maven-resolver-connector-basic/pom.xml
+++ b/maven-resolver-connector-basic/pom.xml
@@ -113,6 +113,10 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
diff --git a/maven-resolver-demos/maven-resolver-demo-maven-plugin/src/main/java/org/apache/maven/resolver/examples/maven/ResolveArtifactMojo.java b/maven-resolver-demos/maven-resolver-demo-maven-plugin/src/main/java/org/apache/maven/resolver/examples/maven/ResolveArtifactMojo.java
index bd3b430..dd21885 100644
--- a/maven-resolver-demos/maven-resolver-demo-maven-plugin/src/main/java/org/apache/maven/resolver/examples/maven/ResolveArtifactMojo.java
+++ b/maven-resolver-demos/maven-resolver-demo-maven-plugin/src/main/java/org/apache/maven/resolver/examples/maven/ResolveArtifactMojo.java
@@ -23,7 +23,6 @@ import java.util.List;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
@@ -74,7 +73,7 @@ public class ResolveArtifactMojo
* The actual execution of the mojo.
*/
public void execute()
- throws MojoExecutionException, MojoFailureException
+ throws MojoExecutionException
{
Artifact artifact;
try
@@ -83,7 +82,7 @@ public class ResolveArtifactMojo
}
catch ( IllegalArgumentException e )
{
- throw new MojoFailureException( e.getMessage(), e );
+ throw new MojoExecutionException( e.getMessage(), e );
}
ArtifactRequest request = new ArtifactRequest();
diff --git a/maven-resolver-impl/pom.xml b/maven-resolver-impl/pom.xml
index 8f43e6b..1ce4a32 100644
--- a/maven-resolver-impl/pom.xml
+++ b/maven-resolver-impl/pom.xml
@@ -146,6 +146,10 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
diff --git a/maven-resolver-named-locks-hazelcast/pom.xml b/maven-resolver-named-locks-hazelcast/pom.xml
index d1597e0..c6bb0f1 100644
--- a/maven-resolver-named-locks-hazelcast/pom.xml
+++ b/maven-resolver-named-locks-hazelcast/pom.xml
@@ -103,6 +103,10 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
diff --git a/maven-resolver-named-locks-redisson/pom.xml b/maven-resolver-named-locks-redisson/pom.xml
index 04bf466..1de71b5 100644
--- a/maven-resolver-named-locks-redisson/pom.xml
+++ b/maven-resolver-named-locks-redisson/pom.xml
@@ -115,6 +115,10 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
diff --git a/maven-resolver-named-locks/pom.xml b/maven-resolver-named-locks/pom.xml
index 46ac46e..ad05f41 100644
--- a/maven-resolver-named-locks/pom.xml
+++ b/maven-resolver-named-locks/pom.xml
@@ -89,6 +89,10 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
diff --git a/maven-resolver-spi/pom.xml b/maven-resolver-spi/pom.xml
index 9a1437e..c721ba0 100644
--- a/maven-resolver-spi/pom.xml
+++ b/maven-resolver-spi/pom.xml
@@ -65,6 +65,10 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
diff --git a/maven-resolver-test-util/pom.xml b/maven-resolver-test-util/pom.xml
index 1e73e7b..a11d9e4 100644
--- a/maven-resolver-test-util/pom.xml
+++ b/maven-resolver-test-util/pom.xml
@@ -69,6 +69,10 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
diff --git a/maven-resolver-transport-classpath/pom.xml b/maven-resolver-transport-classpath/pom.xml
index aaf29b9..098f9a8 100644
--- a/maven-resolver-transport-classpath/pom.xml
+++ b/maven-resolver-transport-classpath/pom.xml
@@ -104,6 +104,10 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
diff --git a/maven-resolver-transport-file/pom.xml b/maven-resolver-transport-file/pom.xml
index 68abf25..d03036e 100644
--- a/maven-resolver-transport-file/pom.xml
+++ b/maven-resolver-transport-file/pom.xml
@@ -109,6 +109,10 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
diff --git a/maven-resolver-transport-http/pom.xml b/maven-resolver-transport-http/pom.xml
index 1c9c2e0..2192a4d 100644
--- a/maven-resolver-transport-http/pom.xml
+++ b/maven-resolver-transport-http/pom.xml
@@ -162,6 +162,10 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
diff --git a/maven-resolver-transport-wagon/pom.xml b/maven-resolver-transport-wagon/pom.xml
index 38e1703..ab99b34 100644
--- a/maven-resolver-transport-wagon/pom.xml
+++ b/maven-resolver-transport-wagon/pom.xml
@@ -135,6 +135,10 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
diff --git a/maven-resolver-util/pom.xml b/maven-resolver-util/pom.xml
index fac16b5..bc47cd6 100644
--- a/maven-resolver-util/pom.xml
+++ b/maven-resolver-util/pom.xml
@@ -70,6 +70,10 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
diff --git a/pom.xml b/pom.xml
index 9511b07..422550d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,6 +74,7 @@
<maven.site.path>resolver-archives/resolver-LATEST</maven.site.path>
<checkstyle.violation.ignore>None</checkstyle.violation.ignore>
<sisuVersion>0.3.5</sisuVersion>
+ <sisuPluginVersion>0.9.0-SNAPSHOT</sisuPluginVersion>
<guiceVersion>4.2.3</guiceVersion>
<guavaVersion>30.1-jre</guavaVersion>
<guavafailureaccessVersion>1.0.1</guavafailureaccessVersion>
@@ -286,6 +287,11 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.9.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.3.1</version>
<configuration>
@@ -416,7 +422,7 @@
<plugin>
<groupId>org.eclipse.sisu</groupId>
<artifactId>sisu-maven-plugin</artifactId>
- <version>${sisuVersion}</version>
+ <version>${sisuPluginVersion}</version>
<executions>
<execution>
<id>generate-index</id>
@@ -442,10 +448,11 @@
<plugin>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-maven-plugin</artifactId>
- <version>5.1.2</version>
+ <version>6.1.0</version>
<executions>
<execution>
<id>bnd-process</id>
+ <phase>process-classes</phase>
<goals>
<goal>bnd-process</goal>
</goals>
@@ -457,6 +464,38 @@
# Reproducible build
-noextraheaders: true
</bnd>
+ <manifestPath>${project.build.directory}/bnd/META-INF/MANIFEST.MF</manifestPath>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>3.2.0</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-shared-utils</artifactId>
+ <version>3.3.4</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>copy-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+ <resources>
+ <resource>
+ <!-- use filtering to make sure the content is checked before being overwritten -->
+ <filtering>true</filtering>
+ <directory>${project.build.directory}/bnd</directory>
+ </resource>
+ </resources>
</configuration>
</execution>
</executions>
@@ -491,7 +530,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
- <version>1.20</version>
+ <version>1.21</version>
<configuration>
<signature>
<groupId>org.codehaus.mojo.signature</groupId>
@@ -509,6 +548,15 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/package-info.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</build>
[maven-resolver] 01/02: mvn4 aggregator
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git
commit 98cc8249840998872706b787b4ca188a7a8d02c8
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jan 28 23:11:39 2022 +0100
mvn4 aggregator
---
.../src/main/java/org/eclipse/aether/version/VersionScheme.java | 2 +-
.../java/org/eclipse/aether/named/support/NamedLockFactorySupport.java | 2 +-
pom.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/version/VersionScheme.java b/maven-resolver-api/src/main/java/org/eclipse/aether/version/VersionScheme.java
index c765a03..7ab984e 100644
--- a/maven-resolver-api/src/main/java/org/eclipse/aether/version/VersionScheme.java
+++ b/maven-resolver-api/src/main/java/org/eclipse/aether/version/VersionScheme.java
@@ -53,7 +53,7 @@ public interface VersionScheme
* @throws InvalidVersionSpecificationException If the constraint specification violates the syntax rules of this
* scheme.
*/
- VersionConstraint parseVersionConstraint( final String constraint )
+ VersionConstraint parseVersionConstraint( String constraint )
throws InvalidVersionSpecificationException;
}
diff --git a/maven-resolver-named-locks/src/main/java/org/eclipse/aether/named/support/NamedLockFactorySupport.java b/maven-resolver-named-locks/src/main/java/org/eclipse/aether/named/support/NamedLockFactorySupport.java
index 9b9a2b4..1dae444 100644
--- a/maven-resolver-named-locks/src/main/java/org/eclipse/aether/named/support/NamedLockFactorySupport.java
+++ b/maven-resolver-named-locks/src/main/java/org/eclipse/aether/named/support/NamedLockFactorySupport.java
@@ -98,7 +98,7 @@ public abstract class NamedLockFactorySupport
* Implementations shall create and return {@link NamedLockSupport} for given {@code name}, this method must never
* return {@code null}.
*/
- protected abstract NamedLockSupport createLock( final String name );
+ protected abstract NamedLockSupport createLock( String name );
/**
* Implementation may override this (empty) method to perform some sort of implementation specific cleanup for
diff --git a/pom.xml b/pom.xml
index 37ad46a..9511b07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>34</version>
+ <version>35-SNAPSHOT</version>
</parent>
<groupId>org.apache.maven.resolver</groupId>