Skip to content

Commit a80df43

Browse files
michael-omichael-o
committed
cleanup deps
1 parent 11da24f commit a80df43

File tree

18 files changed

+224
-10
lines changed

18 files changed

+224
-10
lines changed

‎maven-failsafe-plugin/pom.xml

+30
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,26 @@
4545
</properties>
4646

4747
<dependencies>
48+
<dependency>
49+
<groupId>org.apache.maven.surefire</groupId>
50+
<artifactId>surefire-api</artifactId>
51+
<version>${project.version}</version>
52+
</dependency>
53+
<dependency>
54+
<groupId>org.apache.maven.surefire</groupId>
55+
<artifactId>surefire-booter</artifactId>
56+
<version>${project.version}</version>
57+
</dependency>
58+
<dependency>
59+
<groupId>org.apache.maven.surefire</groupId>
60+
<artifactId>surefire-extensions-api</artifactId>
61+
<version>${project.version}</version>
62+
</dependency>
63+
<dependency>
64+
<groupId>org.apache.maven.surefire</groupId>
65+
<artifactId>surefire-shared-utils</artifactId>
66+
<version>${project.version}</version>
67+
</dependency>
4868
<dependency>
4969
<groupId>org.apache.maven.surefire</groupId>
5070
<artifactId>maven-surefire-common</artifactId>
@@ -68,11 +88,21 @@
6888
<artifactId>maven-core</artifactId>
6989
<scope>provided</scope>
7090
</dependency>
91+
<dependency>
92+
<groupId>org.apache.maven</groupId>
93+
<artifactId>maven-artifact</artifactId>
94+
<scope>provided</scope>
95+
</dependency>
7196
<dependency>
7297
<groupId>org.apache.maven.plugin-tools</groupId>
7398
<artifactId>maven-plugin-annotations</artifactId>
7499
<scope>provided</scope>
75100
</dependency>
101+
<dependency>
102+
<groupId>org.eclipse.sisu</groupId>
103+
<artifactId>org.eclipse.sisu.plexus</artifactId>
104+
<scope>provided</scope>
105+
</dependency>
76106
<dependency>
77107
<groupId>org.mockito</groupId>
78108
<artifactId>mockito-core</artifactId>

‎maven-surefire-common/pom.xml

+50-2
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,11 @@
3737
<artifactId>surefire-api</artifactId>
3838
<version>${project.version}</version>
3939
</dependency>
40+
<dependency>
41+
<groupId>org.apache.maven.surefire</groupId>
42+
<artifactId>surefire-logger-api</artifactId>
43+
<version>${project.version}</version>
44+
</dependency>
4045
<dependency>
4146
<groupId>org.apache.maven.surefire</groupId>
4247
<artifactId>surefire-extensions-api</artifactId>
@@ -52,11 +57,37 @@
5257
<artifactId>maven-core</artifactId>
5358
<scope>provided</scope>
5459
</dependency>
60+
<dependency>
61+
<groupId>org.apache.maven</groupId>
62+
<artifactId>maven-plugin-api</artifactId>
63+
<scope>provided</scope>
64+
</dependency>
65+
<dependency>
66+
<groupId>org.apache.maven</groupId>
67+
<artifactId>maven-artifact</artifactId>
68+
<scope>provided</scope>
69+
</dependency>
70+
<dependency>
71+
<groupId>org.apache.maven</groupId>
72+
<artifactId>maven-model</artifactId>
73+
<scope>provided</scope>
74+
</dependency>
75+
<dependency>
76+
<groupId>javax.inject</groupId>
77+
<artifactId>javax.inject</artifactId>
78+
<version>1</version>
79+
<scope>provided</scope>
80+
</dependency>
81+
<dependency>
82+
<groupId>org.apache.maven.resolver</groupId>
83+
<artifactId>maven-resolver-api</artifactId>
84+
<version>${resolverVersion}</version>
85+
<scope>provided</scope>
86+
</dependency>
5587
<dependency>
5688
<groupId>org.apache.maven.resolver</groupId>
5789
<artifactId>maven-resolver-util</artifactId>
58-
<!-- tha same version as in Maven 3.6.3 -->
59-
<version>1.4.1</version>
90+
<version>${resolverVersion}</version>
6091
</dependency>
6192
<dependency>
6293
<groupId>org.apache.maven.plugin-tools</groupId>
@@ -71,6 +102,17 @@
71102
<groupId>org.codehaus.plexus</groupId>
72103
<artifactId>plexus-java</artifactId>
73104
</dependency>
105+
<dependency>
106+
<groupId>org.codehaus.plexus</groupId>
107+
<artifactId>plexus-component-annotations</artifactId>
108+
<version>2.1.0</version>
109+
<scope>provided</scope>
110+
</dependency>
111+
<dependency>
112+
<groupId>org.eclipse.sisu</groupId>
113+
<artifactId>org.eclipse.sisu.plexus</artifactId>
114+
<scope>provided</scope>
115+
</dependency>
74116
<dependency>
75117
<groupId>org.fusesource.jansi</groupId>
76118
<artifactId>jansi</artifactId>
@@ -117,6 +159,12 @@
117159
<artifactId>plexus-xml</artifactId>
118160
<scope>test</scope>
119161
</dependency>
162+
<dependency>
163+
<groupId>commons-io</groupId>
164+
<artifactId>commons-io</artifactId>
165+
<version>2.16.1</version>
166+
<scope>test</scope>
167+
</dependency>
120168
</dependencies>
121169

