This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git
The following commit(s) were added to refs/heads/master by this push:
new 1e9888a2 Fixes for release (#417)
1e9888a2 is described below
commit 1e9888a236059086ddded6600b1cae9464cbabdc
Author: Tamas Cservenak <[email protected]>
AuthorDate: Thu Jan 25 19:20:37 2024 +0100
Fixes for release (#417)
Changes:
* Javadoc issue: use of H1 HTML tag in versions package javadoc
* Non aligned ctor of JDK Transport factory
* use proper m-dependency-p:unpack-dependencies goal
---
.../transport/jdk/JdkTransporterFactory.java | 7 ++++
.../maven-resolver-transport-jdk/pom.xml | 45 ++++++----------------
.../eclipse/aether/util/version/package-info.java | 5 ++-
3 files changed, 22 insertions(+), 35 deletions(-)
diff --git
a/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-8/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporterFactory.java
b/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-8/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporterFactory.java
index 98de637c..2096ac31 100644
---
a/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-8/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporterFactory.java
+++
b/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-8/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporterFactory.java
@@ -18,10 +18,12 @@
*/
package org.eclipse.aether.transport.jdk;
+import javax.inject.Inject;
import javax.inject.Named;
import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.repository.RemoteRepository;
+import org.eclipse.aether.spi.connector.transport.http.ChecksumExtractor;
import org.eclipse.aether.spi.connector.transport.http.HttpTransporter;
import org.eclipse.aether.spi.connector.transport.http.HttpTransporterFactory;
import org.eclipse.aether.transfer.NoTransporterException;
@@ -43,6 +45,11 @@ public final class JdkTransporterFactory implements
HttpTransporterFactory {
private float priority = 10.0f;
+ @Inject
+ public JdkTransporterFactory(ChecksumExtractor checksumExtractor) {
+ // this is to equalize all Java version constructors to be same, so
Supplier could work across all versions
+ }
+
@Override
public float getPriority() {
return priority;
diff --git
a/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk/pom.xml
b/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk/pom.xml
index 5d38bb48..7136e0cc 100644
--- a/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk/pom.xml
+++ b/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk/pom.xml
@@ -114,58 +114,37 @@
<execution>
<id>java8</id>
<goals>
- <goal>unpack</goal>
+ <goal>unpack-dependencies</goal>
</goals>
<phase>generate-resources</phase>
<configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.maven.resolver</groupId>
- <artifactId>maven-resolver-transport-jdk-8</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
-
<outputDirectory>${project.build.directory}/generated-resources</outputDirectory>
- <excludes>META-INF/maven/**</excludes>
- </artifactItem>
- </artifactItems>
+
<includeArtifactIds>maven-resolver-transport-jdk-8</includeArtifactIds>
+
<outputDirectory>${project.build.directory}/generated-resources</outputDirectory>
+ <excludes>META-INF/maven/**</excludes>
</configuration>
</execution>
<execution>
<id>java11</id>
<goals>
- <goal>unpack</goal>
+ <goal>unpack-dependencies</goal>
</goals>
<phase>generate-resources</phase>
<configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.maven.resolver</groupId>
- <artifactId>maven-resolver-transport-jdk-11</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
-
<outputDirectory>${project.build.directory}/generated-resources/META-INF/versions/11</outputDirectory>
- <includes>**/*.class</includes>
- </artifactItem>
- </artifactItems>
+
<includeArtifactIds>maven-resolver-transport-jdk-11</includeArtifactIds>
+
<outputDirectory>${project.build.directory}/generated-resources/META-INF/versions/11</outputDirectory>
+ <includes>**/*.class</includes>
</configuration>
</execution>
<execution>
<id>java21</id>
<goals>
- <goal>unpack</goal>
+ <goal>unpack-dependencies</goal>
</goals>
<phase>generate-resources</phase>
<configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.maven.resolver</groupId>
- <artifactId>maven-resolver-transport-jdk-21</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
-
<outputDirectory>${project.build.directory}/generated-resources/META-INF/versions/21</outputDirectory>
- <includes>**/*.class</includes>
- </artifactItem>
- </artifactItems>
+
<includeArtifactIds>maven-resolver-transport-jdk-21</includeArtifactIds>
+
<outputDirectory>${project.build.directory}/generated-resources/META-INF/versions/21</outputDirectory>
+ <includes>**/*.class</includes>
</configuration>
</execution>
</executions>
diff --git
a/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/package-info.java
b/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/package-info.java
index 4349d6e7..c4147f9f 100644
---
a/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/package-info.java
+++
b/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/package-info.java
@@ -25,8 +25,9 @@
* <p>
* On the other hand, the {@link
org.eclipse.aether.util.version.UnionVersionRange} is universal implementation
of
* "unions" of various {@link org.eclipse.aether.version.VersionRange}
instances.
- *
- * <h1>Generic Version Spec</h1>
+ * <p>
+ * Below is the <em>Generic Version Spec</em> described:
+ * <p>
* Version string is parsed into version according to these rules below:
* <ul>
* <li>The version string is parsed into segments, from left to right.</li>
