Skip to content

Commit d4d8e5a

Browse files
millemsmillems
committed
Moved SDK dependencies from the root pom.xml to a bom-internal module. This prevents dependencies in the root pom from polluting the bom module. Also added missing core modules to the bom and cleaned up the pom.xml files across the repository.
1 parent 1fafd9e commit d4d8e5a

File tree

35 files changed

+738
-697
lines changed

35 files changed

+738
-697
lines changed

‎aws-sdk-java/pom.xml

Lines changed: 2 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
Amazon AutoScaling, etc).
1616
</description>
1717
<url>https://aws.amazon.com/sdkforjava</url>
18-
<!-- The dependencies section in pom.xml is auto generated. No manual changes are allowed -->
18+
1919
<dependencies>
2020
<dependency>
2121
<artifactId>pinpoint</artifactId>
@@ -633,17 +633,10 @@
633633
<version>${awsjavasdk.version}</version>
634634
</dependency>
635635
</dependencies>
636+
636637
<build>
637638
<finalName>${project.artifactId}-${project.version}</finalName>
638639
<plugins>
639-
<plugin>
640-
<groupId>org.apache.maven.plugins</groupId>
641-
<artifactId>maven-compiler-plugin</artifactId>
642-
</plugin>
643-
<plugin>
644-
<groupId>org.apache.maven.plugins</groupId>
645-
<artifactId>maven-javadoc-plugin</artifactId>
646-
</plugin>
647640
<plugin>
648641
<artifactId>maven-dependency-plugin</artifactId>
649642
<groupId>org.apache.maven.plugins</groupId>
@@ -655,50 +648,4 @@
655648
</plugin>
656649
</plugins>
657650
</build>
658-
<!-- This profile uses the JAPICMP plugin to generate a report of changes between the release version and the latest version -->
659-
<!-- For more information on the plugin, see https://github.com/siom79/japicmp -->
660-
<profiles>
661-
<profile>
662-
<id>versiondiff</id>
663-
<build>
664-
<plugins>
665-
<plugin>
666-
<groupId>com.github.siom79.japicmp</groupId>
667-
<artifactId>japicmp-maven-plugin</artifactId>
668-
<version>0.5.0</version>
669-
<executions>
670-
<execution>
671-
<phase>verify</phase>
672-
<goals>
673-
<goal>cmp</goal>
674-
</goals>
675-
</execution>
676-
</executions>
677-
<configuration>
678-
<oldVersion>
679-
<dependency>
680-
<groupId>software.amazon.awssdk</groupId>
681-
<artifactId>aws-java-sdk</artifactId>
682-
<version>RELEASE</version>
683-
</dependency>
684-
</oldVersion>
685-
<newVersion>
686-
<file>
687-
<path>${project.build.directory}/${project.artifactId}-${project.version}.jar</path>
688-
</file>
689-
</newVersion>
690-
<parameter>
691-
<onlyModified>true</onlyModified>
692-
<accessModifier>public</accessModifier>
693-
<breakBuildOnModifications>false</breakBuildOnModifications>
694-
<breakBuildOnBinaryIncompatibleModifications>false
695-
</breakBuildOnBinaryIncompatibleModifications>
696-
<onlyBinaryIncompatible>false</onlyBinaryIncompatible>
697-
</parameter>
698-
</configuration>
699-
</plugin>
700-
</plugins>
701-
</build>
702-
</profile>
703-
</profiles>
704651
</project>

‎bom-internal/pom.xml

