diff --git a/.gitmodules b/.gitmodules index f4916f35..9e680131 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,4 +6,4 @@ url = https://github.com/awslabs/aws-encryption-sdk-specification.git [submodule "submodules/MaterialProviders"] path = submodules/MaterialProviders - url = https://github.com/aws/aws-cryptographic-material-providers-library-java.git + url = https://github.com/aws/aws-cryptographic-material-providers-library.git diff --git a/codebuild/ci/net-vectors-ci.yml b/codebuild/ci/net-vectors-ci.yml index 41b02ef3..e6747e17 100644 --- a/codebuild/ci/net-vectors-ci.yml +++ b/codebuild/ci/net-vectors-ci.yml @@ -7,7 +7,7 @@ phases: commands: - git submodule update --init submodules/MaterialProviders # Get Dafny - - 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 + - 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 - unzip -qq dafny.zip && rm dafny.zip - export PATH="$PWD/dafny:$PATH" # Get Gradle 7.6 @@ -36,4 +36,4 @@ phases: build: commands: # NOTE: We need to pass the absolute path of the vectors - - mvn -B -ntp install -Dgpg.skip=true -Djacoco.skip=true "-Dtest=TestVectorRunner" "-DtestVectorZip=file://$VECTOR_ZIP" \ No newline at end of file + - mvn -B -ntp install -Dgpg.skip=true -Djacoco.skip=true "-Dtest=TestVectorRunner" "-DtestVectorZip=file://$VECTOR_ZIP" diff --git a/codebuild/ci/release-ci.yml b/codebuild/ci/release-ci.yml index 35740e90..0505a956 100644 --- a/codebuild/ci/release-ci.yml +++ b/codebuild/ci/release-ci.yml @@ -20,7 +20,7 @@ phases: commands: - git submodule update --init submodules/MaterialProviders # Get Dafny - - 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 + - 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 - unzip -qq dafny.zip && rm dafny.zip - export PATH="$PWD/dafny:$PATH" # Get Gradle 7.6 diff --git a/codebuild/ci/vectors-ci-mkp.yml b/codebuild/ci/vectors-ci-mkp.yml index d272768b..1cc402e5 100644 --- a/codebuild/ci/vectors-ci-mkp.yml +++ b/codebuild/ci/vectors-ci-mkp.yml @@ -7,7 +7,7 @@ phases: commands: - git submodule update --init submodules/MaterialProviders # Get Dafny - - 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 + - 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 - unzip -qq dafny.zip && rm dafny.zip - export PATH="$PWD/dafny:$PATH" # Get Gradle 7.6 diff --git a/codebuild/ci/vectors-ci.yml b/codebuild/ci/vectors-ci.yml index 72c4eebc..363c1d35 100644 --- a/codebuild/ci/vectors-ci.yml +++ b/codebuild/ci/vectors-ci.yml @@ -7,7 +7,7 @@ phases: commands: - git submodule update --init submodules/MaterialProviders # Get Dafny - - 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 + - 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 - unzip -qq dafny.zip && rm dafny.zip - export PATH="$PWD/dafny:$PATH" # Get Gradle 7.6 diff --git a/codebuild/ci/vectors-generator.yml b/codebuild/ci/vectors-generator.yml index 1b987762..b3256fb7 100644 --- a/codebuild/ci/vectors-generator.yml +++ b/codebuild/ci/vectors-generator.yml @@ -11,7 +11,7 @@ phases: - git submodule update --init submodules/MaterialProviders # Get Dafny - - 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 + - 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 - unzip -qq dafny.zip && rm dafny.zip - export PATH="$PWD/dafny:$PATH" # Get Gradle 7.6 diff --git a/codebuild/release/release-prod.yml b/codebuild/release/release-prod.yml index a3e7e68b..1a2bc7f7 100644 --- a/codebuild/release/release-prod.yml +++ b/codebuild/release/release-prod.yml @@ -19,7 +19,7 @@ phases: commands: - git submodule update --init submodules/MaterialProviders # Get Dafny - - 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 + - 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 - unzip -qq dafny.zip && rm dafny.zip - export PATH="$PWD/dafny:$PATH" # Get Gradle 7.6 diff --git a/codebuild/release/release-staging.yml b/codebuild/release/release-staging.yml index 2397b5d0..8230d6d4 100644 --- a/codebuild/release/release-staging.yml +++ b/codebuild/release/release-staging.yml @@ -21,7 +21,7 @@ phases: commands: - git submodule update --init submodules/MaterialProviders # Get Dafny - - 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 + - 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 - unzip -qq dafny.zip && rm dafny.zip - export PATH="$PWD/dafny:$PATH" # Get Gradle 7.6 diff --git a/pom.xml b/pom.xml index 3cff1dac..41b312da 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ software.amazon.awssdk bom - 2.20.91 + 2.26.3 true pom import @@ -62,19 +62,19 @@ software.amazon.awssdk kms - 2.20.91 + 2.26.3 software.amazon.cryptography aws-cryptographic-material-providers - 1.0.2 + 1.7.0 software.amazon.cryptography TestAwsCryptographicMaterialProviders - 1.0-SNAPSHOT + 1.7.0 true test diff --git a/src/test/java/com/amazonaws/encryptionsdk/TestVectorGenerator.java b/src/test/java/com/amazonaws/encryptionsdk/TestVectorGenerator.java index eb2b1764..af9bd168 100644 --- a/src/test/java/com/amazonaws/encryptionsdk/TestVectorGenerator.java +++ b/src/test/java/com/amazonaws/encryptionsdk/TestVectorGenerator.java @@ -213,7 +213,7 @@ public static Collection data() throws Exception { KeyVectors keyVectors = KeyVectors.builder() .KeyVectorsConfig( - KeyVectorsConfig.builder().keyManifiestPath(keyManifest.toString()).build()) + KeyVectorsConfig.builder().keyManifestPath(keyManifest.toString()).build()) .build(); final Map keys = parseKeyManifest(keysManifest); diff --git a/src/test/java/com/amazonaws/encryptionsdk/TestVectorRunner.java b/src/test/java/com/amazonaws/encryptionsdk/TestVectorRunner.java index 8c0be82f..052c3b42 100644 --- a/src/test/java/com/amazonaws/encryptionsdk/TestVectorRunner.java +++ b/src/test/java/com/amazonaws/encryptionsdk/TestVectorRunner.java @@ -151,7 +151,7 @@ public static Collection data() throws Exception { KeyVectors keyVectors = KeyVectors.builder() .KeyVectorsConfig( - KeyVectorsConfig.builder().keyManifiestPath(tempFile.getPath()).build()) + KeyVectorsConfig.builder().keyManifestPath(tempFile.getPath()).build()) .build(); MaterialProvidersConfig config = MaterialProvidersConfig.builder().build(); diff --git a/submodules/MaterialProviders b/submodules/MaterialProviders index 9c0efc52..ea0fe508 160000 --- a/submodules/MaterialProviders +++ b/submodules/MaterialProviders @@ -1 +1 @@ -Subproject commit 9c0efc528a0fe5d58d8e0fe0985a29f40259bc00 +Subproject commit ea0fe508dca214b9c9bdaf0fc21122e83971ef1b