Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[feature/java-19] Upgrade to Java 19 #1038

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .mvn/jvm.config
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
1 change: 1 addition & 0 deletions backend/.mvn/jvm.config
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
2 changes: 1 addition & 1 deletion backend/edge-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
<configuration>
<filtering>false</filtering>
<tiles>
<tile>io.featurehub.tiles:tile-java8:[1.1,2)</tile>
<tile>io.featurehub.tiles:tile-java:[1.1,2)</tile>
<tile>io.featurehub.tiles:tile-release:[1.1,2)</tile>
</tiles>
</configuration>
Expand Down
2 changes: 1 addition & 1 deletion backend/party-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<properties>
<app.entrypoint>io.featurehub.party.Application</app.entrypoint>
<app.baseimage>${app.baseimage.prefix}featurehub/base_party:1.13</app.baseimage>
<app.baseimage>${app.baseimage.prefix}featurehub/base_party:1.14</app.baseimage>
<app.port>8085</app.port>
<build.version>0.0.1</build.version>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion backend/tile-app-with-ui/tile.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<build.version>0.0.1</build.version>
<app.baseimage.prefix></app.baseimage.prefix>
<!-- debian base image is a multi-arch fat manifest, we cannot pin against a sha for multi-arch builds -->
<app.baseimage>${app.baseimage.prefix}featurehub/base_jdk:1.12</app.baseimage>
<app.baseimage>${app.baseimage.prefix}featurehub/base_jdk:1.14</app.baseimage>
<app.imagename>${project.artifactId}</app.imagename>
<docker.goal>dockerBuild</docker.goal>
<docker.project.prefix>featurehub</docker.project.prefix>
Expand Down
2 changes: 1 addition & 1 deletion backend/tile-app/tile.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<build.version>0.0.1</build.version>
<app.baseimage.prefix></app.baseimage.prefix>
<!-- base image is a multi-arch fat manifest, we cannot pin against a sha for multi-arch builds -->
<app.baseimage>${app.baseimage.prefix}featurehub/base_jdk:1.12</app.baseimage>
<app.baseimage>${app.baseimage.prefix}featurehub/base_jdk:1.14</app.baseimage>
<app.imagename>${project.artifactId}</app.imagename>
<docker.goal>dockerBuild</docker.goal>
<docker.project.prefix>featurehub</docker.project.prefix>
Expand Down
16 changes: 7 additions & 9 deletions backend/tile-java/tile.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,13 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<!-- source plugin \> = 2.1 is required to use the no-fork goals -->
<version>3.0.0</version>
<version>3.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
<goal>test-jar-no-fork</goal>
</goals>
</execution>
</executions>
Expand All @@ -40,7 +41,7 @@
<sourceDirs>
<sourceDir>${project.basedir}/src/main/kotlin</sourceDir>
<sourceDir>${project.basedir}/src/main/java</sourceDir>
<jvmTarget>11</jvmTarget>
<jvmTarget>19</jvmTarget>
</sourceDirs>
</configuration>
</execution>
Expand All @@ -51,20 +52,17 @@
<sourceDirs>
<sourceDir>${project.basedir}/src/test/kotlin</sourceDir>
<sourceDir>${project.basedir}/src/test/java</sourceDir>
<jvmTarget>11</jvmTarget>
<jvmTarget>19</jvmTarget>
</sourceDirs>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<version>3.11.0</version>
<configuration>
<release>11</release>
<source>11</source>
<target>11</target>
<executable>javac11</executable>
<release>19</release>
<useIncrementalCompilation>false</useIncrementalCompilation>
</configuration>
<executions>
Expand Down Expand Up @@ -126,7 +124,7 @@
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
<version>1.9.0</version>
<version>3.0.0</version>
<executions>
<execution>
<goals>
Expand Down
2 changes: 1 addition & 1 deletion pipeline/build/base_jdk/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=$BUILDPLATFORM eclipse-temurin:11-jre-alpine
FROM --platform=$BUILDPLATFORM eclipse-temurin:19-jre-alpine

# make the non-root user & make appropriate directories
RUN (delgroup ping | true) && adduser -g 999 -u 999 -D k8suser && mkdir -p /db /target /etc/app-config /etc/common-config
Expand Down
2 changes: 1 addition & 1 deletion pipeline/build/base_jdk/make-image.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/sh
docker build --platform linux/amd64 -t featurehub/base_jdk:1.12 .
docker build --platform linux/amd64 -t featurehub/base_jdk:1.14 .
2 changes: 1 addition & 1 deletion pipeline/build/base_party/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM --platform=$BUILDPLATFORM nats:2.9.15-alpine AS builder
WORKDIR /workdir
RUN cp /usr/local/bin/nats-server /workdir && cp /etc/nats/nats-server.conf /workdir

FROM --platform=$BUILDPLATFORM eclipse-temurin:11-jre-alpine
FROM --platform=$BUILDPLATFORM eclipse-temurin:19-jre-alpine

# make the non-root user & make appropriate directories
RUN (delgroup ping | true) && adduser -g 999 -u 999 -D k8suser && mkdir -p /db /target /etc/app-config /etc/common-config
Expand Down
2 changes: 1 addition & 1 deletion pipeline/build/base_party/make-image.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/sh
docker build -t featurehub/base_party:1.13 .
docker build -t featurehub/base_party:1.14 .
Loading