Skip to content

Commit 98fddb0

Browse files
scmacdonscmacdon
committed
updated the SDK build number
1 parent 90239e1 commit 98fddb0

File tree

5 files changed

+39
-44
lines changed

5 files changed

+39
-44
lines changed

‎javav2/example_code/ecr/pom.xml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<dependency>
4141
<groupId>software.amazon.awssdk</groupId>
4242
<artifactId>bom</artifactId>
43-
<version>2.25.56</version>
43+
<version>2.29.45</version>
4444
<type>pom</type>
4545
<scope>import</scope>
4646
</dependency>
@@ -90,13 +90,11 @@
9090
<version>1.9.2</version>
9191
<scope>test</scope>
9292
</dependency>
93-
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
9493
<dependency>
9594
<groupId>com.fasterxml.jackson.core</groupId>
9695
<artifactId>jackson-databind</artifactId>
9796
<version>2.17.0</version>
9897
</dependency>
99-
10098
<dependency>
10199
<groupId>software.amazon.awssdk</groupId>
102100
<artifactId>kms</artifactId>
@@ -130,7 +128,6 @@
130128
<groupId>org.apache.logging.log4j</groupId>
131129
<artifactId>log4j-1.2-api</artifactId>
132130
</dependency>
133-
<!-- https://mvnrepository.com/artifact/com.github.docker-java/docker-java-transport-httpclient5 -->
134131
<dependency>
135132
<groupId>com.github.docker-java</groupId>
136133
<artifactId>docker-java-transport-httpclient5</artifactId>

‎javav2/example_code/ecs/pom.xml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<dependency>
1818
<groupId>software.amazon.awssdk</groupId>
1919
<artifactId>bom</artifactId>
20-
<version>2.21.20</version>
20+
<version>2.29.45</version>
2121
<type>pom</type>
2222
<scope>import</scope>
2323
</dependency>
@@ -65,6 +65,14 @@
6565
<groupId>software.amazon.awssdk</groupId>
6666
<artifactId>ecs</artifactId>
6767
</dependency>
68+
<dependency>
69+
<groupId>software.amazon.awssdk</groupId>
70+
<artifactId>sso</artifactId>
71+
</dependency>
72+
<dependency>
73+
<groupId>software.amazon.awssdk</groupId>
74+
<artifactId>ssooidc</artifactId>
75+
</dependency>
6876
</dependencies>
6977
<build>
7078
<plugins>

‎javav2/example_code/elasticbeanstalk/pom.xml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<dependency>
4040
<groupId>software.amazon.awssdk</groupId>
4141
<artifactId>bom</artifactId>
42-
<version>2.21.20</version>
42+
<version>2.29.45</version>
4343
<type>pom</type>
4444
<scope>import</scope>
4545
</dependency>
@@ -91,5 +91,13 @@
9191
<groupId>software.amazon.awssdk</groupId>
9292
<artifactId>textract</artifactId>
9393
</dependency>
94+
<dependency>
95+
<groupId>software.amazon.awssdk</groupId>
96+
<artifactId>sso</artifactId>
97+
</dependency>
98+
<dependency>
99+
<groupId>software.amazon.awssdk</groupId>
100+
<artifactId>ssooidc</artifactId>
101+
</dependency>
94102
</dependencies>
95103
</project>

‎javav2/example_code/emr/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</properties>
1515
<build>
1616
<plugins>
17-
<plugin>
17+
<plugin>
1818
<groupId>org.apache.maven.plugins</groupId>
1919
<artifactId>maven-compiler-plugin</artifactId>
2020
<version>3.1</version>
@@ -38,7 +38,7 @@
3838
<dependency>
3939
<groupId>software.amazon.awssdk</groupId>
4040
<artifactId>bom</artifactId>
41-
<version>2.21.20</version>
41+
<version>2.29.45</version>
4242
<type>pom</type>
4343
</dependency>
4444
</dependencies>
@@ -59,7 +59,7 @@
5959
<dependency>
6060
<groupId>software.amazon.awssdk</groupId>
6161
<artifactId>secretsmanager</artifactId>
62-
<version>2.20.45</version>
62+
<version>2.29.45</version>
6363
</dependency>
6464
<dependency>
6565
<groupId>com.google.code.gson</groupId>
@@ -85,7 +85,7 @@
8585
<dependency>
8686
<groupId>software.amazon.awssdk</groupId>
8787
<artifactId>emr</artifactId>
88-
<version>2.20.26</version>
88+
<version>2.29.45</version>
8989
</dependency>
9090
</dependencies>
9191
</project>

‎javav2/example_code/emr/src/test/java/EMRTest.java‎

