From 26a7c5e47cd81b5526556abb475417e0e0352f2d Mon Sep 17 00:00:00 2001 From: Valerie Lambert Date: Fri, 15 Sep 2023 16:16:12 -0700 Subject: [PATCH 1/7] chore: Always test/build with locally built MPL and add release safeguards --- .github/workflows/ci_test_java.yml | 4 ---- .github/workflows/ci_test_vector_java.yml | 4 ---- .../runtimes/java/build.gradle.kts | 19 ++++++++++++---- .../java/DynamoDbEncryption/build.gradle.kts | 14 ++++++++++-- .../Migration/DDBECToAWSDBE/build.gradle.kts | 14 ++++++++++-- .../PlaintextToAWSDBE/build.gradle.kts | 14 ++++++++++-- TestVectors/runtimes/java/build.gradle.kts | 20 +++++++++++++---- codebuild/staging/release-staging.yml | 4 +++- project.properties | 4 ++++ scripts/validate-mpl-submodule.sh | 22 +++++++++++++++++++ 10 files changed, 96 insertions(+), 23 deletions(-) create mode 100644 project.properties create mode 100755 scripts/validate-mpl-submodule.sh diff --git a/.github/workflows/ci_test_java.yml b/.github/workflows/ci_test_java.yml index dd807149f..91eb11700 100644 --- a/.github/workflows/ci_test_java.yml +++ b/.github/workflows/ci_test_java.yml @@ -78,8 +78,4 @@ jobs: - name: Test ${{ matrix.library }} working-directory: ./${{ matrix.library }} run: | - # Clear MPL from cache - # We have to do this because MakeFile does not do this yet. The MakeFile automatically builds and deploys dependencies - # instead it should be picking it up from Maven. - rm -rf ~/.m2/repository/software/amazon/cryptography/aws-cryptographic-material-providers make test_java diff --git a/.github/workflows/ci_test_vector_java.yml b/.github/workflows/ci_test_vector_java.yml index 7f26a5773..19917495e 100644 --- a/.github/workflows/ci_test_vector_java.yml +++ b/.github/workflows/ci_test_vector_java.yml @@ -60,8 +60,4 @@ jobs: - name: Test TestVectors working-directory: ./TestVectors run: | - # Clear MPL from cache - # We have to do this because MakeFile does not do this yet. The MakeFile automatically builds and deploys dependencies - # instead it should be picking it up from Maven. - rm -rf ~/.m2/repository/software/amazon/cryptography/aws-cryptographic-material-providers make test_java diff --git a/DynamoDbEncryption/runtimes/java/build.gradle.kts b/DynamoDbEncryption/runtimes/java/build.gradle.kts index bdc5b734e..acaf93455 100644 --- a/DynamoDbEncryption/runtimes/java/build.gradle.kts +++ b/DynamoDbEncryption/runtimes/java/build.gradle.kts @@ -1,3 +1,6 @@ +import java.io.File +import java.io.FileInputStream +import java.util.Properties import java.net.URI import javax.annotation.Nullable import org.gradle.api.tasks.testing.logging.TestExceptionFormat @@ -11,10 +14,18 @@ plugins { id("io.github.gradle-nexus.publish-plugin") version "1.3.0" } +var props = Properties().apply { + load(FileInputStream(File(rootProject.rootDir, "../../../project.properties"))) +} + group = "software.amazon.cryptography" -version = "3.1.0" +version = props.getProperty("projectJavaVersion") description = "Aws Database Encryption Sdk for DynamoDb Java" +var mplVersion = props.getProperty("mplDependencyJavaVersion") +var dafnyRuntimeJavaVersion = props.getProperty("dafnyRuntimeJavaVersion") +var smithyDafnyJavaConversionVersion = props.getProperty("smithyDafnyJavaConversionVersion") + java { toolchain.languageVersion.set(JavaLanguageVersion.of(8)) sourceSets["main"].java { @@ -68,9 +79,9 @@ repositories { val dynamodb by configurations.creating dependencies { - implementation("org.dafny:DafnyRuntime:4.1.0") - implementation("software.amazon.smithy.dafny:conversion:0.1") - implementation("software.amazon.cryptography:aws-cryptographic-material-providers:1.0.0") + implementation("org.dafny:DafnyRuntime:${dafnyRuntimeJavaVersion}") + implementation("software.amazon.smithy.dafny:conversion:${smithyDafnyJavaConversionVersion}") + implementation("software.amazon.cryptography:aws-cryptographic-material-providers:${mplVersion}") implementation(platform("software.amazon.awssdk:bom:2.20.128")) implementation("software.amazon.awssdk:dynamodb") diff --git a/Examples/runtimes/java/DynamoDbEncryption/build.gradle.kts b/Examples/runtimes/java/DynamoDbEncryption/build.gradle.kts index 9d7e54e84..f9383b070 100644 --- a/Examples/runtimes/java/DynamoDbEncryption/build.gradle.kts +++ b/Examples/runtimes/java/DynamoDbEncryption/build.gradle.kts @@ -1,3 +1,6 @@ +import java.io.File +import java.io.FileInputStream +import java.util.Properties import java.net.URI import javax.annotation.Nullable import org.gradle.api.tasks.testing.logging.TestExceptionFormat @@ -9,10 +12,17 @@ plugins { id("io.freefair.lombok") version "8.1.0" } +var props = Properties().apply { + load(FileInputStream(File(rootProject.rootDir, "../../../project.properties"))) +} + group = "software.amazon.cryptography" version = "1.0-SNAPSHOT" description = "DynamoDbEncryptionExamples" +var mplVersion = props.getProperty("mplDependencyJavaVersion") +var ddbecVersion = props.getProperty("projectJavaVersion") + java { toolchain.languageVersion.set(JavaLanguageVersion.of(8)) sourceSets["main"].java { @@ -57,8 +67,8 @@ repositories { } dependencies { - implementation("software.amazon.cryptography:aws-database-encryption-sdk-dynamodb:3.1.0") - implementation("software.amazon.cryptography:aws-cryptographic-material-providers:1.0.0") + implementation("software.amazon.cryptography:aws-database-encryption-sdk-dynamodb:${ddbecVersion}") + implementation("software.amazon.cryptography:aws-cryptographic-material-providers:${mplVersion}") implementation(platform("software.amazon.awssdk:bom:2.19.1")) implementation("software.amazon.awssdk:arns") diff --git a/Examples/runtimes/java/Migration/DDBECToAWSDBE/build.gradle.kts b/Examples/runtimes/java/Migration/DDBECToAWSDBE/build.gradle.kts index 2af95a34c..9771247d7 100644 --- a/Examples/runtimes/java/Migration/DDBECToAWSDBE/build.gradle.kts +++ b/Examples/runtimes/java/Migration/DDBECToAWSDBE/build.gradle.kts @@ -1,3 +1,6 @@ +import java.io.File +import java.io.FileInputStream +import java.util.Properties import java.net.URI import javax.annotation.Nullable import org.gradle.api.tasks.testing.logging.TestExceptionFormat @@ -8,10 +11,17 @@ plugins { `java-library` } +var props = Properties().apply { + load(FileInputStream(File(rootProject.rootDir, "../../../project.properties"))) +} + group = "software.amazon.cryptography" version = "1.0-SNAPSHOT" description = "AWSDatabaseEncryptionSDKMigrationExamples" +var mplVersion = props.getProperty("mplDependencyJavaVersion") +var ddbecVersion = props.getProperty("projectJavaVersion") + java { toolchain.languageVersion.set(JavaLanguageVersion.of(8)) sourceSets["main"].java { @@ -56,8 +66,8 @@ repositories { } dependencies { - implementation("software.amazon.cryptography:aws-database-encryption-sdk-dynamodb:3.1.0") - implementation("software.amazon.cryptography:aws-cryptographic-material-providers:1.0.0") + implementation("software.amazon.cryptography:aws-database-encryption-sdk-dynamodb:${ddbecVersion}") + implementation("software.amazon.cryptography:aws-cryptographic-material-providers:${mplVersion}") implementation(platform("software.amazon.awssdk:bom:2.19.1")) implementation("software.amazon.awssdk:dynamodb") diff --git a/Examples/runtimes/java/Migration/PlaintextToAWSDBE/build.gradle.kts b/Examples/runtimes/java/Migration/PlaintextToAWSDBE/build.gradle.kts index a688e75d9..d000074ea 100644 --- a/Examples/runtimes/java/Migration/PlaintextToAWSDBE/build.gradle.kts +++ b/Examples/runtimes/java/Migration/PlaintextToAWSDBE/build.gradle.kts @@ -1,3 +1,6 @@ +import java.io.File +import java.io.FileInputStream +import java.util.Properties import java.net.URI import javax.annotation.Nullable import org.gradle.api.tasks.testing.logging.TestExceptionFormat @@ -8,10 +11,17 @@ plugins { `java-library` } +var props = Properties().apply { + load(FileInputStream(File(rootProject.rootDir, "../../../project.properties"))) +} + group = "software.amazon.cryptography" version = "1.0-SNAPSHOT" description = "AWSDatabaseEncryptionSDKMigrationExamples" +var mplVersion = props.getProperty("mplDependencyJavaVersion") +var ddbecVersion = props.getProperty("projectJavaVersion") + java { toolchain.languageVersion.set(JavaLanguageVersion.of(8)) sourceSets["main"].java { @@ -56,8 +66,8 @@ repositories { } dependencies { - implementation("software.amazon.cryptography:aws-database-encryption-sdk-dynamodb:3.1.0") - implementation("software.amazon.cryptography:aws-cryptographic-material-providers:1.0.0") + implementation("software.amazon.cryptography:aws-database-encryption-sdk-dynamodb:${ddbecVersion}") + implementation("software.amazon.cryptography:aws-cryptographic-material-providers:${mplVersion}") implementation(platform("software.amazon.awssdk:bom:2.19.1")) implementation("software.amazon.awssdk:dynamodb") diff --git a/TestVectors/runtimes/java/build.gradle.kts b/TestVectors/runtimes/java/build.gradle.kts index 4778aa0f6..e26dfab41 100644 --- a/TestVectors/runtimes/java/build.gradle.kts +++ b/TestVectors/runtimes/java/build.gradle.kts @@ -1,3 +1,6 @@ +import java.io.File +import java.io.FileInputStream +import java.util.Properties import java.net.URI import javax.annotation.Nullable import org.gradle.api.tasks.testing.logging.TestExceptionFormat @@ -12,6 +15,15 @@ plugins { `maven-publish` } +var props = Properties().apply { + load(FileInputStream(File(rootProject.rootDir, "../../../project.properties"))) +} + +var mplVersion = props.getProperty("mplDependencyJavaVersion") +var ddbecVersion = props.getProperty("projectJavaVersion") +var dafnyRuntimeJavaVersion = props.getProperty("dafnyRuntimeJavaVersion") +var smithyDafnyJavaConversionVersion = props.getProperty("smithyDafnyJavaConversionVersion") + group = "software.amazon.cryptography" version = "1.0-SNAPSHOT" description = "TestVectorsDynamoDbEncryption" @@ -70,10 +82,10 @@ repositories { val dynamodb by configurations.creating dependencies { - implementation("org.dafny:DafnyRuntime:4.1.0") - implementation("software.amazon.smithy.dafny:conversion:0.1") - implementation("software.amazon.cryptography:aws-cryptographic-material-providers:1.0.0") - implementation("software.amazon.cryptography:aws-database-encryption-sdk-dynamodb:3.1.0") + implementation("org.dafny:DafnyRuntime:${dafnyRuntimeJavaVersion}") + implementation("software.amazon.smithy.dafny:conversion:${smithyDafnyJavaConversionVersion}") + implementation("software.amazon.cryptography:aws-cryptographic-material-providers:${mplVersion}") + implementation("software.amazon.cryptography:aws-database-encryption-sdk-dynamodb:${ddbecVersion}") implementation("software.amazon.cryptography:TestAwsCryptographicMaterialProviders:1.0-SNAPSHOT") implementation(platform("software.amazon.awssdk:bom:2.20.138")) diff --git a/codebuild/staging/release-staging.yml b/codebuild/staging/release-staging.yml index 539dac9f0..818ccc5d4 100644 --- a/codebuild/staging/release-staging.yml +++ b/codebuild/staging/release-staging.yml @@ -47,8 +47,10 @@ phases: - aws sts get-caller-identity build: commands: - - cd DynamoDbEncryption/ + # Validate the MPL submodule points to the correct release + - scripts/validate-mpl-submodule.sh # Build and deploy to maven local + - cd DynamoDbEncryption/ - make transpile_implementation_java - make transpile_test_java - make mvn_local_deploy diff --git a/project.properties b/project.properties new file mode 100644 index 000000000..2cacfbd4c --- /dev/null +++ b/project.properties @@ -0,0 +1,4 @@ +projectJavaVersion=3.1.0 +mplDependencyJavaVersion=1.0.0 +dafnyRuntimeJavaVersion=4.1.0 +smithyDafnyJavaConversionVersion=0.1 diff --git a/scripts/validate-mpl-submodule.sh b/scripts/validate-mpl-submodule.sh new file mode 100755 index 000000000..e09feeab0 --- /dev/null +++ b/scripts/validate-mpl-submodule.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +# A tiny script to verify that the MPL submodule points to a valid release, +# and that this release matches the MPL dependency defined in this repo's gradle projects. +# Run this script from the root of the repo. + +# Get the MPL version used in DB-ESDK's build.gradle +DBESDK_MPL_VERSION=$(cat project.properties | grep "mplDependencyJavaVersion" | sed 's/^.*=//') + +# Get version from tag of HEAD in MaterialProviders submodule +cd submodules/MaterialProviders +MPL_SUBMODULE_VERSION=$(git tag --points-at HEAD | sed 's/v//'); +if [ "$MPL_SUBMODULE_VERSION" == "" ]; then + echo "Invalid MaterialProviders submodule. The submodule must be set to a commit that is tagged as a release."; + exit 1; +fi + +# Validate this version matches the version used in the DB-ESDK's gradle.properties +if [ "$DBESDK_MPL_VERSION" != "$MPL_SUBMODULE_VERSION" ]; then + echo "Invalid MaterialProviders submodule. Mismatch between the submodule version ("$MPL_SUBMODULE_VERSION") and the version configured in the DB-ESDK's gradle.properties ("$DBESDK_MPL_VERSION")."; + exit 1; +fi From 4b7de2b16c55b7b4a3053e4412fbeffd31803b7d Mon Sep 17 00:00:00 2001 From: Valerie Lambert Date: Fri, 15 Sep 2023 16:46:21 -0700 Subject: [PATCH 2/7] fix --- Examples/runtimes/java/DynamoDbEncryption/build.gradle.kts | 2 +- .../runtimes/java/Migration/DDBECToAWSDBE/build.gradle.kts | 2 +- .../java/Migration/PlaintextToAWSDBE/build.gradle.kts | 2 +- scripts/validate-mpl-submodule.sh | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Examples/runtimes/java/DynamoDbEncryption/build.gradle.kts b/Examples/runtimes/java/DynamoDbEncryption/build.gradle.kts index f9383b070..bcf62436d 100644 --- a/Examples/runtimes/java/DynamoDbEncryption/build.gradle.kts +++ b/Examples/runtimes/java/DynamoDbEncryption/build.gradle.kts @@ -13,7 +13,7 @@ plugins { } var props = Properties().apply { - load(FileInputStream(File(rootProject.rootDir, "../../../project.properties"))) + load(FileInputStream(File(rootProject.rootDir, "../../../../project.properties"))) } group = "software.amazon.cryptography" diff --git a/Examples/runtimes/java/Migration/DDBECToAWSDBE/build.gradle.kts b/Examples/runtimes/java/Migration/DDBECToAWSDBE/build.gradle.kts index 9771247d7..fa2bcc413 100644 --- a/Examples/runtimes/java/Migration/DDBECToAWSDBE/build.gradle.kts +++ b/Examples/runtimes/java/Migration/DDBECToAWSDBE/build.gradle.kts @@ -12,7 +12,7 @@ plugins { } var props = Properties().apply { - load(FileInputStream(File(rootProject.rootDir, "../../../project.properties"))) + load(FileInputStream(File(rootProject.rootDir, "../../../../../project.properties"))) } group = "software.amazon.cryptography" diff --git a/Examples/runtimes/java/Migration/PlaintextToAWSDBE/build.gradle.kts b/Examples/runtimes/java/Migration/PlaintextToAWSDBE/build.gradle.kts index d000074ea..d548fe6f5 100644 --- a/Examples/runtimes/java/Migration/PlaintextToAWSDBE/build.gradle.kts +++ b/Examples/runtimes/java/Migration/PlaintextToAWSDBE/build.gradle.kts @@ -12,7 +12,7 @@ plugins { } var props = Properties().apply { - load(FileInputStream(File(rootProject.rootDir, "../../../project.properties"))) + load(FileInputStream(File(rootProject.rootDir, "../../../../../project.properties"))) } group = "software.amazon.cryptography" diff --git a/scripts/validate-mpl-submodule.sh b/scripts/validate-mpl-submodule.sh index e09feeab0..38050fcca 100755 --- a/scripts/validate-mpl-submodule.sh +++ b/scripts/validate-mpl-submodule.sh @@ -15,8 +15,8 @@ if [ "$MPL_SUBMODULE_VERSION" == "" ]; then exit 1; fi -# Validate this version matches the version used in the DB-ESDK's gradle.properties +# Validate this version matches the version used in the DB-ESDK's build.gradle if [ "$DBESDK_MPL_VERSION" != "$MPL_SUBMODULE_VERSION" ]; then - echo "Invalid MaterialProviders submodule. Mismatch between the submodule version ("$MPL_SUBMODULE_VERSION") and the version configured in the DB-ESDK's gradle.properties ("$DBESDK_MPL_VERSION")."; + echo "Invalid MaterialProviders submodule. Mismatch between the submodule version ("$MPL_SUBMODULE_VERSION") and the version of the configured dependency in project.properties ("$DBESDK_MPL_VERSION")."; exit 1; fi From 405d26a1f5626c92495931587757d9ef6a812f9c Mon Sep 17 00:00:00 2001 From: Valerie Lambert Date: Tue, 19 Sep 2023 10:03:26 -0700 Subject: [PATCH 3/7] prep codebuild testing --- codebuild/release/release.yml | 54 +++++++++++++++++------------------ 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/codebuild/release/release.yml b/codebuild/release/release.yml index 9111a41cc..f90618be4 100644 --- a/codebuild/release/release.yml +++ b/codebuild/release/release.yml @@ -61,32 +61,32 @@ batch: ## The following steps are expected to fail; since maven central takes time to ## update its index. For now, a manual download of the jar is needed to assert artifacts are ## available. For more information, consult the MCM used for this release. - - identifier: validate_release_corretto8 - depend-on: - - upload_to_sonatype - buildspec: codebuild/release/validate-release.yml - env: - variables: - JAVA_ENV_VERSION: corretto8 - JAVA_NUMERIC_VERSION: 8 - image: aws/codebuild/standard:5.0 + # - identifier: validate_release_corretto8 + # depend-on: + # - upload_to_sonatype + # buildspec: codebuild/release/validate-release.yml + # env: + # variables: + # JAVA_ENV_VERSION: corretto8 + # JAVA_NUMERIC_VERSION: 8 + # image: aws/codebuild/standard:5.0 - - identifier: validate_release_corretto11 - depend-on: - - upload_to_sonatype - buildspec: codebuild/release/validate-release.yml - env: - variables: - JAVA_ENV_VERSION: corretto11 - JAVA_NUMERIC_VERSION: 11 - image: aws/codebuild/standard:5.0 + # - identifier: validate_release_corretto11 + # depend-on: + # - upload_to_sonatype + # buildspec: codebuild/release/validate-release.yml + # env: + # variables: + # JAVA_ENV_VERSION: corretto11 + # JAVA_NUMERIC_VERSION: 11 + # image: aws/codebuild/standard:5.0 - - identifier: validate_release_corretto17 - depend-on: - - upload_to_sonatype - buildspec: codebuild/release/validate-release.yml - env: - variables: - JAVA_ENV_VERSION: corretto17 - JAVA_NUMERIC_VERSION: 17 - image: aws/codebuild/standard:7.0 + # - identifier: validate_release_corretto17 + # depend-on: + # - upload_to_sonatype + # buildspec: codebuild/release/validate-release.yml + # env: + # variables: + # JAVA_ENV_VERSION: corretto17 + # JAVA_NUMERIC_VERSION: 17 + # image: aws/codebuild/standard:7.0 From 94fc4b46b6b66ab1c1e0c544ce40d4722d92e664 Mon Sep 17 00:00:00 2001 From: Valerie Lambert Date: Tue, 19 Sep 2023 10:10:14 -0700 Subject: [PATCH 4/7] prep for testing codebuild script --- project.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.properties b/project.properties index 2cacfbd4c..11ec2d936 100644 --- a/project.properties +++ b/project.properties @@ -1,4 +1,4 @@ -projectJavaVersion=3.1.0 +projectJavaVersion=3.1.0-SNAPSHOT mplDependencyJavaVersion=1.0.0 dafnyRuntimeJavaVersion=4.1.0 smithyDafnyJavaConversionVersion=0.1 From 79926a404ed9b10ceb76ef19c05f130f59022019 Mon Sep 17 00:00:00 2001 From: Valerie Lambert Date: Tue, 19 Sep 2023 10:13:10 -0700 Subject: [PATCH 5/7] prep for testing failure case --- submodules/MaterialProviders | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/MaterialProviders b/submodules/MaterialProviders index 13e0ac3c3..86abacc7b 160000 --- a/submodules/MaterialProviders +++ b/submodules/MaterialProviders @@ -1 +1 @@ -Subproject commit 13e0ac3c3c5eea83494706e4a96f40126d8f38a8 +Subproject commit 86abacc7b8cc19c46d9351c92765b7f963740a77 From e219262b439b6f0692c5bd56db9ab5396d1437c4 Mon Sep 17 00:00:00 2001 From: Valerie Lambert Date: Tue, 19 Sep 2023 10:14:18 -0700 Subject: [PATCH 6/7] prep for other failure case --- submodules/MaterialProviders | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/MaterialProviders b/submodules/MaterialProviders index 86abacc7b..479faf78a 160000 --- a/submodules/MaterialProviders +++ b/submodules/MaterialProviders @@ -1 +1 @@ -Subproject commit 86abacc7b8cc19c46d9351c92765b7f963740a77 +Subproject commit 479faf78a54ab9865a8ec0e056ca8f9bb93a7d77 From 2ef253557126570ff570994d2c2991abf8b6c0cd Mon Sep 17 00:00:00 2001 From: Valerie Lambert Date: Tue, 19 Sep 2023 10:16:26 -0700 Subject: [PATCH 7/7] reset --- codebuild/release/release.yml | 54 +++++++++++++++++------------------ project.properties | 2 +- submodules/MaterialProviders | 2 +- 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/codebuild/release/release.yml b/codebuild/release/release.yml index f90618be4..9111a41cc 100644 --- a/codebuild/release/release.yml +++ b/codebuild/release/release.yml @@ -61,32 +61,32 @@ batch: ## The following steps are expected to fail; since maven central takes time to ## update its index. For now, a manual download of the jar is needed to assert artifacts are ## available. For more information, consult the MCM used for this release. - # - identifier: validate_release_corretto8 - # depend-on: - # - upload_to_sonatype - # buildspec: codebuild/release/validate-release.yml - # env: - # variables: - # JAVA_ENV_VERSION: corretto8 - # JAVA_NUMERIC_VERSION: 8 - # image: aws/codebuild/standard:5.0 + - identifier: validate_release_corretto8 + depend-on: + - upload_to_sonatype + buildspec: codebuild/release/validate-release.yml + env: + variables: + JAVA_ENV_VERSION: corretto8 + JAVA_NUMERIC_VERSION: 8 + image: aws/codebuild/standard:5.0 - # - identifier: validate_release_corretto11 - # depend-on: - # - upload_to_sonatype - # buildspec: codebuild/release/validate-release.yml - # env: - # variables: - # JAVA_ENV_VERSION: corretto11 - # JAVA_NUMERIC_VERSION: 11 - # image: aws/codebuild/standard:5.0 + - identifier: validate_release_corretto11 + depend-on: + - upload_to_sonatype + buildspec: codebuild/release/validate-release.yml + env: + variables: + JAVA_ENV_VERSION: corretto11 + JAVA_NUMERIC_VERSION: 11 + image: aws/codebuild/standard:5.0 - # - identifier: validate_release_corretto17 - # depend-on: - # - upload_to_sonatype - # buildspec: codebuild/release/validate-release.yml - # env: - # variables: - # JAVA_ENV_VERSION: corretto17 - # JAVA_NUMERIC_VERSION: 17 - # image: aws/codebuild/standard:7.0 + - identifier: validate_release_corretto17 + depend-on: + - upload_to_sonatype + buildspec: codebuild/release/validate-release.yml + env: + variables: + JAVA_ENV_VERSION: corretto17 + JAVA_NUMERIC_VERSION: 17 + image: aws/codebuild/standard:7.0 diff --git a/project.properties b/project.properties index 11ec2d936..2cacfbd4c 100644 --- a/project.properties +++ b/project.properties @@ -1,4 +1,4 @@ -projectJavaVersion=3.1.0-SNAPSHOT +projectJavaVersion=3.1.0 mplDependencyJavaVersion=1.0.0 dafnyRuntimeJavaVersion=4.1.0 smithyDafnyJavaConversionVersion=0.1 diff --git a/submodules/MaterialProviders b/submodules/MaterialProviders index 479faf78a..13e0ac3c3 160000 --- a/submodules/MaterialProviders +++ b/submodules/MaterialProviders @@ -1 +1 @@ -Subproject commit 479faf78a54ab9865a8ec0e056ca8f9bb93a7d77 +Subproject commit 13e0ac3c3c5eea83494706e4a96f40126d8f38a8