Skip to content

Commit

Permalink
Merge pull request #101 from cyberark/versionUpdate
Browse files Browse the repository at this point in the history
Support JDK 8 & update conjur-java-sdk
  • Loading branch information
itsbrugu authored Jul 21, 2023
2 parents ff6cd44 + 7c25dd4 commit cc6e08b
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 6 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]

## [2.0.1] - 2023-07-19
### Added
- Updated conjur-java-sdk to the version 4.1.0

## [2.0.0]
- Plugin now supports Spring Cloud Configuration and to dynamically inject secrets to application.

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ The Spring Cloud Config Conjur plugin does not support creating, updating or rem
| Conjur OSS | 1.9+ |
| Conjur Enterprise | 12.5+ |
| Conjur Cloud |
| ConjurSDK(Java) | 4.0.0 |
| ConjurSDK(Java) | 4.1.0 |
| Conjur API | 5.1 |
| Spring Cloud | 2021.x and 2022.x |
| Spring Boot | 2.x and 3.x |
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,9 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>11</java.version>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<java.version>1.8</java.version>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<okhttp3.version>4.10.0</okhttp3.version>
</properties>

Expand All @@ -172,7 +172,7 @@
<dependency>
<groupId>com.cyberark</groupId>
<artifactId>conjur-sdk-java</artifactId>
<version>4.0.0</version>
<version>4.1.0</version>
</dependency>

<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ private void getConnection(ConjurProperties conjurProperties) {

String authTokenFile = conjurProperties.getAuthTokenFile();
if (StringUtils.isNotEmpty(authTokenFile)) {
String apiKey = Files.readString(Paths.get(authTokenFile));
String apiKey = new String(Files.readAllBytes(Paths.get(authTokenFile)));
client.setApiKey(apiKey);
}

Expand Down

0 comments on commit cc6e08b

Please sign in to comment.