diff --git a/DynamoDbEncryption/runtimes/java/build.gradle.kts b/DynamoDbEncryption/runtimes/java/build.gradle.kts index e2839abef..2bbd34588 100644 --- a/DynamoDbEncryption/runtimes/java/build.gradle.kts +++ b/DynamoDbEncryption/runtimes/java/build.gradle.kts @@ -250,8 +250,8 @@ nexusPublishing { // https://github.com/gradle-nexus/publish-plugin/ repositories { sonatype { - nexusUrl.set(uri("https://aws.oss.sonatype.org/service/local/")) - snapshotRepositoryUrl.set(uri("https://aws.oss.sonatype.org/content/repositories/snapshots/")) + nexusUrl.set(uri("https://ossrh-staging-api.central.sonatype.com/service/local/")) + snapshotRepositoryUrl.set(uri("https://central.sonatype.com/repository/maven-snapshots/")) username.set(System.getenv("SONA_USERNAME")) password.set(System.getenv("SONA_PASSWORD")) } diff --git a/Makefile b/Makefile index c1806faab..7bede0e44 100644 --- a/Makefile +++ b/Makefile @@ -51,7 +51,7 @@ format_java_misc-check: setup_prettier npx prettier --plugin=prettier-plugin-java . --check setup_prettier: - npm i --no-save prettier@3 prettier-plugin-java@2.5 + npm i --no-save prettier@3.5.3 prettier-plugin-java@2.5 # Generate the top-level project.properties file using smithy-dafny. # This is for the benefit of the nightly Dafny CI, diff --git a/cfn/CB-Staging.yml b/cfn/CB-Staging.yml index 2779bdfdd..967d5c835 100644 --- a/cfn/CB-Staging.yml +++ b/cfn/CB-Staging.yml @@ -55,7 +55,7 @@ Resources: Type: NO_CACHE Environment: ComputeType: BUILD_GENERAL1_LARGE - Image: "aws/codebuild/standard:5.0" + Image: "aws/codebuild/standard:6.0" ImagePullCredentialsType: CODEBUILD PrivilegedMode: true Type: LINUX_CONTAINER @@ -239,6 +239,7 @@ Resources: "arn:aws:secretsmanager:us-west-2:${AWS::AccountId}:secret:Maven-GPG-Keys-Release-haLIjZ", "arn:aws:secretsmanager:us-west-2:${AWS::AccountId}:secret:Maven-GPG-Keys-Release-Credentials-WgJanS", "arn:aws:secretsmanager:us-west-2:${AWS::AccountId}:secret:Sonatype-User-Token-zK61bM", + "arn:aws:secretsmanager:us-west-2:${AWS::AccountId}:secret:Sonatype-Central-Portal-XrYUs2", "arn:aws:secretsmanager:us-west-2:${AWS::AccountId}:secret:Github/aws-crypto-tools-ci-bot-AGUB3U" ], "Action": "secretsmanager:GetSecretValue" diff --git a/codebuild/release/release-prod.yml b/codebuild/release/release-prod.yml index 7a167c659..21d9c1857 100644 --- a/codebuild/release/release-prod.yml +++ b/codebuild/release/release-prod.yml @@ -9,13 +9,14 @@ env: secrets-manager: GPG_KEY: Maven-GPG-Keys-Release-Credentials:Keyname GPG_PASS: Maven-GPG-Keys-Release-Credentials:Passphrase - SONA_USERNAME: Sonatype-User-Token:username - SONA_PASSWORD: Sonatype-User-Token:password + SONA_USERNAME: Sonatype-Central-Portal:Username + SONA_PASSWORD: Sonatype-Central-Portal:Password phases: install: runtime-versions: java: corretto8 + dotnet: 6.0 commands: - cd .. # Get Dafny @@ -27,6 +28,7 @@ phases: - unzip -qq gradle.zip && rm gradle.zip - export PATH="$PWD/gradle-7.6/bin:$PATH" - cd aws-database-encryption-sdk-dynamodb/ + - make -C submodules/MaterialProviders/StandardLibrary setup_net pre_build: commands: - aws secretsmanager get-secret-value --region us-west-2 --secret-id Maven-GPG-Keys-Release --query SecretBinary --output text | base64 -d > ~/mvn_gpg.tgz diff --git a/codebuild/release/release.yml b/codebuild/release/release.yml index d0d327996..643cd46c2 100644 --- a/codebuild/release/release.yml +++ b/codebuild/release/release.yml @@ -13,7 +13,7 @@ batch: variables: JAVA_ENV_VERSION: corretto8 JAVA_NUMERIC_VERSION: 8 - image: aws/codebuild/standard:5.0 + image: aws/codebuild/standard:6.0 - identifier: validate_staging_corretto8 depend-on: @@ -23,7 +23,7 @@ batch: variables: JAVA_ENV_VERSION: corretto8 JAVA_NUMERIC_VERSION: 8 - image: aws/codebuild/standard:5.0 + image: aws/codebuild/standard:6.0 - identifier: validate_staging_corretto11 depend-on: @@ -33,7 +33,7 @@ batch: variables: JAVA_ENV_VERSION: corretto11 JAVA_NUMERIC_VERSION: 11 - image: aws/codebuild/standard:5.0 + image: aws/codebuild/standard:6.0 - identifier: validate_staging_corretto17 depend-on: @@ -55,7 +55,7 @@ batch: variables: JAVA_ENV_VERSION: corretto8 JAVA_NUMERIC_VERSION: 8 - image: aws/codebuild/standard:5.0 + image: aws/codebuild/standard:6.0 ## 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 @@ -68,7 +68,7 @@ batch: variables: JAVA_ENV_VERSION: corretto8 JAVA_NUMERIC_VERSION: 8 - image: aws/codebuild/standard:5.0 + image: aws/codebuild/standard:6.0 - identifier: validate_release_corretto11 depend-on: @@ -78,7 +78,7 @@ batch: variables: JAVA_ENV_VERSION: corretto11 JAVA_NUMERIC_VERSION: 11 - image: aws/codebuild/standard:5.0 + image: aws/codebuild/standard:6.0 - identifier: validate_release_corretto17 depend-on: diff --git a/codebuild/release/validate-release.yml b/codebuild/release/validate-release.yml index 5c0007a1a..b7857a39b 100644 --- a/codebuild/release/validate-release.yml +++ b/codebuild/release/validate-release.yml @@ -11,6 +11,7 @@ phases: install: runtime-versions: java: $JAVA_ENV_VERSION + dotnet: 6.0 commands: - cd .. # Get Dafny @@ -22,6 +23,7 @@ phases: - unzip -qq gradle.zip && rm gradle.zip - export PATH="$PWD/gradle-7.6/bin:$PATH" - cd aws-database-encryption-sdk-dynamodb/ + - make -C submodules/MaterialProviders/StandardLibrary setup_net pre_build: commands: # Get CI Creds to be able to call DBESDK TestVectors diff --git a/codebuild/staging/release-staging.yml b/codebuild/staging/release-staging.yml index 65c824f67..03863b0b9 100644 --- a/codebuild/staging/release-staging.yml +++ b/codebuild/staging/release-staging.yml @@ -18,6 +18,7 @@ phases: install: runtime-versions: java: corretto8 + dotnet: 6.0 commands: - cd .. # Get Dafny @@ -29,6 +30,7 @@ phases: - unzip -qq gradle.zip && rm gradle.zip - export PATH="$PWD/gradle-7.6/bin:$PATH" - cd aws-database-encryption-sdk-dynamodb/ + - make -C submodules/MaterialProviders/StandardLibrary setup_net pre_build: commands: - export CODEARTIFACT_TOKEN=$(aws codeartifact get-authorization-token --domain crypto-tools-internal --domain-owner 587316601012 --region us-east-1 --query authorizationToken --output text) diff --git a/codebuild/staging/validate-staging.yml b/codebuild/staging/validate-staging.yml index 6bd1cd9cf..c4c8e4639 100644 --- a/codebuild/staging/validate-staging.yml +++ b/codebuild/staging/validate-staging.yml @@ -15,6 +15,7 @@ phases: install: runtime-versions: java: $JAVA_ENV_VERSION + dotnet: 6.0 commands: - cd .. # Get Dafny @@ -26,6 +27,7 @@ phases: - unzip -qq gradle.zip && rm gradle.zip - export PATH="$PWD/gradle-7.6/bin:$PATH" - cd aws-database-encryption-sdk-dynamodb/ + - make -C submodules/MaterialProviders/StandardLibrary setup_net pre_build: commands: # Get published CA DBESDK jar