Skip to content

Commit db82b95

Browse files
davidh44davidh44
committed
Move dependency to parent pom
1 parent 4db8286 commit db82b95

9 files changed

Lines changed: 21 additions & 202 deletions

File tree

‎core/http-auth-aws/pom.xml‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -126,11 +126,6 @@
126126
<artifactId>equalsverifier</artifactId>
127127
<scope>test</scope>
128128
</dependency>
129-
<dependency>
130-
<groupId>org.reactivestreams</groupId>
131-
<artifactId>reactive-streams-tck</artifactId>
132-
<scope>test</scope>
133-
</dependency>
134129
<dependency>
135130
<groupId>software.amazon.awssdk</groupId>
136131
<artifactId>test-utils</artifactId>
@@ -155,33 +150,6 @@
155150

156151
<build>
157152
<plugins>
158-
<!-- The Reactive Streams TCK tests are based on TestNG. See http://maven.apache.org/surefire/maven-surefire-plugin/examples/testng.html#Running_TestNG_and_JUnit_Tests -->
159-
<plugin>
160-
<groupId>org.apache.maven.plugins</groupId>
161-
<artifactId>maven-surefire-plugin</artifactId>
162-
<version>${maven.surefire.version}</version>
163-
<configuration>
164-
<properties>
165-
<property>
166-
<name>junit</name>
167-
<value>false</value>
168-
</property>
169-
</properties>
170-
<threadCount>1</threadCount>
171-
</configuration>
172-
<dependencies>
173-
<dependency>
174-
<groupId>org.apache.maven.surefire</groupId>
175-
<artifactId>surefire-junit-platform</artifactId>
176-
<version>${maven.surefire.version}</version>
177-
</dependency>
178-
<dependency>
179-
<groupId>org.apache.maven.surefire</groupId>
180-
<artifactId>surefire-testng</artifactId>
181-
<version>${maven.surefire.version}</version>
182-
</dependency>
183-
</dependencies>
184-
</plugin>
185153
<plugin>
186154
<groupId>org.apache.maven.plugins</groupId>
187155
<artifactId>maven-jar-plugin</artifactId>

‎core/sdk-core/pom.xml‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -193,11 +193,6 @@
193193
<version>${awsjavasdk.version}</version>
194194
<scope>test</scope>
195195
</dependency>
196-
<dependency>
197-
<groupId>org.reactivestreams</groupId>
198-
<artifactId>reactive-streams-tck</artifactId>
199-
<scope>test</scope>
200-
</dependency>
201196
<dependency>
202197
<groupId>com.google.jimfs</groupId>
203198
<artifactId>jimfs</artifactId>
@@ -232,33 +227,6 @@
232227
</dependencies>
233228
<build>
234229
<plugins>
235-
<!-- The Reactive Streams TCK tests are based on TestNG. See http://maven.apache.org/surefire/maven-surefire-plugin/examples/testng.html#Running_TestNG_and_JUnit_Tests -->
236-
<plugin>
237-
<groupId>org.apache.maven.plugins</groupId>
238-
<artifactId>maven-surefire-plugin</artifactId>
239-
<version>${maven.surefire.version}</version>
240-
<configuration>
241-
<properties>
242-
<property>
243-
<name>junit</name>
244-
<value>false</value>
245-
</property>
246-
</properties>
247-
<threadCount>1</threadCount>
248-
</configuration>
249-
<dependencies>
250-
<dependency>
251-
<groupId>org.apache.maven.surefire</groupId>
252-
<artifactId>surefire-junit-platform</artifactId>
253-
<version>${maven.surefire.version}</version>
254-
</dependency>
255-
<dependency>
256-
<groupId>org.apache.maven.surefire</groupId>
257-
<artifactId>surefire-testng</artifactId>
258-
<version>${maven.surefire.version}</version>
259-
</dependency>
260-
</dependencies>
261-
</plugin>
262230
<plugin>
263231
<groupId>org.codehaus.mojo</groupId>
264232
<artifactId>build-helper-maven-plugin</artifactId>

‎http-client-spi/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,6 @@
7575
<artifactId>assertj-core</artifactId>
7676
<scope>test</scope>
7777
</dependency>
78-
<dependency>
79-
<groupId>org.reactivestreams</groupId>
80-
<artifactId>reactive-streams-tck</artifactId>
81-
<scope>test</scope>
82-
</dependency>
8378
<dependency>
8479
<groupId>nl.jqno.equalsverifier</groupId>
8580
<artifactId>equalsverifier</artifactId>

