Skip to content

Commit 6dd2d12

Browse files
chore: bump to latest mpl (#2046)
Co-authored-by: Ritvik Kapila <[email protected]>
1 parent 7cfe049 commit 6dd2d12

12 files changed

+16
-16
lines changed

.gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
url = https://github.com/awslabs/aws-encryption-sdk-specification.git
77
[submodule "submodules/MaterialProviders"]
88
path = submodules/MaterialProviders
9-
url = https://github.com/aws/aws-cryptographic-material-providers-library-java.git
9+
url = https://github.com/aws/aws-cryptographic-material-providers-library.git

codebuild/ci/net-vectors-ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ phases:
77
commands:
88
- git submodule update --init submodules/MaterialProviders
99
# Get Dafny
10-
- curl https://github.com/dafny-lang/dafny/releases/download/v4.2.0/dafny-4.2.0-x64-ubuntu-20.04.zip -L -o dafny.zip
10+
- curl https://github.com/dafny-lang/dafny/releases/download/v4.8.0/dafny-4.8.0-x64-ubuntu-20.04.zip -L -o dafny.zip
1111
- unzip -qq dafny.zip && rm dafny.zip
1212
- export PATH="$PWD/dafny:$PATH"
1313
# Get Gradle 7.6
@@ -36,4 +36,4 @@ phases:
3636
build:
3737
commands:
3838
# NOTE: We need to pass the absolute path of the vectors
39-
- mvn -B -ntp install -Dgpg.skip=true -Djacoco.skip=true "-Dtest=TestVectorRunner" "-DtestVectorZip=file://$VECTOR_ZIP"
39+
- mvn -B -ntp install -Dgpg.skip=true -Djacoco.skip=true "-Dtest=TestVectorRunner" "-DtestVectorZip=file://$VECTOR_ZIP"

codebuild/ci/release-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ phases:
2020
commands:
2121
- git submodule update --init submodules/MaterialProviders
2222
# Get Dafny
23-
- curl https://github.com/dafny-lang/dafny/releases/download/v4.2.0/dafny-4.2.0-x64-ubuntu-20.04.zip -L -o dafny.zip
23+
- curl https://github.com/dafny-lang/dafny/releases/download/v4.8.0/dafny-4.8.0-x64-ubuntu-20.04.zip -L -o dafny.zip
2424
- unzip -qq dafny.zip && rm dafny.zip
2525
- export PATH="$PWD/dafny:$PATH"
2626
# Get Gradle 7.6

codebuild/ci/vectors-ci-mkp.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ phases:
77
commands:
88
- git submodule update --init submodules/MaterialProviders
99
# Get Dafny
10-
- curl https://github.com/dafny-lang/dafny/releases/download/v4.2.0/dafny-4.2.0-x64-ubuntu-20.04.zip -L -o dafny.zip
10+
- curl https://github.com/dafny-lang/dafny/releases/download/v4.8.0/dafny-4.8.0-x64-ubuntu-20.04.zip -L -o dafny.zip
1111
- unzip -qq dafny.zip && rm dafny.zip
1212
- export PATH="$PWD/dafny:$PATH"
1313
# Get Gradle 7.6

codebuild/ci/vectors-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ phases:
77
commands:
88
- git submodule update --init submodules/MaterialProviders
99
# Get Dafny
10-
- curl https://github.com/dafny-lang/dafny/releases/download/v4.2.0/dafny-4.2.0-x64-ubuntu-20.04.zip -L -o dafny.zip
10+
- curl https://github.com/dafny-lang/dafny/releases/download/v4.8.0/dafny-4.8.0-x64-ubuntu-20.04.zip -L -o dafny.zip
1111
- unzip -qq dafny.zip && rm dafny.zip
1212
- export PATH="$PWD/dafny:$PATH"
1313
# Get Gradle 7.6

codebuild/ci/vectors-generator.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ phases:
1111

1212
- git submodule update --init submodules/MaterialProviders
1313
# Get Dafny
14-
- curl https://github.com/dafny-lang/dafny/releases/download/v4.2.0/dafny-4.2.0-x64-ubuntu-20.04.zip -L -o dafny.zip
14+
- curl https://github.com/dafny-lang/dafny/releases/download/v4.8.0/dafny-4.8.0-x64-ubuntu-20.04.zip -L -o dafny.zip
1515
- unzip -qq dafny.zip && rm dafny.zip
1616
- export PATH="$PWD/dafny:$PATH"
1717
# Get Gradle 7.6

codebuild/release/release-prod.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ phases:
1919
commands:
2020
- git submodule update --init submodules/MaterialProviders
2121
# Get Dafny
22-
- curl https://github.com/dafny-lang/dafny/releases/download/v4.2.0/dafny-4.2.0-x64-ubuntu-20.04.zip -L -o dafny.zip
22+
- curl https://github.com/dafny-lang/dafny/releases/download/v4.8.0/dafny-4.8.0-x64-ubuntu-20.04.zip -L -o dafny.zip
2323
- unzip -qq dafny.zip && rm dafny.zip
2424
- export PATH="$PWD/dafny:$PATH"
2525
# Get Gradle 7.6

codebuild/release/release-staging.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ phases:
2121
commands:
2222
- git submodule update --init submodules/MaterialProviders
2323
# Get Dafny
24-
- curl https://github.com/dafny-lang/dafny/releases/download/v4.2.0/dafny-4.2.0-x64-ubuntu-20.04.zip -L -o dafny.zip
24+
- curl https://github.com/dafny-lang/dafny/releases/download/v4.8.0/dafny-4.8.0-x64-ubuntu-20.04.zip -L -o dafny.zip
2525
- unzip -qq dafny.zip && rm dafny.zip
2626
- export PATH="$PWD/dafny:$PATH"
2727
# Get Gradle 7.6

pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<dependency>
4444
<groupId>software.amazon.awssdk</groupId>
4545
<artifactId>bom</artifactId>
46-
<version>2.20.91</version>
46+
<version>2.26.3</version>
4747
<optional>true</optional>
4848
<type>pom</type>
4949
<scope>import</scope>
@@ -62,19 +62,19 @@
6262
<dependency>
6363
<groupId>software.amazon.awssdk</groupId>
6464
<artifactId>kms</artifactId>
65-
<version>2.20.91</version>
65+
<version>2.26.3</version>
6666
</dependency>
6767

6868
<dependency>
6969
<groupId>software.amazon.cryptography</groupId>
7070
<artifactId>aws-cryptographic-material-providers</artifactId>
71-
<version>1.0.2</version>
71+
<version>1.7.0</version>
7272
</dependency>
7373

7474
<dependency>
7575
<groupId>software.amazon.cryptography</groupId>
7676
<artifactId>TestAwsCryptographicMaterialProviders</artifactId>
77-
<version>1.0-SNAPSHOT</version>
77+
<version>1.7.0</version>
7878
<optional>true</optional>
7979
<scope>test</scope>
8080
</dependency>

src/test/java/com/amazonaws/encryptionsdk/TestVectorGenerator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ public static Collection<Object[]> data() throws Exception {
213213
KeyVectors keyVectors =
214214
KeyVectors.builder()
215215
.KeyVectorsConfig(
216-
KeyVectorsConfig.builder().keyManifiestPath(keyManifest.toString()).build())
216+
KeyVectorsConfig.builder().keyManifestPath(keyManifest.toString()).build())
217217
.build();
218218

219219
final Map<String, KeyEntry> keys = parseKeyManifest(keysManifest);

src/test/java/com/amazonaws/encryptionsdk/TestVectorRunner.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ public static Collection<Object[]> data() throws Exception {
151151
KeyVectors keyVectors =
152152
KeyVectors.builder()
153153
.KeyVectorsConfig(
154-
KeyVectorsConfig.builder().keyManifiestPath(tempFile.getPath()).build())
154+
KeyVectorsConfig.builder().keyManifestPath(tempFile.getPath()).build())
155155
.build();
156156

157157
MaterialProvidersConfig config = MaterialProvidersConfig.builder().build();

submodules/MaterialProviders

Submodule MaterialProviders updated 630 files

0 commit comments

Comments
 (0)