Merge branch 'master' into rkapila/hkeyring-shared-cache-example

Author: RitvikKapila

.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

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"
+      - mvn -B -ntp install -Dgpg.skip=true -Djacoco.skip=true "-Dtest=TestVectorRunner" "-DtestVectorZip=file://$VECTOR_ZIP"

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

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

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

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

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

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

pom.xml

@@ -43,7 +43,7 @@
             <dependency>
                 <groupId>software.amazon.awssdk</groupId>
                 <artifactId>bom</artifactId>
-                <version>2.20.91</version>
+                <version>2.26.3</version>
                 <optional>true</optional>
                 <type>pom</type>
                 <scope>import</scope>
@@ -62,19 +62,19 @@
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>kms</artifactId>
-            <version>2.20.91</version>
+            <version>2.26.3</version>
         </dependency>
 
         <dependency>
             <groupId>software.amazon.cryptography</groupId>
             <artifactId>aws-cryptographic-material-providers</artifactId>
-            <version>1.0.2</version>
+            <version>1.7.0</version>
         </dependency>
 
         <dependency>
             <groupId>software.amazon.cryptography</groupId>
             <artifactId>TestAwsCryptographicMaterialProviders</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>1.7.0</version>
             <optional>true</optional>
             <scope>test</scope>
         </dependency>

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

@@ -213,7 +213,7 @@ public static Collection<Object[]> data() throws Exception {
     KeyVectors keyVectors =
         KeyVectors.builder()
             .KeyVectorsConfig(
-                KeyVectorsConfig.builder().keyManifiestPath(keyManifest.toString()).build())
+                KeyVectorsConfig.builder().keyManifestPath(keyManifest.toString()).build())
             .build();
 
     final Map<String, KeyEntry> keys = parseKeyManifest(keysManifest);