From 8bd2b60063d1a557691078987542cffaa321f437 Mon Sep 17 00:00:00 2001
From: Mark Lowe <melowe@users.noreply.github.com>
Date: Wed, 22 Jan 2020 10:10:49 +0000
Subject: [PATCH] Change build files and artefacts to java 11 (#978)

* change build files to only build for java 11.
---
 .travis.yml                                   |  35 +-----
 build.gradle                                  |   9 +-
 enclave/enclave-jaxrs/pom.xml                 |  12 +-
 pom.xml                                       | 111 +++++++-----------
 shared/build.gradle                           |   6 +-
 tessera-dist/pom.xml                          |  12 +-
 .../src/test/resources/logback-enclave.xml    |   2 +-
 tests/pom.xml                                 |  11 --
 8 files changed, 64 insertions(+), 134 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b91c23e3b4..d1f96af340 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,43 +19,25 @@ stages:
 jobs:
   include:
     - stage: test
-      name: "Unit Tests Java 8"
-      jdk:  oraclejdk8
+      name: "Unit Tests"
+      jdk:  oraclejdk11
       install: &build_no_checks
         - mvn install -Dsilent=true -DskipTests=true -Dmaven.javadoc.skip=true -Dchecksyle.skip=true -Dspotbugs.skip=true -Djacoco.skip=true -B dependency:go-offline
       script: &build_with_unittests
         - mvn install -pl \!tests/acceptance-test -P reduce-logging -o || travis_terminate 1
 
     - name: "Gradle Build"
-      jdk:  oraclejdk8
+      jdk:  oraclejdk11
       script:
         - ./gradlew build || travis_terminate 1
 
-    - name: "Unit Tests Java 11"
+    - name: "Acceptance Tests"
       jdk:  oraclejdk11
       install: *build_no_checks
-      script: *build_with_unittests
-
-    - name: "Acceptance Tests Java 8"
-      jdk:  oraclejdk8
-      install: *build_no_checks
       script: mvn verify -pl tests/acceptance-test -P reduce-logging -o || travis_terminate 1
 
-    - name: "Acceptance Tests Java 11"
+    - name: "Vault Acceptance Tests"
       jdk:  oraclejdk11
-#      before_install:
-#        - rm "${JAVA_HOME}/lib/security/cacerts"
-#        - ln -s /etc/ssl/certs/java/cacerts "${JAVA_HOME}/lib/security/cacerts"
-      install: *build_no_checks
-      script: mvn verify -pl tests/acceptance-test -P reduce-logging || travis_terminate 1
-
-    - name: "Simple Only Acceptance Tests"
-      jdk:  oraclejdk8
-      install: *build_no_checks
-      script: mvn verify -pl tests/acceptance-test -P simple-acceptance-tests,reduce-logging -o || travis_terminate 1
-
-    - name: "Vault Acceptance Tests Java 8"
-      jdk:  oraclejdk8
       before_install: &install_hashicorp
         - wget https://releases.hashicorp.com/vault/1.2.2/vault_1.2.2_linux_amd64.zip -O /tmp/vault_1.2.2_linux_amd64.zip
         - mkdir -p vault/bin && pushd $_
@@ -64,11 +46,6 @@ jobs:
       install: *build_no_checks
       script: mvn verify -pl tests/acceptance-test -P vault-acceptance-tests,reduce-logging -o || travis_terminate 1
 
-    - name: "Vault Acceptance Tests Java 11"
-      jdk:  oraclejdk11
-      before_install: *install_hashicorp
-      install: *build_no_checks
-      script: mvn verify -pl tests/acceptance-test -P vault-acceptance-tests,reduce-logging -o || travis_terminate 1
 
 #    - stage: deploy only
 #      name: "Deploy to OSSRH"
@@ -80,7 +57,7 @@ jobs:
 
     - stage: tag and deploy
       name: "Tag on GitHub and deploy to OSSRH"
-      jdk:  oraclejdk8
+      jdk:  oraclejdk11
       script:
         - head_ref=$(git rev-parse HEAD) || travis_terminate 1
         - branch_ref=$(git rev-parse "$TRAVIS_BRANCH") || travis_terminate 1
diff --git a/build.gradle b/build.gradle
index f030af0f09..4f2361e8c4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -98,6 +98,12 @@ allprojects {
                 compile "javax.inject:javax.inject:1"
                 compile "javax:javaee-api:7.0"
 
+                compile "javax.xml.bind:jaxb-api:2.3.0"
+                compile "org.glassfish.jaxb:jaxb-runtime:2.3.0"
+                compile "javax.activation:javax.activation-api:1.2.0"
+                compile "javax.annotation:javax.annotation-api:1.3.2"
+
+
             }
         }
     }
@@ -119,6 +125,7 @@ subprojects {
     }
 
     dependencies {
+
         compile 'org.slf4j:slf4j-api'
         runtimeOnly 'ch.qos.logback:logback-classic'
         runtimeOnly 'ch.qos.logback:logback-core'
@@ -220,7 +227,7 @@ subprojects {
         }
     }
 
