Skip to content
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

fix(Java, .NET): Let the MPL define dependencies #1473

Closed
wants to merge 2 commits into from
+1 −45
Closed

fix(Java, .NET): Let the MPL define dependencies #1473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d581899
fix(Java): Let the MPL define dependencies
texastony Nov 7, 2024
ce7662c
fix(.NET): Let the MPL define dependencies
texastony Nov 7, 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
4 changes: 0 additions & 4 deletions DynamoDbEncryption/runtimes/java/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,10 @@ repositories {
val dynamodb by configurations.creating

dependencies {
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.26.25"))
implementation("software.amazon.awssdk:dynamodb")
implementation("software.amazon.awssdk:dynamodb-enhanced")
implementation("software.amazon.awssdk:kms")

testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.2")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.2")
Expand Down
11 changes: 0 additions & 11 deletions DynamoDbEncryption/runtimes/net/DynamoDbEncryption.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,18 +57,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.303.14"/>
<PackageReference Include="AWSSDK.Core" Version="3.7.304.16"/>
<PackageReference Include="DafnyRuntime" Version="$(DafnyVersion)" />
<ProjectReference Include="../../../submodules/MaterialProviders/AwsCryptographicMaterialProviders/runtimes/net/MPL.csproj"/>
<!--
System.Collections.Immutable can be removed once dafny.msbuild is updated with
https://github.com/dafny-lang/dafny.msbuild/pull/10 and versioned
-->
<PackageReference Include="System.Collections.Immutable" Version="1.7.0"/>
<!-- Work around for dafny-lang/dafny/issues/1951; remove once resolved -->
<PackageReference Include="System.ValueTuple" Version="4.5.0"/>

<Compile Include="Extern/**/*.cs"/>
<Compile Include="Generated/**/*.cs"/>
<Compile Include="src/**/*.cs"/>
Expand Down
10 changes: 0 additions & 10 deletions DynamoDbEncryption/runtimes/net/tests/Test-DynamoDbEncryption.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,6 @@
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
</PropertyGroup>

<ItemGroup>
<!--
System.Collections.Immutable can be removed once dafny.msbuild is updated with
https://github.com/dafny-lang/dafny.msbuild/pull/10 and versioned
-->
<PackageReference Include="System.Collections.Immutable" Version="1.7.0" />
<!-- Work around for dafny-lang/dafny/issues/1951; remove once resolved -->
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="../DynamoDbEncryption.csproj" />
<Compile Include="TestsFromDafny.cs" />
Expand Down
7 changes: 0 additions & 7 deletions Examples/runtimes/java/DynamoDbEncryption/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,18 +68,11 @@ repositories {

dependencies {
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")
implementation("software.amazon.awssdk:auth")
implementation("software.amazon.awssdk:dynamodb")
implementation("software.amazon.awssdk:dynamodb-enhanced")
implementation("software.amazon.awssdk:kms")
implementation("software.amazon.awssdk:sts")

implementation("org.bouncycastle:bcprov-jdk18on:1.72")

// https://mvnrepository.com/artifact/org.testng/testng
testImplementation("org.testng:testng:7.5")
}
Expand Down
3 changes: 0 additions & 3 deletions Examples/runtimes/java/Migration/DDBECToAWSDBE/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,9 @@ repositories {

dependencies {
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")
implementation("software.amazon.awssdk:dynamodb-enhanced")
implementation("software.amazon.awssdk:kms")

// To support legacy configuration
implementation("com.amazonaws:aws-java-sdk-dynamodb:1.12.409")
Expand Down
4 changes: 0 additions & 4 deletions Examples/runtimes/java/Migration/PlaintextToAWSDBE/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,8 @@ repositories {

dependencies {
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")
implementation("software.amazon.awssdk:dynamodb-enhanced")
implementation("software.amazon.awssdk:kms")

// https://mvnrepository.com/artifact/org.testng/testng
testImplementation("org.testng:testng:7.5")
Expand Down
7 changes: 1 addition & 6 deletions TestVectors/runtimes/java/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,17 +86,12 @@ repositories {
val dynamodb by configurations.creating

dependencies {
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:${mplVersion}")

implementation(platform("software.amazon.awssdk:bom:2.26.25"))
implementation("software.amazon.awssdk:dynamodb")
implementation("software.amazon.awssdk:dynamodb-enhanced")
implementation("software.amazon.awssdk:core:2.26.25")
implementation("software.amazon.awssdk:kms")
implementation("software.amazon.awssdk:core")
testImplementation("com.amazonaws:DynamoDBLocal:2.+")
// This is where we gather the SQLLite files to copy over
dynamodb("com.amazonaws:DynamoDBLocal:2.+")
Expand Down
Loading