Skip to content

Commit

Permalink
Merge pull request #71 from conjurdemos/bump-deps
Browse files Browse the repository at this point in the history
CONJSE-1837: Bump dependencies
  • Loading branch information
szh authored Feb 9, 2024
2 parents 8a4125d + 91d77fb commit fae1a39
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 10 deletions.
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]

## [1.2.2] - 2024-02-09

### Changed
- Shifted tests to use `docker compose` instead of `docker-compose`
[conjurdemos/pet-store-demo#70](https://github.com/conjurdemos/pet-store-demo/pull/70)

### Security
- Upgrade spring-boot and other dependencies to latest versions
[conjurdemos/pet-store-demo#71](https://github.com/conjurdemos/pet-store-demo/pull/71)
- Upgrade spring-boot to 3.2.1 and Java to 11
[conjurdemos/pet-store-demo#70](https://github.com/conjurdemos/pet-store-demo/pull/70)
- Upgrade spring-boot to 3.0.7 for CVE-2023-20883
Expand Down Expand Up @@ -65,6 +69,7 @@ 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.1...HEAD
[Unreleased]: https://github.com/cyberark/secretless-broker/compare/v1.2.2...HEAD
[1.2.2]: https://github.com/cyberark/secretless-broker/compare/v1.2.1...v1.2.2
[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 @@ -17,7 +17,7 @@ RUN curl -sSL https://raw.githubusercontent.com/cyberark/summon/master/install.s

# STAGE:
# The 'maven' base is used to package the application
FROM maven:3.9.5-amazoncorretto-21-debian as maven
FROM maven:3.9.6-amazoncorretto-21-debian as maven

WORKDIR /app

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.2.1
1.2.2
14 changes: 7 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,34 +10,34 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.2.1</version>
<version>3.2.2</version>
</parent>

<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>3.2.1</version>
<version>3.2.2</version>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.7.0</version>
<version>42.7.1</version>
</dependency>
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<version>8.2.0</version>
<version>8.3.0</version>
</dependency>
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
<version>12.4.2.jre11</version>
<version>12.6.0.jre11</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
<version>3.2.1</version>
<version>3.2.2</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
Expand All @@ -47,7 +47,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
<version>3.2.1</version>
<version>3.2.2</version>
</dependency>
</dependencies>

Expand Down

0 comments on commit fae1a39

Please sign in to comment.