Skip to content

Commit df10cc3

Browse files
simonmartysimonmarty
authored
Update dependencies and plugins (#117)
*Issue #, if available:* *Description of changes:* By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent 240a967 commit df10cc3

File tree

4 files changed

+58
-21
lines changed

4 files changed

+58
-21
lines changed

‎.github/workflows/maven.yml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,16 @@ jobs:
1515
runs-on: ubuntu-latest
1616

1717
steps:
18-
- uses: actions/checkout@v3
19-
- name: Set up JDK 11
20-
uses: actions/setup-java@v3
18+
- uses: actions/checkout@v4
19+
- name: Set up JDK 21
20+
uses: actions/setup-java@v4
2121
with:
22-
java-version: '11'
23-
distribution: 'temurin'
22+
java-version: '21'
23+
distribution: 'corretto'
2424
cache: maven
25+
- name: Maven version
26+
run: mvn --version
2527
- name: Build with Maven
26-
run: mvn -B package --file pom.xml
28+
run: mvn clean package
2729
- name: Codecov
2830
uses: codecov/[email protected]

‎pom.xml‎

Lines changed: 43 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
24
<modelVersion>4.0.0</modelVersion>
35

46
<groupId>com.amazonaws.secretsmanager</groupId>
57
<artifactId>aws-secretsmanager-caching-java</artifactId>
6-
<version>2.0.0</version>
8+
<version>2.0.1</version>
79
<packaging>jar</packaging>
810

911

@@ -35,6 +37,7 @@
3537
</scm>
3638

3739
<properties>
40+
<maven.compiler.release>8</maven.compiler.release>
3841
<maven.compiler.source>1.8</maven.compiler.source>
3942
<maven.compiler.target>1.8</maven.compiler.target>
4043
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -44,27 +47,33 @@
4447
<dependency>
4548
<groupId>software.amazon.awssdk</groupId>
4649
<artifactId>secretsmanager</artifactId>
47-
<version>2.20.93</version>
50+
<version>2.29.6</version>
4851
</dependency>
4952
<dependency>
5053
<groupId>org.testng</groupId>
5154
<artifactId>testng</artifactId>
52-
<version>7.8.0</version>
55+
<version>7.10.2</version>
5356
<scope>test</scope>
5457
</dependency>
5558
<dependency>
5659
<groupId>org.mockito</groupId>
5760
<artifactId>mockito-core</artifactId>
58-
<version>5.4.0</version>
61+
<version>5.14.2</version>
5962
<scope>test</scope>
6063
</dependency>
64+
<dependency>
65+
<groupId>com.github.spotbugs</groupId>
66+
<artifactId>spotbugs-annotations</artifactId>
67+
<version>4.8.6</version>
68+
<scope>compile</scope>
69+
</dependency>
6170
</dependencies>
6271
<build>
6372
<plugins>
6473
<plugin>
6574
<groupId>org.apache.maven.plugins</groupId>
6675
<artifactId>maven-compiler-plugin</artifactId>
67-
<version>3.11.0</version>
76+
<version>3.13.0</version>
6877
<configuration>
6978
<source>1.8</source>
7079
<target>1.8</target>
@@ -76,7 +85,7 @@
7685
<plugin>
7786
<groupId>org.apache.maven.plugins</groupId>
7887
<artifactId>maven-source-plugin</artifactId>
79-
<version>3.3.0</version>
88+
<version>3.3.1</version>
8089
<executions>
8190
<execution>
8291
<id>attach-sources</id>
@@ -89,7 +98,7 @@
8998
<plugin>
9099
<groupId>org.apache.maven.plugins</groupId>
91100
<artifactId>maven-javadoc-plugin</artifactId>
92-
<version>3.5.0</version>
101+
<version>3.11.1</version>
93102
<executions>
94103
<execution>
95104
<id>attach-javadocs</id>
@@ -101,7 +110,7 @@
101110
</plugin>
102111
<plugin>
103112
<artifactId>maven-checkstyle-plugin</artifactId>
104-
<version>3.3.0</version>
113+
<version>3.6.0</version>
105114
<configuration>
106115
<configLocation>${basedir}/config/checkstyle/checkstyle.xml</configLocation>
107116
<consoleOutput>true</consoleOutput>
@@ -121,9 +130,9 @@
121130
</executions>
122131
</plugin>
123132
<plugin>
124-
<groupId>org.codehaus.mojo</groupId>
125-
<artifactId>findbugs-maven-plugin</artifactId>
126-
<version>3.0.5</version>
133+
<groupId>com.github.spotbugs</groupId>
134+
<artifactId>spotbugs-maven-plugin</artifactId>
135+
<version>4.8.6.5</version>
127136
<configuration>
128137
<effort>Max</effort>
129138
<threshold>Low</threshold>
@@ -143,7 +152,7 @@
143152
<plugin>
144153
<groupId>org.jacoco</groupId>
145154
<artifactId>jacoco-maven-plugin</artifactId>
146-
<version>0.8.10</version>
155+
<version>0.8.12</version>
147156
<executions>
148157
<execution>
149158
<id>prepare-agent</id>
@@ -160,6 +169,26 @@
160169
</execution>
161170
</executions>
162171
</plugin>
172+
<plugin>
173+
<groupId>org.apache.maven.plugins</groupId>
174+
<artifactId>maven-dependency-plugin</artifactId>
175+
<version>3.8.1</version>
176+
<executions>
177+
<execution>
178+
<goals>
179+
<goal>properties</goal>
180+
</goals>
181+
</execution>
182+
</executions>
183+
</plugin>
184+
<plugin>
185+
<groupId>org.apache.maven.plugins</groupId>
186+
<artifactId>maven-surefire-plugin</artifactId>
187+
<version>3.5.2</version>
188+
<configuration>
189+
<argLine>@{argLine} -javaagent:${org.mockito:mockito-core:jar}</argLine>
190+
</configuration>
191+
</plugin>
163192
</plugins>
164193
</build>
165194

@@ -171,7 +200,7 @@
171200
<plugin>
172201
<groupId>org.apache.maven.plugins</groupId>
173202
<artifactId>maven-gpg-plugin</artifactId>
174-
<version>3.1.0</version>
203+
<version>3.2.7</version>
175204
<executions>
176205
<execution>
177206
<id>sign-artifacts</id>

‎src/main/java/com/amazonaws/secretsmanager/caching/SecretCacheConfiguration.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
import java.util.concurrent.TimeUnit;
1717

18+
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
1819
import software.amazon.awssdk.services.secretsmanager.SecretsManagerClient;
1920

2021

@@ -71,6 +72,7 @@ public SecretCacheConfiguration() {
7172
*
7273
* @return The AWS Secrets Manager client.
7374
*/
75+
@SuppressFBWarnings(value = "EI_EXPOSE_REP")
7476
public SecretsManagerClient getClient() {
7577
return client;
7678
}
@@ -83,6 +85,7 @@ public SecretsManagerClient getClient() {
8385
* @param client
8486
* The AWS Secrets Manager client.
8587
*/
88+
@SuppressFBWarnings(value = "EI_EXPOSE_REP2")
8689
public void setClient(SecretsManagerClient client) {
8790
this.client = client;
8891
}
@@ -106,6 +109,7 @@ public SecretCacheConfiguration withClient(SecretsManagerClient client) {
106109
*
107110
* @return The object used to hook in-memory cache updates.
108111
*/
112+
@SuppressFBWarnings(value = "EI_EXPOSE_REP")
109113
public SecretCacheHook getCacheHook() {
110114
return cacheHook;
111115
}
@@ -117,6 +121,7 @@ public SecretCacheHook getCacheHook() {
117121
* @param cacheHook
118122
* The interface used to hook the in-memory cache.
119123
*/
124+
@SuppressFBWarnings(value = "EI_EXPOSE_REP2")
120125
public void setCacheHook(SecretCacheHook cacheHook) {
121126
this.cacheHook = cacheHook;
122127
}

‎src/main/java/com/amazonaws/secretsmanager/caching/cache/SecretCacheObject.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import java.util.concurrent.ThreadLocalRandom;
1717

1818
import com.amazonaws.secretsmanager.caching.SecretCacheConfiguration;
19-
19+
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
2020
import software.amazon.awssdk.services.secretsmanager.SecretsManagerClient;
2121
import software.amazon.awssdk.services.secretsmanager.model.GetSecretValueResponse;
2222

@@ -92,6 +92,7 @@ public abstract class SecretCacheObject<T> {
9292
* @param config
9393
* The secret cache configuration.
9494
*/
95+
@SuppressFBWarnings(value = "EI_EXPOSE_REP2")
9596
public SecretCacheObject(final String secretId,
9697
final SecretsManagerClient client,
9798
final SecretCacheConfiguration config) {

0 commit comments

Comments
 (0)