Skip to content

Commit 1e365a9

Browse files
authored
Merge pull request #432 from petrberan/dependencyUpdates
chore: Dependency updates (Maven, Mima, common-compress, Plexus)
2 parents 836573b + 54f1c79 commit 1e365a9

File tree

8 files changed

+18
-14
lines changed

8 files changed

+18
-14
lines changed

.mvn/wrapper/maven-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@
1616
# under the License.
1717
wrapperVersion=3.3.2
1818
distributionType=only-script
19-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
19+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.12/apache-maven-3.9.12-bin.zip

maven/api-maven-embedded/src/main/java/org/jboss/shrinkwrap/resolver/api/maven/embedded/DistributionStage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
public interface DistributionStage<NEXT_STEP extends BuildStage<DAEMON_TRIGGER_TYPE>, DAEMON_TRIGGER_TYPE extends DaemonBuildTrigger>
2828
extends BuildStage<DAEMON_TRIGGER_TYPE> {
2929

30-
String DEFAULT_MAVEN_VERSION = "3.9.9";
30+
String DEFAULT_MAVEN_VERSION = "3.9.12";
3131

3232
/**
3333
* Configures EmbeddedMaven to build project with Maven 3 of given version. If the zip file is not cached in directory

maven/impl-maven-embedded/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/invoker/equipped/InvokerEquippedEmbeddedMavenForMultiModuleSampleTestCase.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@ void testMultiModuleSampleBuildWithMaven310() {
6161

6262
BuiltProject builtProject = EmbeddedMaven
6363
.withMavenInvokerSet(request, invoker)
64-
.useMaven3Version("3.9.9")
64+
.useMaven3Version("3.9.12")
6565
.build();
6666
builtProject.setMavenLog(logBuffer.toString());
6767

68-
verifyMavenVersion(builtProject, "3.9.9");
68+
verifyMavenVersion(builtProject, "3.9.12");
6969
verifyMultiModuleSample(builtProject, true);
7070
}
7171

maven/impl-maven-embedded/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/invoker/equipped/InvokerEquippedEmbeddedMavenForWarSampleTestCase.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@ void testWarSampleBuildWithMaven310() {
5252

5353
BuiltProject builtProject = EmbeddedMaven
5454
.withMavenInvokerSet(request, invoker)
55-
.useMaven3Version("3.9.9")
55+
.useMaven3Version("3.9.12")
5656
.build();
5757
builtProject.setMavenLog(logBuffer.toString());
5858

5959
verifyWarSampleWithSources(builtProject);
60-
verifyMavenVersion(builtProject, "3.9.9");
60+
verifyMavenVersion(builtProject, "3.9.12");
6161
}
6262

6363
@Test

maven/impl-maven-embedded/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/pom/equipped/PomEquippedEmbeddedMavenForMultiModuleSampleTestCase.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ class PomEquippedEmbeddedMavenForMultiModuleSampleTestCase {
3232
void testMultiModuleSampleBuildWithMaven310() {
3333
BuiltProject builtProject = EmbeddedMaven
3434
.forProject(workDirExtension.prepareProject(pathToMultiModulePom))
35-
.useMaven3Version("3.9.9")
35+
.useMaven3Version("3.9.12")
3636
.setUserSettingsFile(new File("src/it/settings.xml"))
3737
.setGoals("install")
3838
.addProperty(multiModuleactivateModulesParamKey, multiModuleactivateModulesParamValue)
3939
.addProperty(archiveNameModuleTwoParamKey, archiveNameModuleTwoParamValue)
4040
.setShowVersion(true)
4141
.build();
4242

43-
verifyMavenVersion(builtProject, "3.9.9");
43+
verifyMavenVersion(builtProject, "3.9.12");
4444
verifyMultiModuleSample(builtProject, true);
4545
}
4646

maven/impl-maven-embedded/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/pom/equipped/PomEquippedEmbeddedMavenForWarSampleTestCase.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ void testWarSampleBuildWithMaven310() {
2626
BuiltProject builtProject = EmbeddedMaven
2727
.forProject(workDirExtension.prepareProject(pathToWarSamplePom))
2828
.setUserSettingsFile(new File("src/it/settings.xml"))
29-
.useMaven3Version("3.9.9")
29+
.useMaven3Version("3.9.12")
3030
.setGoals("clean", "package", "source:jar")
3131
.setShowVersion(true)
3232
.build();
3333

3434
verifyWarSampleWithSources(builtProject);
35-
verifyMavenVersion(builtProject, "3.9.9");
35+
verifyMavenVersion(builtProject, "3.9.12");
3636
}
3737

3838
@Test

maven/maven-plugin/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,10 @@
8484
<groupId>com.google.guava</groupId>
8585
<artifactId>guava</artifactId>
8686
</exclusion>
87+
<exclusion>
88+
<groupId>com.google.inject</groupId>
89+
<artifactId>guice</artifactId>
90+
</exclusion>
8791
</exclusions>
8892
</dependency>
8993
</dependencies>

pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,16 @@
3232
<!-- Versioning -->
3333
<version.com.google.guice>6.0.0</version.com.google.guice>
3434
<version.commons-codec>1.18.0</version.commons-codec>
35-
<version.commons-compress>1.27.1</version.commons-compress>
35+
<version.commons-compress>1.28.0</version.commons-compress>
3636
<version.commons-io>2.21.0</version.commons-io>
37-
<version.eu.maveniverse.mima>2.4.22</version.eu.maveniverse.mima>
38-
<version.org.apache.maven>3.9.9</version.org.apache.maven>
37+
<version.eu.maveniverse.mima>2.4.39</version.eu.maveniverse.mima>
38+
<version.org.apache.maven>3.9.12</version.org.apache.maven>
3939
<version.org.apache.maven-plugin-annotations>3.15.1</version.org.apache.maven-plugin-annotations>
4040
<version.org.apache.maven-invoker>3.3.0</version.org.apache.maven-invoker>
4141
<version.org.codehaus.plexus-classworlds>2.9.0</version.org.codehaus.plexus-classworlds>
4242
<version.org.codehaus.plexus-compiler-javac>2.15.0</version.org.codehaus.plexus-compiler-javac>
4343
<version.org.codehaus.plexus-sec-dispatcher>2.0</version.org.codehaus.plexus-sec-dispatcher>
44-
<version.org.eclipse.plexus>0.9.0.M3</version.org.eclipse.plexus>
44+
<version.org.eclipse.plexus>0.9.0.M4</version.org.eclipse.plexus>
4545
<version.org.gradle.gradle-tooling-api>8.13</version.org.gradle.gradle-tooling-api>
4646
<version.org.jboss.shrinkwrap>1.2.6</version.org.jboss.shrinkwrap>
4747

0 commit comments

Comments
 (0)