Skip to content

Upgrading Maven library to 3.9.9 #2406

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

Open
suztomo wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Upgrading Maven library to 3.9.9 #2406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c5e92be
Upgrading Maven library to 3.9.9
suztomo Jun 6, 2025
98fe07c
Regenerate Maven wrapper to use 3.9.9
suztomo Jun 6, 2025
ee2f95d
Insert verify to point to unexpected null value
suztomo Jun 6, 2025
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
117 changes: 0 additions & 117 deletions .mvn/wrapper/MavenWrapperDownloader.java
View file
Open in desktop

This file was deleted.

5 changes: 3 additions & 2 deletions .mvn/wrapper/maven-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
wrapperVersion=3.3.2
distributionType=only-script
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
10 changes: 7 additions & 3 deletions ...ncies/src/main/java/com/google/cloud/tools/opensource/dependencies/RepositoryUtility.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import static com.google.common.collect.ImmutableList.toImmutableList;

import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Verify;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import java.io.File;
Expand Down Expand Up @@ -56,6 +57,7 @@
import org.eclipse.aether.connector.basic.BasicRepositoryConnectorFactory;
import org.eclipse.aether.impl.DefaultServiceLocator;
import org.eclipse.aether.repository.LocalRepository;
import org.eclipse.aether.repository.LocalRepositoryManager;
import org.eclipse.aether.repository.RemoteRepository;
import org.eclipse.aether.resolution.VersionRangeRequest;
import org.eclipse.aether.resolution.VersionRangeResolutionException;
Expand Down Expand Up @@ -95,16 +97,18 @@ public static RepositorySystem newRepositorySystem() {
locator.addService(RepositoryConnectorFactory.class, BasicRepositoryConnectorFactory.class);
locator.addService(TransporterFactory.class, FileTransporterFactory.class);
locator.addService(TransporterFactory.class, HttpTransporterFactory.class);

return locator.getService(RepositorySystem.class);
RepositorySystem system = locator.getService(RepositorySystem.class);
Verify.verifyNotNull(system, "Couldn't retrieve RepositorySystem");
return system;
}

@VisibleForTesting
static DefaultRepositorySystemSession createDefaultRepositorySystemSession(
RepositorySystem system) {
DefaultRepositorySystemSession session = MavenRepositorySystemUtils.newSession();
LocalRepository localRepository = new LocalRepository(findLocalRepository());
session.setLocalRepositoryManager(system.newLocalRepositoryManager(session, localRepository));
LocalRepositoryManager localRepositoryManager = system.newLocalRepositoryManager(session, localRepository);
session.setLocalRepositoryManager(localRepositoryManager);
return session;
}

Expand Down
5 changes: 3 additions & 2 deletions ...ncies/src/test/java/com/google/cloud/tools/opensource/classpath/ClassPathBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,9 @@ public void testResolve_removingDuplicates() throws InvalidVersionSpecificationE
/** Test that BOM members come before the transitive dependencies. */
@Test
public void testBomToPaths_firstElementsAreBomMembers() throws RepositoryException {
List<Artifact> managedDependencies =
Bom.readBom("com.google.cloud:google-cloud-bom:0.81.0-alpha")
Bom bom = Bom.readBom("com.google.cloud:google-cloud-bom:0.81.0-alpha");
List<Artifact> managedDependencies =
bom
.getManagedDependencies();

ImmutableList<ClassPathEntry> classPath =
Expand Down
Loading
Loading