hubert/SimpleNotes
1
0
Fork 0
Code Projects Releases Activity

Upgrade to java 14

Browse Source
This commit is contained in:
Hubert Van De Walle 2020-06-16 17:03:11 +02:00
parent bef1391c90
commit 3221b490ea
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile.api
View File

@ -1,4 +1,4 @@
FROM maven:3.6.3-jdk-13 as builder FROM maven:3.6.3-jdk-14 as builder
WORKDIR /tmp WORKDIR /tmp
@ -12,7 +12,7 @@ COPY api/test test
RUN mvn package RUN mvn package
FROM openjdk:13-alpine FROM openjdk:14-alpine
ENV APPLICATION_USER ktor ENV APPLICATION_USER ktor
RUN adduser -D -g '' $APPLICATION_USER RUN adduser -D -g '' $APPLICATION_USER

12
api/pom.xml
View File

@ -25,7 +25,7 @@
<kotlin.compiler.incremental>true</kotlin.compiler.incremental> <kotlin.compiler.incremental>true</kotlin.compiler.incremental>
<kotlin.compiler.jvmTarget>12</kotlin.compiler.jvmTarget> <kotlin.compiler.jvmTarget>12</kotlin.compiler.jvmTarget>
<main.class>be.vandewalleh.NotesApplicationKt</main.class> <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.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target> <maven.compiler.target>${java.version}</maven.compiler.target>
</properties> </properties>
@ -222,10 +222,12 @@
<version>3.0.0-M4</version> <version>3.0.0-M4</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration> <configuration>
<source>13</source> <source>14</source>
<target>13</target> <target>14</target>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
@ -238,9 +240,6 @@
<goals> <goals>
<goal>compile</goal> <goal>compile</goal>
</goals> </goals>
<configuration>
<experimentalCoroutines>enable</experimentalCoroutines>
</configuration>
</execution> </execution>
<execution> <execution>
<id>test-compile</id> <id>test-compile</id>
@ -248,7 +247,6 @@
<goal>test-compile</goal> <goal>test-compile</goal>
</goals> </goals>
<configuration> <configuration>
<experimentalCoroutines>enable</experimentalCoroutines>
<sourceDirs> <sourceDirs>
<sourceDir>${project.basedir}/test</sourceDir> <sourceDir>${project.basedir}/test</sourceDir>
</sourceDirs> </sourceDirs>