From 3221b490ea70f3dd3ef7f20820c760612b4b773e Mon Sep 17 00:00:00 2001
From: Hubert Van De Walle <hubv@protonmail.com>
Date: Tue, 16 Jun 2020 17:03:11 +0200
Subject: [PATCH] Upgrade to java 14

---
 Dockerfile.api |  4 ++--
 api/pom.xml    | 12 +++++-------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/Dockerfile.api b/Dockerfile.api
index 539f7ef..b69b39b 100644
--- a/Dockerfile.api
+++ b/Dockerfile.api
@@ -1,4 +1,4 @@
-FROM maven:3.6.3-jdk-13 as builder
+FROM maven:3.6.3-jdk-14 as builder
 
 WORKDIR /tmp
 
@@ -12,7 +12,7 @@ COPY api/test test
 
 RUN mvn package
 
-FROM openjdk:13-alpine
+FROM openjdk:14-alpine
 
 ENV APPLICATION_USER ktor
 RUN adduser -D -g '' $APPLICATION_USER
diff --git a/api/pom.xml b/api/pom.xml
index c4cb038..63c2e02 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -25,7 +25,7 @@
         <kotlin.compiler.incremental>true</kotlin.compiler.incremental>
         <kotlin.compiler.jvmTarget>12</kotlin.compiler.jvmTarget>
         <main.class>be.vandewalleh.NotesApplicationKt</main.class>
-        <java.version>13</java.version>
+        <java.version>14</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
     </properties>
@@ -222,10 +222,12 @@
                 <version>3.0.0-M4</version>
             </plugin>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
                 <configuration>
-                    <source>13</source>
-                    <target>13</target>
+                    <source>14</source>
+                    <target>14</target>
                 </configuration>
             </plugin>
             <plugin>
@@ -238,9 +240,6 @@
                         <goals>
                             <goal>compile</goal>
                         </goals>
-                        <configuration>
-                            <experimentalCoroutines>enable</experimentalCoroutines>
-                        </configuration>
                     </execution>
                     <execution>
                         <id>test-compile</id>
@@ -248,7 +247,6 @@
                             <goal>test-compile</goal>
                         </goals>
                         <configuration>
-                            <experimentalCoroutines>enable</experimentalCoroutines>
                             <sourceDirs>
                                 <sourceDir>${project.basedir}/test</sourceDir>
                             </sourceDirs>