‎http-clients/aws-crt-client/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,6 @@
112112
<artifactId>assertj-core</artifactId>
113113
<scope>test</scope>
114114
</dependency>
115-
<dependency>
116-
<groupId>org.reactivestreams</groupId>
117-
<artifactId>reactive-streams-tck</artifactId>
118-
<scope>test</scope>
119-
</dependency>
120115
<dependency>
121116
<groupId>org.apache.logging.log4j</groupId>
122117
<artifactId>log4j-api</artifactId>

‎http-clients/netty-nio-client/pom.xml‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -147,11 +147,6 @@
147147
<artifactId>assertj-core</artifactId>
148148
<scope>test</scope>
149149
</dependency>
150-
<dependency>
151-
<groupId>org.reactivestreams</groupId>
152-
<artifactId>reactive-streams-tck</artifactId>
153-
<scope>test</scope>
154-
</dependency>
155150
<dependency>
156151
<groupId>org.apache.logging.log4j</groupId>
157152
<artifactId>log4j-api</artifactId>
@@ -254,33 +249,6 @@
254249

255250
<build>
256251
<plugins>
257-
<!-- The Reactive Streams TCK tests are based on TestNG. See http://maven.apache.org/surefire/maven-surefire-plugin/examples/testng.html#Running_TestNG_and_JUnit_Tests -->
258-
<plugin>
259-
<groupId>org.apache.maven.plugins</groupId>
260-
<artifactId>maven-surefire-plugin</artifactId>
261-
<version>${maven.surefire.version}</version>
262-
<configuration>
263-
<properties>
264-
<property>
265-
<name>junit</name>
266-
<value>false</value>
267-
</property>
268-
</properties>
269-
<threadCount>1</threadCount>
270-
</configuration>
271-
<dependencies>
272-
<dependency>
273-
<groupId>org.apache.maven.surefire</groupId>
274-
<artifactId>surefire-junit-platform</artifactId>
275-
<version>${maven.surefire.version}</version>
276-
</dependency>
277-
<dependency>
278-
<groupId>org.apache.maven.surefire</groupId>
279-
<artifactId>surefire-testng</artifactId>
280-
<version>${maven.surefire.version}</version>
281-
</dependency>
282-
</dependencies>
283-
</plugin>
284252
<plugin>
285253
<groupId>org.apache.maven.plugins</groupId>
286254
<artifactId>maven-jar-plugin</artifactId>

‎pom.xml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,15 @@
213213

214214
<dependencies>
215215
<!-- Internal dependencies are managed in the bom-internal module. -->
216+
217+
<!-- reactive-streams-tck brings TestNG, which is needed globally so the surefire-testng provider
218+
can discover TCK tests in any module without per-module surefire configuration. -->
219+
<dependency>
220+
<groupId>org.reactivestreams</groupId>
221+
<artifactId>reactive-streams-tck</artifactId>
222+
<version>${reactive-streams.version}</version>
223+
<scope>test</scope>
224+
</dependency>
216225
</dependencies>
217226

