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

Upgrade Maven from 3.8.1 to 3.9.6 #1729

Merged
merged 1 commit into from
Sep 24, 2024
Merged

Upgrade Maven from 3.8.1 to 3.9.6 #1729

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
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
<selenium.version>4.25.0</selenium.version>
<!-- aligned with selenium -->
<guava.version>33.3.0-jre</guava.version>
<maven.version>3.8.1</maven.version>
<maven-resolver.version>1.6.2</maven-resolver.version>
<maven.version>3.9.6</maven.version>
<maven-resolver.version>1.9.18</maven-resolver.version>
Copy link
Member Author

Choose a reason for hiding this comment

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

Not the latest version, but Maven 3.9.6 ships Maven Resolver 1.9.18, so keeping the versions aligned here.

<groovy.version>3.0.22</groovy.version>
<jffi.version>1.3.13</jffi.version>
<spotless.check.skip>false</spotless.check.skip>
Expand Down
18 changes: 18 additions & 0 deletions src/main/java/org/jenkinsci/test/acceptance/utils/aether/AetherModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,16 @@
import jakarta.inject.Singleton;
import java.util.Collections;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import org.apache.maven.model.building.DefaultModelBuilderFactory;
import org.apache.maven.model.building.ModelBuilder;
import org.apache.maven.repository.internal.DefaultArtifactDescriptorReader;
import org.apache.maven.repository.internal.DefaultModelCacheFactory;
import org.apache.maven.repository.internal.DefaultVersionRangeResolver;
import org.apache.maven.repository.internal.DefaultVersionResolver;
import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
import org.apache.maven.repository.internal.ModelCacheFactory;
import org.apache.maven.repository.internal.SnapshotMetadataGeneratorFactory;
import org.apache.maven.repository.internal.VersionsMetadataGeneratorFactory;
import org.eclipse.aether.DefaultRepositorySystemSession;
Expand All @@ -31,6 +34,7 @@
import org.eclipse.aether.spi.connector.transport.TransporterFactory;
import org.eclipse.aether.transfer.TransferEvent;
import org.eclipse.aether.transport.file.FileTransporterFactory;
import org.eclipse.aether.transport.http.ChecksumExtractor;
import org.eclipse.aether.transport.http.HttpTransporterFactory;
import org.jenkinsci.test.acceptance.utils.MavenLocalRepository;

Expand Down Expand Up @@ -97,6 +101,15 @@ public void transferProgressed(TransferEvent event) {
return session;
}

/**
* Checksum extractors (none).
*/
@Provides
@Singleton
Map<String, ChecksumExtractor> provideChecksumExtractors() {
return Collections.emptyMap();
}

Comment on lines +104 to +112
Copy link
Member Author

Choose a reason for hiding this comment

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

Taken from the example in apache/maven-resolver#140.

/**
* Repository system connectors (needed for remote transport).
*/
Expand Down Expand Up @@ -143,4 +156,9 @@ Set<MetadataGeneratorFactory> provideMetadataGeneratorFactories(
ModelBuilder provideModelBuilder() {
return new DefaultModelBuilderFactory().newInstance();
}

@Provides
ModelCacheFactory provideModelCacheFactory() {
return new DefaultModelCacheFactory();
}
Comment on lines +160 to +163
Copy link
Member Author

Choose a reason for hiding this comment

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

Taken from the example in apache/maven-resolver#319.

}
Loading