Add Vespa version substitution in script.

3 files changed, 19 insertions, 10 deletions

diff --git a/screwdriver.yaml b/screwdriver.yaml
index 74f3b29b38e..d2d7dc53a56 100644
--- a/screwdriver.yaml
+++ b/screwdriver.yaml
@@ -125,12 +125,7 @@ jobs:
           git clone -q https://github.com/vespa-engine/system-test
           (cd system-test && git checkout $SYSTEM_TEST_REF)
           # Set correct version in pom.xml files
-          (cd vespa && \
-           find . -name "pom.xml" -exec sed -i'' \
-                -e "s,<version>.*SNAPSHOT.*</version>,<version>$VESPA_VERSION</version>," \
-                -e "s,<vespaversion>.*project.version.*</vespaversion>,<vespaversion>$VESPA_VERSION</vespaversion>," \
-                -e "s,<test-framework.version>.*project.version.*</test-framework.version>,<test-framework.version>$VESPA_VERSION</test-framework.version>," \
-                {} \;)
+          (cd vespa && screwdriver/replace-vespa-version-in-poms.sh $VESPA_VERSION $(pwd) )
       - make-srpm: |
           make -C $WORKDIR/vespa -f .copr/Makefile srpm outdir=$WORKDIR
       - *restore-cache
diff --git a/screwdriver/release-java-artifacts.sh b/screwdriver/release-java-artifacts.sh
index dc288989441..e1f979cb746 100755
--- a/screwdriver/release-java-artifacts.sh
+++ b/screwdriver/release-java-artifacts.sh
@@ -39,10 +39,7 @@ chmod 700 $SD_SOURCE_DIR/screwdriver/deploy
 chmod 600 $SD_SOURCE_DIR/screwdriver/deploy/*
 
 # Build the Java code with the correct version set
-find . -name "pom.xml" -exec sed -i'' -e "s,<version>.*SNAPSHOT.*</version>,<version>$VESPA_RELEASE</version>," \
-     -e "s,<vespaversion>.*project.version.*</vespaversion>,<vespaversion>$VESPA_RELEASE</vespaversion>," \
-     -e "s,<test-framework.version>.*project.version.*</test-framework.version>,<test-framework.version>$VESPA_RELEASE</test-framework.version>," \
-     {} \;
+screwdriver/replace-vespa-version-in-poms.sh $VESPA_RELEASE .
 
 # We disable javadoc for all modules not marked as public API
 for MODULE in $(comm -2 -3 \
diff --git a/screwdriver/replace-vespa-version-in-poms.sh b/screwdriver/replace-vespa-version-in-poms.sh
new file mode 100755
index 00000000000..1f73c1ff933
--- /dev/null
+++ b/screwdriver/replace-vespa-version-in-poms.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -euo pipefail
+
+if [[ $# -ne 2 ]]; then
+    echo "Usage: $0 <Vespa version> <path>"
+    exit 1
+fi
+
+readonly VESPA_VERSION=$1
+readonly DIR=$2
+
+find $DIR -name "pom.xml" -exec sed -i \
+     -e "s,<version>.*SNAPSHOT.*</version>,<version>$VESPA_VERSION</version>," \
+     -e "s,<vespaversion>.*project.version.*</vespaversion>,<vespaversion>$VESPA_VERSION</vespaversion>," \
+     -e "s,<test-framework.version>.*project.version.*</test-framework.version>,<test-framework.version>$VESPA_VERSION</test-framework.version>," \
+     {} \;