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

Jump to bottom

checkpoint of optional dependency approach #189

Closed
wants to merge 1 commit into from
Closed

checkpoint of optional dependency approach #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions ...csharp/AppEncryption/AppEncryption.IntegrationTests/AppEncryption.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
<PackageReference Include="Moq" Version="4.10.1" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.3.101.4" />
<PackageReference Include="AWSSDK.KeyManagementService" Version="3.3.100.5" />
<PackageReference Include="App.Metrics" Version="3.1.0" />
</ItemGroup>
<ItemGroup Label="CLI Tool References">
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
Expand Down
3 changes: 3 additions & 0 deletions languages/csharp/AppEncryption/AppEncryption.Tests/AppEncryption.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
<PackageReference Include="TestContainers" Version="0.0.2.64" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.3.101.4" />
<PackageReference Include="AWSSDK.KeyManagementService" Version="3.3.100.5" />
<PackageReference Include="App.Metrics" Version="3.1.0" />
</ItemGroup>
<ItemGroup Label="CLI Tool References">
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
Expand Down
12 changes: 9 additions & 3 deletions languages/csharp/AppEncryption/AppEncryption/AppEncryption.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,17 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
<ItemGroup Label="Package References">
<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.3.101.4" />
<PackageReference Include="AWSSDK.KeyManagementService" Version="3.3.100.5" />
<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.3.101.4">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="AWSSDK.KeyManagementService" Version="3.3.100.5">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="LanguageExt.Core" Version="3.1.15" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="App.Metrics" Version="3.1.0" />
<PackageReference Include="App.Metrics" Version="3.1.0">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>
<ItemGroup Label="Project References">
<ProjectReference Include="../Crypto/Crypto.csproj" />
Expand Down
3 changes: 3 additions & 0 deletions languages/java/app-encryption/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,18 +173,21 @@
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-kms</artifactId>
<version>${aws.sdk.version}</version>
<optional>true</optional>
</dependency>

<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-dynamodb</artifactId>
<version>${aws.sdk.version}</version>
<optional>true</optional>
</dependency>

<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-core</artifactId>
<version>${micrometer.version}</version>
<optional>true</optional>
</dependency>

<!-- Test Dependencies -->
Expand Down
6 changes: 3 additions & 3 deletions languages/java/secure-memory/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,8 @@
</repository>
</distributionManagement>
<scm>
<connection>scm:git:https://github.com/godaddy/asherah.git</connection>
<developerConnection>scm:git:https://github.com/godaddy/asherah.git</developerConnection>
<url>https://github.com/godaddy/asherah</url>
<connection>scm:git:https://github.com/godaddy/asherah.git</connection>
<developerConnection>scm:git:https://github.com/godaddy/asherah.git</developerConnection>
<url>https://github.com/godaddy/asherah</url>
</scm>
</project>
3 changes: 3 additions & 0 deletions samples/csharp/ReferenceApp/ReferenceApp/ReferenceApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
<PackageReference Include="GoDaddy.Asherah.AppEncryption" Version="1.0.0-alpha" />
<PackageReference Include="CommandLineParser" Version="2.4.3" />
<PackageReference Include="MySql.Data" Version="8.0.16" />
<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.3.101.4" />
<PackageReference Include="AWSSDK.KeyManagementService" Version="3.3.100.5" />
<PackageReference Include="App.Metrics" Version="3.1.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.2.0" />
<PackageReference Include="App.Metrics.Reporting.Console" Version="3.1.0" />
</ItemGroup>
Expand Down
13 changes: 13 additions & 0 deletions samples/java/reference-app/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<appencryption.version>1.0.0-SNAPSHOT</appencryption.version>
<aws.sdk.version>1.11.468</aws.sdk.version>
<junit.jupiter.version>5.1.0</junit.jupiter.version>
<junit.platform.version>1.1.0</junit.platform.version>
<jacoco.version>0.8.2</jacoco.version>
Expand Down Expand Up @@ -110,6 +111,18 @@
<version>${appencryption.version}</version>
</dependency>

<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-kms</artifactId>
<version>${aws.sdk.version}</version>
</dependency>

<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-dynamodb</artifactId>
<version>${aws.sdk.version}</version>
</dependency>

<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
Expand Down
23 changes: 20 additions & 3 deletions tests/java/test-app/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@
<junit.platform.version>1.2.0</junit.platform.version>
<dropwizard.version>1.3.5</dropwizard.version>
<sl4j.version>1.7.25</sl4j.version>
<aws.sdk.version>1.11.468</aws.sdk.version>
<mysql.connector.java.version>8.0.13</mysql.connector.java.version>
<com.zaxxer.hikaricp.version>2.6.1</com.zaxxer.hikaricp.version>
<micrometer.version>1.1.1</micrometer.version>
<mockito.core.version>2.22.0</mockito.core.version>
<elasticsearch.version>6.3.2</elasticsearch.version>
<docker.image.src.root>images</docker.image.src.root>
Expand All @@ -33,8 +35,8 @@
<connection>scm:git:https://github.com/godaddy/asherah.git</connection>
<developerConnection>scm:git:https://github.com/godaddy/asherah.git</developerConnection>
<url>https://github.com/godaddy/asherah</url>
<tag>HEAD</tag>
</scm>
<tag>HEAD</tag>
</scm>
<build>
<plugins>
<plugin>
Expand Down Expand Up @@ -223,7 +225,7 @@
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-kinesis</artifactId>
<version>1.11.496</version>
<version>${aws.sdk.version}</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.dataformat</groupId>
Expand Down Expand Up @@ -275,6 +277,16 @@
<artifactId>mockito-junit-jupiter</artifactId>
<version>${mockito.core.version}</version>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-kms</artifactId>
<version>${aws.sdk.version}</version>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-dynamodb</artifactId>
<version>${aws.sdk.version}</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
Expand All @@ -285,5 +297,10 @@
<artifactId>HikariCP</artifactId>
<version>${com.zaxxer.hikaricp.version}</version>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-core</artifactId>
<version>${micrometer.version}</version>
</dependency>
</dependencies>
</project>