Skip to content

Commit c63c3d1

Browse files
scmacdonscmacdon
committed
updated POM to use JDK 21
1 parent 255195a commit c63c3d1

File tree

10 files changed

+22
-112
lines changed

10 files changed

+22
-112
lines changed

‎javav2/example_code/forecast/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
<version>1.0-SNAPSHOT</version>
99
<properties>
1010
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
11-
<java.version>17</java.version>
12-
<maven.compiler.target>17</maven.compiler.target>
13-
<maven.compiler.source>17</maven.compiler.source>
11+
<java.version>21</java.version>
12+
<maven.compiler.target>21</maven.compiler.target>
13+
<maven.compiler.source>21</maven.compiler.source>
1414
</properties>
1515
<build>
1616
<plugins>
@@ -26,7 +26,7 @@
2626
<dependency>
2727
<groupId>software.amazon.awssdk</groupId>
2828
<artifactId>bom</artifactId>
29-
<version>2.29.45</version>
29+
<version>2.31.8</version>
3030
<type>pom</type>
3131
<scope>import</scope>
3232
</dependency>

‎javav2/example_code/forecast/src/test/java/ForecastTest.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ public static void setUp() {
3535
int randomNum = rand.nextInt((10000 - 1) + 1) + 1;
3636
forecast = ForecastClient.builder()
3737
.region(Region.US_WEST_2)
38-
.credentialsProvider(EnvironmentVariableCredentialsProvider.create())
3938
.build();
4039

4140
// Get the values to run these tests from AWS Secrets Manager.
@@ -110,7 +109,6 @@ public void DeleteForecast() throws InterruptedException {
110109
private static String getSecretValues() {
111110
SecretsManagerClient secretClient = SecretsManagerClient.builder()
112111
.region(Region.US_EAST_1)
113-
.credentialsProvider(EnvironmentVariableCredentialsProvider.create())
114112
.build();
115113
String secretName = "test/forecast";
116114

‎javav2/example_code/glacier/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
<version>1.0-SNAPSHOT</version>
99
<properties>
1010
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
11-
<java.version>17</java.version>
12-
<maven.compiler.target>17</maven.compiler.target>
13-
<maven.compiler.source>17</maven.compiler.source>
11+
<java.version>21</java.version>
12+
<maven.compiler.target>21</maven.compiler.target>
13+
<maven.compiler.source>21</maven.compiler.source>
1414
</properties>
1515
<build>
1616
<plugins>
@@ -38,7 +38,7 @@
3838
<dependency>
3939
<groupId>software.amazon.awssdk</groupId>
4040
<artifactId>bom</artifactId>
41-
<version>2.29.45</version>
41+
<version>2.31.8</version>
4242
<type>pom</type>
4343
<scope>import</scope>
4444
</dependency>

‎javav2/example_code/glacier/src/test/java/GlacierTest.java‎

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@
1010
import software.amazon.awssdk.services.secretsmanager.SecretsManagerClient;
1111
import software.amazon.awssdk.services.secretsmanager.model.GetSecretValueRequest;
1212
import software.amazon.awssdk.services.secretsmanager.model.GetSecretValueResponse;
13+
1314
import java.io.*;
1415
import java.nio.file.Path;
1516
import java.nio.file.Paths;
17+
1618
import static org.junit.jupiter.api.Assertions.*;
1719

1820
/**
@@ -33,7 +35,6 @@ public class GlacierTest {
3335
@BeforeAll
3436
public static void setUp() {
3537
glacier = GlacierClient.builder()
36-
.credentialsProvider(EnvironmentVariableCredentialsProvider.create())
3738
.region(Region.US_EAST_1)
3839
.build();
3940

@@ -46,31 +47,6 @@ public static void setUp() {
4647
downloadVault = values.getDownloadVault();
4748
accountId = values.getAccountId();
4849
emptyVault = values.getEmptyVault();
49-
50-
// Uncomment this code block if you prefer using a config.properties file to
51-
// retrieve AWS values required for these tests.
52-
/*
53-
* try (InputStream input =
54-
* GlacierTest.class.getClassLoader().getResourceAsStream("config.properties"))
55-
* {
56-
* Properties prop = new Properties();
57-
* if (input == null) {
58-
* System.out.println("Sorry, unable to find config.properties");
59-
* return;
60-
* }
61-
*
62-
* // Populate the data members required for all tests.
63-
* prop.load(input);
64-
* vaultName = prop.getProperty("vaultName");
65-
* strPath = prop.getProperty("strPath");
66-
* downloadVault= prop.getProperty("downloadVault");
67-
* accountId= prop.getProperty("accountId");
68-
* emptyVault= prop.getProperty("emptyVault");
69-
*
70-
* } catch (IOException ex) {
71-
* ex.printStackTrace();
72-
* }
73-
*/
7450
}
7551

7652
@Test
@@ -135,7 +111,6 @@ public void DeleteVault() {
135111
private static String getSecretValues() {
136112
SecretsManagerClient secretClient = SecretsManagerClient.builder()
137113
.region(Region.US_EAST_1)
138-
.credentialsProvider(EnvironmentVariableCredentialsProvider.create())
139114
.build();
140115
String secretName = "test/glacier";
141116

‎javav2/example_code/glue/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
<version>1.0-SNAPSHOT</version>
99
<properties>
1010
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
11-
<java.version>17</java.version>
12-
<maven.compiler.target>17</maven.compiler.target>
13-
<maven.compiler.source>17</maven.compiler.source>
11+
<java.version>21</java.version>
12+
<maven.compiler.target>21</maven.compiler.target>
13+
<maven.compiler.source>21</maven.compiler.source>
1414
</properties>
1515
<build>
1616
<plugins>
@@ -35,7 +35,7 @@
3535
<dependency>
3636
<groupId>software.amazon.awssdk</groupId>
3737
<artifactId>bom</artifactId>
38-
<version>2.29.45</version>
38+
<version>2.31.8</version>
3939
<type>pom</type>
4040
<scope>import</scope>
4141
</dependency>

‎javav2/example_code/glue/src/test/java/GlueTest.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ public class GlueTest {
4747
public static void setUp() {
4848
glueClient = GlueClient.builder()
4949
.region(Region.US_EAST_1)
50-
.credentialsProvider(EnvironmentVariableCredentialsProvider.create())
5150
.build();
5251

5352
// Get the values to run these tests from AWS Secrets Manager.
@@ -199,7 +198,6 @@ void testDelCrawler() {
199198
private static String getSecretValues() {
200199
SecretsManagerClient secretClient = SecretsManagerClient.builder()
201200
.region(Region.US_EAST_1)
202-
.credentialsProvider(EnvironmentVariableCredentialsProvider.create())
203201
.build();
204202
String secretName = "test/glue";
205203

‎javav2/example_code/guardduty/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
<version>1.0-SNAPSHOT</version>
99
<properties>
1010
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
11-
<java.version>17</java.version>
12-
<maven.compiler.target>17</maven.compiler.target>
13-
<maven.compiler.source>17</maven.compiler.source>
11+
<java.version>21</java.version>
12+
<maven.compiler.target>21</maven.compiler.target>
13+
<maven.compiler.source>21</maven.compiler.source>
1414
</properties>
1515
<build>
1616
<plugins>
@@ -35,7 +35,7 @@
3535
<dependency>
3636
<groupId>software.amazon.awssdk</groupId>
3737
<artifactId>bom</artifactId>
38-
<version>2.29.45</version>
38+
<version>2.31.8</version>
3939
<type>pom</type>
4040
<scope>import</scope>
4141
</dependency>

‎javav2/example_code/guardduty/src/test/java/GuarddutyTest.java‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ public static void setUp() {
3131
Region region = Region.US_EAST_1;
3232
guardDutyClient = GuardDutyClient.builder()
3333
.region(region)
34-
.credentialsProvider(EnvironmentVariableCredentialsProvider.create())
3534
.build();
3635

3736
// Get the values to run these tests from AWS Secrets Manager.
@@ -40,28 +39,6 @@ public static void setUp() {
4039
SecretValues values = gson.fromJson(json, SecretValues.class);
4140
detectorId = values.getDetectorId();
4241
findingId = values.getFindingId();
43-
44-
// Uncomment this code block if you prefer using a config.properties file to
45-
// retrieve AWS values required for these tests.
46-
/*
47-
*
48-
* try (InputStream input =
49-
* GuarddutyTest.class.getClassLoader().getResourceAsStream("config.properties")
50-
* ) {
51-
* Properties prop = new Properties();
52-
* if (input == null) {
53-
* System.out.println("Sorry, unable to find config.properties");
54-
* return;
55-
* }
56-
* // Populate the data members required for all tests.
57-
* prop.load(input);
58-
* detectorId = prop.getProperty("detectorId");
59-
* findingId = prop.getProperty("findingId");
60-
*
61-
* } catch (IOException ex) {
62-
* ex.printStackTrace();
63-
* }
64-
*/
6542
}
6643

6744
@Test
@@ -92,7 +69,6 @@ private static String getSecretValues() {
9269
// Get the Amazon RDS creds from Secrets Manager.
9370
SecretsManagerClient secretClient = SecretsManagerClient.builder()
9471
.region(Region.US_EAST_1)
95-
.credentialsProvider(EnvironmentVariableCredentialsProvider.create())
9672
.build();
9773
String secretName = "test/guarduty";
9874

‎javav2/example_code/iam/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
<properties>
1010
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1111
<slf4j.version>1.7.28</slf4j.version>
12-
<java.version>17</java.version>
13-
<maven.compiler.target>17</maven.compiler.target>
14-
<maven.compiler.source>17</maven.compiler.source>
12+
<java.version>21</java.version>
13+
<maven.compiler.target>21</maven.compiler.target>
14+
<maven.compiler.source>21</maven.compiler.source>
1515
</properties>
1616
<build>
1717
<plugins>
@@ -27,7 +27,7 @@
2727
<dependency>
2828
<groupId>software.amazon.awssdk</groupId>
2929
<artifactId>bom</artifactId>
30-
<version>2.29.45</version>
30+
<version>2.31.8</version>
3131
<type>pom</type>
3232
<scope>import</scope>
3333
</dependency>

‎javav2/example_code/iam/src/test/java/IAMServiceTest.java‎

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ public static void setUp() {
4545
Region region = Region.AWS_GLOBAL;
4646
iam = IamClient.builder()
4747
.region(region)
48-
.credentialsProvider(EnvironmentVariableCredentialsProvider.create())
4948
.build();
5049

5150
// Get the values to run these tests from AWS Secrets Manager.
@@ -62,37 +61,6 @@ public static void setUp() {
6261
roleSessionName = values.getRoleName() + UUID.randomUUID();;
6362
fileLocationSc = values.getFileLocationSc();
6463
bucketNameSc = values.getBucketNameSc();
65-
66-
// Uncomment this code block if you prefer using a config.properties file to
67-
// retrieve AWS values required for these tests.
68-
/*
69-
*
70-
* try (InputStream input =
71-
* IAMServiceTest.class.getClassLoader().getResourceAsStream("config.properties"
72-
* )) {
73-
* Properties prop = new Properties();
74-
* prop.load(input);
75-
* userName = prop.getProperty("userName");
76-
* policyName= prop.getProperty("policyName");
77-
* policyARN= prop.getProperty("policyARN");
78-
* roleName=prop.getProperty("roleName");
79-
* accountAlias=prop.getProperty("accountAlias");
80-
* usernameSc=prop.getProperty("usernameSc");
81-
* policyNameSc=prop.getProperty("policyNameSc");
82-
* roleNameSc=prop.getProperty("roleNameSc");
83-
* roleSessionName=prop.getProperty("roleSessionName");
84-
* fileLocationSc=prop.getProperty("fileLocationSc");
85-
* bucketNameSc=prop.getProperty("bucketNameSc");
86-
*
87-
* if (input == null) {
88-
* System.out.println("Sorry, unable to find config.properties");
89-
* return;
90-
* }
91-
*
92-
* } catch (IOException ex) {
93-
* ex.printStackTrace();
94-
* }
95-
*/
9664
}
9765

9866
@Test
@@ -122,10 +90,6 @@ public void CreateAccessKey() {
12290
System.out.println("Test 3 passed");
12391
}
12492

125-
126-
127-
128-
12993
@Test
13094
@Tag("IntegrationTest")
13195
@Order(4)
@@ -254,7 +218,6 @@ public void TestIAMScenario() throws Exception {
254218
private static String getSecretValues() {
255219
SecretsManagerClient secretClient = SecretsManagerClient.builder()
256220
.region(Region.US_EAST_1)
257-
.credentialsProvider(EnvironmentVariableCredentialsProvider.create())
258221
.build();
259222
String secretName = "test/iam";
260223

0 commit comments

Comments
 (0)