Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package maven-resolver for openSUSE:Factory
checked in at 2024-06-12 15:39:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/maven-resolver (Old)
and /work/SRC/openSUSE:Factory/.maven-resolver.new.19518 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven-resolver"
Wed Jun 12 15:39:27 2024 rev:20 rq:1180164 version:1.9.20
Changes:
--------
--- /work/SRC/openSUSE:Factory/maven-resolver/maven-resolver.changes
2024-04-03 17:21:11.715220562 +0200
+++ /work/SRC/openSUSE:Factory/.maven-resolver.new.19518/maven-resolver.changes
2024-06-12 15:40:22.418639861 +0200
@@ -1,0 +2,15 @@
+Wed Jun 12 10:33:43 UTC 2024 - Fridrich Strba <fst...@suse.com>
+
+- Upgrade to upstream version 1.9.20
+ * Bug
+ + MRESOLVER-483: PreorderNodeListGenerator bug: may print
+ trailing ":"
+ + MRESOLVER-522: File locking threads not entering critical
+ region were "oversleeping"
+ + MRESOLVER-547: BF collector always copies artifacts, even
+ when it should not
+ * Improvement
+ + MRESOLVER-536: Skip setting last modified time when FS does
+ not support it
+
+-------------------------------------------------------------------
Old:
----
maven-resolver-1.9.18-source-release.zip
New:
----
maven-resolver-1.9.20-source-release.zip
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ maven-resolver.spec ++++++
--- /var/tmp/diff_new_pack.VHfRuU/_old 2024-06-12 15:40:22.958659646 +0200
+++ /var/tmp/diff_new_pack.VHfRuU/_new 2024-06-12 15:40:22.962659793 +0200
@@ -19,7 +19,7 @@
%define _buildshell /bin/bash
%bcond_with tests
Name: maven-resolver
-Version: 1.9.18
+Version: 1.9.20
Release: 0
Summary: Apache Maven Artifact Resolver library
License: Apache-2.0
++++++ maven-resolver-1.9.18-source-release.zip ->
maven-resolver-1.9.20-source-release.zip ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/maven-resolver-1.9.18/NOTICE
new/maven-resolver-1.9.20/NOTICE
--- old/maven-resolver-1.9.18/NOTICE 2023-11-22 15:54:24.000000000 +0100
+++ new/maven-resolver-1.9.20/NOTICE 2024-04-26 10:42:06.000000000 +0200
@@ -1,5 +1,5 @@
Maven Artifact Resolver
-Copyright 2010-2023 The Apache Software Foundation
+Copyright 2010-2024 The Apache Software Foundation
This product includes software developed at
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/maven-resolver-1.9.18/maven-resolver-api/pom.xml
new/maven-resolver-1.9.20/maven-resolver-api/pom.xml
--- old/maven-resolver-1.9.18/maven-resolver-api/pom.xml 2023-11-22
15:54:24.000000000 +0100
+++ new/maven-resolver-1.9.20/maven-resolver-api/pom.xml 2024-04-26
10:42:06.000000000 +0200
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver</artifactId>
- <version>1.9.18</version>
+ <version>1.9.20</version>
</parent>
<artifactId>maven-resolver-api</artifactId>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-resolver-1.9.18/maven-resolver-connector-basic/pom.xml
new/maven-resolver-1.9.20/maven-resolver-connector-basic/pom.xml
--- old/maven-resolver-1.9.18/maven-resolver-connector-basic/pom.xml
2023-11-22 15:54:24.000000000 +0100
+++ new/maven-resolver-1.9.20/maven-resolver-connector-basic/pom.xml
2024-04-26 10:42:06.000000000 +0200
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver</artifactId>
- <version>1.9.18</version>
+ <version>1.9.20</version>
</parent>
<artifactId>maven-resolver-connector-basic</artifactId>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-resolver-1.9.18/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml
new/maven-resolver-1.9.20/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml
---
old/maven-resolver-1.9.18/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml
2023-11-22 15:54:24.000000000 +0100
+++
new/maven-resolver-1.9.20/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml
2024-04-26 10:42:06.000000000 +0200
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-demos</artifactId>
- <version>1.9.18</version>
+ <version>1.9.20</version>
</parent>
<artifactId>resolver-demo-maven-plugin</artifactId>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-resolver-1.9.18/maven-resolver-demos/maven-resolver-demo-snippets/pom.xml
new/maven-resolver-1.9.20/maven-resolver-demos/maven-resolver-demo-snippets/pom.xml
---
old/maven-resolver-1.9.18/maven-resolver-demos/maven-resolver-demo-snippets/pom.xml
2023-11-22 15:54:24.000000000 +0100
+++
new/maven-resolver-1.9.20/maven-resolver-demos/maven-resolver-demo-snippets/pom.xml
2024-04-26 10:42:06.000000000 +0200
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-demos</artifactId>
- <version>1.9.18</version>
+ <version>1.9.20</version>
</parent>
<artifactId>maven-resolver-demo-snippets</artifactId>
@@ -117,4 +117,13 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.sisu</groupId>
+ <artifactId>sisu-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/maven-resolver-1.9.18/maven-resolver-demos/pom.xml
new/maven-resolver-1.9.20/maven-resolver-demos/pom.xml
--- old/maven-resolver-1.9.18/maven-resolver-demos/pom.xml 2023-11-22
15:54:24.000000000 +0100
+++ new/maven-resolver-1.9.20/maven-resolver-demos/pom.xml 2024-04-26
10:42:06.000000000 +0200
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver</artifactId>
- <version>1.9.18</version>
+ <version>1.9.20</version>
</parent>
<artifactId>maven-resolver-demos</artifactId>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/maven-resolver-1.9.18/maven-resolver-impl/pom.xml
new/maven-resolver-1.9.20/maven-resolver-impl/pom.xml
--- old/maven-resolver-1.9.18/maven-resolver-impl/pom.xml 2023-11-22
15:54:24.000000000 +0100
+++ new/maven-resolver-1.9.20/maven-resolver-impl/pom.xml 2024-04-26
10:42:06.000000000 +0200
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver</artifactId>
- <version>1.9.18</version>
+ <version>1.9.20</version>
</parent>
<artifactId>maven-resolver-impl</artifactId>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-resolver-1.9.18/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/bf/BfDependencyCollector.java
new/maven-resolver-1.9.20/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/bf/BfDependencyCollector.java
---
old/maven-resolver-1.9.18/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/bf/BfDependencyCollector.java
2023-11-22 15:54:24.000000000 +0100
+++
new/maven-resolver-1.9.20/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/bf/BfDependencyCollector.java
2024-04-26 10:42:06.000000000 +0200
@@ -45,8 +45,6 @@
import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.RequestTrace;
import org.eclipse.aether.artifact.Artifact;
-import org.eclipse.aether.artifact.ArtifactType;
-import org.eclipse.aether.artifact.DefaultArtifact;
import org.eclipse.aether.collection.CollectRequest;
import org.eclipse.aether.collection.DependencyManager;
import org.eclipse.aether.collection.DependencySelector;
@@ -431,14 +429,7 @@
private ArtifactDescriptorResult resolveDescriptorForVersion(
Args args, DependencyProcessingContext context, Results results,
Dependency dependency, Version version) {
Artifact original = dependency.getArtifact();
- Artifact newArtifact = new DefaultArtifact(
- original.getGroupId(),
- original.getArtifactId(),
- original.getClassifier(),
- original.getExtension(),
- version.toString(),
- original.getProperties(),
- (ArtifactType) null);
+ Artifact newArtifact = original.setVersion(version.toString());
Dependency newDependency =
new Dependency(newArtifact, dependency.getScope(),
dependency.isOptional(), dependency.getExclusions());
DependencyProcessingContext newContext = context.copy();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-resolver-1.9.18/maven-resolver-named-locks/pom.xml
new/maven-resolver-1.9.20/maven-resolver-named-locks/pom.xml
--- old/maven-resolver-1.9.18/maven-resolver-named-locks/pom.xml
2023-11-22 15:54:24.000000000 +0100
+++ new/maven-resolver-1.9.20/maven-resolver-named-locks/pom.xml
2024-04-26 10:42:06.000000000 +0200
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver</artifactId>
- <version>1.9.18</version>
+ <version>1.9.20</version>
</parent>
<artifactId>maven-resolver-named-locks</artifactId>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-resolver-1.9.18/maven-resolver-named-locks/src/main/java/org/eclipse/aether/named/support/FileLockNamedLock.java
new/maven-resolver-1.9.20/maven-resolver-named-locks/src/main/java/org/eclipse/aether/named/support/FileLockNamedLock.java
---
old/maven-resolver-1.9.18/maven-resolver-named-locks/src/main/java/org/eclipse/aether/named/support/FileLockNamedLock.java
2023-11-22 15:54:24.000000000 +0100
+++
new/maven-resolver-1.9.20/maven-resolver-named-locks/src/main/java/org/eclipse/aether/named/support/FileLockNamedLock.java
2024-04-26 10:42:06.000000000 +0200
@@ -84,16 +84,16 @@
@Override
protected boolean doLockShared(final long time, final TimeUnit unit)
throws InterruptedException {
- return retry(time, unit, RETRY_SLEEP_MILLIS, this::doLockShared, null,
false);
+ return retry(time, unit, RETRY_SLEEP_MILLIS, () ->
doLockSharedPerform(time, unit), null, false);
}
@Override
protected boolean doLockExclusively(final long time, final TimeUnit unit)
throws InterruptedException {
- return retry(time, unit, RETRY_SLEEP_MILLIS, this::doLockExclusively,
null, false);
+ return retry(time, unit, RETRY_SLEEP_MILLIS, () ->
doLockExclusivelyPerform(time, unit), null, false);
}
- private Boolean doLockShared() {
- if (criticalRegion.tryLock()) {
+ private Boolean doLockSharedPerform(final long time, final TimeUnit unit)
throws InterruptedException {
+ if (criticalRegion.tryLock(time, unit)) {
try {
Deque<Boolean> steps =
threadSteps.computeIfAbsent(Thread.currentThread(), k -> new ArrayDeque<>());
FileLock obtainedLock = fileLockRef.get();
@@ -127,8 +127,8 @@
return null;
}
- private Boolean doLockExclusively() {
- if (criticalRegion.tryLock()) {
+ private Boolean doLockExclusivelyPerform(final long time, final TimeUnit
unit) throws InterruptedException {
+ if (criticalRegion.tryLock(time, unit)) {
try {
Deque<Boolean> steps =
threadSteps.computeIfAbsent(Thread.currentThread(), k -> new ArrayDeque<>());
FileLock obtainedLock = fileLockRef.get();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-resolver-1.9.18/maven-resolver-named-locks-hazelcast/pom.xml
new/maven-resolver-1.9.20/maven-resolver-named-locks-hazelcast/pom.xml
--- old/maven-resolver-1.9.18/maven-resolver-named-locks-hazelcast/pom.xml
2023-11-22 15:54:24.000000000 +0100
+++ new/maven-resolver-1.9.20/maven-resolver-named-locks-hazelcast/pom.xml
2024-04-26 10:42:06.000000000 +0200
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver</artifactId>
- <version>1.9.18</version>
+ <version>1.9.20</version>
</parent>
<artifactId>maven-resolver-named-locks-hazelcast</artifactId>
@@ -50,7 +50,7 @@
<dependency>
<groupId>com.hazelcast</groupId>
<artifactId>hazelcast</artifactId>
- <version>5.3.2</version>
+ <version>5.3.7</version>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-resolver-1.9.18/maven-resolver-named-locks-redisson/pom.xml
new/maven-resolver-1.9.20/maven-resolver-named-locks-redisson/pom.xml
--- old/maven-resolver-1.9.18/maven-resolver-named-locks-redisson/pom.xml
2023-11-22 15:54:24.000000000 +0100
+++ new/maven-resolver-1.9.20/maven-resolver-named-locks-redisson/pom.xml
2024-04-26 10:42:06.000000000 +0200
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver</artifactId>
- <version>1.9.18</version>
+ <version>1.9.20</version>
</parent>
<artifactId>maven-resolver-named-locks-redisson</artifactId>
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.redisson</groupId>
<artifactId>redisson</artifactId>
- <version>3.23.4</version>
+ <version>3.29.0</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/maven-resolver-1.9.18/maven-resolver-spi/pom.xml
new/maven-resolver-1.9.20/maven-resolver-spi/pom.xml
--- old/maven-resolver-1.9.18/maven-resolver-spi/pom.xml 2023-11-22
15:54:24.000000000 +0100
+++ new/maven-resolver-1.9.20/maven-resolver-spi/pom.xml 2024-04-26
10:42:06.000000000 +0200
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver</artifactId>
- <version>1.9.18</version>
+ <version>1.9.20</version>
</parent>
<artifactId>maven-resolver-spi</artifactId>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-resolver-1.9.18/maven-resolver-supplier/pom.xml
new/maven-resolver-1.9.20/maven-resolver-supplier/pom.xml
--- old/maven-resolver-1.9.18/maven-resolver-supplier/pom.xml 2023-11-22
15:54:24.000000000 +0100
+++ new/maven-resolver-1.9.20/maven-resolver-supplier/pom.xml 2024-04-26
10:42:06.000000000 +0200
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver</artifactId>
- <version>1.9.18</version>
+ <version>1.9.20</version>
</parent>
<artifactId>maven-resolver-supplier</artifactId>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-resolver-1.9.18/maven-resolver-test-util/pom.xml
new/maven-resolver-1.9.20/maven-resolver-test-util/pom.xml
--- old/maven-resolver-1.9.18/maven-resolver-test-util/pom.xml 2023-11-22
15:54:24.000000000 +0100
+++ new/maven-resolver-1.9.20/maven-resolver-test-util/pom.xml 2024-04-26
10:42:06.000000000 +0200
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver</artifactId>
- <version>1.9.18</version>
+ <version>1.9.20</version>
</parent>
<artifactId>maven-resolver-test-util</artifactId>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-resolver-1.9.18/maven-resolver-transport-classpath/pom.xml
new/maven-resolver-1.9.20/maven-resolver-transport-classpath/pom.xml
--- old/maven-resolver-1.9.18/maven-resolver-transport-classpath/pom.xml
2023-11-22 15:54:24.000000000 +0100
+++ new/maven-resolver-1.9.20/maven-resolver-transport-classpath/pom.xml
2024-04-26 10:42:06.000000000 +0200
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver</artifactId>
- <version>1.9.18</version>
+ <version>1.9.20</version>
</parent>
<artifactId>maven-resolver-transport-classpath</artifactId>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-resolver-1.9.18/maven-resolver-transport-file/pom.xml
new/maven-resolver-1.9.20/maven-resolver-transport-file/pom.xml
--- old/maven-resolver-1.9.18/maven-resolver-transport-file/pom.xml
2023-11-22 15:54:24.000000000 +0100
+++ new/maven-resolver-1.9.20/maven-resolver-transport-file/pom.xml
2024-04-26 10:42:06.000000000 +0200
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver</artifactId>
- <version>1.9.18</version>
+ <version>1.9.20</version>
</parent>
<artifactId>maven-resolver-transport-file</artifactId>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-resolver-1.9.18/maven-resolver-transport-http/pom.xml
new/maven-resolver-1.9.20/maven-resolver-transport-http/pom.xml
--- old/maven-resolver-1.9.18/maven-resolver-transport-http/pom.xml
2023-11-22 15:54:24.000000000 +0100
+++ new/maven-resolver-1.9.20/maven-resolver-transport-http/pom.xml
2024-04-26 10:42:06.000000000 +0200
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver</artifactId>
- <version>1.9.18</version>
+ <version>1.9.20</version>
</parent>
<artifactId>maven-resolver-transport-http</artifactId>
@@ -34,7 +34,7 @@
<properties>
<Automatic-Module-Name>org.apache.maven.resolver.transport.http</Automatic-Module-Name>
<Bundle-SymbolicName>${Automatic-Module-Name}</Bundle-SymbolicName>
- <jettyVersion>9.4.52.v20230823</jettyVersion>
+ <jettyVersion>9.4.54.v20240208</jettyVersion>
</properties>
<dependencies>
@@ -75,7 +75,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1</version>
<scope>runtime</scope>
</dependency>
<dependency>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-resolver-1.9.18/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpTransporter.java
new/maven-resolver-1.9.20/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpTransporter.java
---
old/maven-resolver-1.9.18/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpTransporter.java
2023-11-22 15:54:24.000000000 +0100
+++
new/maven-resolver-1.9.20/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpTransporter.java
2024-04-26 10:42:06.000000000 +0200
@@ -31,7 +31,6 @@
import java.nio.charset.Charset;
import java.nio.file.Files;
import java.nio.file.StandardCopyOption;
-import java.nio.file.attribute.FileTime;
import java.util.Collections;
import java.util.Date;
import java.util.HashSet;
@@ -691,8 +690,7 @@
if (lastModifiedHeader != null) {
Date lastModified =
DateUtils.parseDate(lastModifiedHeader.getValue());
if (lastModified != null) {
- Files.setLastModifiedTime(
- task.getDataFile().toPath(),
FileTime.fromMillis(lastModified.getTime()));
+
task.getDataFile().setLastModified(lastModified.getTime());
}
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-resolver-1.9.18/maven-resolver-transport-wagon/pom.xml
new/maven-resolver-1.9.20/maven-resolver-transport-wagon/pom.xml
--- old/maven-resolver-1.9.18/maven-resolver-transport-wagon/pom.xml
2023-11-22 15:54:24.000000000 +0100
+++ new/maven-resolver-1.9.20/maven-resolver-transport-wagon/pom.xml
2024-04-26 10:42:06.000000000 +0200
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver</artifactId>
- <version>1.9.18</version>
+ <version>1.9.20</version>
</parent>
<artifactId>maven-resolver-transport-wagon</artifactId>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/maven-resolver-1.9.18/maven-resolver-util/pom.xml
new/maven-resolver-1.9.20/maven-resolver-util/pom.xml
--- old/maven-resolver-1.9.18/maven-resolver-util/pom.xml 2023-11-22
15:54:24.000000000 +0100
+++ new/maven-resolver-1.9.20/maven-resolver-util/pom.xml 2024-04-26
10:42:06.000000000 +0200
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver</artifactId>
- <version>1.9.18</version>
+ <version>1.9.20</version>
</parent>
<artifactId>maven-resolver-util</artifactId>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-resolver-1.9.18/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/visitor/AbstractDepthFirstNodeListGenerator.java
new/maven-resolver-1.9.20/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/visitor/AbstractDepthFirstNodeListGenerator.java
---
old/maven-resolver-1.9.18/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/visitor/AbstractDepthFirstNodeListGenerator.java
2023-11-22 15:54:24.000000000 +0100
+++
new/maven-resolver-1.9.20/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/visitor/AbstractDepthFirstNodeListGenerator.java
2024-04-26 10:42:06.000000000 +0200
@@ -135,10 +135,10 @@
if (node.getDependency() != null) {
Artifact artifact = node.getDependency().getArtifact();
if (artifact.getFile() != null) {
- buffer.append(artifact.getFile().getAbsolutePath());
- if (it.hasNext()) {
+ if (buffer.length() != 0) {
buffer.append(File.pathSeparatorChar);
}
+ buffer.append(artifact.getFile().getAbsolutePath());
}
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-resolver-1.9.18/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/visitor/AbstractDepthFirstNodeListGeneratorTestSupport.java
new/maven-resolver-1.9.20/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/visitor/AbstractDepthFirstNodeListGeneratorTestSupport.java
---
old/maven-resolver-1.9.18/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/visitor/AbstractDepthFirstNodeListGeneratorTestSupport.java
1970-01-01 01:00:00.000000000 +0100
+++
new/maven-resolver-1.9.20/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/visitor/AbstractDepthFirstNodeListGeneratorTestSupport.java
2024-04-26 10:42:06.000000000 +0200
@@ -0,0 +1,87 @@
+/*
+ * 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.
+ */
+package org.eclipse.aether.util.graph.visitor;
+
+import java.io.File;
+import java.util.List;
+
+import org.eclipse.aether.graph.DependencyNode;
+import org.eclipse.aether.graph.DependencyVisitor;
+import org.eclipse.aether.internal.test.util.DependencyGraphParser;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+public abstract class AbstractDepthFirstNodeListGeneratorTestSupport {
+
+ protected DependencyNode parse(String resource) throws Exception {
+ return new
DependencyGraphParser("visitor/ordered-list/").parseResource(resource);
+ }
+
+ protected void assertSequence(List<DependencyNode> actual, String...
expected) {
+ assertEquals(actual.toString(), expected.length, actual.size());
+ for (int i = 0; i < expected.length; i++) {
+ DependencyNode node = actual.get(i);
+ assertEquals(
+ actual.toString(),
+ expected[i],
+ node.getDependency().getArtifact().getArtifactId());
+ }
+ }
+
+ @Test
+ public void testClasspath() throws Exception {
+ DependencyNode root = parse("simple.txt");
+
+ PreorderNodeListGenerator visitor = new PreorderNodeListGenerator();
+ root.accept(visitor);
+
+ assertEquals(visitor.getClassPath(), "");
+ }
+
+ @Test
+ public void testFullyResolverClasspath() throws Exception {
+ DependencyNode root = parse("simple.txt");
+
+ DependencyVisitor fileSetter = new DependencyVisitor() {
+ @Override
+ public boolean visitEnter(DependencyNode node) {
+ node.setArtifact(
+ node.getArtifact().setFile(new
File(node.getArtifact().getArtifactId())));
+ return true;
+ }
+
+ @Override
+ public boolean visitLeave(DependencyNode node) {
+ return true;
+ }
+ };
+ root.accept(fileSetter);
+
+ PreorderNodeListGenerator visitor = new PreorderNodeListGenerator();
+ root.accept(visitor);
+
+ String classpath = visitor.getClassPath();
+ assertEquals(5, classpath.split(File.pathSeparator).length);
+ for (File file : visitor.getFiles()) {
+ assertTrue("missing: " + file,
classpath.contains(file.getAbsolutePath()));
+ }
+ }
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-resolver-1.9.18/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/visitor/PostorderNodeListGeneratorTest.java
new/maven-resolver-1.9.20/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/visitor/PostorderNodeListGeneratorTest.java
---
old/maven-resolver-1.9.18/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/visitor/PostorderNodeListGeneratorTest.java
2023-11-22 15:54:24.000000000 +0100
+++
new/maven-resolver-1.9.20/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/visitor/PostorderNodeListGeneratorTest.java
2024-04-26 10:42:06.000000000 +0200
@@ -18,30 +18,12 @@
*/
package org.eclipse.aether.util.graph.visitor;
-import java.util.List;
-
import org.eclipse.aether.graph.DependencyNode;
-import org.eclipse.aether.internal.test.util.DependencyGraphParser;
import org.junit.Test;
import static org.junit.Assert.*;
-public class PostorderNodeListGeneratorTest {
-
- private DependencyNode parse(String resource) throws Exception {
- return new
DependencyGraphParser("visitor/ordered-list/").parseResource(resource);
- }
-
- private void assertSequence(List<DependencyNode> actual, String...
expected) {
- assertEquals(actual.toString(), expected.length, actual.size());
- for (int i = 0; i < expected.length; i++) {
- DependencyNode node = actual.get(i);
- assertEquals(
- actual.toString(),
- expected[i],
- node.getDependency().getArtifact().getArtifactId());
- }
- }
+public class PostorderNodeListGeneratorTest extends
AbstractDepthFirstNodeListGeneratorTestSupport {
@Test
public void testOrdering() throws Exception {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/maven-resolver-1.9.18/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/visitor/PreorderNodeListGeneratorTest.java
new/maven-resolver-1.9.20/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/visitor/PreorderNodeListGeneratorTest.java
---
old/maven-resolver-1.9.18/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/visitor/PreorderNodeListGeneratorTest.java
2023-11-22 15:54:24.000000000 +0100
+++
new/maven-resolver-1.9.20/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/visitor/PreorderNodeListGeneratorTest.java
2024-04-26 10:42:06.000000000 +0200
@@ -18,31 +18,12 @@
*/
package org.eclipse.aether.util.graph.visitor;
-import java.util.List;
-
import org.eclipse.aether.graph.DependencyNode;
-import org.eclipse.aether.internal.test.util.DependencyGraphParser;
import org.junit.Test;
import static org.junit.Assert.*;
-public class PreorderNodeListGeneratorTest {
-
- private DependencyNode parse(String resource) throws Exception {
- return new
DependencyGraphParser("visitor/ordered-list/").parseResource(resource);
- }
-
- private void assertSequence(List<DependencyNode> actual, String...
expected) {
- assertEquals(actual.toString(), expected.length, actual.size());
- for (int i = 0; i < expected.length; i++) {
- DependencyNode node = actual.get(i);
- assertEquals(
- actual.toString(),
- expected[i],
- node.getDependency().getArtifact().getArtifactId());
- }
- }
-
+public class PreorderNodeListGeneratorTest extends
AbstractDepthFirstNodeListGeneratorTestSupport {
@Test
public void testOrdering() throws Exception {
DependencyNode root = parse("simple.txt");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/maven-resolver-1.9.18/pom.xml
new/maven-resolver-1.9.20/pom.xml
--- old/maven-resolver-1.9.18/pom.xml 2023-11-22 15:54:24.000000000 +0100
+++ new/maven-resolver-1.9.20/pom.xml 2024-04-26 10:42:06.000000000 +0200
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>41</version>
+ <version>42</version>
<relativePath />
</parent>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver</artifactId>
- <version>1.9.18</version>
+ <version>1.9.20</version>
<packaging>pom</packaging>
<name>Maven Artifact Resolver</name>
@@ -65,7 +65,7 @@
<scm>
<connection>scm:git:https://gitbox.apache.org/repos/asf/maven-resolver.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-resolver.git</developerConnection>
- <tag>maven-resolver-1.9.18</tag>
+ <tag>maven-resolver-1.9.20</tag>
<url>https://github.com/apache/maven-resolver/tree/${project.scm.tag}</url>
</scm>
<issueManagement>
@@ -89,14 +89,14 @@
<failsafe.redirectTestOutputToFile>${surefire.redirectTestOutputToFile}</failsafe.redirectTestOutputToFile>
<maven.site.path>resolver-archives/resolver-LATEST</maven.site.path>
<checkstyle.violation.ignore>None</checkstyle.violation.ignore>
- <sisuVersion>0.3.5</sisuVersion>
- <guiceVersion>5.1.0</guiceVersion>
+ <sisuVersion>0.9.0.M2</sisuVersion>
+ <guiceVersion>6.0.0</guiceVersion>
<slf4jVersion>1.7.36</slf4jVersion>
<!-- used by supplier and demo only -->
- <mavenVersion>3.9.4</mavenVersion>
+ <mavenVersion>3.9.6</mavenVersion>
<minimalMavenBuildVersion>[3.8.7,)</minimalMavenBuildVersion>
<minimalJavaBuildVersion>[1.8.0-362,)</minimalJavaBuildVersion>
-
<project.build.outputTimestamp>2023-11-22T15:54:23Z</project.build.outputTimestamp>
+
<project.build.outputTimestamp>2024-04-26T10:42:05Z</project.build.outputTimestamp>
</properties>
<dependencyManagement>
@@ -227,6 +227,11 @@
<artifactId>guice</artifactId>
<version>${guiceVersion}</version>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>33.1.0-jre</version>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -248,7 +253,7 @@
<plugin>
<groupId>com.github.siom79.japicmp</groupId>
<artifactId>japicmp-maven-plugin</artifactId>
- <version>0.17.2</version>
+ <version>0.21.1</version>
<configuration>
<oldVersion>
<!-- We compare same module against 1.8.0 set as "baseline" -->
++++++ maven-resolver-build.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/common.xml new/common.xml
--- old/common.xml 2024-01-22 16:23:38.398661844 +0100
+++ new/common.xml 2024-06-11 17:08:21.442441140 +0200
@@ -3,7 +3,7 @@
<project name="common" basedir=".">
<property file="build.properties"/>
- <property name="project.version" value="1.9.18"/>
+ <property name="project.version" value="1.9.20"/>
<property name="project.groupId" value="org.apache.maven.resolver"/>
<property name="project.url" value="https://maven.apache.org/resolver/"/>
@@ -11,7 +11,8 @@
<property name="spec.version" value="1.9"/>
- <property name="compiler.source" value="1.8"/>
+ <property name="compiler.release" value="8"/>
+ <property name="compiler.source" value="1.${compiler.release}"/>
<property name="compiler.target" value="${compiler.source}"/>
</project>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/maven-resolver-api/build.xml
new/maven-resolver-api/build.xml
--- old/maven-resolver-api/build.xml 2023-06-19 12:33:55.495126760 +0200
+++ new/maven-resolver-api/build.xml 2024-06-11 17:15:19.125390298 +0200
@@ -32,7 +32,6 @@
<path id="build.classpath"/>
<path id="build.test.classpath">
<fileset dir="../lib">
- <!-- junit-4.12 hamcrest-core-1.3 mockito-core-2.23.0 -->
<include name="**/*.jar"/>
</fileset>
</path>
@@ -57,6 +56,7 @@
debug="true"
optimize="false"
deprecation="true"
+ release="${compiler.release}"
target="${compiler.target}"
verbose="false"
fork="false"
@@ -83,6 +83,7 @@
debug="true"
optimize="false"
deprecation="true"
+ release="${compiler.release}"
target="${compiler.target}"
verbose="false"
fork="false"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/maven-resolver-connector-basic/build.xml
new/maven-resolver-connector-basic/build.xml
--- old/maven-resolver-connector-basic/build.xml 2023-06-19
12:33:42.671027279 +0200
+++ new/maven-resolver-connector-basic/build.xml 2024-06-11
17:14:59.855254229 +0200
@@ -34,7 +34,6 @@
<pathelement location="../maven-resolver-spi/target/classes"/>
<pathelement location="../maven-resolver-util/target/classes"/>
<fileset dir="../lib">
- <!-- javax.inject-1 slf4j-api-1.7.25 -->
<include name="**/*.jar"/>
</fileset>
</path>
@@ -44,9 +43,6 @@
<pathelement location="../maven-resolver-util/target/classes"/>
<pathelement location="../maven-resolver-test-util/target/classes"/>
<fileset dir="../lib">
- <!-- javax.inject-1 slf4j-api-1.7.25 slf4j-simple-1.7.25
- sisu-guice-3.2.6-no_aop guava-16.0.1 junit-4.12
- hamcrest-core-1.3 -->
<include name="**/*.jar"/>
</fileset>
</path>
@@ -71,6 +67,7 @@
debug="true"
optimize="false"
deprecation="true"
+ release="${compiler.release}"
target="${compiler.target}"
verbose="false"
fork="false"
@@ -119,6 +116,7 @@
debug="true"
optimize="false"
deprecation="true"
+ release="${compiler.release}"
target="${compiler.target}"
verbose="false"
fork="false"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/maven-resolver-impl/build.xml
new/maven-resolver-impl/build.xml
--- old/maven-resolver-impl/build.xml 2023-06-19 12:33:30.174930339 +0200
+++ new/maven-resolver-impl/build.xml 2024-06-11 17:14:25.885014369 +0200
@@ -35,8 +35,6 @@
<pathelement location="../maven-resolver-util/target/classes"/>
<pathelement location="../maven-resolver-named-locks/target/classes"/>
<fileset dir="../lib">
- <!-- javax.inject-1 org.eclipse.sisu.inject-0.3.3 sisu-guice-3.2.6-no_aop
- slf4j-api-1.7.25 -->
<include name="**/*.jar"/>
</fileset>
</path>
@@ -47,8 +45,6 @@
<pathelement location="../maven-resolver-named-locks/target/classes"/>
<pathelement location="../maven-resolver-test-util/target/classes"/>
<fileset dir="../lib">
- <!-- javax.inject-1 org.eclipse.sisu.inject-0.3.3 sisu-guice-3.2.6-no_aop
- slf4j-api-1.7.25 slf4j-simple-1.7.25 junit-4.12
hamcrest-core-1.3 -->
<include name="**/*.jar"/>
</fileset>
</path>
@@ -73,6 +69,7 @@
debug="true"
optimize="false"
deprecation="true"
+ release="${compiler.release}"
target="${compiler.target}"
verbose="false"
fork="false"
@@ -121,6 +118,7 @@
debug="true"
optimize="false"
deprecation="true"
+ release="${compiler.release}"
target="${compiler.target}"
verbose="false"
fork="false"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/maven-resolver-named-locks/build.xml
new/maven-resolver-named-locks/build.xml
--- old/maven-resolver-named-locks/build.xml 2023-06-19 12:33:17.402831252
+0200
+++ new/maven-resolver-named-locks/build.xml 2024-06-11 17:14:02.621516755
+0200
@@ -31,16 +31,12 @@
<path id="build.classpath">
<fileset dir="../lib">
- <!-- javax.inject-1 org.eclipse.sisu.inject-0.3.3 sisu-guice-3.2.6-no_aop
- slf4j-api-1.7.25 -->
<include name="**/*.jar"/>
</fileset>
</path>
<path id="build.test.classpath">
<pathelement location="../maven-resolver-test-util/target/classes"/>
<fileset dir="../lib">
- <!-- javax.inject-1 org.eclipse.sisu.inject-0.3.3 sisu-guice-3.2.6-no_aop
- slf4j-api-1.7.25 slf4j-simple-1.7.25 junit-4.12
hamcrest-core-1.3 -->
<include name="**/*.jar"/>
</fileset>
</path>
@@ -65,6 +61,7 @@
debug="true"
optimize="false"
deprecation="true"
+ release="${compiler.release}"
target="${compiler.target}"
verbose="false"
fork="false"
@@ -113,6 +110,7 @@
debug="true"
optimize="false"
deprecation="true"
+ release="${compiler.release}"
target="${compiler.target}"
verbose="false"
fork="false"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/maven-resolver-spi/build.xml
new/maven-resolver-spi/build.xml
--- old/maven-resolver-spi/build.xml 2023-06-19 12:33:06.318745286 +0200
+++ new/maven-resolver-spi/build.xml 2024-06-11 17:13:44.271387187 +0200
@@ -35,7 +35,6 @@
<path id="build.test.classpath">
<pathelement location="../maven-resolver-api/target/classes"/>
<fileset dir="../lib">
- <!-- junit-4.12 hamcrest-core-1.3 -->
<include name="**/*.jar"/>
</fileset>
</path>
@@ -60,6 +59,7 @@
debug="true"
optimize="false"
deprecation="true"
+ release="${compiler.release}"
target="${compiler.target}"
verbose="false"
fork="false"
@@ -86,6 +86,7 @@
debug="true"
optimize="false"
deprecation="true"
+ release="${compiler.release}"
target="${compiler.target}"
verbose="false"
fork="false"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/maven-resolver-test-util/build.xml
new/maven-resolver-test-util/build.xml
--- old/maven-resolver-test-util/build.xml 2023-06-19 12:32:50.310621121
+0200
+++ new/maven-resolver-test-util/build.xml 2024-06-11 17:13:31.037960417
+0200
@@ -37,7 +37,6 @@
<pathelement location="../maven-resolver-api/target/classes"/>
<pathelement location="../maven-resolver-spi/target/classes"/>
<fileset dir="../lib">
- <!-- junit-4.12 hamcrest-core-1.3 -->
<include name="**/*.jar"/>
</fileset>
</path>
@@ -62,6 +61,7 @@
debug="true"
optimize="false"
deprecation="true"
+ release="${compiler.release}"
target="${compiler.target}"
verbose="false"
fork="false"
@@ -88,6 +88,7 @@
debug="true"
optimize="false"
deprecation="true"
+ release="${compiler.release}"
target="${compiler.target}"
verbose="false"
fork="false"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/maven-resolver-transport-classpath/build.xml
new/maven-resolver-transport-classpath/build.xml
--- old/maven-resolver-transport-classpath/build.xml 2023-06-19
12:32:35.902509366 +0200
+++ new/maven-resolver-transport-classpath/build.xml 2024-06-11
17:13:06.831122846 +0200
@@ -35,7 +35,6 @@
<pathelement location="../maven-resolver-spi/target/classes"/>
<pathelement location="../maven-resolver-util/target/classes"/>
<fileset dir="../lib">
- <!-- javax.inject-1 -->
<include name="**/*.jar"/>
</fileset>
</path>
@@ -44,7 +43,6 @@
<pathelement location="../maven-resolver-spi/target/classes"/>
<pathelement location="../maven-resolver-util/target/classes"/>
<pathelement location="../maven-resolver-test-util/target/classes"/>
- <!-- javax.inject-1 sisu-guice-3.2.6-no_aop junit-4.12 hamcrest-core-1.3
-->
</path>
<!-- ======================================================================
-->
@@ -67,6 +65,7 @@
debug="true"
optimize="false"
deprecation="true"
+ release="${compiler.release}"
target="${compiler.target}"
verbose="false"
fork="false"
@@ -115,6 +114,7 @@
debug="true"
optimize="false"
deprecation="true"
+ release="${compiler.release}"
target="${compiler.target}"
verbose="false"
fork="false"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/maven-resolver-transport-file/build.xml
new/maven-resolver-transport-file/build.xml
--- old/maven-resolver-transport-file/build.xml 2023-06-19 12:31:47.774136066
+0200
+++ new/maven-resolver-transport-file/build.xml 2024-06-11 17:12:47.630987278
+0200
@@ -33,7 +33,6 @@
<pathelement location="../maven-resolver-api/target/classes"/>
<pathelement location="../maven-resolver-spi/target/classes"/>
<fileset dir="../lib">
- <!-- javax.inject-1 slf4j-api-1.7.25.jar -->
<include name="**/*.jar"/>
</fileset>
</path>
@@ -42,8 +41,6 @@
<pathelement location="../maven-resolver-spi/target/classes"/>
<pathelement location="../maven-resolver-test-util/target/classes"/>
<fileset dir="../lib">
- <!-- javax.inject-1 slf4j-api-1.7.25.jar sisu-guice-3.2.6-no_aop
- junit-4.12 hamcrest-core-1.3 slf4j-simple-1.7.25 -->
<include name="**/*.jar"/>
</fileset>
</path>
@@ -68,6 +65,7 @@
debug="true"
optimize="false"
deprecation="true"
+ release="${compiler.release}"
target="${compiler.target}"
verbose="false"
fork="false"
@@ -116,6 +114,7 @@
debug="true"
optimize="false"
deprecation="true"
+ release="${compiler.release}"
target="${compiler.target}"
verbose="false"
fork="false"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/maven-resolver-transport-http/build.xml
new/maven-resolver-transport-http/build.xml
--- old/maven-resolver-transport-http/build.xml 2023-06-19 12:30:57.885749107
+0200
+++ new/maven-resolver-transport-http/build.xml 2024-06-11 17:12:25.364163398
+0200
@@ -34,7 +34,6 @@
<pathelement location="../maven-resolver-spi/target/classes"/>
<pathelement location="../maven-resolver-util/target/classes"/>
<fileset dir="../lib">
- <!-- httpclient-4.5.6 httpcore-4.4.10 javax.inject-1 slf4j-api-1.7.25 -->
<include name="**/*.jar"/>
</fileset>
</path>
@@ -43,8 +42,6 @@
<pathelement location="../maven-resolver-spi/target/classes"/>
<pathelement location="../maven-resolver-util/target/classes"/>
<fileset dir="../lib">
- <!-- httpclient-4.5.6 httpcore-4.4.10 javax.inject-1 slf4j-api-1.7.25
- jcl-over-slf4j-1.7.25 -->
<include name="**/*.jar"/>
</fileset>
</path>
@@ -69,6 +66,7 @@
debug="true"
optimize="false"
deprecation="true"
+ release="${compiler.release}"
target="${compiler.target}"
verbose="false"
fork="false"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/maven-resolver-transport-wagon/build.xml
new/maven-resolver-transport-wagon/build.xml
--- old/maven-resolver-transport-wagon/build.xml 2023-06-19
12:30:50.845694501 +0200
+++ new/maven-resolver-transport-wagon/build.xml 2024-06-11
17:12:13.294078180 +0200
@@ -34,11 +34,8 @@
<pathelement location="../maven-resolver-spi/target/classes"/>
<pathelement location="../maven-resolver-util/target/classes"/>
<fileset dir="../lib">
- <!-- wagon-provider-api-3.0.0 javax.inject-1 plexus-classworlds-2.5.2
- plexus-utils-3.1.0 org.eclipse.sisu.plexus-0.3.3
slf4j-api-1.7.25 -->
<include name="**/*.jar"/>
</fileset>
- <pathelement
location="${repo.local}/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar"/>
</path>
<path id="build.test.classpath">
<pathelement location="../maven-resolver-api/target/classes"/>
@@ -46,14 +43,9 @@
<pathelement location="../maven-resolver-util/target/classes"/>
<pathelement location="../maven-resolver-test-util/target/classes"/>
<fileset dir="../lib">
- <!-- -->
<include name="**/*.jar"/>
</fileset>
<fileset dir="../lib">
- <!-- wagon-provider-api-3.0.0 javax.inject-1 plexus-classworlds-2.5.2
- plexus-utils-3.1.0 org.eclipse.sisu.plexus-0.3.3 slf4j-api-1.7.25
- sisu-guice-3.2.6-no_aop junit-4.12 hamcrest-core-1.3
- slf4j-simple-1.7.25 -->
<include name="**/*.jar"/>
</fileset>
</path>
@@ -78,6 +70,7 @@
debug="true"
optimize="false"
deprecation="true"
+ release="${compiler.release}"
target="${compiler.target}"
verbose="false"
fork="false"
@@ -126,6 +119,7 @@
debug="true"
optimize="false"
deprecation="true"
+ release="${compiler.release}"
target="${compiler.target}"
verbose="false"
fork="false"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/maven-resolver-util/build.xml
new/maven-resolver-util/build.xml
--- old/maven-resolver-util/build.xml 2023-06-19 12:30:26.733507474 +0200
+++ new/maven-resolver-util/build.xml 2024-06-11 17:10:01.963150909 +0200
@@ -36,7 +36,6 @@
<pathelement location="../maven-resolver-api/target/classes"/>
<pathelement location="../maven-resolver-test-util/target/classes"/>
<fileset dir="../lib">
- <!-- junit-4.12 hamcrest-core-1.3 mockito-core-2.23.0 -->
<include name="**/*.jar"/>
</fileset>
</path>
@@ -61,6 +60,7 @@
debug="true"
optimize="false"
deprecation="true"
+ release="${compiler.release}"
target="${compiler.target}"
verbose="false"
fork="false"
@@ -87,6 +87,7 @@
debug="true"
optimize="false"
deprecation="true"
+ release="${compiler.release}"
target="${compiler.target}"
verbose="false"
fork="false"