122170
<build>

‎maven-surefire-plugin/pom.xml

+11-1
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,24 @@
4343
</properties>
4444

4545
<dependencies>
46+
<dependency>
47+
<groupId>org.apache.maven.surefire</groupId>
48+
<artifactId>surefire-api</artifactId>
49+
<version>${project.version}</version>
50+
</dependency>
51+
<dependency>
52+
<groupId>org.apache.maven.surefire</groupId>
53+
<artifactId>surefire-extensions-api</artifactId>
54+
<version>${project.version}</version>
55+
</dependency>
4656
<dependency>
4757
<groupId>org.apache.maven.surefire</groupId>
4858
<artifactId>maven-surefire-common</artifactId>
4959
<version>${project.version}</version>
5060
</dependency>
5161
<dependency>
5262
<groupId>org.apache.maven</groupId>
53-
<artifactId>maven-core</artifactId>
63+
<artifactId>maven-plugin-api</artifactId>
5464
<scope>provided</scope>
5565
</dependency>
5666
<dependency>

‎maven-surefire-report-plugin/pom.xml

+36-1
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,14 @@
4747

4848
<properties>
4949
<doxiaVersion>1.12.0</doxiaVersion>
50-
<resolverVersion>1.4.1</resolverVersion>
5150
</properties>
5251

5352
<dependencies>
53+
<dependency>
54+
<groupId>org.apache.maven.surefire</groupId>
55+
<artifactId>surefire-logger-api</artifactId>
56+
<version>${project.version}</version>
57+
</dependency>
5458
<dependency>
5559
<groupId>org.apache.maven.surefire</groupId>
5660
<artifactId>surefire-report-parser</artifactId>
@@ -61,21 +65,42 @@
6165
<artifactId>maven-core</artifactId>
6266
<scope>provided</scope>
6367
</dependency>
68+
<dependency>
69+
<groupId>org.apache.maven</groupId>
70+
<artifactId>maven-artifact</artifactId>
71+
<scope>provided</scope>
72+
</dependency>
6473
<dependency>
6574
<groupId>org.apache.maven</groupId>
6675
<artifactId>maven-model</artifactId>
6776
<scope>provided</scope>
6877
</dependency>
78+
<dependency>
79+
<groupId>org.apache.maven</groupId>
80+
<artifactId>maven-settings</artifactId>
81+
<scope>provided</scope>
82+
</dependency>
6983
<dependency>
7084
<groupId>org.apache.maven</groupId>
7185
<artifactId>maven-plugin-api</artifactId>
7286
<scope>provided</scope>
7387
</dependency>
88+
<dependency>
89+
<groupId>org.apache.maven.resolver</groupId>
90+
<artifactId>maven-resolver-api</artifactId>
91+
<version>${resolverVersion}</version>
92+
<scope>provided</scope>
93+
</dependency>
7494
<dependency>
7595
<groupId>org.apache.maven.plugin-tools</groupId>
7696
<artifactId>maven-plugin-annotations</artifactId>
7797
<scope>provided</scope>
7898
</dependency>
99+
<dependency>
100+
<groupId>org.apache.maven.shared</groupId>
101+
<artifactId>maven-shared-utils</artifactId>
102+
<version>3.3.4</version>
103+
</dependency>
79104
<dependency>
80105
<groupId>org.apache.maven.doxia</groupId>
81106
<artifactId>doxia-sink-api</artifactId>
@@ -98,6 +123,16 @@
98123
<groupId>org.codehaus.plexus</groupId>
99124
<artifactId>plexus-xml</artifactId>
100125
</dependency>
126+
<dependency>
127+
<groupId>org.codehaus.plexus</groupId>
128+
<artifactId>plexus-i18n</artifactId>
129+
<version>1.0-beta-10</version>
130+
</dependency>
131+
<dependency>
132+
<groupId>org.codehaus.plexus</groupId>
133+
<artifactId>plexus-interpolation</artifactId>
134+
<version>1.25</version>
135+
</dependency>
101136
<dependency>
102137
<groupId>org.fusesource.jansi</groupId>
103138
<artifactId>jansi</artifactId>

