Skip to content

Commit c615ed9

Browse files
lor6lor6
authored
Merge pull request eugenp#5284 from dkapil/task/BAEL-8958
BAEL-8958 Fix surefire configs of activejdbc, apache-shiro, asm, cas-…
2 parents 6995a96 + 04929e4 commit c615ed9

11 files changed

Lines changed: 24 additions & 187 deletions

File tree

‎activejdbc/pom.xml‎

Lines changed: 1 addition & 46 deletions
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>activejdbc</artifactId>
65
<version>1.0-SNAPSHOT</version>
76
<packaging>jar</packaging>
@@ -79,55 +78,11 @@
7978
</dependency>
8079
</dependencies>
8180
</plugin>
82-
<plugin>
83-
<groupId>org.apache.maven.plugins</groupId>
84-
<artifactId>maven-surefire-plugin</artifactId>
85-
<version>${maven-surefire-plugin.version}</version>
86-
<configuration>
87-
<reportFormat>brief</reportFormat>
88-
<trimStackTrace>true</trimStackTrace>
89-
<useFile>false</useFile>
90-
<includes>
91-
<include>**/*Spec*.java</include>
92-
<include>**/*Test*.java</include>
93-
</includes>
94-
<excludes>
95-
<exclude>**/helpers/*</exclude>
96-
<exclude>**/*$*</exclude>
97-
</excludes>
98-
</configuration>
99-
</plugin>
10081
</plugins>
10182
</build>
10283

103-
<repositories>
104-
<repository>
105-
<id>snapshots1</id>
106-
<name>JavaLite Snapshots1</name>
107-
<url>http://repo.javalite.io/</url>
108-
<snapshots>
109-
<enabled>true</enabled>
110-
<updatePolicy>always</updatePolicy>
111-
<checksumPolicy>warn</checksumPolicy>
112-
</snapshots>
113-
</repository>
114-
</repositories>
115-
116-
<pluginRepositories>
117-
<pluginRepository>
118-
<id>snapshots2</id>
119-
<name>JavaLite Snapshots2</name>
120-
<url>http://repo.javalite.io/</url>
121-
<snapshots>
122-
<enabled>true</enabled>
123-
<updatePolicy>always</updatePolicy>
124-
<checksumPolicy>warn</checksumPolicy>
125-
</snapshots>
126-
</pluginRepository>
127-
</pluginRepositories>
128-
12984
<properties>
130-
<activejdbc.version>1.4.13</activejdbc.version>
85+
<activejdbc.version>2.0</activejdbc.version>
13186
<environments>development.test,development</environments>
13287
<mysql.connector.version>5.1.34</mysql.connector.version>
13388
</properties>

‎activejdbc/src/main/java/com/baeldung/model/Employee.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,8 @@ public Employee(String firstName, String lastName, String gender, String created
1616
set("created_by",createdBy);
1717
}
1818

19+
public String getLastName() {
20+
return getString("last_name");
21+
}
22+
1923
}

‎activejdbc/src/main/java/com/baeldung/model/Role.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,8 @@ public Role(String role,String createdBy){
1515
set("role_name",role);
1616
set("created_by",createdBy);
1717
}
18+
19+
public String getRoleName() {
20+
return getString("role_name");
21+
}
1822
}

activejdbc/src/test/java/com/baeldung/ActiveJDBCAppTest.java renamed to activejdbc/src/test/java/com/baeldung/ActiveJDBCAppManualTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import java.util.List;
99

