Skip to content

Commit 72991bc

Browse files
authored
Merge pull request #36120 from vespa-engine/hmusum/bump-maven-version-in-bootstrap.sh
Bump Maven version to 3.9.13
2 parents ac8e998 + 13525b2 commit 72991bc

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

bootstrap.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ echo "Using maven target: ${MAVEN_TARGET}"
6161
# Set up maven wrapper.
6262
echo "Setting up maven wrapper in $(pwd)"
6363
# shellcheck disable=SC2086 # allow word splitting for maven extra opts
64-
mvn -B wrapper:wrapper -Dmaven=3.9.12 -N ${MAVEN_EXTRA_OPTS}
64+
mvn -B wrapper:wrapper -Dmaven=3.9.13 -N ${MAVEN_EXTRA_OPTS}
6565

6666
# Proxy allowing you to put $(pwd)/maven-wrapper/bin first in PATH
6767
# to redirect any plain "mvn" commands so they use the wrapper

dependency-versions/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@
184184
<maven-assembly-plugin.vespa.version>3.7.1</maven-assembly-plugin.vespa.version>
185185
<maven-bundle-plugin.vespa.version>5.1.9</maven-bundle-plugin.vespa.version>
186186
<maven-compiler-plugin.vespa.version>3.13.0</maven-compiler-plugin.vespa.version>
187-
<maven-core.vespa.version>3.9.12</maven-core.vespa.version>
187+
<maven-core.vespa.version>3.9.13</maven-core.vespa.version>
188188
<maven-dependency-plugin.vespa.version>3.8.1</maven-dependency-plugin.vespa.version>
189189
<maven-deploy-plugin.vespa.version>3.1.4</maven-deploy-plugin.vespa.version>
190190
<maven-enforcer-plugin.vespa.version>3.6.2</maven-enforcer-plugin.vespa.version>

maven-plugins/allowed-maven-dependencies.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ org.codehaus.plexus:plexus-component-annotations:2.2.0
5454
org.codehaus.plexus:plexus-interpolation:${plexus-interpolation.vespa.version}
5555
org.codehaus.plexus:plexus-io:${plexus-io.vespa.version}
5656
org.codehaus.plexus:plexus-sec-dispatcher:2.0
57+
org.codehaus.plexus:plexus-testing:2.1.0
5758
org.codehaus.plexus:plexus-utils:${plexus-utils.vespa.version}
5859
org.codehaus.plexus:plexus-xml:${plexus-xml.vespa.version}
5960
org.codehaus.woodstox:stax2-api:${stax2-api.vespa.version}

0 commit comments

Comments
 (0)