Skip to content

chore: bump to latest mpl #2046

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Sep 27, 2024
Merged

chore: bump to latest mpl #2046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
40ba566
chore: bump to latest mpl
josecorella Sep 13, 2024
f3570a3
use dafny 4.8.0
josecorella Sep 13, 2024
5cd377b
update submodule MPL
RitvikKapila Sep 18, 2024
1dbf93e
remove TestAwsCryptographicMaterialProviders snapshot dependency
RitvikKapila Sep 18, 2024
1648d3d
revert; fix TestVectors snapshot version
RitvikKapila Sep 18, 2024
2ea087a
try
RitvikKapila Sep 18, 2024
613dc7e
revert
RitvikKapila Sep 18, 2024
d9c0931
bump
josecorella Sep 27, 2024
2163ee8
spelling is hard
josecorella Sep 27, 2024
b9fdc2f
bump kms dep
josecorella Sep 27, 2024
ad306e4
another
josecorella Sep 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions codebuild/ci/net-vectors-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
2 changes: 1 addition & 1 deletion codebuild/ci/release-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion codebuild/ci/vectors-ci-mkp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion codebuild/ci/vectors-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion codebuild/ci/vectors-generator.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion codebuild/release/release-prod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion codebuild/release/release-staging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/amazonaws/encryptionsdk/TestVectorGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/amazonaws/encryptionsdk/TestVectorRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ public static Collection<Object[]> 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();
Expand Down
2 changes: 1 addition & 1 deletion submodules/MaterialProviders
Open in desktop
Submodule MaterialProviders updated 630 files
Loading