-    sourceCompatibility = '1.8'
+    sourceCompatibility = '11'
 
     java {
         withJavadocJar()
diff --git a/enclave/enclave-jaxrs/pom.xml b/enclave/enclave-jaxrs/pom.xml
index b001f67aa4..5acad743ee 100644
--- a/enclave/enclave-jaxrs/pom.xml
+++ b/enclave/enclave-jaxrs/pom.xml
@@ -251,16 +251,6 @@
 
     <name>enclave-jaxrs</name>
 
-    <profiles>
-        <profile>
-            <id>afterjdk9</id>
-            <activation>
-                <jdk>[9,12)</jdk>
-            </activation>
-            <properties>
-                <dist.classfier>jdk${java.vm.specification.version}_server</dist.classfier>
-            </properties>
-        </profile>
-    </profiles>
+
 
 </project>
diff --git a/pom.xml b/pom.xml
index 2799e19614..b81e3f97be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,8 +43,8 @@
         <jersey.version>2.27</jersey.version>
         <jetty.version>9.4.25.v20191220</jetty.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
         <spring.version>5.1.2.RELEASE</spring.version>
         <slf4j.version>1.7.5</slf4j.version>
         <eclipselink.version>2.7.3</eclipselink.version>
@@ -155,19 +155,23 @@
 
                 </plugin>
 
-                <!--                <plugin>
-                    <groupId>org.owasp</groupId>
-                    <artifactId>dependency-check-maven</artifactId>
-                    <version>${owasp.plugin.version}</version>
-                    <executions>
-                        <execution>
-                            <goals>
-                                <goal>check</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>-->
 
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>3.8.1</version>
+                    <configuration>
+                        <source>11</source>
+                        <target>11</target>
+                    </configuration>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.ow2.asm</groupId>
+                            <artifactId>asm</artifactId>
+                            <version>6.2</version>
+                        </dependency>
+                    </dependencies>
+                </plugin>
             </plugins>
 
         </pluginManagement>
@@ -1381,6 +1385,28 @@
             <scope>test</scope>
         </dependency>
 
+
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+        </dependency>
+
+
+        <dependency>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.activation</groupId>
+            <artifactId>javax.activation-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+        </dependency>
+
     </dependencies>
 
     <reporting>
@@ -1569,66 +1595,13 @@
                             </systemPropertyVariables>
                         </configuration>
                     </plugin>
-                </plugins>
-            </build>
 
-        </profile>
 
 
-        <profile>
-            <id>java11</id>
-            <activation>
-                <jdk>[9,12)</jdk>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-compiler-plugin</artifactId>
-                        <version>3.8.1</version>
-                        <configuration>
-                            <source>8</source>
-                            <target>${java.vm.specification.version}</target>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.ow2.asm</groupId>
-                                <artifactId>asm</artifactId>
-                                <version>6.2</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
                 </plugins>
             </build>
-            <dependencies>
-
-                <dependency>
-                    <groupId>javax.xml.bind</groupId>
-                    <artifactId>jaxb-api</artifactId>
-                </dependency>
-
-                <dependency>
-                    <groupId>org.eclipse.persistence</groupId>
-                    <artifactId>org.eclipse.persistence.moxy</artifactId>
-                </dependency>
-
-                <dependency>
-                    <groupId>org.glassfish.jaxb</groupId>
-                    <artifactId>jaxb-runtime</artifactId>
-                </dependency>
-
-                <dependency>
-                    <groupId>javax.activation</groupId>
-                    <artifactId>javax.activation-api</artifactId>
-                </dependency>
-
-                <dependency>
-                    <groupId>javax.annotation</groupId>
-                    <artifactId>javax.annotation-api</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
 
+        </profile>
 
         <profile>
             <id>release</id>
@@ -1690,7 +1663,7 @@
                             <failOnError>false</failOnError>
                             <linksource>true</linksource>
                             <show>protected</show>
-                            <source>1.8</source>
+                            <source>11</source>
                         </configuration>
 
                         <executions>
diff --git a/shared/build.gradle b/shared/build.gradle
index 8b13789179..8f8260af65 100644
--- a/shared/build.gradle
+++ b/shared/build.gradle
@@ -1 +1,5 @@
-
+dependencies {
+    compile "javax.xml.bind:jaxb-api"
+    runtimeOnly "org.glassfish.jaxb:jaxb-runtime"
+    compile "javax.annotation:javax.annotation-api"
+}
diff --git a/tessera-dist/pom.xml b/tessera-dist/pom.xml
index 4e8720d54c..7d6db3de69 100644
--- a/tessera-dist/pom.xml
+++ b/tessera-dist/pom.xml
@@ -87,15 +87,5 @@
         </pluginManagement>
     </build>
 
-    <profiles>
-        <profile>
-            <id>afterjdk9</id>
-            <activation>
-                <jdk>[9,12)</jdk>
-            </activation>
-            <properties>
-                <dist.classfier>jdk${java.vm.specification.version}_app</dist.classfier>
-            </properties>
-        </profile>
-    </profiles>
+
 </project>
diff --git a/tests/acceptance-test/src/test/resources/logback-enclave.xml b/tests/acceptance-test/src/test/resources/logback-enclave.xml
index 10de77f3c4..2f93bf2388 100644
--- a/tests/acceptance-test/src/test/resources/logback-enclave.xml
+++ b/tests/acceptance-test/src/test/resources/logback-enclave.xml
@@ -9,7 +9,7 @@
         </encoder>
     </appender>
 
-    <root level="INFO">
+    <root level="ALL">
         <appender-ref ref="FILE"/>
     </root>
 
diff --git a/tests/pom.xml b/tests/pom.xml
index 8c02407b20..8c61612f0a 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -84,17 +84,6 @@
             </modules>
         </profile>
 
-        <profile>
-            <id>afterjdk9</id>
-            <activation>
-                <jdk>[9,12)</jdk>
-            </activation>
-            <properties>
-                <enclave.server.classifer>jdk${java.vm.specification.version}_server</enclave.server.classifer>
-                <tesssra.app.classifer>jdk${java.vm.specification.version}_app</tesssra.app.classifer>
-            </properties>
-
-        </profile>
     </profiles>