10-
public class ActiveJDBCAppTest extends DBSpec
10+
public class ActiveJDBCAppManualTest extends DBSpec
1111
{
1212
@Test
1313
public void ifEmployeeCreated_thenIsValid() {

‎apache-shiro/pom.xml‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
6-
<groupId>com.baeldung</groupId>
76
<artifactId>apache-shiro</artifactId>
87
<version>1.0-SNAPSHOT</version>
98

@@ -36,13 +35,11 @@
3635
<dependency>
3736
<groupId>org.slf4j</groupId>
3837
<artifactId>jcl-over-slf4j</artifactId>
39-
<version>${slf4j-version}</version>
4038
<scope>runtime</scope>
4139
</dependency>
4240
<dependency>
4341
<groupId>org.slf4j</groupId>
4442
<artifactId>slf4j-log4j12</artifactId>
45-
<version>${slf4j-version}</version>
4643
<scope>runtime</scope>
4744
</dependency>
4845
<dependency>
@@ -53,26 +50,9 @@
5350
</dependency>
5451
</dependencies>
5552

56-
<build>
57-
<plugins>
58-
<plugin>
59-
<groupId>org.apache.maven.plugins</groupId>
60-
<artifactId>maven-compiler-plugin</artifactId>
61-
<version>${maven-compiler-plugin.version}</version>
62-
<configuration>
63-
<source>${java.version}</source>
64-
<target>${java.version}</target>
65-
</configuration>
66-
</plugin>
67-
</plugins>
68-
</build>
69-
7053
<properties>
7154
<apache-shiro-core-version>1.4.0</apache-shiro-core-version>
72-
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
73-
<java.version>1.8</java.version>
7455
<log4j-version>1.2.17</log4j-version>
75-
<slf4j-version>1.7.25</slf4j-version>
7656
</properties>
7757

7858
</project>

‎asm/pom.xml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,6 @@
4242
</archive>
4343
</configuration>
4444
</plugin>
45-
<plugin>
46-
<groupId>org.apache.maven.plugins</groupId>
47-
<artifactId>maven-surefire-plugin</artifactId>
48-
<version>${maven-surefire-plugin.version}</version>
49-
<configuration>
50-
<argLine>-javaagent:"C:\asm-1.0.jar"</argLine>
51-
</configuration>
52-
</plugin>
5345
</plugins>
5446
</build>
5547

‎cas/cas-secured-app/pom.xml‎

Lines changed: 1 addition & 9 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>cas-secured-app</artifactId>
7-
<version>0.0.1-SNAPSHOT</version>
86
<packaging>jar</packaging>
97
<name>cas-secured-app</name>
10-
<description>Demo project for Spring Boot</description>
8+
<description>Demo project for CAS</description>
119

1210
<parent>
1311
<artifactId>parent-boot-1</artifactId>
@@ -60,10 +58,4 @@
6058
</plugins>
6159
</build>
6260

63-
<properties>
64-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
65-
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
66-
<java.version>1.8</java.version>
67-
</properties>
68-
6961
</project>

‎cas/cas-server/pom.xml‎

Lines changed: 10 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,17 @@
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>cas-server</artifactId>
76
<packaging>war</packaging>
87
<version>1.0</version>
98

9+
<parent>
10+
<artifactId>parent-boot-1</artifactId>
11+
<groupId>com.baeldung</groupId>
12+
<version>0.0.1-SNAPSHOT</version>
13+
<relativePath>../../parent-boot-1</relativePath>
14+
</parent>
15+
1016
<dependencies>
1117
<dependency>
1218
<groupId>org.apereo.cas</groupId>
@@ -39,7 +45,6 @@
3945
<plugin>
4046
<groupId>org.springframework.boot</groupId>
4147
<artifactId>spring-boot-maven-plugin</artifactId>
42-
<version>${springboot.version}</version>
4348
<configuration>
4449
<mainClass>${mainClassName}</mainClass>
4550
<addResources>true</addResources>
@@ -74,42 +79,10 @@
7479
</overlays>
7580
</configuration>
7681
</plugin>
77-
<plugin>
78-
<groupId>org.apache.maven.plugins</groupId>
79-
<artifactId>maven-compiler-plugin</artifactId>
80-
<version>${maven-compiler-plugin.version}</version>
81-
</plugin>
8282
</plugins>
8383
<finalName>cas</finalName>
8484
</build>
8585

86-
<repositories>
87-
<repository>
88-
<id>sonatype-releases</id>
89-
<url>http://oss.sonatype.org/content/repositories/releases/</url>
90-
<snapshots>
91-
<enabled>false</enabled>
92-
</snapshots>
93-
<releases>
94-
<enabled>true</enabled>
95-
</releases>
96-
</repository>
97-
<repository>
98-
<id>sonatype-snapshots</id>
99-
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
100-
<snapshots>
101-
<enabled>true</enabled>
102-
</snapshots>
103-
<releases>
104-
<enabled>false</enabled>
105-
</releases>
106-
</repository>
107-
<repository>
108-
<id>shibboleth-releases</id>
109-
<url>https://build.shibboleth.net/nexus/content/repositories/releases</url>
110-
</repository>
111-
</repositories>
112-
11386
<profiles>
11487
<profile>
11588
<activation>
@@ -214,23 +187,20 @@
214187
</profiles>
215188

216189
<properties>
217-
<cas.version>5.3.0-SNAPSHOT</cas.version>
218-
<springboot.version>1.5.13.RELEASE</springboot.version>
190+
<cas.version>5.3.3</cas.version>
219191
<!-- app.server could be -jetty, -undertow, -tomcat, or blank if you plan to provide appserver -->
220192
<app.server>-tomcat</app.server>
221193

222194
<mainClassName>org.springframework.boot.loader.WarLauncher</mainClassName>
223195
<isExecutable>false</isExecutable>
224196
<manifestFileToUse>${project.build.directory}/war/work/org.apereo.cas/cas-server-webapp${app.server}/META-INF/MANIFEST.MF</manifestFileToUse>
225197

226-
<maven.compiler.source>1.8</maven.compiler.source>
227-
<maven.compiler.target>1.8</maven.compiler.target>
228-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
229198
<wrapper-maven-plugin.version>0.0.4</wrapper-maven-plugin.version>
230199
<maven-war-plugin.version>2.6</maven-war-plugin.version>
231200
<maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
201+
232202
<echo-maven-plugin.version>0.3.0</echo-maven-plugin.version>
233203
<pgpverify-maven-plugin.version>1.1.0</pgpverify-maven-plugin.version>
234204
</properties>
235205

236-
</project>
206+
</project>

‎core-java-io/pom.xml‎

Lines changed: 0 additions & 60 deletions
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>core-java-io</artifactId>
65
<version>0.1.0-SNAPSHOT</version>
76
<packaging>jar</packaging>
@@ -166,36 +165,6 @@
166165
</resource>
167166
</resources>
168167
<plugins>
169-
<plugin>
170-
<groupId>org.apache.maven.plugins</groupId>
171-
<artifactId>maven-surefire-plugin</artifactId>
172-
<configuration>
173-
<excludes>
174-
<exclude>**/*LiveTest.java</exclude>
175-
<exclude>**/*IntegrationTest.java</exclude>
176-
<exclude>**/*IntTest.java</exclude>
177-
<exclude>**/*LongRunningUnitTest.java</exclude>
178-
<exclude>**/*ManualTest.java</exclude>
179-
</excludes>
180-
<testFailureIgnore>true</testFailureIgnore>
181-
</configuration>
182-
</plugin>
183-
<plugin>
184-
<groupId>org.springframework.boot</groupId>
185-
<artifactId>spring-boot-maven-plugin</artifactId>
186-
<version>${spring-boot-maven-plugin.version}</version>
187-
<executions>
188-
<execution>
189-
<goals>
190-
<goal>repackage</goal>
191-
</goals>
192-
<configuration>
193-
<classifier>spring-boot</classifier>
194-
<mainClass>org.baeldung.executable.ExecutableMavenJar</mainClass>
195-
</configuration>
196-
</execution>
197-
</executions>
198-
</plugin>
199168
<plugin>
200169
<groupId>org.codehaus.mojo</groupId>
201170
<artifactId>exec-maven-plugin</artifactId>
@@ -229,32 +198,6 @@
229198
<id>integration</id>
230199
<build>
231200
<plugins>
232-
<plugin>
233-
<groupId>org.apache.maven.plugins</groupId>
234-
<artifactId>maven-surefire-plugin</artifactId>
235-
<executions>
236-
<execution>
237-
<phase>integration-test</phase>
238-
<goals>
239-
<goal>test</goal>
240-
</goals>
241-
<configuration>
242-
<excludes>
243-
<exclude>**/*ManualTest.java</exclude>
244-
</excludes>
245-
<includes>
246-
<include>**/*IntegrationTest.java</include>
247-
<include>**/*IntTest.java</include>
248-
</includes>
249-
</configuration>
250-
</execution>
251-
</executions>
252-
<configuration>
253-
<systemPropertyVariables>
254-
<test.mime>json</test.mime>
255-
</systemPropertyVariables>
256-
</configuration>
257-
</plugin>
258201
<plugin>
259202
<groupId>org.codehaus.mojo</groupId>
260203
<artifactId>exec-maven-plugin</artifactId>
@@ -310,14 +253,11 @@
310253
<avaitility.version>1.7.0</avaitility.version>
311254

312255
<!-- maven plugins -->
313-
<maven.compiler.source>1.8</maven.compiler.source>
314-
<maven.compiler.target>1.8</maven.compiler.target>
315256
<maven-javadoc-plugin.version>3.0.0-M1</maven-javadoc-plugin.version>
316257
<hsqldb.version>2.4.0</hsqldb.version>
317258
<esapi.version>2.1.0.1</esapi.version>
318259
<jmh-generator-annprocess.version>1.19</jmh-generator-annprocess.version>
319260
<async-http-client.version>2.4.5</async-http-client.version>
320-
<spring-boot-maven-plugin.version>2.0.4.RELEASE</spring-boot-maven-plugin.version>
321261
</properties>
322262

323263
</project>

core-java-io/src/test/java/com/baeldung/symlink/SymLinkExampleUnitTest.java renamed to core-java-io/src/test/java/com/baeldung/symlink/SymLinkExampleManualTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
import org.junit.Test;
1111

12-
public class SymLinkExampleUnitTest {
12+
public class SymLinkExampleManualTest {
1313

1414
@Test
1515
public void whenUsingFiles_thenCreateSymbolicLink() throws IOException {

0 commit comments

Comments
 (0)