Spring/spring-data-neo4j
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix build on JDK 16.

Browse Source
This commit is contained in:
Michael Simons
2021-05-20 10:12:53 +02:00
parent d130b15e71
commit b00583ac25
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ci/test.sh
View File

@@ -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

8
pom.xml
View File

@@ -72,7 +72,7 @@
<asciidoctor-maven-plugin.version>2.1.0</asciidoctor-maven-plugin.version>
<asciidoctorj-diagram.version>2.1.0</asciidoctorj-diagram.version>
<byte-buddy.version>1.10.9</byte-buddy.version>
<byte-buddy.version>1.11.0</byte-buddy.version>
<cdi>2.0.SP1</cdi>
<changelist>-SNAPSHOT</changelist>
<checkstyle.version>8.40</checkstyle.version>
@@ -86,8 +86,8 @@
<jaxb.version>2.3.1</jaxb.version>
<jqassistant-dashboard-plugin.version>1.9.0</jqassistant-dashboard-plugin.version>
<jqassistant.plugin.git.version>1.8.0</jqassistant.plugin.git.version>
<jqassistant.plugin.version>1.9.0</jqassistant.plugin.version>
<jqassistant.version>1.9.0</jqassistant.version>
<jqassistant.plugin.version>1.9.1</jqassistant.plugin.version>
<jqassistant.version>1.9.1</jqassistant.version>
<junit-cc-testcontainer>2020.0.7</junit-cc-testcontainer>
<maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
<maven-deploy-plugin.version>3.0.0-M1</maven-deploy-plugin.version>
@@ -102,7 +102,7 @@
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<mockito>${mockito.version}</mockito>
<mockito.version>3.7.7</mockito.version>
<mockito.version>3.10.0</mockito.version>
<neo4j-java-driver.version>4.2.5</neo4j-java-driver.version>
<neo4j.version>4.2.4</neo4j.version>
<objenesis.version>3.0.1</objenesis.version>