‎pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@
8989
<properties>
9090
<javaVersion>8</javaVersion>
9191
<mavenVersion>3.6.3</mavenVersion>
92+
<resolverVersion>1.4.1</resolverVersion>
9293
<commonsLang3Version>3.14.0</commonsLang3Version>
9394
<commonsCompress>1.26.1</commonsCompress>
9495
<commonsIoVersion>2.16.1</commonsIoVersion>

‎surefire-booter/pom.xml

+10
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,16 @@
4242
<artifactId>surefire-extensions-spi</artifactId>
4343
<version>${project.version}</version>
4444
</dependency>
45+
<dependency>
46+
<groupId>org.apache.maven.surefire</groupId>
47+
<artifactId>surefire-shared-utils</artifactId>
48+
<version>${project.version}</version>
49+
</dependency>
50+
<dependency>
51+
<groupId>org.apache.maven.surefire</groupId>
52+
<artifactId>surefire-logger-api</artifactId>
53+
<version>${project.version}</version>
54+
</dependency>
4555
<dependency>
4656
<groupId>com.google.code.findbugs</groupId>
4757
<artifactId>jsr305</artifactId>

‎surefire-extensions-api/pom.xml

+6
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,12 @@
3636
<version>${project.version}</version>
3737
<scope>provided</scope>
3838
</dependency>
39+
<dependency>
40+
<groupId>org.apache.maven.surefire</groupId>
41+
<artifactId>surefire-logger-api</artifactId>
42+
<version>${project.version}</version>
43+
<scope>provided</scope>
44+
</dependency>
3945
<dependency>
4046
<groupId>com.google.code.findbugs</groupId>
4147
<artifactId>jsr305</artifactId>

‎surefire-its/pom.xml

+11
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,12 @@
4242
<version>3.2.5</version>
4343
<scope>test</scope>
4444
</dependency>
45+
<dependency>
46+
<groupId>org.apache.maven.surefire</groupId>
47+
<artifactId>surefire-logger-api</artifactId>
48+
<version>3.2.5</version>
49+
<scope>test</scope>
50+
</dependency>
4551
<dependency>
4652
<groupId>org.apache.maven.shared</groupId>
4753
<artifactId>maven-verifier</artifactId>
@@ -77,6 +83,11 @@
7783
<artifactId>commons-lang3</artifactId>
7884
<scope>test</scope>
7985
</dependency>
86+
<dependency>
87+
<groupId>org.codehaus.plexus</groupId>
88+
<artifactId>plexus-utils</artifactId>
89+
<scope>test</scope>
90+
</dependency>
8091
</dependencies>
8192

8293
<build>

‎surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1295AttributeJvmCrashesToTestsIT.java

-6
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,11 @@
3131

