Skip to content

Commit

Permalink
Merge pull request #78 from ao508/java21
Browse files Browse the repository at this point in the history
Update to java21
  • Loading branch information
ao508 authored Oct 2, 2024
2 parents 8dea13d + b8e1987 commit 9797802
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 29 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
defaults: &defaults
docker:
- image: cimg/openjdk:8.0.275
- image: cimg/openjdk:21.0

version: 2.1

Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM maven:3.6.1-jdk-11-slim
FROM maven:3.8.8
# create working directory and set
RUN mkdir /label-generator
ADD . /label-generator
WORKDIR /label-generator
RUN mvn clean install

# copy jar and set entrypoint
FROM openjdk:11-slim
FROM openjdk:21
COPY --from=0 /label-generator/target/smile_label_generator.jar /label-generator/smile_label_generator.jar
ENTRYPOINT ["java"]
9 changes: 9 additions & 0 deletions jitpack.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
jdk:
- openjdk21

before_install:
- sdk install maven 3.8.8
- sdk use maven 3.8.8
- sdk install java 21.0.2-open
- sdk use java 21.0.2-open
- sdk update
39 changes: 13 additions & 26 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.3.RELEASE</version>
<version>3.3.3</version>
</parent>

<repositories>
Expand All @@ -29,21 +29,20 @@
</pluginRepositories>

<properties>
<java.version>1.8</java.version>
<maven.compiler.version>1.8</maven.compiler.version>
<spring.version>5.2.6.RELEASE</spring.version>
<spring.boot.version>2.3.3.RELEASE</spring.boot.version>
<slf4j.version>1.7.30</slf4j.version>
<jackson.version>2.11.2</jackson.version>
<java.version>21</java.version>
<maven.compiler.version>3.11.0</maven.compiler.version>
<spring.version>6.1.12</spring.version>
<spring.boot.version>3.3.3</spring.boot.version>
<jackson.version>2.17.2</jackson.version>
<!-- smile messaging and shared entities dependency versions -->
<smile_messaging_java.group>com.github.mskcc</smile_messaging_java.group>
<smile_messaging_java.version>1.4.1.RELEASE</smile_messaging_java.version>
<smile_messaging_java.version>java-v21-beta-2</smile_messaging_java.version>
<!-- smile commons centralized config properties -->
<smile_commons.group>com.github.mskcc</smile_commons.group>
<smile_commons.version>1.4.1.RELEASE</smile_commons.version>
<smile_commons.version>java-v21-beta-2</smile_commons.version>
<!-- smile server model module -->
<smile_server.group>com.github.mskcc.smile-server</smile_server.group>
<smile_server.version>1.6.0.RELEASE</smile_server.version>
<smile_server.version>java-v21-beta-2</smile_server.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -99,19 +98,7 @@
<dependency>
<groupId>org.skyscreamer</groupId>
<artifactId>jsonassert</artifactId>
<version>1.5.0</version>
</dependency>
<!-- string utils -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>19.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.11</version>
<version>1.5.3</version>
</dependency>
</dependencies>

Expand Down Expand Up @@ -144,10 +131,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.6.1</version>
<version>${maven.compiler.version}</version>
<configuration>
<source>${maven.compiler.version}</source>
<target>${maven.compiler.version}</target>
<source>${java.version}</source>
<target>${java.version}</target>
<compilerArgument>-Xlint:deprecation</compilerArgument>
</configuration>
</plugin>
Expand Down

0 comments on commit 9797802

Please sign in to comment.