Skip to content

Commit 04b0185

Browse files
Fix build on JDK 16.
1 parent 7d09c00 commit 04b0185

File tree

2 files changed

+17
-5
lines changed

2 files changed

+17
-5
lines changed

ci/test.sh

+13-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,19 @@
22

33
set -euo pipefail
44

5+
# Checking for the major class versions seems more sane than fiddling around with the
6+
# various formats the different JDKs offer
7+
JAVA_VERSION=`javap -verbose java.lang.String | grep "major version" | cut -d " " -f5`
8+
ADDITIONAL_JAVA_OPS=""
9+
10+
if [[ "$JAVA_VERSION" -ge 60 ]]
11+
then
12+
# SDN 6 itself does not need this, but the embedded Neo4j database used by jQAssistant during verification
13+
# of SDN 6 requires it.
14+
ADDITIONAL_JAVA_OPS="--add-opens java.base/java.lang=ALL-UNNAMED --add-exports java.base/sun.nio.ch=ALL-UNNAMED"
15+
fi
16+
517
mkdir -p /tmp/jenkins-home
618
chown -R 1001:1001 .
7-
MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" \
19+
MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home $ADDITIONAL_JAVA_OPS" \
820
./mvnw -s settings.xml -P${PROFILE} clean dependency:list verify -Dsort -U -B -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-neo4j

pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
<asciidoctor-maven-plugin.version>2.1.0</asciidoctor-maven-plugin.version>
7373
<asciidoctorj-diagram.version>2.1.0</asciidoctorj-diagram.version>
7474

75-
<byte-buddy.version>1.10.9</byte-buddy.version>
75+
<byte-buddy.version>1.11.0</byte-buddy.version>
7676
<cdi>2.0.SP1</cdi>
7777
<changelist>-SNAPSHOT</changelist>
7878
<checkstyle.version>8.40</checkstyle.version>
@@ -86,8 +86,8 @@
8686
<jaxb.version>2.3.1</jaxb.version>
8787
<jqassistant-dashboard-plugin.version>1.9.0</jqassistant-dashboard-plugin.version>
8888
<jqassistant.plugin.git.version>1.8.0</jqassistant.plugin.git.version>
89-
<jqassistant.plugin.version>1.9.0</jqassistant.plugin.version>
90-
<jqassistant.version>1.9.0</jqassistant.version>
89+
<jqassistant.plugin.version>1.9.1</jqassistant.plugin.version>
90+
<jqassistant.version>1.9.1</jqassistant.version>
9191
<junit-cc-testcontainer>2020.0.7</junit-cc-testcontainer>
9292
<maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
9393
<maven-deploy-plugin.version>3.0.0-M1</maven-deploy-plugin.version>
@@ -102,7 +102,7 @@
102102
<maven.compiler.source>${java.version}</maven.compiler.source>
103103
<maven.compiler.target>${java.version}</maven.compiler.target>
104104
<mockito>${mockito.version}</mockito>
105-
<mockito.version>3.7.7</mockito.version>
105+
<mockito.version>3.10.0</mockito.version>
106106
<neo4j-java-driver.version>4.2.5</neo4j-java-driver.version>
107107
<neo4j.version>4.2.4</neo4j.version>
108108
<objenesis.version>3.0.1</objenesis.version>

0 commit comments

Comments
 (0)