Skip to content

Commit b18d260

Browse files
author
Krzysztof Woyke
committed
JAVA-4931: Cleanup surefire config. Part 2.
1 parent 232d9bc commit b18d260

File tree

22 files changed

+1
-146
lines changed

22 files changed

+1
-146
lines changed

‎core-groovy-2/pom.xml

-2
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@
115115
</plugin>
116116
<plugin>
117117
<artifactId>maven-surefire-plugin</artifactId>
118-
<version>${surefire.plugin.version}</version>
119118
<configuration>
120119
<useFile>false</useFile>
121120
<includes>
@@ -186,7 +185,6 @@
186185
<logback.version>1.2.3</logback.version>
187186
<groovy.version>2.5.7</groovy.version>
188187
<assembly.plugin.version>3.1.0</assembly.plugin.version>
189-
<surefire.plugin.version>2.20.1</surefire.plugin.version>
190188
<compiler.plugin.version>3.8.0</compiler.plugin.version>
191189
<groovy.compiler.version>3.3.0-01</groovy.compiler.version>
192190
</properties>

‎core-groovy-collections/pom.xml

-2
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@
101101
</plugin>
102102
<plugin>
103103
<artifactId>maven-surefire-plugin</artifactId>
104-
<version>${surefire.plugin.version}</version>
105104
<configuration>
106105
<useFile>false</useFile>
107106
<includes>
@@ -128,7 +127,6 @@
128127
<hsqldb.version>2.4.0</hsqldb.version>
129128
<spock-core.version>1.1-groovy-2.4</spock-core.version>
130129
<gmavenplus-plugin.version>1.6</gmavenplus-plugin.version>
131-
<surefire.plugin.version>2.20.1</surefire.plugin.version>
132130
</properties>
133131

134132
</project>

‎core-java-modules/core-java-streams-3/pom.xml

-2
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@
4949
<properties>
5050
<!-- testing -->
5151
<assertj.version>3.6.1</assertj.version>
52-
<!-- plugins -->
53-
<maven-surefire-plugin.version>2.22.1</maven-surefire-plugin.version>
5452
</properties>
5553

5654
</project>

‎ddd-modules/mainapp/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
<plugin>
3030
<groupId>org.apache.maven.plugins</groupId>
3131
<artifactId>maven-surefire-plugin</artifactId>
32-
<version>2.16</version>
3332
<configuration>
3433
<enableAssertions>true</enableAssertions>
3534
</configuration>

‎ddd/pom.xml

-9
Original file line numberDiff line numberDiff line change
@@ -99,15 +99,6 @@
9999
</dependency>
100100
</dependencies>
101101

102-
<build>
103-
<plugins>
104-
<plugin>
105-
<groupId>org.apache.maven.plugins</groupId>
106-
<artifactId>maven-surefire-plugin</artifactId>
107-
</plugin>
108-
</plugins>
109-
</build>
110-
111102
<properties>
112103
<joda-money.version>1.0.1</joda-money.version>
113104

‎guava-modules/guava-collections-list/pom.xml

-8
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,6 @@
6666
<filtering>true</filtering>
6767
</resource>
6868
</resources>
69-
70-
<plugins>
71-
<plugin>
72-
<groupId>org.apache.maven.plugins</groupId>
73-
<artifactId>maven-surefire-plugin</artifactId>
74-
<version>2.22.2</version>
75-
</plugin>
76-
</plugins>
7769
</build>
7870

7971
<properties>

‎guava-modules/guava-collections-map/pom.xml

-8
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,6 @@
3838
<filtering>true</filtering>
3939
</resource>
4040
</resources>
41-
42-
<plugins>
43-
<plugin>
44-
<groupId>org.apache.maven.plugins</groupId>
45-
<artifactId>maven-surefire-plugin</artifactId>
46-
<version>2.22.2</version>
47-
</plugin>
48-
</plugins>
4941
</build>
5042

5143
<properties>

‎guava-modules/guava-collections-set/pom.xml

-8
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,6 @@
3737

3838
<build>
3939
<finalName>guava-collections-set</finalName>
40-
41-
<plugins>
42-
<plugin>
43-
<groupId>org.apache.maven.plugins</groupId>
44-
<artifactId>maven-surefire-plugin</artifactId>
45-
<version>2.22.2</version>
46-
</plugin>
47-
</plugins>
4840
</build>
4941

