Skip to content

Commit fb59d36

Browse files
afrankenafranken
committed
POM cleanup: ordering, scoping
1 parent df72f15 commit fb59d36

File tree

7 files changed

+43
-38
lines changed

7 files changed

+43
-38
lines changed

‎integration-tests/pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
<groupId>com.adobe.testing</groupId>
4141
<artifactId>s3mock-docker</artifactId>
4242
<type>pom</type>
43+
<scope>test</scope>
4344
<exclusions>
4445
<exclusion>
4546
<groupId>*</groupId>
@@ -70,6 +71,7 @@
7071
<dependency>
7172
<groupId>org.awaitility</groupId>
7273
<artifactId>awaitility</artifactId>
74+
<scope>test</scope>
7375
</dependency>
7476
<dependency>
7577
<groupId>org.jetbrains.kotlin</groupId>

‎server/pom.xml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@
3535
</properties>
3636

3737
<dependencies>
38+
<dependency>
39+
<groupId>org.springframework.boot</groupId>
40+
<artifactId>spring-boot-starter-web</artifactId>
41+
</dependency>
3842
<dependency>
3943
<groupId>com.fasterxml.jackson.dataformat</groupId>
4044
<artifactId>jackson-dataformat-xml</artifactId>
@@ -59,11 +63,6 @@
5963
<groupId>software.amazon.awssdk</groupId>
6064
<artifactId>s3</artifactId>
6165
</dependency>
62-
<dependency>
63-
<groupId>software.amazon.awssdk</groupId>
64-
<artifactId>auth</artifactId>
65-
<scope>test</scope>
66-
</dependency>
6766
<dependency>
6867
<groupId>commons-codec</groupId>
6968
<artifactId>commons-codec</artifactId>
@@ -82,9 +81,15 @@
8281
<artifactId>httpcore</artifactId>
8382
<scope>test</scope>
8483
</dependency>
84+
<dependency>
85+
<groupId>software.amazon.awssdk</groupId>
86+
<artifactId>auth</artifactId>
87+
<scope>test</scope>
88+
</dependency>
8589
<dependency>
8690
<groupId>org.glassfish.jaxb</groupId>
8791
<artifactId>jaxb-runtime</artifactId>
92+
<scope>test</scope>
8893
</dependency>
8994
<dependency>
9095
<groupId>org.junit.jupiter</groupId>
@@ -101,23 +106,20 @@
101106
<artifactId>spring-boot-configuration-processor</artifactId>
102107
<optional>true</optional>
103108
</dependency>
104-
<dependency>
105-
<groupId>org.springframework.boot</groupId>
106-
<artifactId>spring-boot-starter-actuator</artifactId>
107-
</dependency>
108109
<dependency>
109110
<groupId>org.springframework.boot</groupId>
110111
<artifactId>spring-boot-devtools</artifactId>
111112
<optional>true</optional>
112113
</dependency>
113114
<dependency>
114115
<groupId>org.springframework.boot</groupId>
115-
<artifactId>spring-boot-starter-test</artifactId>
116+
<artifactId>spring-boot-starter-actuator</artifactId>
116117
<scope>test</scope>
117118
</dependency>
118119
<dependency>
119120
<groupId>org.springframework.boot</groupId>
120-
<artifactId>spring-boot-starter-web</artifactId>
121+
<artifactId>spring-boot-starter-test</artifactId>
122+
<scope>test</scope>
121123
</dependency>
122124
<dependency>
123125
<groupId>org.xmlunit</groupId>

‎testsupport/common/pom.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,21 @@
3131
<name>S3Mock - Testsupport - Common</name>
3232

