From e3df57b11eccfbe5b626ff52946eeba7a5448eba Mon Sep 17 00:00:00 2001 From: rusher Date: Fri, 15 Nov 2024 01:04:14 +0100 Subject: [PATCH] [misc] permit java 11 testing --- .travis.yml | 4 +- pom.xml | 116 ++++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 111 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 242916836..c4f296189 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ jobs: jdk: openjdk8 name: "CS 11.6 - openjdk 8" - stage: Language - env: srv=mariadb v=11.4 packet=8 + env: srv=mariadb v=11.4 packet=8 PROFILE=java11 jdk: openjdk11 name: "CS 11.4 - openjdk 11 - packet 8M" - stage: Language @@ -47,7 +47,7 @@ script: - |- if [ "java8" == "$PROFILE" ]; then rm -R .mvn - java -version + java -version mvn -version fi - if [ -n "$BENCH" ] ; then mvn package -P bench -Dmaven.test.skip -Dmaven.javadoc.skip=true ; fi diff --git a/pom.xml b/pom.xml index c77338e90..1e9e65312 100644 --- a/pom.xml +++ b/pom.xml @@ -281,18 +281,12 @@ 2.0.3 true - + org.bouncycastle bcpkix-jdk18on 1.78.1 - - - - - - org.osgi @@ -354,6 +348,114 @@ + + java11 + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.10.1 + + true + 1.8 + 1.8 + + -Xlint:all,-options,-path,-processing + + + + + compile-java-8 + + compile + + + + compile-java-9 + compile + + compile + + + 9 + 9 + 9 + + --add-exports + jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED + --add-exports + jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED + --add-exports + jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED + --add-exports + jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED + --add-exports + jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED + + + ${project.basedir}/src/main/java9 + + true + + + + compile-java-11 + compile + + compile + + + 11 + 11 + 11 + + ${project.basedir}/src/main/java11 + + true + + + + + + + org.jacoco + jacoco-maven-plugin + ${jacoco.version} + + + META-INF/** + + + + + jacoco-initialize + + prepare-agent + + + + report + test + + report + + + + + + + + + + ch.qos.logback + logback-classic + ${logback.version} + test + + + + default