5042
<properties>

‎guava-modules/guava-collections/pom.xml

-8
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,6 @@
7171
<filtering>true</filtering>
7272
</resource>
7373
</resources>
74-
75-
<plugins>
76-
<plugin>
77-
<groupId>org.apache.maven.plugins</groupId>
78-
<artifactId>maven-surefire-plugin</artifactId>
79-
<version>2.22.2</version>
80-
</plugin>
81-
</plugins>
8274
</build>
8375

8476
<properties>

‎guava-modules/guava-io/pom.xml

-8
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,6 @@
4040
<filtering>true</filtering>
4141
</resource>
4242
</resources>
43-
44-
<plugins>
45-
<plugin>
46-
<groupId>org.apache.maven.plugins</groupId>
47-
<artifactId>maven-surefire-plugin</artifactId>
48-
<version>2.22.2</version>
49-
</plugin>
50-
</plugins>
5143
</build>
5244

5345
</project>

‎guava-modules/guava-utilities/pom.xml

-8
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,6 @@
5252
<filtering>true</filtering>
5353
</resource>
5454
</resources>
55-
56-
<plugins>
57-
<plugin>
58-
<groupId>org.apache.maven.plugins</groupId>
59-
<artifactId>maven-surefire-plugin</artifactId>
60-
<version>2.22.2</version>
61-
</plugin>
62-
</plugins>
6355
</build>
6456

6557
<properties>

‎guava-modules/pom.xml

+1-10
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,8 @@
4646
</dependency>
4747
</dependencies>
4848

49-
<build>
50-
<plugins>
51-
<plugin>
52-
<groupId>org.apache.maven.plugins</groupId>
53-
<artifactId>maven-surefire-plugin</artifactId>
54-
<version>2.22.2</version>
55-
</plugin>
56-
</plugins>
57-
</build>
58-
5949
<properties>
50+
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
6051
<junit-jupiter.version>5.6.2</junit-jupiter.version>
6152
<guava.version>29.0-jre</guava.version>
6253
</properties>

‎jackson-modules/pom.xml

-10
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,6 @@
5050
</dependency>
5151
</dependencies>
5252

53-
<build>
54-
<plugins>
55-
<plugin>
56-
<groupId>org.apache.maven.plugins</groupId>
57-
<artifactId>maven-surefire-plugin</artifactId>
58-
<version>2.22.2</version>
59-
</plugin>
60-
</plugins>
61-
</build>
62-
6353
<properties>
6454
<junit-jupiter.version>5.6.2</junit-jupiter.version>
6555
</properties>

‎jackson-simple/pom.xml

-8
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,6 @@
5151
<filtering>true</filtering>
5252
</resource>
5353
</resources>
54-
55-
<plugins>
56-
<plugin>
57-
<groupId>org.apache.maven.plugins</groupId>
58-
<artifactId>maven-surefire-plugin</artifactId>
59-
<version>2.22.2</version>
60-
</plugin>
61-
</plugins>
6254
</build>
6355

6456
<properties>

‎logging-modules/log-mdc/pom.xml

-8
Original file line numberDiff line numberDiff line change
@@ -95,14 +95,6 @@
9595
</plugin>
9696
</plugins>
9797
</pluginManagement>
98-
99-
<plugins>
100-
<plugin>
101-
<groupId>org.apache.maven.plugins</groupId>
102-
<artifactId>maven-surefire-plugin</artifactId>
103-
<version>2.22.2</version>
104-
</plugin>
105-
</plugins>
10698
</build>
10799

108100
<properties>

‎logging-modules/pom.xml

-10
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,6 @@
2121
<module>flogger</module>
2222
</modules>
2323

24-
<build>
25-
<plugins>
26-
<plugin>
27-
<groupId>org.apache.maven.plugins</groupId>
28-
<artifactId>maven-surefire-plugin</artifactId>
29-
<version>2.22.2</version>
30-
</plugin>
31-
</plugins>
32-
</build>
33-
3424
<properties>
3525
<junit-jupiter.version>5.6.2</junit-jupiter.version>
3626
</properties>

