Skip to content

Commit 980c00e

Browse files
dkapildkapil
committed
BAEL-8963 Fix surefire configs of springresttomcat, roo, spring-swagger, vertx, twilio and twitter4j projects
- Fixed surefire configs and basic pom standardization
1 parent 6995a96 commit 980c00e

File tree

18 files changed

+52
-196
lines changed

18 files changed

+52
-196
lines changed

‎Twitter4J/pom.xml

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
33
<modelVersion>4.0.0</modelVersion>
4-
5-
<groupId>com.mabsisa</groupId>
64
<artifactId>Twitter4J</artifactId>
75
<packaging>jar</packaging>
8-
<version>1.0-SNAPSHOT</version>
96
<name>Twitter4J</name>
10-
<url>http://maven.apache.org</url>
117

128
<parent>
139
<groupId>com.baeldung</groupId>
@@ -23,27 +19,6 @@
2319
</dependency>
2420
</dependencies>
2521

26-
<build>
27-
<finalName>${project.artifactId}</finalName>
28-
<resources>
29-
<resource>
30-
<directory>src/main/resources</directory>
31-
</resource>
32-
</resources>
33-
<plugins>
34-
<plugin>
35-
<groupId>org.apache.maven.plugins</groupId>
36-
<artifactId>maven-surefire-plugin</artifactId>
37-
<version>${maven-surefire-plugin.version}</version>
38-
<configuration>
39-
<excludes>
40-
<exclude>**/ApplicationTest.java</exclude>
41-
</excludes>
42-
</configuration>
43-
</plugin>
44-
</plugins>
45-
</build>
46-
4722
<properties>
4823
<twitter4j-stream.version>4.0.6</twitter4j-stream.version>
4924
</properties>

‎pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@
471471
<module>spring-boot-persistence</module>
472472
<module>spring-boot-security</module>
473473
<module>spring-boot-mvc</module>
474-
<module>spring-boot-vue</module>
474+
<module>spring-boot-vue</module>
475475
<module>spring-boot-logging-log4j2</module>
476476
<module>spring-cloud-data-flow</module>
477477
<module>spring-cloud</module>
@@ -635,7 +635,7 @@
635635
<!-- <module>rest-with-spark-java</module> --><!-- PMD voilation -->
636636
<module>spring-boot-autoconfiguration</module>
637637
<module>spring-boot-custom-starter</module>
638-
<!-- <module>spring-boot-jasypt</module> --><!-- PMD voilation -->
638+
<module>spring-boot-jasypt</module>
639639
<!-- <module>spring-custom-aop</module> --><!-- Malformed POM -->
640640
<module>spring-data-rest-querydsl</module>
641641
<!-- <module>spring-groovy</module> --><!-- PMD voilation -->
@@ -652,7 +652,7 @@
652652
<!-- <module>static-analysis</module> --><!-- PMD voilation -->
653653
<module>stripe</module>
654654
<!-- <module>structurizr</module> --><!-- Artiifact not found -->
655-
<!-- <module>Twitter4J</module> --><!-- Test failure -->
655+
<module>Twitter4J</module>
656656
<module>wicket</module>
657657
<module>xstream</module>
658658
<module>cas/cas-secured-app</module>

‎spring-4/pom.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,8 @@
7171
</build>
7272

7373
<properties>
74-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
7574
<flips-web.version>1.0.1</flips-web.version>
7675
<lombok.version>1.16.18</lombok.version>
77-
<java.version>1.8</java.version>
7876
<h2database.version>1.4.197</h2database.version>
7977
</properties>
8078

‎spring-boot-jasypt/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
<groupId>com.example.jasypt</groupId>
77
<artifactId>spring-boot-jasypt</artifactId>
8-
<version>0.0.1-SNAPSHOT</version>
98
<packaging>jar</packaging>
109
<name>spring-boot-jasypt</name>
1110
<description>Demo project for Spring Boot</description>
@@ -52,9 +51,6 @@
5251
</build>
5352

5453
<properties>
55-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
56-
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
57-
<java.version>1.8</java.version>
5854
<jasypt.version>2.0.0</jasypt.version>
5955
</properties>
6056

‎spring-boot-logging-log4j2/disabling-console-logging/disabling-console-jul/pom.xml

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
4-
<groupId>com.baeldung</groupId>
5-
<version>0.0.1-SNAPSHOT</version>
64
<artifactId>disabling-console-jul</artifactId>
75

8-
<parent>
9-
<groupId>org.springframework.boot</groupId>
10-
<artifactId>spring-boot-starter-parent</artifactId>
11-
<version>2.0.4.RELEASE</version>
12-
</parent>
6+
<parent>
7+
<groupId>com.baeldung</groupId>
8+
<artifactId>disabling-console-logging</artifactId>
9+
<version>0.0.1-SNAPSHOT</version>
10+
</parent>
1311

