Skip to content

Commit

Permalink
Migrate from deprecated openjdk base image to eclipse-temurin
Browse files Browse the repository at this point in the history
  • Loading branch information
szh committed Apr 24, 2023
1 parent 23198d3 commit 3d8b2d4
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 9 deletions.
10 changes: 8 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [Unreleased]

## [1.2.1] - 2023-04-24

### Security
- Updated Springboot to 3.0.2 and Dockerfile to openjdk:21
- Updated Spring boot to 3.0.6 and Dockerfile to eclipse-temurin
[conjurdemos/pet-store-demo#60](https://github.com/conjurdemos/pet-store-demo/pull/60)
- Updated Spring boot to 3.0.2 and Dockerfile to openjdk:21
[conjurdemos/pet-store-demo#58](https://github.com/conjurdemos/pet-store-demo/pull/58)
- Updated postgresql to 42.5.1 to resolve CVE-2022-41946
[conjurdemos/pet-store-demo#57](https://github.com/conjurdemos/pet-store-demo/pull/57)
Expand Down Expand Up @@ -46,5 +51,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

The first tagged version.

[Unreleased]: https://github.com/cyberark/secretless-broker/compare/v1.2.0...HEAD
[Unreleased]: https://github.com/cyberark/secretless-broker/compare/v1.2.1...HEAD
[1.2.1]: https://github.com/cyberark/secretless-broker/compare/v1.2.0...v1.2.1
[1.2.0]: https://github.com/cyberark/secretless-broker/compare/v1.1.0...v1.2.0
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ RUN mvn package && cp target/petstore-*.jar app.jar
# This base is used for the final image
# It extracts the packaged application from the previous stage
# and builds the final image
FROM openjdk:21-slim
FROM eclipse-temurin:20-jre
LABEL org.opencontainers.image.authors="CyberArk"

# Install the fix for CVE-2022-1271
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.2.0
1.2.1
10 changes: 5 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@

<groupId>org.springframework</groupId>
<artifactId>petstore</artifactId>
<version>0.1.0</version>
<version>0.2.1</version>

<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.0.2</version>
<version>3.0.6</version>
</parent>

<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>3.0.2</version>
<version>3.0.6</version>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
Expand All @@ -41,7 +41,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
<version>3.0.2</version>
<version>3.0.6</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
Expand All @@ -51,7 +51,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
<version>3.0.2</version>
<version>3.0.6</version>
</dependency>
</dependencies>

Expand Down

0 comments on commit 3d8b2d4

Please sign in to comment.