Update to use the local maven plugin in tests
Change-Id: I7c2c0964eec35bb4a337b8d9b2eece534a994755
diff --git a/rcpttTests/pom-base.xml b/rcpttTests/pom-base.xml
index 1c44092..59865ad 100644
--- a/rcpttTests/pom-base.xml
+++ b/rcpttTests/pom-base.xml
@@ -35,7 +35,7 @@
<properties>
<rcptt-maven-group>org.eclipse.rcptt</rcptt-maven-group>
- <rcptt-maven-version>2.5.0</rcptt-maven-version>
+ <rcptt-maven-version>2.5.1-SNAPSHOT</rcptt-maven-version>
<rcptt-maven-plugin>rcptt-maven-plugin</rcptt-maven-plugin>
<runner-version>2.5.1-SNAPSHOT</runner-version>
<rcpttRepo>http://download.eclipse.org/rcptt/nightly/2.5.1/latest/repository</rcpttRepo>
diff --git a/releng/Jenkinsfile.groovy b/releng/Jenkinsfile.groovy
index 672a376..ad01c42 100644
--- a/releng/Jenkinsfile.groovy
+++ b/releng/Jenkinsfile.groovy
@@ -128,7 +128,7 @@
sh "mvn --version"
sh "./fast-build.sh -Dmaven.repo.local=$WORKSPACE/m2 -U -B -e ${sign ? "-P sign" : ""}"
sh "./build_runner.sh -Dmaven.repo.local=$WORKSPACE/m2 -B -e"
- sh "mvn -f maven-plugin/pom.xml clean verify -Dmaven.repo.local=$WORKSPACE/m2 -B -e"
+ sh "mvn -f maven-plugin/pom.xml clean install -Dmaven.repo.local=$WORKSPACE/m2 -B -e"
sh "./$DOC_DIR/generate-doc.sh -Dmaven.repo.local=$WORKSPACE/m2 -B -e"
}
}
diff --git a/update_version.sh b/update_version.sh
index d8e4238..604e9bc 100755
--- a/update_version.sh
+++ b/update_version.sh
@@ -28,17 +28,17 @@
OPTIONS="-Dtycho.mode=maven -Dtycho.localArtifacts=ignore -DnewVersion=$VERSION_WITH_DECORATOR -DupdateVersionRangeMatchingBounds"
echo "================= Updating All Components ================="
-mvn $GOAL -f releng/pom.xml -P update-version $OPTIONS || exit 100
+mvn $GOAL -f releng/pom.xml -P update-version $OPTIONS -B || exit 100
echo "================== Updating Maven Plugin =================="
-mvn $GOAL -f maven-plugin/pom.xml $OPTIONS || exit 101
+mvn $GOAL -f maven-plugin/pom.xml $OPTIONS -B || exit 101
echo "================== Updating Maven Script =================="
-mvn versions:set -f clean-pom.xml -DnewVersion=$VERSION_WITH_DECORATOR -DgenerateBackupPoms=false || exit 102
+mvn versions:set -f clean-pom.xml -DnewVersion=$VERSION_WITH_DECORATOR -DgenerateBackupPoms=false -B || exit 102
echo "================== Updating RCPTT Tests =================="
-mvn versions:use-dep-version -f ./rcpttTests/ECL_IDE_module/pom.xml -Dincludes=com.xored.q7:q7contexts.shared -DdepVersion=$VERSION_WITH_DECORATOR -DgenerateBackupPoms=false -DforceVersion=true || exit 103
-mvn versions:set -f ./rcpttTests/pom-base.xml -DnewVersion=$VERSION_WITH_DECORATOR -DgenerateBackupPoms=false || exit 104
-# mvn versions:set-property -f ./rcpttTests/pom-base.xml -Dproperty=rcptt-maven-version -DnewVersion=$VERSION_WITH_DECORATOR -DgenerateBackupPoms=false || exit 105
-# mvn versions:set-property -f ./rcpttTests/pom-base.xml -Dproperty=runner-version -DnewVersion=$VERSION_WITH_DECORATOR -DgenerateBackupPoms=false || exit 106
-# mvn versions:set-property -f ./rcpttTests/pom-base.xml -Dproperty=rcpttRepo -DnewVersion="http://download.eclipse.org/rcptt/nightly/$VERSION/latest/repository" -DgenerateBackupPoms=false || exit 107
+mvn versions:use-dep-version -f ./rcpttTests/ECL_IDE_module/pom.xml -Dincludes=com.xored.q7:q7contexts.shared -DdepVersion=$VERSION_WITH_DECORATOR -DgenerateBackupPoms=false -DforceVersion=true -B || exit 103
+mvn versions:set -f ./rcpttTests/pom-base.xml -DnewVersion=$VERSION_WITH_DECORATOR -DgenerateBackupPoms=false -B || exit 104
+mvn versions:set-property -f ./rcpttTests/pom-base.xml -Dproperty=rcptt-maven-version -DnewVersion=$VERSION_WITH_DECORATOR -DgenerateBackupPoms=false -B || exit 105
+mvn versions:set-property -f ./rcpttTests/pom-base.xml -Dproperty=runner-version -DnewVersion=$VERSION_WITH_DECORATOR -DgenerateBackupPoms=false -B || exit 106
+mvn versions:set-property -f ./rcpttTests/pom-base.xml -Dproperty=rcpttRepo -DnewVersion="http://download.eclipse.org/rcptt/nightly/$VERSION/latest/repository" -DgenerateBackupPoms=false -B || exit 107
