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

Jump to bottom

Move to Java17 #438

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Move to Java17 #438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions maven-resolver-demos/maven-resolver-demo-snippets/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@

<properties>
<Automatic-Module-Name>org.apache.maven.resolver.demo.snippets</Automatic-Module-Name>
<!-- Jetty 10.x needs Java 11, generator-signer needs 17: we want both to work -->
<javaVersion>17</javaVersion>
</properties>

<dependencies>
Expand Down
1 change: 0 additions & 1 deletion maven-resolver-generator-gnupg/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
<Automatic-Module-Name>org.apache.maven.resolver.generator.gnupg</Automatic-Module-Name>
<Bundle-SymbolicName>${Automatic-Module-Name}</Bundle-SymbolicName>

<javaVersion>17</javaVersion>
<bouncycastleVersion>1.77</bouncycastleVersion>
</properties>

Expand Down
2 changes: 0 additions & 2 deletions maven-resolver-test-http/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@
<properties>
<Automatic-Module-Name>org.apache.maven.resolver.test.http</Automatic-Module-Name>
<Bundle-SymbolicName>${Automatic-Module-Name}</Bundle-SymbolicName>

<javaVersion>11</javaVersion>
</properties>

<dependencies>
Expand Down
1 change: 0 additions & 1 deletion maven-resolver-tools/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
<description>Various tools.</description>

<properties>
<javaVersion>17</javaVersion>
<maven.deploy.skip>true</maven.deploy.skip>

<Automatic-Module-Name>org.apache.maven.resolver.tools</Automatic-Module-Name>
Expand Down
8 changes: 3 additions & 5 deletions ...t/maven-resolver-transport-jdk-11/pom.xml → ...t/maven-resolver-transport-jdk-17/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,15 @@
<version>2.0.0-SNAPSHOT</version>
</parent>

<artifactId>maven-resolver-transport-jdk-11</artifactId>
<artifactId>maven-resolver-transport-jdk-17</artifactId>
<packaging>jar</packaging>

<name>Maven Artifact Resolver Transport JDK 11</name>
<description>Maven Artifact Transport JDK Java 11+.</description>
<name>Maven Artifact Resolver Transport JDK 17</name>
<description>Maven Artifact Transport JDK Java 17+.</description>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why? Can't it then just be "Maven Artifact Resolver Transport JDK" or so?


<properties>
<Automatic-Module-Name>org.apache.maven.resolver.transport.jdk</Automatic-Module-Name>
<Bundle-SymbolicName>${Automatic-Module-Name}</Bundle-SymbolicName>

<javaVersion>11</javaVersion>
</properties>

<dependencies>
Expand Down
6 changes: 1 addition & 5 deletions .../aether/transport/jdk/JdkTransporter.java → .../aether/transport/jdk/JdkTransporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,7 @@
import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.repository.AuthenticationContext;
import org.eclipse.aether.repository.RemoteRepository;
import org.eclipse.aether.spi.connector.transport.AbstractTransporter;
import org.eclipse.aether.spi.connector.transport.GetTask;
import org.eclipse.aether.spi.connector.transport.PeekTask;
import org.eclipse.aether.spi.connector.transport.PutTask;
import org.eclipse.aether.spi.connector.transport.TransportTask;
import org.eclipse.aether.spi.connector.transport.*;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😄

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.HttpTransporterException;
Expand Down
0 ...r/transport/jdk/JdkTransporterCloser.java → ...r/transport/jdk/JdkTransporterCloser.java
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions .../jdk/JdkTransporterConfigurationKeys.java → .../jdk/JdkTransporterConfigurationKeys.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ private JdkTransporterConfigurationKeys() {}
* Use string representation of HttpClient version enum "HTTP_2" or "HTTP_1_1" to set default HTTP protocol to use.
*
* @configurationSource {@link RepositorySystemSession#getConfigProperties()}
* @configurationType {@link java.lang.String}
* @configurationType {@link String}
* @configurationDefaultValue {@link #DEFAULT_HTTP_VERSION}
* @configurationRepoIdSuffix Yes
*/
Expand All @@ -51,7 +51,7 @@ private JdkTransporterConfigurationKeys() {}
* <a href="https://bugs.openjdk.org/browse/JDK-8225647">JDK-8225647</a> for details.
*
* @configurationSource {@link RepositorySystemSession#getConfigProperties()}
* @configurationType {@link java.lang.Integer}
* @configurationType {@link Integer}
* @configurationDefaultValue {@link #DEFAULT_MAX_CONCURRENT_REQUESTS}
* @configurationRepoIdSuffix Yes
*/
Expand Down
0 .../transport/jdk/JdkTransporterFactory.java → .../transport/jdk/JdkTransporterFactory.java
View file
Open in desktop
File renamed without changes.
0 ...her/transport/jdk/JdkTransporterTest.java → ...her/transport/jdk/JdkTransporterTest.java
View file
Open in desktop
File renamed without changes.
88 changes: 0 additions & 88 deletions maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-8/pom.xml
View file
Open in desktop

This file was deleted.

73 changes: 0 additions & 73 deletions ...transport-jdk-8/src/main/java/org/eclipse/aether/transport/jdk/JdkTransporterFactory.java
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions ...resolver-transport-jdk-8/src/main/java/org/eclipse/aether/transport/jdk/package-info.java
View file
Open in desktop

This file was deleted.

26 changes: 3 additions & 23 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 @@ -35,21 +35,13 @@
<properties>
<Automatic-Module-Name>org.apache.maven.resolver.transport.jdk</Automatic-Module-Name>
<Bundle-SymbolicName>${Automatic-Module-Name}</Bundle-SymbolicName>

<javaVersion>11</javaVersion>
</properties>

<dependencies>
<!-- These dependencies are actually included in this multi-release JAR -->
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-transport-jdk-8</artifactId>
<version>${project.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-transport-jdk-11</artifactId>
<artifactId>maven-resolver-transport-jdk-17</artifactId>
<version>${project.version}</version>
<optional>true</optional>
</dependency>
Expand Down Expand Up @@ -112,29 +104,17 @@
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>java8</id>
<id>java17</id>
<goals>
<goal>unpack-dependencies</goal>
</goals>
<phase>generate-resources</phase>
<configuration>
<includeArtifactIds>maven-resolver-transport-jdk-8</includeArtifactIds>
<includeArtifactIds>maven-resolver-transport-jdk-17</includeArtifactIds>
<outputDirectory>${project.build.directory}/generated-resources</outputDirectory>
<excludes>META-INF/maven/**</excludes>
</configuration>
</execution>
<execution>
<id>java11</id>
<goals>
<goal>unpack-dependencies</goal>
</goals>
<phase>generate-resources</phase>
<configuration>
<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>
Expand Down
3 changes: 1 addition & 2 deletions maven-resolver-transport-jdk-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@
<description>Maven Artifact Transport JDK Java 11+ parent.</description>

<modules>
<module>maven-resolver-transport-jdk-8</module>
<module>maven-resolver-transport-jdk-11</module>
<module>maven-resolver-transport-jdk-17</module>
<module>maven-resolver-transport-jdk-21</module>
<module>maven-resolver-transport-jdk</module>
</modules>
Expand Down
2 changes: 0 additions & 2 deletions maven-resolver-transport-jetty/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@
<properties>
<Automatic-Module-Name>org.apache.maven.resolver.transport.jetty</Automatic-Module-Name>
<Bundle-SymbolicName>${Automatic-Module-Name}</Bundle-SymbolicName>

<javaVersion>11</javaVersion>
</properties>

<dependencies>
Expand Down
Loading