Commitfc0499d

committed

Upgrade to Java 15

1 parentd47e38e commitfc0499dCopy full SHA for fc0499d

File tree

-8

lines changed

-8

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ apply from: "gradle/dependencies.gradle"`
`14`	`14`
`15`	`15`	`allprojects {`
`16`	`16`	`// Apply the java plugin to add support for Java`
`17`		`- applyplugin:'java'`
	`17`	`+ applyplugin:'java-library'`
`18`	`18`	`applyplugin:'idea'`
`19`	`19`	`applyplugin:'eclipse'`
`20`	`20`	`applyplugin:'maven-publish'`
`@@ -23,8 +23,8 @@ allprojects {`
`23`	`23`	`group='com.stubbornjava.StubbornJava'`
`24`	`24`	`version='0.0.0-SNAPSHOT'`
`25`	`25`
`26`		`- sourceCompatibility=1.8`
`27`		`- targetCompatibility=1.8`
	`26`	`+ sourceCompatibility=15`
	`27`	`+ targetCompatibility=15`
`28`	`28`
`29`	`29`	`sourceSets {`
`30`	`30`	`main {`

Lines changed: 4 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`		`-FROMopenjdk:8-jdk-alpine AS builder`
	`1`	`+FROMadoptopenjdk/openjdk15:alpine-jre AS builder`
`2`	`2`
`3`		`-# ----`
`4`		`-# Install Maven`
	`3`	`+# We will eventually need more things here`
`5`	`4`	`RUN apk add --no-cache curl tar bash`
`6`	`5`
`7`	`6`	`RUN mkdir -p /app`
`@@ -11,9 +10,9 @@ COPY build/libs/ /app/libs`
`11`	`10`
`12`	`11`	`# Using multi build steps here to keep container as small as possible`
`13`	`12`	`# Eventually we may add more tooling above`
`14`		`-FROMopenjdk:8-jre-alpine`
	`13`	`+FROMadoptopenjdk/openjdk15:alpine-jre`
`15`	`14`	`RUN mkdir -p /app`
`16`	`15`	`WORKDIR /app`
`17`	`16`	`COPY --from=builder /app/libs /app/libs`
`18`	`17`	`COPY docker/entrypoint.sh /app/entrypoint.sh`
`19`		`-CMD ["/usr/bin/java","-XX:+UnlockExperimentalVMOptions","-XX:+UseCGroupMemoryLimitForHeap","-cp","libs/*","com.stubbornjava.webapp.StubbornJavaWebApp"]`
	`18`	`+CMD ["/usr/bin/java","-cp","libs/*","com.stubbornjava.webapp.StubbornJavaWebApp"]`

Comments

(0)