Lines changed: 315 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,315 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<parent>
6+
<artifactId>aws-sdk-java-pom</artifactId>
7+
<groupId>software.amazon.awssdk</groupId>
8+
<version>2.4.4-SNAPSHOT</version>
9+
</parent>
10+
<modelVersion>4.0.0</modelVersion>
11+
12+
<artifactId>bom-internal</artifactId>
13+
14+
<dependencyManagement>
15+
<dependencies>
16+
<!-- Non-Test Dependencies -->
17+
<dependency>
18+
<groupId>software.amazon</groupId>
19+
<artifactId>flow</artifactId>
20+
<version>${flow.version}</version>
21+
</dependency>
22+
<dependency>
23+
<groupId>commons-io</groupId>
24+
<artifactId>commons-io</artifactId>
25+
<version>${commons.io.version}</version>
26+
</dependency>
27+
<dependency>
28+
<groupId>com.fasterxml.jackson.jr</groupId>
29+
<artifactId>jackson-jr-objects</artifactId>
30+
<version>${jackson.version}</version>
31+
</dependency>
32+
<dependency>
33+
<groupId>org.slf4j</groupId>
34+
<artifactId>slf4j-api</artifactId>
35+
<version>${slf4j.version}</version>
36+
</dependency>
37+
<dependency>
38+
<groupId>com.fasterxml.jackson.core</groupId>
39+
<artifactId>jackson-databind</artifactId>
40+
<version>${jackson.version}</version>
41+
</dependency>
42+
<dependency>
43+
<groupId>com.fasterxml.jackson.core</groupId>
44+
<artifactId>jackson-core</artifactId>
45+
<version>${jackson.version}</version>
46+
</dependency>
47+
<dependency>
48+
<groupId>com.fasterxml.jackson.core</groupId>
49+
<artifactId>jackson-annotations</artifactId>
50+
<version>${jackson.annotations.version}</version>
51+
</dependency>
52+
<dependency>
53+
<groupId>com.fasterxml.jackson.dataformat</groupId>
54+
<artifactId>jackson-dataformat-cbor</artifactId>
55+
<version>${jackson.version}</version>
56+
</dependency>
57+
<dependency>
58+
<groupId>com.fasterxml.jackson.datatype</groupId>
59+
<artifactId>jackson-datatype-jdk8</artifactId>
60+
<version>${jackson.version}</version>
61+
</dependency>
62+
<dependency>
63+
<groupId>com.fasterxml.jackson.datatype</groupId>
64+
<artifactId>jackson-datatype-jsr310</artifactId>
65+
<version>${jackson.version}</version>
66+
</dependency>
67+
<dependency>
68+
<groupId>software.amazon.ion</groupId>
69+
<artifactId>ion-java</artifactId>
70+
<version>${ion.java.version}</version>
71+
</dependency>
72+
<dependency>
73+
<groupId>org.apache.httpcomponents</groupId>
74+
<artifactId>httpclient</artifactId>
75+
<version>${httpcomponents.httpclient.version}</version>
76+
</dependency>
77+
<dependency>
78+
<groupId>org.apache.httpcomponents</groupId>
79+
<artifactId>httpcore</artifactId>
80+
<version>${httpcomponents.httpcore.version}</version>
81+
</dependency>
82+
<dependency>
83+
<groupId>io.netty</groupId>
84+
<artifactId>netty-codec-http</artifactId>
85+
<version>${netty.version}</version>
86+
</dependency>
87+
<dependency>
88+
<groupId>io.netty</groupId>
89+
<artifactId>netty-codec-http2</artifactId>
90+
<version>${netty.version}</version>
91+
</dependency>
92+
<dependency>
93+
<groupId>io.netty</groupId>
94+
<artifactId>netty-handler</artifactId>
95+
<version>${netty.version}</version>
96+
</dependency>
97+
<dependency>
98+
<groupId>io.netty</groupId>
99+
<artifactId>netty-codec</artifactId>
100+
<version>${netty.version}</version>
101+
</dependency>
102+
<dependency>
103+
<groupId>io.netty</groupId>
104+
<artifactId>netty-transport</artifactId>
105+
<version>${netty.version}</version>
106+
</dependency>
107+
<dependency>
108+
<groupId>io.netty</groupId>
109+
<artifactId>netty-common</artifactId>
110+
<version>${netty.version}</version>
111+
</dependency>
112+
<dependency>
113+
<groupId>io.netty</groupId>
114+
<artifactId>netty-buffer</artifactId>
115+
<version>${netty.version}</version>
116+
</dependency>
117+
<dependency>
118+
<groupId>org.reactivestreams</groupId>
119+
<artifactId>reactive-streams</artifactId>
120+
<version>${reactive-streams.version}</version>
121+
</dependency>
122+
<dependency>
123+
<groupId>com.typesafe.netty</groupId>
124+
<artifactId>netty-reactive-streams-http</artifactId>
125+
<version>${netty-reactive-streams-http.version}</version>
126+
</dependency>
127+
<dependency>
128+
<groupId>io.netty</groupId>
129+
<artifactId>netty-transport-native-epoll</artifactId>
130+
<version>${netty.version}</version>
131+
<classifier>linux-x86_64</classifier>
132+
</dependency>
133+
<dependency>
134+
<artifactId>org.eclipse.jdt.core</artifactId>
135+
<groupId>org.eclipse.jdt</groupId>
136+
<version>${org.eclipse.jdt.version}</version>
137+
</dependency>
138+
<dependency>
139+
<artifactId>org.eclipse.text</artifactId>
140+
<groupId>org.eclipse.text</groupId>
141+
<version>${org.eclipse.text.version}</version>
142+
</dependency>
143+
<dependency>
144+
<groupId>com.squareup</groupId>
145+
<artifactId>javapoet</artifactId>
146+
<version>${javapoet.verion}</version>
147+
</dependency>
148+
<dependency>
149+
<groupId>org.apache.maven.plugins</groupId>
150+
<artifactId>maven-deploy-plugin</artifactId>
151+
<version>3.1.1</version>
152+
</dependency>
153+
<dependency>
154+
<artifactId>maven-plugin-api</artifactId>
155+
<groupId>org.apache.maven</groupId>
156+
<version>3.5.0</version>
157+
</dependency>
158+
<dependency>
159+
<artifactId>maven-plugin-annotations</artifactId>
160+
<groupId>org.apache.maven.plugin-tools</groupId>
161+
<version>3.5</version>
162+
</dependency>
163+
<dependency>
164+
<artifactId>maven-project</artifactId>
165+
<groupId>org.apache.maven</groupId>
166+
<version>2.2.1</version>
167+
</dependency>
168+
<dependency>
169+
<groupId>commons-cli</groupId>
170+
<artifactId>commons-cli</artifactId>
171+
<version>1.4</version>
172+
</dependency>
173+
<dependency>
174+
<groupId>org.openjdk.jmh</groupId>
175+
<artifactId>jmh-core</artifactId>
176+
<version>${jmh.version}</version>
177+
</dependency>
178+
<dependency>
179+
<groupId>org.openjdk.jmh</groupId>
180+
<artifactId>jmh-generator-annprocess</artifactId>
181+
<version>${jmh.version}</version>
182+
<scope>provided</scope>
183+
</dependency>
184+
185+
<!-- Build Dependencies -->
186+
<dependency>
187+
<groupId>com.puppycrawl.tools</groupId>
188+
<artifactId>checkstyle</artifactId>
189+
<version>8.7</version>
190+
</dependency>
191+
<dependency>
192+
<groupId>org.apache.maven.plugins</groupId>
193+
<artifactId>maven-surefire-plugin</artifactId>
194+
<version>${maven.surefire.version}</version>
195+
</dependency>
196+
197+
<!-- Test Dependencies -->
198+
<dependency>
199+
<groupId>io.reactivex.rxjava2</groupId>
200+
<artifactId>rxjava</artifactId>
201+
<version>${rxjava.version}</version>
202+
<scope>test</scope>
203+
</dependency>
204+
<dependency>
205+
<artifactId>commons-lang3</artifactId>
206+
<groupId>org.apache.commons</groupId>
207+
<version>${commons.lang.version}</version>
208+
<scope>test</scope>
209+
</dependency>
210+
<dependency>
211+
<groupId>commons-lang</groupId>
212+
<artifactId>commons-lang</artifactId>
213+
<version>${commons-lang.verson}</version>
214+
<scope>test</scope>
215+
</dependency>
216+
<dependency>
217+
<groupId>org.unitils</groupId>
218+
<artifactId>unitils-core</artifactId>
219+
<version>${unitils.version}</version>
220+
<scope>test</scope>
221+
</dependency>
222+
<dependency>
223+
<groupId>xmlunit</groupId>
224+
<artifactId>xmlunit</artifactId>
225+
<version>${xmlunit.version}</version>
226+
<scope>test</scope>
227+
</dependency>
228+
<dependency>
229+
<groupId>org.mockito</groupId>
230+
<artifactId>mockito-core</artifactId>
231+
<version>${mockito.version}</version>
232+
<scope>test</scope>
233+
</dependency>
234+
<dependency>
235+
<groupId>nl.jqno.equalsverifier</groupId>
236+
<artifactId>equalsverifier</artifactId>
237+
<version>${equalsverifier.version}</version>
238+
<scope>test</scope>
239+
</dependency>
240+
<dependency>
241+
<groupId>log4j</groupId>
242+
<artifactId>log4j</artifactId>
243+
<version>${log4j.version}</version>
244+
<scope>test</scope>
245+
</dependency>
246+
<dependency>
247+
<groupId>org.slf4j</groupId>
248+
<artifactId>slf4j-log4j12</artifactId>
249+
<version>${slf4j.version}</version>
250+
<scope>test</scope>
251+
</dependency>
252+
<dependency>
253+
<groupId>org.slf4j</groupId>
254+
<artifactId>slf4j-simple</artifactId>
255+
<version>1.7.25</version>
256+
<scope>test</scope>
257+
</dependency>
258+
<dependency>
259+
<groupId>org.assertj</groupId>
260+
<artifactId>assertj-core</artifactId>
261+
<version>${assertj.version}</version>
262+
<scope>test</scope>
263+
</dependency>
264+
<dependency>
265+
<groupId>software.amazon.awssdk</groupId>
266+
<artifactId>test-utils</artifactId>
267+
<version>${awsjavasdk.version}</version>
268+
<scope>test</scope>
269+
</dependency>
270+
<dependency>
271+
<groupId>com.github.tomakehurst</groupId>
272+
<artifactId>wiremock</artifactId>
273+
<version>${wiremock.version}</version>
274+
<scope>test</scope>
275+
</dependency>
276+
<dependency>
277+
<groupId>com.google.guava</groupId>
278+
<artifactId>guava</artifactId>
279+
<version>${guava.version}</version>
280+
<scope>test</scope>
281+
</dependency>
282+
<dependency>
283+
<groupId>junit</groupId>
284+
<artifactId>junit</artifactId>
285+
<version>${junit.version}</version>
286+
<scope>test</scope>
287+
</dependency>
288+
<dependency>
289+
<groupId>org.hamcrest</groupId>
290+
<artifactId>hamcrest-all</artifactId>
291+
<version>${hamcrest.version}</version>
292+
<scope>test</scope>
293+
</dependency>
294+
<dependency>
295+
<groupId>org.hamcrest</groupId>
296+
<artifactId>hamcrest-core</artifactId>
297+
<version>${hamcrest.version}</version>
298+
<scope>test</scope>
299+
</dependency>
300+
<dependency>
301+
<groupId>org.reactivestreams</groupId>
302+
<artifactId>reactive-streams-tck</artifactId>
303+
<version>${reactive-streams.version}</version>
304+
<scope>test</scope>
305+
</dependency>
306+
<dependency>
307+
<groupId>com.google.jimfs</groupId>
308+
<artifactId>jimfs</artifactId>
309+
<version>${jimfs.version}</version>
310+
<scope>test</scope>
311+
</dependency>
312+
</dependencies>
313+
</dependencyManagement>
314+
315+
</project>

0 commit comments

Comments
 (0)