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

[SHRINKRES-344] Update Maven to 3.9.8 and MIMA to 2.4.15 #236

Merged
merged 1 commit into from
Jul 24, 2024
Merged

[SHRINKRES-344] Update Maven to 3.9.8 and MIMA to 2.4.15 #236

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: 1 addition & 1 deletion bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@

<jboss.releases.repo.url>https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/</jboss.releases.repo.url>
<jboss.snapshots.repo.url>https://repository.jboss.org/nexus/content/repositories/snapshots/</jboss.snapshots.repo.url>
<version.org.apache.maven>3.9.6</version.org.apache.maven>
<version.org.apache.maven>3.9.8</version.org.apache.maven>

</properties>

Expand Down
2 changes: 1 addition & 1 deletion ...ded/src/main/java/org/jboss/shrinkwrap/resolver/api/maven/embedded/DistributionStage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
public interface DistributionStage<NEXT_STEP extends BuildStage<DAEMON_TRIGGER_TYPE>, DAEMON_TRIGGER_TYPE extends DaemonBuildTrigger>
extends BuildStage<DAEMON_TRIGGER_TYPE> {

String DEFAULT_MAVEN_VERSION = "3.9.6";
String DEFAULT_MAVEN_VERSION = "3.9.8";

/**
* Configures EmbeddedMaven to build project with Maven 3 of given version. If the zip file is not cached in directory
Expand Down
4 changes: 2 additions & 2 deletions ...n/embedded/invoker/equipped/InvokerEquippedEmbeddedMavenForMultiModuleSampleTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@ public void testMultiModuleSampleBuildWithMaven310() {

BuiltProject builtProject = EmbeddedMaven
.withMavenInvokerSet(request, invoker)
.useMaven3Version("3.9.6")
.useMaven3Version("3.9.8")
.build();
builtProject.setMavenLog(logBuffer.toString());

verifyMavenVersion(builtProject, "3.9.6");
verifyMavenVersion(builtProject, "3.9.8");
verifyMultiModuleSample(builtProject, true);
}

Expand Down
4 changes: 2 additions & 2 deletions ...mpl/maven/embedded/invoker/equipped/InvokerEquippedEmbeddedMavenForWarSampleTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,12 @@ public void testWarSampleBuildWithMaven310() {

BuiltProject builtProject = EmbeddedMaven
.withMavenInvokerSet(request, invoker)
.useMaven3Version("3.9.6")
.useMaven3Version("3.9.8")
.build();
builtProject.setMavenLog(logBuffer.toString());

verifyWarSampleWithSources(builtProject);
verifyMavenVersion(builtProject, "3.9.6");
verifyMavenVersion(builtProject, "3.9.8");
}

@Test(expected = IllegalStateException.class)
Expand Down
4 changes: 2 additions & 2 deletions ...mpl/maven/embedded/pom/equipped/PomEquippedEmbeddedMavenForMultiModuleSampleTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@ public class PomEquippedEmbeddedMavenForMultiModuleSampleTestCase {
public void testMultiModuleSampleBuildWithMaven310() {
BuiltProject builtProject = EmbeddedMaven
.forProject(workDirRule.prepareProject(pathToMultiModulePom))
.useMaven3Version("3.9.6")
.useMaven3Version("3.9.8")
.setUserSettingsFile(new File("src/it/settings.xml"))
.setGoals("install")
.addProperty(multiModuleactivateModulesParamKey, multiModuleactivateModulesParamValue)
.addProperty(archiveNameModuleTwoParamKey, archiveNameModuleTwoParamValue)
.setShowVersion(true)
.build();

verifyMavenVersion(builtProject, "3.9.6");
verifyMavenVersion(builtProject, "3.9.8");
verifyMultiModuleSample(builtProject, true);
}

Expand Down
4 changes: 2 additions & 2 deletions ...solver/impl/maven/embedded/pom/equipped/PomEquippedEmbeddedMavenForWarSampleTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ public void testWarSampleBuildWithMaven310() {
BuiltProject builtProject = EmbeddedMaven
.forProject(workDirRule.prepareProject(pathToWarSamplePom))
.setUserSettingsFile(new File("src/it/settings.xml"))
.useMaven3Version("3.9.6")
.useMaven3Version("3.9.8")
.setGoals("clean", "package", "source:jar")
.setShowVersion(true)
.build();

verifyWarSampleWithSources(builtProject);
verifyMavenVersion(builtProject, "3.9.6");
verifyMavenVersion(builtProject, "3.9.8");
}

@Test(expected = IllegalStateException.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 @@ -33,8 +33,8 @@
<version.com.google.guice>7.0.0</version.com.google.guice>
<version.commons-codec>1.16.1</version.commons-codec>
<version.commons-io>2.16.1</version.commons-io>
<version.eu.maveniverse.mima>2.4.8</version.eu.maveniverse.mima>
<version.org.apache.maven>3.9.6</version.org.apache.maven>
<version.eu.maveniverse.mima>2.4.15</version.eu.maveniverse.mima>
<version.org.apache.maven>3.9.8</version.org.apache.maven>
<version.org.apache.maven-plugin-annotations>3.13.1</version.org.apache.maven-plugin-annotations>
<version.org.apache.maven-invoker>3.0.1</version.org.apache.maven-invoker>
<version.org.arquillian.arquillian-spacelift>1.0.2</version.org.arquillian.arquillian-spacelift>
Expand Down