File tree Expand file tree Collapse file tree 8 files changed +21
-12
lines changed
DynamoDbEncryption/runtimes/java Expand file tree Collapse file tree 8 files changed +21
-12
lines changed Original file line number Diff line number Diff line change @@ -250,8 +250,8 @@ nexusPublishing {
250250 // https://github.com/gradle-nexus/publish-plugin/
251251 repositories {
252252 sonatype {
253- nexusUrl.set(uri(" https://aws.oss .sonatype.org /service/local/" ))
254- snapshotRepositoryUrl.set(uri(" https://aws.oss. sonatype.org/content/repositories/ snapshots/" ))
253+ nexusUrl.set(uri(" https://ossrh-staging-api.central .sonatype.com /service/local/" ))
254+ snapshotRepositoryUrl.set(uri(" https://central. sonatype.com/repository/maven- snapshots/" ))
255255 username.set(System .getenv(" SONA_USERNAME" ))
256256 password.set(System .getenv(" SONA_PASSWORD" ))
257257 }
Original file line number Diff line number Diff line change @@ -51,7 +51,7 @@ format_java_misc-check: setup_prettier
5151 npx prettier --plugin=prettier-plugin-java . --check
5252
5353setup_prettier :
54- npm i --no-save prettier@3
[email protected] 54+ npm i --no-save prettier@3
.5.3 [email protected] 5555
5656# Generate the top-level project.properties file using smithy-dafny.
5757# This is for the benefit of the nightly Dafny CI,
Original file line number Diff line number Diff line change @@ -55,7 +55,7 @@ Resources:
5555 Type : NO_CACHE
5656 Environment :
5757 ComputeType : BUILD_GENERAL1_LARGE
58- Image : " aws/codebuild/standard:5 .0"
58+ Image : " aws/codebuild/standard:6 .0"
5959 ImagePullCredentialsType : CODEBUILD
6060 PrivilegedMode : true
6161 Type : LINUX_CONTAINER
@@ -239,6 +239,7 @@ Resources:
239239 "arn:aws:secretsmanager:us-west-2:${AWS::AccountId}:secret:Maven-GPG-Keys-Release-haLIjZ",
240240 "arn:aws:secretsmanager:us-west-2:${AWS::AccountId}:secret:Maven-GPG-Keys-Release-Credentials-WgJanS",
241241 "arn:aws:secretsmanager:us-west-2:${AWS::AccountId}:secret:Sonatype-User-Token-zK61bM",
242+ "arn:aws:secretsmanager:us-west-2:${AWS::AccountId}:secret:Sonatype-Central-Portal-XrYUs2",
242243 "arn:aws:secretsmanager:us-west-2:${AWS::AccountId}:secret:Github/aws-crypto-tools-ci-bot-AGUB3U"
243244 ],
244245 "Action": "secretsmanager:GetSecretValue"
Original file line number Diff line number Diff line change 99 secrets-manager :
1010 GPG_KEY : Maven-GPG-Keys-Release-Credentials:Keyname
1111 GPG_PASS : Maven-GPG-Keys-Release-Credentials:Passphrase
12- SONA_USERNAME : Sonatype-User-Token:username
13- SONA_PASSWORD : Sonatype-User-Token:password
12+ SONA_USERNAME : Sonatype-Central-Portal:Username
13+ SONA_PASSWORD : Sonatype-Central-Portal:Password
1414
1515phases :
1616 install :
1717 runtime-versions :
1818 java : corretto8
19+ dotnet : 6.0
1920 commands :
2021 - cd ..
2122 # Get Dafny
@@ -27,6 +28,7 @@ phases:
2728 - unzip -qq gradle.zip && rm gradle.zip
2829 - export PATH="$PWD/gradle-7.6/bin:$PATH"
2930 - cd aws-database-encryption-sdk-dynamodb/
31+ - make -C submodules/MaterialProviders/StandardLibrary setup_net
3032 pre_build :
3133 commands :
3234 - aws secretsmanager get-secret-value --region us-west-2 --secret-id Maven-GPG-Keys-Release --query SecretBinary --output text | base64 -d > ~/mvn_gpg.tgz
Original file line number Diff line number Diff line change 1313 variables :
1414 JAVA_ENV_VERSION : corretto8
1515 JAVA_NUMERIC_VERSION : 8
16- image : aws/codebuild/standard:5 .0
16+ image : aws/codebuild/standard:6 .0
1717
1818 - identifier : validate_staging_corretto8
1919 depend-on :
2323 variables :
2424 JAVA_ENV_VERSION : corretto8
2525 JAVA_NUMERIC_VERSION : 8
26- image : aws/codebuild/standard:5 .0
26+ image : aws/codebuild/standard:6 .0
2727
2828 - identifier : validate_staging_corretto11
2929 depend-on :
3333 variables :
3434 JAVA_ENV_VERSION : corretto11
3535 JAVA_NUMERIC_VERSION : 11
36- image : aws/codebuild/standard:5 .0
36+ image : aws/codebuild/standard:6 .0
3737
3838 - identifier : validate_staging_corretto17
3939 depend-on :
5555 variables :
5656 JAVA_ENV_VERSION : corretto8
5757 JAVA_NUMERIC_VERSION : 8
58- image : aws/codebuild/standard:5 .0
58+ image : aws/codebuild/standard:6 .0
5959
6060 # # The following steps are expected to fail; since maven central takes time to
6161 # # update its index. For now, a manual download of the jar is needed to assert artifacts are
6868 variables :
6969 JAVA_ENV_VERSION : corretto8
7070 JAVA_NUMERIC_VERSION : 8
71- image : aws/codebuild/standard:5 .0
71+ image : aws/codebuild/standard:6 .0
7272
7373 - identifier : validate_release_corretto11
7474 depend-on :
7878 variables :
7979 JAVA_ENV_VERSION : corretto11
8080 JAVA_NUMERIC_VERSION : 11
81- image : aws/codebuild/standard:5 .0
81+ image : aws/codebuild/standard:6 .0
8282
8383 - identifier : validate_release_corretto17
8484 depend-on :
Original file line number Diff line number Diff line change @@ -11,6 +11,7 @@ phases:
1111 install :
1212 runtime-versions :
1313 java : $JAVA_ENV_VERSION
14+ dotnet : 6.0
1415 commands :
1516 - cd ..
1617 # Get Dafny
@@ -22,6 +23,7 @@ phases:
2223 - unzip -qq gradle.zip && rm gradle.zip
2324 - export PATH="$PWD/gradle-7.6/bin:$PATH"
2425 - cd aws-database-encryption-sdk-dynamodb/
26+ - make -C submodules/MaterialProviders/StandardLibrary setup_net
2527 pre_build :
2628 commands :
2729 # Get CI Creds to be able to call DBESDK TestVectors
Original file line number Diff line number Diff line change @@ -18,6 +18,7 @@ phases:
1818 install :
1919 runtime-versions :
2020 java : corretto8
21+ dotnet : 6.0
2122 commands :
2223 - cd ..
2324 # Get Dafny
@@ -29,6 +30,7 @@ phases:
2930 - unzip -qq gradle.zip && rm gradle.zip
3031 - export PATH="$PWD/gradle-7.6/bin:$PATH"
3132 - cd aws-database-encryption-sdk-dynamodb/
33+ - make -C submodules/MaterialProviders/StandardLibrary setup_net
3234 pre_build :
3335 commands :
3436 - export CODEARTIFACT_TOKEN=$(aws codeartifact get-authorization-token --domain crypto-tools-internal --domain-owner 587316601012 --region us-east-1 --query authorizationToken --output text)
Original file line number Diff line number Diff line change @@ -15,6 +15,7 @@ phases:
1515 install :
1616 runtime-versions :
1717 java : $JAVA_ENV_VERSION
18+ dotnet : 6.0
1819 commands :
1920 - cd ..
2021 # Get Dafny
@@ -26,6 +27,7 @@ phases:
2627 - unzip -qq gradle.zip && rm gradle.zip
2728 - export PATH="$PWD/gradle-7.6/bin:$PATH"
2829 - cd aws-database-encryption-sdk-dynamodb/
30+ - make -C submodules/MaterialProviders/StandardLibrary setup_net
2931 pre_build :
3032 commands :
3133 # Get published CA DBESDK jar
You can’t perform that action at this time.
0 commit comments