Skip to content

Commit 9799b93

Browse files
dkapildkapil
committed
BAEL-8960 Fix surefire configs of java security api, java annotations, jenkins, api, jhipster, jni, maven, msf4j, mustache projects
- Surefire config fixes, pom standardizations, added packaging pom at jhipster level and jhipster-microservice level
1 parent 738d65b commit 9799b93

File tree

15 files changed

+869
-951
lines changed

15 files changed

+869
-951
lines changed

‎java-ee-8-security-api/pom.xml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,16 @@
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>java-ee-8-security-api</artifactId>
87
<version>1.0-SNAPSHOT</version>
98
<packaging>pom</packaging>
109

10+
<parent>
11+
<groupId>com.baeldung</groupId>
12+
<artifactId>parent-modules</artifactId>
13+
<version>1.0.0-SNAPSHOT</version>
14+
</parent>
15+
1116
<dependencies>
1217

1318
<dependency>
@@ -53,10 +58,6 @@
5358
</build>
5459

5560
<properties>
56-
<maven.compiler.source>1.8</maven.compiler.source>
57-
<maven.compiler.target>1.8</maven.compiler.target>
58-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
59-
6061
<defaultHttpPort>9080</defaultHttpPort>
6162
<defaultHttpsPort>9443</defaultHttpsPort>
6263

‎jee-7/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
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>jee-7</artifactId>
76
<version>1.0-SNAPSHOT</version>
87
<packaging>war</packaging>

‎jenkins/hello-world/pom.xml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,6 @@
77
<packaging>hpi</packaging>
88
<name>Hello World Plugin</name>
99
<description>A sample Jenkins Hello World plugin</description>
10-
<url>https://wiki.jenkins-ci.org/display/JENKINS/TODO+Plugin</url>
11-
<licenses>
12-
<license>
13-
<name>MIT License</name>
14-
<url>http://opensource.org/licenses/MIT</url>
15-
</license>
16-
</licenses>
1710

1811
<parent>
1912
<groupId>org.jenkins-ci.plugins</groupId>

‎jhipster/jhipster-microservice/car-app/pom.xml‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
43
<modelVersion>4.0.0</modelVersion>
54

65
<parent>
7-
<artifactId>parent-boot-1</artifactId>
8-
<groupId>com.baeldung</groupId>
9-
<version>0.0.1-SNAPSHOT</version>
10-
<relativePath>../../../parent-boot-1</relativePath>
6+
<artifactId>jhipster-microservice</artifactId>
7+
<groupId>com.baeldung.jhipster</groupId>
8+
<version>1.0.0-SNAPSHOT</version>
119
</parent>
10+
1211
<groupId>com.car.app</groupId>
1312
<artifactId>car-app</artifactId>
14-
<version>0.0.1-SNAPSHOT</version>
1513
<packaging>war</packaging>
1614
<name>car-app</name>
1715

@@ -37,9 +35,11 @@
3735
<jjwt.version>0.7.0</jjwt.version>
3836
<liquibase-hibernate5.version>3.6</liquibase-hibernate5.version>
3937
<liquibase-slf4j.version>2.0.0</liquibase-slf4j.version>
38+
<liquibase.version>3.6.2</liquibase.version>
4039
<logstash-logback-encoder.version>4.8</logstash-logback-encoder.version>
4140
<m2e.apt.activation>jdt_apt</m2e.apt.activation>
4241
<mapstruct.version>1.1.0.Final</mapstruct.version>
42+
<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
4343
<maven-enforcer-plugin.version>1.4.1</maven-enforcer-plugin.version>
4444
<maven-resources-plugin.version>3.0.1</maven-resources-plugin.version>
4545
<maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
@@ -186,12 +186,10 @@
186186
<dependency>
187187
<groupId>commons-io</groupId>
188188
<artifactId>commons-io</artifactId>
189-
<version>${commons-io.version}</version>
190189
</dependency>
191190
<dependency>
192191
<groupId>io.dropwizard.metrics</groupId>
193192
<artifactId>metrics-annotation</artifactId>
194-
<version>${dropwizard-metrics.version}</version>
195193
</dependency>
196194
<dependency>
197195
<groupId>io.dropwizard.metrics</groupId>
@@ -200,17 +198,14 @@
200198
<dependency>
201199
<groupId>io.dropwizard.metrics</groupId>
202200
<artifactId>metrics-json</artifactId>
203-
<version>${dropwizard-metrics.version}</version>
204201
</dependency>
205202
<dependency>
206203
<groupId>io.dropwizard.metrics</groupId>
207204
<artifactId>metrics-jvm</artifactId>
208-
<version>${dropwizard-metrics.version}</version>
209205
</dependency>
210206
<dependency>
211207
<groupId>io.dropwizard.metrics</groupId>
212208
<artifactId>metrics-servlet</artifactId>
213-
<version>${dropwizard-metrics.version}</version>
214209
</dependency>
215210
<dependency>
216211
<groupId>io.dropwizard.metrics</groupId>
@@ -505,8 +500,6 @@
505500
<artifactId>maven-compiler-plugin</artifactId>
506501
<version>${maven-compiler-plugin.version}</version>
507502
<configuration>
508-
<source>${maven.compiler.source}</source>
509-
<target>${maven.compiler.target}</target>
510503
<annotationProcessorPaths>
511504
<path>
512505
<groupId>org.mapstruct</groupId>
@@ -519,6 +512,7 @@
519512
<plugin>
520513
<groupId>org.apache.maven.plugins</groupId>
521514
<artifactId>maven-eclipse-plugin</artifactId>
515+
<version>${maven-eclipse-plugin.version}</version>
522516
<configuration>
523517
<downloadSources>true</downloadSources>
524518
<downloadJavadocs>true</downloadJavadocs>

0 commit comments

Comments
 (0)