3232
import static java.util.Arrays.asList;
3333
import static java.util.concurrent.TimeUnit.SECONDS;
34-
import static org.apache.commons.lang3.SystemUtils.IS_OS_LINUX;
35-
import static org.apache.commons.lang3.SystemUtils.IS_OS_MAC_OSX;
36-
import static org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS;
3734
import static org.apache.maven.surefire.its.jiras.Surefire1295AttributeJvmCrashesToTestsIT.ForkMode.DEFAULT;
3835
import static org.apache.maven.surefire.its.jiras.Surefire1295AttributeJvmCrashesToTestsIT.ForkMode.ONE_FORK_NO_REUSE;
3936
import static org.apache.maven.surefire.its.jiras.Surefire1295AttributeJvmCrashesToTestsIT.ForkMode.ONE_FORK_REUSE;
4037
import static org.assertj.core.api.Assertions.assertThat;
4138
import static org.junit.Assert.fail;
42-
import static org.junit.Assume.assumeTrue;
4339

4440
/**
4541
* https://issues.apache.org/jira/browse/SUREFIRE-1295
@@ -88,8 +84,6 @@ public static Iterable<Object[]> parameters() {
8884

8985
@Test
9086
public void test() throws Exception {
91-
assumeTrue(IS_OS_LINUX || IS_OS_MAC_OSX || IS_OS_WINDOWS);
92-
9387
SurefireLauncher launcher = unpack("crash-during-test", "_" + crashStyle + "_" + forkStyle.ordinal())
9488
.setForkJvm();
9589

‎surefire-providers/common-junit4/pom.xml

+10
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,16 @@
3838
<version>4.0</version>
3939
<scope>provided</scope>
4040
</dependency>
41+
<dependency>
42+
<groupId>org.apache.maven.surefire</groupId>
43+
<artifactId>surefire-logger-api</artifactId>
44+
<version>${project.version}</version>
45+
</dependency>
46+
<dependency>
47+
<groupId>org.apache.maven.surefire</groupId>
48+
<artifactId>surefire-shared-utils</artifactId>
49+
<version>${project.version}</version>
50+
</dependency>
4151
<dependency>
4252
<groupId>org.apache.maven.surefire</groupId>
4353
<artifactId>common-junit3</artifactId>

‎surefire-providers/common-junit48/pom.xml

+5
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@
3838
<version>4.8.1</version>
3939
<scope>provided</scope>
4040
</dependency>
41+
<dependency>
42+
<groupId>org.apache.maven.surefire</groupId>
43+
<artifactId>surefire-shared-utils</artifactId>
44+
<version>${project.version}</version>
45+
</dependency>
4146
<dependency>
4247
<groupId>org.apache.maven.surefire</groupId>
4348
<artifactId>common-junit4</artifactId>

‎surefire-providers/surefire-junit-platform/pom.xml

+16
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,16 @@
8989
<artifactId>common-java5</artifactId>
9090
<version>${project.version}</version>
9191
</dependency>
92+
<dependency>
93+
<groupId>org.apache.maven.surefire</groupId>
94+
<artifactId>surefire-shared-utils</artifactId>
95+
<version>${project.version}</version>
96+
</dependency>
97+
<dependency>
98+
<groupId>org.junit.platform</groupId>
99+
<artifactId>junit-platform-engine</artifactId>
100+
<version>${junitPlatformVersion}</version>
101+
</dependency>
92102
<dependency>
93103
<groupId>org.junit.platform</groupId>
94104
<artifactId>junit-platform-launcher</artifactId>
@@ -100,6 +110,12 @@
100110
<version>${junit5Version}</version>
101111
<scope>test</scope>
102112
</dependency>
113+
<dependency>
114+
<groupId>org.junit.jupiter</groupId>
115+
<artifactId>junit-jupiter-api</artifactId>
116+
<version>${junit5Version}</version>
117+
<scope>test</scope>
118+
</dependency>
103119
<dependency>
104120
<groupId>org.junit.jupiter</groupId>
105121
<artifactId>junit-jupiter-params</artifactId>

‎surefire-providers/surefire-junit3/pom.xml

+6
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,12 @@
4848
<artifactId>common-java5</artifactId>
4949
<version>${project.version}</version>
5050
</dependency>
51+
<dependency>
52+
<groupId>org.apache.maven.surefire</groupId>
53+
<artifactId>surefire-shared-utils</artifactId>
54+
<version>${project.version}</version>
55+
<scope>test</scope>
56+
</dependency>
5157
</dependencies>
5258

5359
<build>

0 commit comments

Comments
 (0)