Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes for release #417

Merged
merged 2 commits into from
Jan 25, 2024
Merged

Fixes for release #417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1398b9c
Fixes for release
cstamas Jan 25, 2024
0d93371
Replace wrong goal with proper goal
cstamas Jan 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions ...transport-jdk-8/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporterFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
45 changes: 12 additions & 33 deletions maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 3 additions & 2 deletions maven-resolver-util/src/main/java/org/eclipse/aether/util/version/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down