Lines changed: 16 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
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.*;
15+
1416
import static org.junit.jupiter.api.Assertions.*;
1517

1618
/**
@@ -32,9 +34,9 @@ public class EMRTest {
3234
@BeforeAll
3335
public static void setUp() throws IOException {
3436
emrClient = EmrClient.builder()
35-
.region(Region.US_WEST_2)
36-
.credentialsProvider(EnvironmentVariableCredentialsProvider.create())
37-
.build();
37+
.region(Region.US_WEST_2)
38+
.credentialsProvider(EnvironmentVariableCredentialsProvider.create())
39+
.build();
3840

3941
// Get the values to run these tests from AWS Secrets Manager.
4042
Gson gson = new Gson();
@@ -50,7 +52,7 @@ public static void setUp() throws IOException {
5052
// Uncomment this code block if you prefer using a config.properties file to
5153
// retrieve AWS values required for these tests.
5254
/*
53-
*
55+
*
5456
* try (InputStream input =
5557
* EMRTest.class.getClassLoader().getResourceAsStream("config.properties")) {
5658
* Properties prop = new Properties();
@@ -66,7 +68,7 @@ public static void setUp() throws IOException {
6668
* logUri = prop.getProperty("logUri");
6769
* name = prop.getProperty("name");
6870
* existingClusterId= prop.getProperty("existingClusterId");
69-
*
71+
*
7072
* } catch (IOException ex) {
7173
* ex.printStackTrace();
7274
* }
@@ -83,71 +85,51 @@ public void createClusterTest() {
8385

8486
@Test
8587
@Order(2)
86-
public void describeClusterTest() {
87-
assertDoesNotThrow(() -> DescribeCluster.describeMyCluster(emrClient, existingClusterId));
88-
System.out.println("Test 2 passed");
89-
}
90-
91-
@Test
92-
@Order(3)
9388
public void listClusterTest() {
9489
assertDoesNotThrow(() -> ListClusters.listAllClusters(emrClient));
9590
System.out.println("Test 3 passed");
9691
}
9792

9893
@Test
99-
@Order(4)
94+
@Order(3)
10095
public void createEmrFleetTest() {
10196
assertDoesNotThrow(() -> CreateEmrFleet.createFleet(emrClient));
10297
System.out.println("Test 4 passed");
10398
}
10499

105-
@Test
106-
@Order(5)
107-
public void addStepsTest() {
108-
assertDoesNotThrow(() -> AddSteps.addNewStep(emrClient, jobFlowId, jar, myClass));
109-
System.out.println("Test 5 passed");
110-
}
111100

112101
@Test
113-
@Order(6)
102+
@Order(4)
114103
public void createSparkClusterTest() {
115104
assertDoesNotThrow(() -> CreateSparkCluster.createCluster(emrClient, jar, myClass, keys, logUri, name));
116105
System.out.println("Test 6 passed");
117106
}
118107

119108
@Test
120-
@Order(7)
109+
@Order(5)
121110
public void createHiveClusterTest() {
122111
assertDoesNotThrow(() -> CreateHiveCluster.createCluster(emrClient, jar, myClass, keys, logUri, name));
123112
System.out.println("Test 7 passed");
124113

125114
}
126115

127116
@Test
128-
@Order(8)
117+
@Order(6)
129118
public void customEmrfsMaterialsTest() {
130119
assertDoesNotThrow(() -> CustomEmrfsMaterials.createEmrfsCluster(emrClient, jar, myClass, keys, logUri, name));
131120
System.out.println("Test 8 passed");
132121
}
133122

134-
@Test
135-
@Order(9)
136-
public void terminateJobFlowTest() {
137-
assertDoesNotThrow(() -> TerminateJobFlow.terminateFlow(emrClient, existingClusterId));
138-
System.out.println("Test 9 passed");
139-
}
140-
141123
private static String getSecretValues() {
142124
SecretsManagerClient secretClient = SecretsManagerClient.builder()
143-
.region(Region.US_EAST_1)
144-
.credentialsProvider(EnvironmentVariableCredentialsProvider.create())
145-
.build();
125+
.region(Region.US_EAST_1)
126+
.credentialsProvider(EnvironmentVariableCredentialsProvider.create())
127+
.build();
146128
String secretName = "text/emr";
147129

148130
GetSecretValueRequest valueRequest = GetSecretValueRequest.builder()
149-
.secretId(secretName)
150-
.build();
131+
.secretId(secretName)
132+
.build();
151133

152134
GetSecretValueResponse valueResponse = secretClient.getSecretValue(valueRequest);
153135
return valueResponse.secretString();

0 commit comments

Comments
 (0)