3333
<dependencies>
34+
<dependency>
35+
<groupId>com.amazonaws</groupId>
36+
<artifactId>aws-java-sdk-s3</artifactId>
37+
</dependency>
3438
<dependency>
3539
<groupId>com.adobe.testing</groupId>
3640
<artifactId>s3mock</artifactId>
3741
</dependency>
3842
<dependency>
39-
<groupId>com.amazonaws</groupId>
40-
<artifactId>aws-java-sdk-s3</artifactId>
43+
<groupId>software.amazon.awssdk</groupId>
44+
<artifactId>s3</artifactId>
45+
</dependency>
46+
<dependency>
47+
<groupId>software.amazon.awssdk</groupId>
48+
<artifactId>url-connection-client</artifactId>
4149
</dependency>
4250
<dependency>
4351
<groupId>org.assertj</groupId>
@@ -72,13 +80,5 @@
7280
<artifactId>aws-xml-protocol</artifactId>
7381
<scope>test</scope>
7482
</dependency>
75-
<dependency>
76-
<groupId>software.amazon.awssdk</groupId>
77-
<artifactId>s3</artifactId>
78-
</dependency>
79-
<dependency>
80-
<groupId>software.amazon.awssdk</groupId>
81-
<artifactId>url-connection-client</artifactId>
82-
</dependency>
8383
</dependencies>
8484
</project>

‎testsupport/junit4/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
<dependency>
4949
<groupId>org.springframework.boot</groupId>
5050
<artifactId>spring-boot-starter-actuator</artifactId>
51+
<scope>test</scope>
5152
</dependency>
5253
</dependencies>
5354
</project>

‎testsupport/junit5/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@
3636
<artifactId>s3mock-testsupport-common</artifactId>
3737
</dependency>
3838

39+
<dependency>
40+
<groupId>org.junit.jupiter</groupId>
41+
<artifactId>junit-jupiter-api</artifactId>
42+
</dependency>
3943
<dependency>
4044
<groupId>org.assertj</groupId>
4145
<artifactId>assertj-core</artifactId>
4246
<scope>test</scope>
4347
</dependency>
44-
<dependency>
45-
<groupId>org.junit.jupiter</groupId>
46-
<artifactId>junit-jupiter-api</artifactId>
47-
</dependency>
4848

4949
<dependency>
5050
<groupId>org.junit.jupiter</groupId>

‎testsupport/testcontainers/pom.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,6 @@
3131
<name>S3Mock - Testsupport - Testcontainers</name>
3232

3333
<dependencies>
34-
<dependency>
35-
<groupId>com.adobe.testing</groupId>
36-
<artifactId>s3mock</artifactId>
37-
<scope>test</scope>
38-
</dependency>
3934
<dependency>
4035
<!-- only enforcing build order - all transitive dependencies are removed -->
4136
<groupId>com.adobe.testing</groupId>
@@ -48,6 +43,15 @@
4843
</exclusion>
4944
</exclusions>
5045
</dependency>
46+
<dependency>
47+
<groupId>org.testcontainers</groupId>
48+
<artifactId>testcontainers</artifactId>
49+
</dependency>
50+
<dependency>
51+
<groupId>com.adobe.testing</groupId>
52+
<artifactId>s3mock</artifactId>
53+
<scope>test</scope>
54+
</dependency>
5155
<dependency>
5256
<groupId>org.assertj</groupId>
5357
<artifactId>assertj-core</artifactId>
@@ -63,10 +67,6 @@
6367
<artifactId>junit-jupiter</artifactId>
6468
<scope>test</scope>
6569
</dependency>
66-
<dependency>
67-
<groupId>org.testcontainers</groupId>
68-
<artifactId>testcontainers</artifactId>
69-
</dependency>
7070
<dependency>
7171
<groupId>software.amazon.awssdk</groupId>
7272
<artifactId>aws-query-protocol</artifactId>

‎testsupport/testng/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@
3535
<groupId>com.adobe.testing</groupId>
3636
<artifactId>s3mock-testsupport-common</artifactId>
3737
</dependency>
38+
<dependency>
39+
<groupId>org.testng</groupId>
40+
<artifactId>testng</artifactId>
41+
</dependency>
3842
<dependency>
3943
<groupId>org.assertj</groupId>
4044
<artifactId>assertj-core</artifactId>
4145
<scope>test</scope>
4246
</dependency>
43-
<dependency>
44-
<groupId>org.testng</groupId>
45-
<artifactId>testng</artifactId>
46-
</dependency>
4747
</dependencies>
4848

4949
<build>

0 commit comments

Comments
 (0)