Skip to content

Commit 30df82c

Browse files
johnwalkerjohnwalker
committed
Remove parent dependency from sdk1, sdk2
1.14.0 fails since software.amazon.cryptools:dynamodbencryptionclient-pom isn't deployed to maven (but it passes locally, if you've installed it into your local maven repository). For context, we originally split the maven module up into a shared package, an sdk1 package and an sdk2 package, and intended to have a large amount of reuse. That wound up not happening: sdk2 is entirely self-contained. Although there's some duplication in between the build logic between sdk1 and sdk2, it's not worth the mental overhead of dealing with a parent and aggregator pom.
1 parent 98cdee9 commit 30df82c

File tree

2 files changed

+584
-37
lines changed

2 files changed

+584
-37
lines changed

‎sdk1/pom.xml

+303-31
Original file line numberDiff line numberDiff line change
@@ -5,44 +5,13 @@
55
http://maven.apache.org/maven-v4_0_0.xsd">
66
<modelVersion>4.0.0</modelVersion>
77

8-
<parent>
9-
<groupId>software.amazon.cryptools</groupId>
10-
<artifactId>dynamodbencryptionclient-pom</artifactId>
11-
<version>0.1.0-SNAPSHOT</version>
12-
</parent>
13-
14-
158
<groupId>com.amazonaws</groupId>
169
<artifactId>aws-dynamodb-encryption-java</artifactId>
1710
<version>1.14.1-SNAPSHOT</version>
1811
<packaging>jar</packaging>
1912
<name>aws-dynamodb-encryption-java :: SDK1</name>
2013
<description>AWS DynamoDB Encryption Client for AWS Java SDK v1</description>
2114