1412
<dependencies>
1513
<dependency>
@@ -45,9 +43,4 @@
4543
</plugins>
4644
</build>
4745

48-
<properties>
49-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
50-
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
51-
<java.version>1.8</java.version>
52-
</properties>
5346
</project>

‎spring-boot-logging-log4j2/disabling-console-logging/disabling-console-log4j2/pom.xml

Lines changed: 36 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,42 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
4-
<groupId>com.baeldung</groupId>
5-
<version>0.0.1-SNAPSHOT</version>
6-
<artifactId>disabling-console-log4j2</artifactId>
7-
<parent>
8-
<groupId>org.springframework.boot</groupId>
9-
<artifactId>spring-boot-starter-parent</artifactId>
10-
<version>2.0.4.RELEASE</version>
11-
</parent>
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<artifactId>disabling-console-log4j2</artifactId>
125

13-
<dependencies>
14-
<dependency>
15-
<groupId>org.springframework.boot</groupId>
16-
<artifactId>spring-boot-starter-web</artifactId>
17-
</dependency>
18-
<dependency>
19-
<groupId>org.springframework.boot</groupId>
20-
<artifactId>spring-boot-starter</artifactId>
21-
<exclusions>
22-
<exclusion>
23-
<groupId>org.springframework.boot</groupId>
24-
<artifactId>spring-boot-starter-logging</artifactId>
25-
</exclusion>
26-
</exclusions>
27-
</dependency>
28-
<dependency>
29-
<groupId>org.springframework.boot</groupId>
30-
<artifactId>spring-boot-starter-log4j2</artifactId>
31-
</dependency>
32-
</dependencies>
6+
<parent>
7+
<groupId>com.baeldung</groupId>
8+
<artifactId>disabling-console-logging</artifactId>
9+
<version>0.0.1-SNAPSHOT</version>
10+
</parent>
3311

34-
<build>
35-
<plugins>
36-
<plugin>
37-
<groupId>org.springframework.boot</groupId>
38-
<artifactId>spring-boot-maven-plugin</artifactId>
39-
</plugin>
40-
</plugins>
41-
</build>
12+
<dependencies>
13+
<dependency>
14+
<groupId>org.springframework.boot</groupId>
15+
<artifactId>spring-boot-starter-web</artifactId>
16+
</dependency>
17+
<dependency>
18+
<groupId>org.springframework.boot</groupId>
19+
<artifactId>spring-boot-starter</artifactId>
20+
<exclusions>
21+
<exclusion>
22+
<groupId>org.springframework.boot</groupId>
23+
<artifactId>spring-boot-starter-logging</artifactId>
24+
</exclusion>
25+
</exclusions>
26+
</dependency>
27+
<dependency>
28+
<groupId>org.springframework.boot</groupId>
29+
<artifactId>spring-boot-starter-log4j2</artifactId>
30+
</dependency>
31+
</dependencies>
4232

43-
<properties>
44-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
45-
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
46-
<java.version>1.8</java.version>
47-
</properties>
33+
<build>
34+
<plugins>
35+
<plugin>
36+
<groupId>org.springframework.boot</groupId>
37+
<artifactId>spring-boot-maven-plugin</artifactId>
38+
</plugin>
39+
</plugins>
40+
</build>
4841

4942
</project>

‎spring-boot-logging-log4j2/disabling-console-logging/pom.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
4-
<version>0.0.1-SNAPSHOT</version>
5-
<groupId>com.baeldung</groupId>
64
<artifactId>disabling-console-logging</artifactId>
75
<packaging>pom</packaging>
86
<description>Projects for Disabling Spring Boot Console Logging tutorials</description>

‎spring-boot-logging-log4j2/pom.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
55

6-
<groupId>com.baeldung</groupId>
76
<artifactId>spring-boot-logging-log4j2</artifactId>
8-
<version>0.0.1-SNAPSHOT</version>
97
<packaging>pom</packaging>
108
<description>Projects for Spring Boot Logging tutorials</description>
119

@@ -43,10 +41,4 @@
4341
</plugins>
4442
</build>
4543

46-
<properties>
47-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
48-
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
49-
<java.version>1.8</java.version>
50-
</properties>
51-
5244
</project>

‎spring-boot-logging-log4j2/spring-boot-logging-log4j2-app/pom.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
55

6-
<groupId>com.baeldung</groupId>
76
<artifactId>spring-boot-logging-log4j2-app</artifactId>
8-
<version>0.0.1-SNAPSHOT</version>
97
<packaging>jar</packaging>
108
<description>Demo project for Spring Boot Logging with Log4J2</description>
119