218227
<build>
@@ -302,6 +311,13 @@
302311
<include>**/*TestCase.java</include>
303312
</includes>
304313
<skipTests>${skip.unit.tests}</skipTests>
314+
<!-- Prevent TestNG from re-running JUnit tests -->
315+
<properties>
316+
<property>
317+
<name>junit</name>
318+
<value>false</value>
319+
</property>
320+
</properties>
305321
</configuration>
306322
<!-- Have to explicitly set surefire provider because reactivestreamsTCK is using TestNG-->
307323
<dependencies>
@@ -310,6 +326,11 @@
310326
<artifactId>surefire-junit-platform</artifactId>
311327
<version>${maven.surefire.version}</version>
312328
</dependency>
329+
<dependency>
330+
<groupId>org.apache.maven.surefire</groupId>
331+
<artifactId>surefire-testng</artifactId>
332+
<version>${maven.surefire.version}</version>
333+
</dependency>
313334
</dependencies>
314335
</plugin>
315336
<plugin>

‎services-custom/s3-transfer-manager/pom.xml‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -185,11 +185,6 @@
185185
<artifactId>commons-lang3</artifactId>
186186
<scope>test</scope>
187187
</dependency>
188-
<dependency>
189-
<groupId>org.reactivestreams</groupId>
190-
<artifactId>reactive-streams-tck</artifactId>
191-
<scope>test</scope>
192-
</dependency>
193188
<dependency>
194189
<groupId>com.google.jimfs</groupId>
195190
<artifactId>jimfs</artifactId>
@@ -225,33 +220,6 @@
225220

226221
<build>
227222
<plugins>
228-
<!-- The Reactive Streams TCK tests are based on TestNG. See http://maven.apache.org/surefire/maven-surefire-plugin/examples/testng.html#Running_TestNG_and_JUnit_Tests -->
229-
<plugin>
230-
<groupId>org.apache.maven.plugins</groupId>
231-
<artifactId>maven-surefire-plugin</artifactId>
232-
<version>${maven.surefire.version}</version>
233-
<configuration>
234-
<properties>
235-
<property>
236-
<name>junit</name>
237-
<value>false</value>
238-
</property>
239-
</properties>
240-
<threadCount>1</threadCount>
241-
</configuration>
242-
<dependencies>
243-
<dependency>
244-
<groupId>org.apache.maven.surefire</groupId>
245-
<artifactId>surefire-junit-platform</artifactId>
246-
<version>${maven.surefire.version}</version>
247-
</dependency>
248-
<dependency>
249-
<groupId>org.apache.maven.surefire</groupId>
250-
<artifactId>surefire-testng</artifactId>
251-
<version>${maven.surefire.version}</version>
252-
</dependency>
253-
</dependencies>
254-
</plugin>
255223
<plugin>
256224
<groupId>org.apache.maven.plugins</groupId>
257225
<artifactId>maven-jar-plugin</artifactId>

‎services/s3/pom.xml‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -31,33 +31,6 @@
3131
<url>https://aws.amazon.com/sdkforjava</url>
3232
<build>
3333
<plugins>
34-
<!-- The Reactive Streams TCK tests are based on TestNG. See http://maven.apache.org/surefire/maven-surefire-plugin/examples/testng.html#Running_TestNG_and_JUnit_Tests -->
35-
<plugin>
36-
<groupId>org.apache.maven.plugins</groupId>
37-
<artifactId>maven-surefire-plugin</artifactId>
38-
<version>${maven.surefire.version}</version>
39-
<configuration>
40-
<properties>
41-
<property>
42-
<name>junit</name>
43-
<value>false</value>
44-
</property>
45-
</properties>
46-
<threadCount>1</threadCount>
47-
</configuration>
48-
<dependencies>
49-
<dependency>
50-
<groupId>org.apache.maven.surefire</groupId>
51-
<artifactId>surefire-junit-platform</artifactId>
52-
<version>${maven.surefire.version}</version>
53-
</dependency>
54-
<dependency>
55-
<groupId>org.apache.maven.surefire</groupId>
56-
<artifactId>surefire-testng</artifactId>
57-
<version>${maven.surefire.version}</version>
58-
</dependency>
59-
</dependencies>
60-
</plugin>
6134
<plugin>
6235
<groupId>org.apache.maven.plugins</groupId>
6336
<artifactId>maven-jar-plugin</artifactId>
@@ -207,11 +180,6 @@
207180
<artifactId>wiremock-jre8-standalone</artifactId>
208181
<scope>test</scope>
209182
</dependency>
210-
<dependency>
211-
<groupId>org.reactivestreams</groupId>
212-
<artifactId>reactive-streams-tck</artifactId>
213-
<scope>test</scope>
214-
</dependency>
215183
<dependency>
216184
<groupId>software.amazon.awssdk</groupId>
217185
<artifactId>auth-crt</artifactId>

‎utils/pom.xml‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,6 @@
9494
<artifactId>commons-io</artifactId>
9595
<scope>test</scope>
9696
</dependency>
97-
<dependency>
98-
<groupId>org.reactivestreams</groupId>
99-
<artifactId>reactive-streams-tck</artifactId>
100-
<scope>test</scope>
101-
</dependency>
10297
<dependency>
10398
<groupId>org.apache.logging.log4j</groupId>
10499
<artifactId>log4j-api</artifactId>
@@ -139,33 +134,6 @@
139134

140135
<build>
141136
<plugins>
142-
<!-- The Reactive Streams TCK tests are based on TestNG. See http://maven.apache.org/surefire/maven-surefire-plugin/examples/testng.html#Running_TestNG_and_JUnit_Tests -->
143-
<plugin>
144-
<groupId>org.apache.maven.plugins</groupId>
145-
<artifactId>maven-surefire-plugin</artifactId>
146-
<version>${maven.surefire.version}</version>
147-
<configuration>
148-
<properties>
149-
<property>
150-
<name>junit</name>
151-
<value>false</value>
152-
</property>
153-
</properties>
154-
<threadCount>1</threadCount>
155-
</configuration>
156-
<dependencies>
157-
<dependency>
158-
<groupId>org.apache.maven.surefire</groupId>
159-
<artifactId>surefire-junit-platform</artifactId>
160-
<version>${maven.surefire.version}</version>
161-
</dependency>
162-
<dependency>
163-
<groupId>org.apache.maven.surefire</groupId>
164-
<artifactId>surefire-testng</artifactId>
165-
<version>${maven.surefire.version}</version>
166-
</dependency>
167-
</dependencies>
168-
</plugin>
169137
<plugin>
170138
<groupId>org.apache.maven.plugins</groupId>
171139
<artifactId>maven-jar-plugin</artifactId>

0 commit comments

Comments
 (0)