Merge pull request #102 from gruelbox/java-11

Switch build to Java 11
gruelbox · Oct 8, 2019 · 12f2c45 · 12f2c45
2 parents 84cf96d + 30409f8
commit 12f2c45
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -14,7 +14,7 @@ mainenvironment: &mainenvironment
   BUILD_ARGS: -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
 setup: &setup
   docker:
-    - image: circleci/openjdk:8-jdk-browsers
+    - image: circleci/openjdk:11-jdk-browsers
       environment: *mainenvironment
   working_directory: ~/orko
 
@@ -164,7 +164,7 @@ jobs:
     steps:
       - run:
           name: apt update
-          command: sudo apt-get update -y
+          command: sudo rm -rf /var/lib/apt/lists/* && sudo apt-get update -y
       - run:
           name: Install packages
           command: sudo apt-get install xvfb libgtk2.0-0 libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2
@@ -203,7 +203,7 @@ jobs:
 
   "Unit tests (MySQL)":
     docker:
-      - image: circleci/openjdk:8-jdk-browsers
+      - image: circleci/openjdk:11-jdk-browsers
         environment: *mainenvironment
       - image: circleci/mysql:5.7
         environment:

diff --git a/orko-base/pom.xml b/orko-base/pom.xml
@@ -135,4 +135,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
+</project>
diff --git a/orko-common/src/main/java/com/gruelbox/orko/job/script/ScriptJobProcessor.java b/orko-common/src/main/java/com/gruelbox/orko/job/script/ScriptJobProcessor.java
@@ -321,7 +321,7 @@ public String toString() {
 
   public final class State {
 
-    public final StateManager<String> persistent = new StateManager<String>() {
+    public final StateManager<String> persistent = new StateManager<>() {
 
       @Override
       public void set(String key, String value) {

diff --git a/pom.xml b/pom.xml
@@ -210,8 +210,8 @@
 
   <properties>
     <min.maven.version>3.0.0</min.maven.version>
-    <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>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <skip.surefire.tests>${skipTests}</skip.surefire.tests>

diff --git a/system.properties b/system.properties
@@ -1 +1 @@
-java.runtime.version=1.8
+java.runtime.version=11