Skip to content

Commit

Permalink
Update to Java 17
Browse files Browse the repository at this point in the history
  • Loading branch information
alb3rtino committed Jun 24, 2023
1 parent aa7c38f commit 17712a8
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 10 deletions.
7 changes: 6 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
FROM folioci/alpine-jre-openjdk11:latest
FROM folioci/alpine-jre-openjdk17:latest

# Install latest patch versions of packages: https://pythonspeed.com/articles/security-updates-in-docker/
USER root
RUN apk upgrade --no-cache
USER folio

ENV VERTICLE_FILE mod-erm-usage-server-fat.jar

Expand Down
4 changes: 2 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
buildMvn {
publishModDescriptor = 'yes'
mvnDeploy = 'yes'
buildNode = 'jenkins-agent-java11'
buildNode = 'jenkins-agent-java17'

doDocker = {
buildJavaDocker {
publishMaster = 'yes'
healthChk = 'yes'
healthChkCmd = 'curl -sS --fail -o /dev/null http://localhost:8081/apidocs/ || exit 1'
healthChkCmd = 'wget --no-verbose --tries=1 --spider http://localhost:8081/admin/health || exit 1'
}
}
}
10 changes: 5 additions & 5 deletions mod-erm-usage-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -141,13 +141,13 @@
</plugin>

<plugin>
<groupId>com.nickwongdev</groupId>
<groupId>dev.aspectj</groupId>
<artifactId>aspectj-maven-plugin</artifactId>
<version>1.12.6</version>
<version>1.13.1</version>
<configuration>
<verbose>true</verbose>
<showWeaveInfo>false</showWeaveInfo>
<complianceLevel>11</complianceLevel>
<complianceLevel>17</complianceLevel>
<includes>
<include>**/impl/*.java</include>
<include>**/*.aj</include>
Expand All @@ -173,12 +173,12 @@
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
<version>1.9.7</version>
<version>1.9.19</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjtools</artifactId>
<version>1.9.7</version>
<version>1.9.19</version>
</dependency>
</dependencies>
</plugin>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
<maven.compiler.release>11</maven.compiler.release>
<maven.compiler.release>17</maven.compiler.release>

<raml-module-builder.version>35.0.6</raml-module-builder.version>
<ramlfiles_path>${project.parent.basedir}/ramls</ramlfiles_path>
<vertx.version>4.3.8</vertx.version>
<erm.usage.counter.version>3.0.0</erm.usage.counter.version>
<erm.usage.counter.version>4.0.0-SNAPSHOT</erm.usage.counter.version>

<maven.javadoc.failOnError>false</maven.javadoc.failOnError>
</properties>
Expand Down

0 comments on commit 17712a8

Please sign in to comment.