22-
<dependencyManagement>
23-
<dependencies>
24-
<dependency>
25-
<groupId>com.amazonaws</groupId>
26-
<artifactId>aws-java-sdk-bom</artifactId>
27-
<version>1.11.460</version>
28-
<type>pom</type>
29-
<scope>import</scope>
30-
</dependency>
31-
</dependencies>
32-
</dependencyManagement>
33-
34-
<dependencies>
35-
<dependency>
36-
<groupId>com.amazonaws</groupId>
37-
<artifactId>aws-java-sdk-dynamodb</artifactId>
38-
</dependency>
39-
40-
<dependency>
41-
<groupId>com.amazonaws</groupId>
42-
<artifactId>aws-java-sdk-kms</artifactId>
43-
</dependency>
44-
</dependencies>
45-
4615
<profiles>
4716
<profile>
4817
<id>publishing</id>
@@ -85,4 +54,307 @@
8554
</build>
8655
</profile>
8756
</profiles>
57+
58+
<scm>
59+
<url>https://github.com/aws/aws-dynamodb-encryption-java.git</url>
60+
<connection>scm:git:[email protected]:aws/aws-dynamodb-encryption-java.git</connection>
61+
<developerConnection>scm:git:[email protected]:aws/aws-dynamodb-encryption-java.git</developerConnection>
62+
</scm>
63+
64+
<licenses>
65+
<license>
66+
<name>Apache License, Version 2.0</name>
67+
<url>https://aws.amazon.com/apache2.0</url>
68+
<distribution>repo</distribution>
69+
</license>
70+
</licenses>
71+
72+
<properties>
73+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
74+
<sqlite4java.version>1.0.392</sqlite4java.version>
75+
<checkstyle.version>8.18</checkstyle.version>
76+
<maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version>
77+
<ddej-build-tools.version>0.1.0</ddej-build-tools.version>
78+
<jacoco-maven-plugin.version>0.8.3</jacoco-maven-plugin.version>
79+
<maven-source-plugin.version>3.0.1</maven-source-plugin.version>
80+
<maven-jxr-plugin.version>3.0.0</maven-jxr-plugin.version>
81+
<maven-failsafe-plugin.version>3.0.0-M3</maven-failsafe-plugin.version>
82+
<maven-surefire-plugin.version>3.0.0-M3</maven-surefire-plugin.version>
83+
<maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
84+
</properties>
85+
86+
<developers>
87+
<developer>
88+
<id>amazonwebservices</id>
89+
<organization>Amazon Web Services</organization>
90+
<organizationUrl>https://aws.amazon.com</organizationUrl>
91+
<roles>
92+
<role>developer</role>
93+
</roles>
94+
</developer>
95+
</developers>
96+
97+
<dependencyManagement>
98+
<dependencies>
99+
<dependency>
100+
<groupId>com.amazonaws</groupId>
101+
<artifactId>aws-java-sdk-bom</artifactId>
102+
<version>1.11.460</version>
103+
<type>pom</type>
104+
<scope>import</scope>
105+
</dependency>
106+
</dependencies>
107+
</dependencyManagement>
108+
109+
<dependencies>
110+
<dependency>
111+
<groupId>com.amazonaws</groupId>
112+
<artifactId>aws-java-sdk-dynamodb</artifactId>
113+
</dependency>
114+
115+
<dependency>
116+
<groupId>com.amazonaws</groupId>
117+
<artifactId>aws-java-sdk-kms</artifactId>
118+
</dependency>
119+
120+
<dependency>
121+
<groupId>org.testng</groupId>
122+
<artifactId>testng</artifactId>
123+
<version>6.10</version>
124+
<scope>test</scope>
125+
</dependency>
126+
127+
<dependency>
128+
<groupId>org.quicktheories</groupId>
129+
<artifactId>quicktheories</artifactId>
130+
<version>0.25</version>
131+
<scope>test</scope>
132+
</dependency>
133+
134+
<dependency>
135+
<groupId>org.hamcrest</groupId>
136+
<artifactId>hamcrest-all</artifactId>
137+
<version>1.3</version>
138+
<scope>test</scope>
139+
</dependency>
140+
141+
<dependency>
142+
<groupId>org.bouncycastle</groupId>
143+
<artifactId>bcprov-ext-jdk15on</artifactId>
144+
<version>1.60</version>
145+
<scope>test</scope>
146+
</dependency>
147+
148+
<dependency>
149+
<groupId>com.amazonaws</groupId>
150+
<artifactId>DynamoDBLocal</artifactId>
151+
<version>1.10.5.1</version>
152+
<scope>test</scope>
153+
</dependency>
154+
155+
<dependency>
156+
<groupId>com.almworks.sqlite4java</groupId>
157+
<artifactId>sqlite4java</artifactId>
158+
<version>${sqlite4java.version}</version>
159+
<scope>test</scope>
160+
</dependency>
161+
162+
<dependency>
163+
<groupId>com.almworks.sqlite4java</groupId>
164+
<artifactId>libsqlite4java-osx</artifactId>
165+
<version>${sqlite4java.version}</version>
166+
<type>dylib</type>
167+
<scope>test</scope>
168+
</dependency>
169+
170+
<dependency>
171+
<groupId>com.almworks.sqlite4java</groupId>
172+
<artifactId>sqlite4java-win32-x64</artifactId>
173+
<version>${sqlite4java.version}</version>
174+
<type>dll</type>
175+
<scope>test</scope>
176+
</dependency>
177+
178+
<dependency>
179+
<groupId>com.almworks.sqlite4java</groupId>
180+
<artifactId>libsqlite4java-linux-amd64</artifactId>
181+
<type>so</type>
182+
<version>${sqlite4java.version}</version>
183+
<scope>test</scope>
184+
</dependency>
185+
</dependencies>
186+
187+
<!--Custom repository:-->
188+
<repositories>
189+
<repository>
190+
<id>dynamodb-local</id>
191+
<name>DynamoDB Local Release Repository</name>
192+
<url>https://s3-us-west-2.amazonaws.com/dynamodb-local/release</url>
193+
</repository>
194+
</repositories>
195+
196+
<build>
197+
<plugins>
198+
<plugin>
199+
<groupId>org.apache.maven.plugins</groupId>
200+
<artifactId>maven-compiler-plugin</artifactId>
201+
<version>3.8.0</version>
202+
<configuration>
203+
<source>1.8</source>
204+
<target>1.8</target>
205+
</configuration>
206+
</plugin>
207+
208+
<plugin>
209+
<groupId>org.apache.maven.plugins</groupId>
210+
<artifactId>maven-source-plugin</artifactId>
211+
<version>3.0.1</version>
212+
</plugin>
213+
214+
<plugin>
215+
<groupId>org.apache.maven.plugins</groupId>
216+
<artifactId>maven-javadoc-plugin</artifactId>
217+
<version>3.0.1</version>
218+
<configuration>
219+
<excludePackageNames>*.internal:*.transform</excludePackageNames>
220+
<minmemory>128m</minmemory>
221+
<maxmemory>1024m</maxmemory>
222+
</configuration>
223+
</plugin>
224+
225+
<plugin>
226+
<groupId>org.apache.maven.plugins</groupId>
227+
<artifactId>maven-dependency-plugin</artifactId>
228+
<version>3.1.1</version>
229+
<executions>
230+
<execution>
231+
<id>copy</id>
232+
<phase>test-compile</phase>
233+
<goals>
234+
<goal>copy-dependencies</goal>
235+
</goals>
236+
<configuration>
237+
<includeScope>test</includeScope>
238+
<includeTypes>so,dll,dylib</includeTypes>
239+
<outputDirectory>${project.build.directory}/test-lib</outputDirectory>
240+
</configuration>
241+
</execution>
242+
</executions>
243+
</plugin>
244+
245+
<plugin>
246+
<groupId>org.apache.maven.plugins</groupId>
247+
<artifactId>maven-surefire-plugin</artifactId>
248+
<version>${maven-surefire-plugin.version}</version>
249+
<configuration>
250+
<useSystemClassLoader>false</useSystemClassLoader>
251+
<includes>
252+
<include>**/Test*.java</include>
253+
<include>**/*Test.java</include>
254+
<include>**/*TestCase.java</include>
255+
<include>**/*Tests.java</include>
256+
<include>**/*TestCases.java</include>
257+
</includes>
258+
<systemProperties>
259+
<property>
260+
<name>sqlite4java.library.path</name>
261+
<value>${project.build.directory}/test-lib</value>
262+
</property>
263+
</systemProperties>
264+
</configuration>
265+
</plugin>
266+
267+
<plugin>
268+
<groupId>org.apache.maven.plugins</groupId>
269+
<artifactId>maven-checkstyle-plugin</artifactId>
270+
<version>${maven-checkstyle-plugin.version}</version>
271+
<dependencies>
272+
<dependency>
273+
<groupId>com.puppycrawl.tools</groupId>
274+
<artifactId>checkstyle</artifactId>
275+
<version>${checkstyle.version}</version>
276+
</dependency>
277+
<dependency>
278+
<groupId>software.amazon.cryptools</groupId>
279+
<artifactId>ddej-build-tools</artifactId>
280+
<version>${ddej-build-tools.version}</version>
281+
</dependency>
282+
</dependencies>
283+
<executions>
284+
<execution>
285+
<id>checkstyle</id>
286+
<phase>validate</phase>
287+
<goals>
288+
<goal>check</goal>
289+
</goals>
290+
</execution>
291+
</executions>
292+
<configuration>
293+
<configLocation>software/amazon/cryptools/ddej-build-tools/checkstyle/checkstyle.xml</configLocation>
294+
<suppressionsLocation>software/amazon/cryptools/ddej-build-tools/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
295+
<consoleOutput>true</consoleOutput>
296+
<failsOnError>true</failsOnError>
297+
<logViolationsToConsole>true</logViolationsToConsole>
298+
<failOnViolation>true</failOnViolation>
299+
</configuration>
300+
</plugin>
301+
302+
<plugin>
303+
<groupId>org.apache.maven.plugins</groupId>
304+
<artifactId>maven-failsafe-plugin</artifactId>
305+
<version>${maven-failsafe-plugin.version}</version>
306+
<configuration>
307+
<useSystemClassLoader>false</useSystemClassLoader>
308+
<systemProperties>
309+
<property>
310+
<name>sqlite4java.library.path</name>
311+
<value>${project.build.directory}/test-lib</value>
312+
</property>
313+
</systemProperties>
314+
<includes>
315+
<include>**/*ITCase.java</include>
316+
</includes>
317+
</configuration>
318+
<executions>
319+
<execution>
320+
<goals>
321+
<goal>integration-test</goal>
322+
<goal>verify</goal>
323+
</goals>
324+
</execution>
325+
</executions>
326+
</plugin>
327+
328+
<plugin>
329+
<groupId>org.jacoco</groupId>
330+
<artifactId>jacoco-maven-plugin</artifactId>
331+
<version>${jacoco-maven-plugin.version}</version>
332+
<executions>
333+
<execution>
334+
<goals>
335+
<goal>prepare-agent</goal>
336+
</goals>
337+
</execution>
338+
<execution>
339+
<id>report</id>
340+
<phase>test</phase>
341+
<goals>
342+
<goal>report</goal>
343+
</goals>
344+
</execution>
345+
</executions>
346+
</plugin>
347+
</plugins>
348+
</build>
349+
350+
<reporting>
351+
<plugins>
352+
<plugin>
353+
<groupId>org.apache.maven.plugins</groupId>
354+
<artifactId>maven-jxr-plugin</artifactId>
355+
<version>${maven-jxr-plugin.version}</version>
356+
</plugin>
357+
</plugins>
358+
</reporting>
359+
88360
</project>

0 commit comments

Comments
 (0)