Skip to content

Commit

Permalink
SDC-14716. Split aws-secrets-manager-credentialstore into 2 modules p…
Browse files Browse the repository at this point in the history 
…rotolib and lib

Change-Id: Ie55377e35b91dd316a867cb2c8dfad4cb6cb1025
Reviewed-on: https://review.streamsets.net/c/datacollector/+/32148
Tested-by: StreamSets CI <[email protected]>
Reviewed-by: Jarcec Cecho <[email protected]>
  • Loading branch information
@madhukard
madhukard committed May 17, 2020
1 parent a72421a commit 925130a
Show file tree
Hide file tree
Showing 6 changed files with 156 additions and 99 deletions.
102 changes: 3 additions & 99 deletions aws-secrets-manager-credentialstore-lib/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,108 +33,12 @@
<name>StreamSets Data Collector AWS Secrets Manager 1.0.0 Lib</name>
<packaging>jar</packaging>

<properties>
<awssdk.version>1.11.385</awssdk.version>
<awssdk.caching.secrets.client.version>1.0.0</awssdk.caching.secrets.client.version>
<guava.version>18.0</guava.version>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-bom</artifactId>
<version>${awssdk.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<!-- Provided Dependencies -->
<dependency>
<groupId>com.streamsets</groupId>
<artifactId>streamsets-datacollector-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.streamsets</groupId>
<artifactId>streamsets-datacollector-sdk</artifactId>
<scope>provided</scope>
</dependency>

<!-- Compile Dependencies -->
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-secretsmanager</artifactId>
<version>${awssdk.version}</version>
</dependency>
<dependency>
<groupId>com.amazonaws.secretsmanager</groupId>
<artifactId>aws-secretsmanager-caching-java</artifactId>
<version>${awssdk.caching.secrets.client.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-cbor</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.streamsets</groupId>
<artifactId>streamsets-datacollector-common</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>

<!-- Test Dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
<artifactId>streamsets-datacollector-aws-secrets-manager-credentialstore-protolib</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
</dependencies>

Expand Down
152 changes: 152 additions & 0 deletions aws-secrets-manager-credentialstore-protolib/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2020 StreamSets Inc.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.streamsets</groupId>
<artifactId>streamsets-datacollector-root-lib</artifactId>
<version>3.17.0-SNAPSHOT</version>
<relativePath>../root-lib</relativePath>
</parent>
<artifactId>streamsets-datacollector-aws-secrets-manager-credentialstore-protolib</artifactId>
<version>3.17.0-SNAPSHOT</version>
<description>StreamSets Data Collector AWS Secrets Manager 1.0.0 Protolib</description>
<name>StreamSets Data Collector AWS Secrets Manager 1.0.0 Protolib</name>
<packaging>jar</packaging>

<properties>
<awssdk.version>1.11.385</awssdk.version>
<awssdk.caching.secrets.client.version>1.0.0</awssdk.caching.secrets.client.version>
<guava.version>18.0</guava.version>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-bom</artifactId>
<version>${awssdk.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<!-- Provided Dependencies -->
<dependency>
<groupId>com.streamsets</groupId>
<artifactId>streamsets-datacollector-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.streamsets</groupId>
<artifactId>streamsets-datacollector-sdk</artifactId>
<scope>provided</scope>
</dependency>

<!-- Compile Dependencies -->
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-secretsmanager</artifactId>
<version>${awssdk.version}</version>
</dependency>
<dependency>
<groupId>com.amazonaws.secretsmanager</groupId>
<artifactId>aws-secretsmanager-caching-java</artifactId>
<version>${awssdk.caching.secrets.client.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-cbor</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.streamsets</groupId>
<artifactId>streamsets-datacollector-common</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>

<!-- Test Dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</project>
0 ...ger/AWSSecretsManagerCredentialStore.java → ...ger/AWSSecretsManagerCredentialStore.java
View file
File renamed without changes.
0 ...redential/aws/secrets/manager/Errors.java → ...redential/aws/secrets/manager/Errors.java
View file
File renamed without changes.
0 ...TestAWSSecretsManagerCredentialStore.java → ...TestAWSSecretsManagerCredentialStore.java
View file
File renamed without changes.
1 change: 1 addition & 0 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@
<module>httpcommonlib</module>
<module>net-commonlib</module>

<module>aws-secrets-manager-credentialstore-protolib</module>
<module>azure-keyvault-credentialstore-protolib</module>
<module>lookup-protolib</module>

Expand Down

0 comments on commit 925130a

Please sign in to comment.