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

[WFCORE-7076] Upgrade maven dependencies to 3.9.9 #6274

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[WFCORE-7076] Upgrade maven dependencies to 3.9.9 #6274

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
10 changes: 10 additions & 0 deletions elytron/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,6 +391,16 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
12 changes: 10 additions & 2 deletions model-test/src/main/java/org/jboss/as/model/test/MavenUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,11 @@
import java.util.concurrent.ConcurrentHashMap;

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.AbstractRepositoryListener;
Expand Down Expand Up @@ -281,8 +283,6 @@ private RepositorySystemSession newRepositorySystemSession() {
return this.session;
}
DefaultRepositorySystemSession session = MavenRepositorySystemUtils.newSession();


LocalRepository localRepo = new LocalRepository(mavenSettings.getLocalRepository().toString());
session.setLocalRepositoryManager(REPOSITORY_SYSTEM.newLocalRepositoryManager(session, localRepo));

Expand All @@ -295,6 +295,11 @@ public void transferFailed(TransferEvent event) {
super.transferFailed(event);
}
});

// these properties are needed by Maven to correctly parse poms when resolving nested dependencies
session.setSystemProperty("java.version", System.getProperty("java.version"));
session.setSystemProperty("java.home", System.getProperty("java.home"));

this.session = session;
return session;
}
Expand All @@ -312,11 +317,14 @@ static RepositorySystem newRepositorySystem() {
*/

DefaultServiceLocator locator = new DefaultServiceLocator();


locator.addService(ArtifactDescriptorReader.class, DefaultArtifactDescriptorReader.class);
locator.addService(VersionResolver.class, DefaultVersionResolver.class);
locator.addService(VersionRangeResolver.class, DefaultVersionRangeResolver.class);
locator.addService(MetadataGeneratorFactory.class, SnapshotMetadataGeneratorFactory.class);
locator.addService(MetadataGeneratorFactory.class, VersionsMetadataGeneratorFactory.class);
locator.addService(ModelCacheFactory.class, DefaultModelCacheFactory.class);
locator.setErrorHandler(new MyErrorHandler());

locator.addService(RepositoryConnectorFactory.class, BasicRepositoryConnectorFactory.class);
Expand Down
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 @@ -196,8 +196,8 @@
<version.org.apache.httpcomponents.httpclient>4.5.14</version.org.apache.httpcomponents.httpclient>
<version.org.apache.httpcomponents.httpcore>4.4.16</version.org.apache.httpcomponents.httpcore>
<version.org.apache.logging.log4j>2.23.1</version.org.apache.logging.log4j>
<version.org.apache.maven.provider>3.5.4</version.org.apache.maven.provider>
<version.org.apache.maven.resolver>1.1.1</version.org.apache.maven.resolver>
<version.org.apache.maven.provider>3.9.9</version.org.apache.maven.provider>
<version.org.apache.maven.resolver>1.9.22</version.org.apache.maven.resolver>
<version.org.apache.sshd>2.14.0</version.org.apache.sshd>
<version.org.apache.velocity>2.3</version.org.apache.velocity>
<version.org.bouncycastle>1.79</version.org.bouncycastle>
Expand Down
10 changes: 10 additions & 0 deletions subsystem-test/framework/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,22 @@
<name>WildFly: Subsystem Test Harness</name>

<dependencies>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>compile</scope>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>

<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-resolver-provider</artifactId>
Expand Down
9 changes: 9 additions & 0 deletions testsuite/shared/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,15 @@
<artifactId>shrinkwrap-impl-base</artifactId>
</dependency>

<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>

<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
Expand Down
Loading