‎spring-boot-mvc/pom.xml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
5-
<groupId>com.baeldung</groupId>
65
<artifactId>spring-boot-mvc</artifactId>
7-
<version>0.0.1-SNAPSHOT</version>
86
<packaging>jar</packaging>
97
<name>spring-boot-mvc</name>
10-
<description>Demo project for Spring Boot</description>
8+
<description>Module For Spring Boot MVC</description>
119

1210
<parent>
1311
<artifactId>parent-boot-2</artifactId>
@@ -55,9 +53,6 @@
5553
</build>
5654

5755
<properties>
58-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
59-
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
60-
<java.version>1.8</java.version>
6156
<!-- ROME for RSS -->
6257
<rome.version>1.10.0</rome.version>
6358
<start-class>com.baeldung.springbootmvc.SpringBootMvcApplication</start-class>

‎spring-rest-embedded-tomcat/pom.xml

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>org.baeldung.embedded</groupId>
55
<artifactId>spring-rest-embedded-tomcat</artifactId>
6-
<version>0.0.1-SNAPSHOT</version>
76
<name>spring-rest-embedded-tomcat</name>
87
<packaging>war</packaging>
98

@@ -61,33 +60,8 @@
6160

6261
</dependencies>
6362

64-
<build>
65-
<finalName>spring-rest-embedded-tomcat</finalName>
66-
<plugins>
67-
<plugin>
68-
<groupId>org.apache.maven.plugins</groupId>
69-
<artifactId>maven-surefire-plugin</artifactId>
70-
<version>${maven-surefire-plugin.version}</version>
71-
<configuration>
72-
<forkCount>3</forkCount>
73-
<reuseForks>true</reuseForks>
74-
<excludes>
75-
<exclude>**/*IntegrationTest.java</exclude>
76-
<exclude>**/*IntTest.java</exclude>
77-
<exclude>**/*LongRunningUnitTest.java</exclude>
78-
<exclude>**/*ManualTest.java</exclude>
79-
<exclude>**/JdbcTest.java</exclude>
80-
<exclude>**/*LiveTest.java</exclude>
81-
</excludes>
82-
</configuration>
83-
</plugin>
84-
</plugins>
85-
</build>
86-
8763
<properties>
8864
<jackson.library>2.9.2</jackson.library>
89-
<maven.compiler.source>1.8</maven.compiler.source>
90-
<maven.compiler.target>1.8</maven.compiler.target>
9165
<servlet.version>4.0.0</servlet.version>
9266
<tomcat.version>9.0.1</tomcat.version>
9367
<httpclient.version>4.5.3</httpclient.version>

‎spring-rest-shell/pom.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
5-
<groupId>com.baeldung</groupId>
65
<artifactId>spring-rest-shell</artifactId>
7-
<version>0.0.1-SNAPSHOT</version>
86
<packaging>jar</packaging>
97
<name>spring-rest-shell</name>
108
<description>A simple project to demonstrate Spring REST Shell features.</description>
@@ -48,10 +46,4 @@
4846
</plugins>
4947
</build>
5048

51-
<properties>
52-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
53-
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
54-
<java.version>1.8</java.version>
55-
</properties>
56-
5749
</project>

‎spring-security-openid/pom.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
55

6-
<groupId>com.baeldung</groupId>
76
<artifactId>spring-security-openid</artifactId>
8-
<version>0.0.1-SNAPSHOT</version>
97
<packaging>war</packaging>
108
<name>spring-security-openid</name>
119
<description>Spring OpenID sample project</description>

‎spring-swagger-codegen/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
4-
<groupId>com.baeldung</groupId>
54
<artifactId>spring-swagger-codegen</artifactId>
65
<version>0.0.1-SNAPSHOT</version>
76
<packaging>pom</packaging>

‎spring-swagger-codegen/spring-swagger-codegen-api-client/pom.xml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -38,23 +38,6 @@
3838

3939
<build>
4040
<plugins>
41-
<plugin>
42-
<groupId>org.apache.maven.plugins</groupId>
43-
<artifactId>maven-surefire-plugin</artifactId>
44-
<version>${maven-surefire-plugin.version}</version>
45-
<configuration>
46-
<systemProperties>
47-
<property>
48-
<name>loggerPath</name>
49-
<value>conf/log4j.properties</value>
50-
</property>
51-
</systemProperties>
52-
<argLine>-Xms512m -Xmx1500m</argLine>
53-
<parallel>methods</parallel>
54-
<forkMode>pertest</forkMode>
55-
</configuration>
56-
</plugin>
57-
5841
<!-- attach test jar -->
5942
<plugin>
6043
<groupId>org.apache.maven.plugins</groupId>

0 commit comments

Comments
 (0)