diff --git a/ci/test.sh b/ci/test.sh index f60495a5d..608311891 100755 --- a/ci/test.sh +++ b/ci/test.sh @@ -2,7 +2,19 @@ set -euo pipefail +# Checking for the major class versions seems more sane than fiddling around with the +# various formats the different JDKs offer +JAVA_VERSION=`javap -verbose java.lang.String | grep "major version" | cut -d " " -f5` +ADDITIONAL_JAVA_OPS="" + +if [[ "$JAVA_VERSION" -ge 60 ]] +then + # SDN 6 itself does not need this, but the embedded Neo4j database used by jQAssistant during verification + # of SDN 6 requires it. + ADDITIONAL_JAVA_OPS="--add-opens java.base/java.lang=ALL-UNNAMED --add-exports java.base/sun.nio.ch=ALL-UNNAMED" +fi + mkdir -p /tmp/jenkins-home chown -R 1001:1001 . -MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" \ +MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home $ADDITIONAL_JAVA_OPS" \ ./mvnw -s settings.xml -P${PROFILE} clean dependency:list verify -Dsort -U -B -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-neo4j diff --git a/pom.xml b/pom.xml index c8211dc99..f5834673b 100644 --- a/pom.xml +++ b/pom.xml @@ -72,7 +72,7 @@ 2.1.0 2.1.0 - 1.10.9 + 1.11.0 2.0.SP1 -SNAPSHOT 8.40 @@ -86,8 +86,8 @@ 2.3.1 1.9.0 1.8.0 - 1.9.0 - 1.9.0 + 1.9.1 + 1.9.1 2020.0.7 3.1.2 3.0.0-M1 @@ -102,7 +102,7 @@ ${java.version} ${java.version} ${mockito.version} - 3.7.7 + 3.10.0 4.2.5 4.2.4 3.0.1