‎persistence-modules/hibernate-libraries/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,6 @@
175175
<log4jdbc.version>2.0.0</log4jdbc.version>
176176
<logback.version>1.2.3</logback.version>
177177
<maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
178-
<maven.surefire.version>2.22.2</maven.surefire.version>
179178
<maven.compiler.version>3.8.1</maven.compiler.version>
180179
<maven.version>3.8.1</maven.version>
181180
<mysql.version>8.0.19</mysql.version>

‎quarkus/pom.xml

-3
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@
9797
</plugin>
9898
<plugin>
9999
<artifactId>maven-surefire-plugin</artifactId>
100-
<version>${surefire-plugin.version}</version>
101100
<configuration>
102101
<forkCount>1</forkCount>
103102
<reuseForks>true</reuseForks>
@@ -136,7 +135,6 @@
136135
</plugin>
137136
<plugin>
138137
<artifactId>maven-failsafe-plugin</artifactId>
139-
<version>${surefire-plugin.version}</version>
140138
<executions>
141139
<execution>
142140
<goals>
@@ -157,7 +155,6 @@
157155
</profiles>
158156

159157
<properties>
160-
<surefire-plugin.version>2.22.0</surefire-plugin.version>
161158
<quarkus.version>1.7.0.Final</quarkus.version>
162159
<junit-jupiter.version>5.6.0</junit-jupiter.version>
163160
</properties>

‎spring-5/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@
142142
<asciidoctor-plugin.version>1.5.6</asciidoctor-plugin.version>
143143
<commons-collections4.version>4.1</commons-collections4.version>
144144
<snippetsDirectory>${project.build.directory}/generated-snippets</snippetsDirectory>
145-
<maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
146145
</properties>
147146

148147
</project>

‎spring-core-3/pom.xml

-11
Original file line numberDiff line numberDiff line change
@@ -69,18 +69,7 @@
6969
</dependency>
7070
</dependencies>
7171

72-
<build>
73-
<plugins>
74-
<plugin>
75-
<groupId>org.apache.maven.plugins</groupId>
76-
<artifactId>maven-surefire-plugin</artifactId>
77-
<version>${maven.surefire.version}</version>
78-
</plugin>
79-
</plugins>
80-
</build>
81-
8272
<properties>
83-
<maven.surefire.version>2.22.1</maven.surefire.version>
8473
<annotation-api.version>1.3.2</annotation-api.version>
8574
<spring.boot.version>2.2.2.RELEASE</spring.boot.version>
8675
</properties>

‎spring-core-4/pom.xml

-11
Original file line numberDiff line numberDiff line change
@@ -87,18 +87,7 @@
8787

8888
</dependencies>
8989

90-
<build>
91-
<plugins>
92-
<plugin>
93-
<groupId>org.apache.maven.plugins</groupId>
94-
<artifactId>maven-surefire-plugin</artifactId>
95-
<version>${maven.surefire.version}</version>
96-
</plugin>
97-
</plugins>
98-
</build>
99-
10090
<properties>
101-
<maven.surefire.version>2.22.1</maven.surefire.version>
10291
<annotation-api.version>1.3.2</annotation-api.version>
10392
<spring.boot.version>2.2.2.RELEASE</spring.boot.version>
10493
<guava.version>28.2-jre</guava.version>

‎spring-web-modules/spring-mvc-basics-2/pom.xml

-9
Original file line numberDiff line numberDiff line change
@@ -131,14 +131,6 @@
131131
<artifactId>json</artifactId>
132132
<version>${json.version}</version>
133133
</dependency>
134-
<dependency>
135-
<groupId>org.apache.maven.surefire</groupId>
136-
<artifactId>surefire-logger-api</artifactId>
137-
<version>${maven-surefire-plugin.version}</version>
138-
<!-- to get around bug https://github.com/junit-team/junit5/issues/1367 -->
139-
<scope>test</scope>
140-
<optional>true</optional>
141-
</dependency>
142134
</dependencies>
143135

144136
<build>
@@ -163,7 +155,6 @@
163155
<properties>
164156
<maven.compiler.source>1.8</maven.compiler.source>
165157
<maven.compiler.target>1.8</maven.compiler.target>
166-
<maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
167158
<javax.servlet.jsp-api.version>2.3.2-b02</javax.servlet.jsp-api.version>
168159
<javax.servlet-api.version>4.0.0</javax.servlet-api.version>
169160
<hibernate-validator.version>6.0.10.Final</hibernate-validator.version>

0 commit comments

Comments
 (0)