[misc] permit java 11 testing

mariadb-corporation · Nov 15, 2024 · e3df57b · e3df57b
1 parent 147a08a
commit e3df57b
Show file tree

Hide file tree

Showing 2 changed files with 111 additions and 9 deletions.
diff --git 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
@@ -281,18 +281,12 @@
             <version>2.0.3</version>
             <optional>true</optional>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/org.bouncycastle/bctls-jdk18on -->
+
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcpkix-jdk18on</artifactId>
             <version>1.78.1</version>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>org.bouncycastle</groupId>-->
-<!--            <artifactId>bcprov-jdk18on</artifactId>-->
-<!--            <version>1.79</version>-->
-<!--            <optional>true</optional>-->
-<!--        </dependency>-->
 
         <dependency>
             <groupId>org.osgi</groupId>
@@ -354,6 +348,114 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>java11</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <version>3.10.1</version>
+                        <configuration>
+                            <showWarnings>true</showWarnings>
+                            <source>1.8</source>
+                            <target>1.8</target>
+                            <compilerArgs>
+                                <arg>-Xlint:all,-options,-path,-processing</arg>
+                            </compilerArgs>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>compile-java-8</id>
+                                <goals>
+                                    <goal>compile</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>compile-java-9</id>
+                                <phase>compile</phase>
+                                <goals>
+                                    <goal>compile</goal>
+                                </goals>
+                                <configuration>
+                                    <release>9</release>
+                                    <source>9</source>
+                                    <target>9</target>
+                                    <compilerArgs>
+                                        <arg>--add-exports</arg>
+                                        <arg>jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>
+                                        <arg>--add-exports</arg>
+                                        <arg>jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
+                                        <arg>--add-exports</arg>
+                                        <arg>jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED</arg>
+                                        <arg>--add-exports</arg>
+                                        <arg>jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED</arg>
+                                        <arg>--add-exports</arg>
+                                        <arg>jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</arg>
+                                    </compilerArgs>
+                                    <compileSourceRoots>
+                                        <compileSourceRoot>${project.basedir}/src/main/java9</compileSourceRoot>
+                                    </compileSourceRoots>
+                                    <multiReleaseOutput>true</multiReleaseOutput>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>compile-java-11</id>
+                                <phase>compile</phase>
+                                <goals>
+                                    <goal>compile</goal>
+                                </goals>
+                                <configuration>
+                                    <release>11</release>
+                                    <source>11</source>
+                                    <target>11</target>
+                                    <compileSourceRoots>
+                                        <compileSourceRoot>${project.basedir}/src/main/java11</compileSourceRoot>
+                                    </compileSourceRoots>
+                                    <multiReleaseOutput>true</multiReleaseOutput>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <plugin>
+                        <groupId>org.jacoco</groupId>
+                        <artifactId>jacoco-maven-plugin</artifactId>
+                        <version>${jacoco.version}</version>
+                        <configuration>
+                            <excludes>
+                                <exclude>META-INF/**</exclude>
+                            </excludes>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>jacoco-initialize</id>
+                                <goals>
+                                    <goal>prepare-agent</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>report</id>
+                                <phase>test</phase>
+                                <goals>
+                                    <goal>report</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+            <dependencies>
+
+                <dependency>
+                    <groupId>ch.qos.logback</groupId>
+                    <artifactId>logback-classic</artifactId>
+                    <version>${logback.version}</version>
+                    <scope>test</scope>
+                </dependency>
+
+            </dependencies>
+        </profile>
         <profile>
             <id>default</id>
             <activation>