Skip to content

Commit 2b374fa

Browse files
Doha2012Eugen
Doha2012
authored and
Eugen
committed
cleanup pom (eugenp#1846)
* upgrade to spring boot 1.5.2 * add full update to REST API * modify ratings controller * upgrade herold * fix integration test * fix integration test * minor fix * fix integration test * fix integration test * minor cleanup * minor cleanup * remove log4j properties * use standard logbook.xml * remove log4j dependencies * remove commons-logging * merge * fix conflict * exclude commons-logging dependency * cleanup * minor fix * minor fix * fix dependency issues * Revert "fix dependency issues" This reverts commit 83bf1f9. * fix dependency issues * minor fix * minor fix * minor fix * cleanup generated files * fix commons-logging issue * add parent to pom * cleanup parent dependencies * cleanup pom * cleanup pom
1 parent 47a97d3 commit 2b374fa

95 files changed

Lines changed: 1237 additions & 3127 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎annotations/annotation-user/pom.xml‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@
1212

1313
<artifactId>annotation-user</artifactId>
1414

15-
<properties>
16-
<junit.version>4.12</junit.version>
17-
<maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
18-
</properties>
19-
2015
<dependencies>
2116

2217
<dependency>
@@ -25,31 +20,6 @@
2520
<version>${project.parent.version}</version>
2621
</dependency>
2722

28-
<dependency>
29-
<groupId>junit</groupId>
30-
<artifactId>junit</artifactId>
31-
<version>${junit.version}</version>
32-
<scope>test</scope>
33-
</dependency>
34-
3523
</dependencies>
3624

37-
<build>
38-
39-
<plugins>
40-
41-
<plugin>
42-
<groupId>org.apache.maven.plugins</groupId>
43-
<artifactId>maven-compiler-plugin</artifactId>
44-
<version>${maven-compiler-plugin.version}</version>
45-
<configuration>
46-
<source>1.8</source>
47-
<target>1.8</target>
48-
</configuration>
49-
</plugin>
50-
51-
</plugins>
52-
53-
</build>
54-
5525
</project>

‎ejb/ejb-client/pom.xml‎

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
11
<?xml version="1.0"?>
22
<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">
4-
<modelVersion>4.0.0</modelVersion>
5-
<parent>
6-
<groupId>com.baeldung.ejb</groupId>
7-
<artifactId>ejb</artifactId>
8-
<version>1.0-SNAPSHOT</version>
9-
</parent>
10-
<artifactId>ejb-client</artifactId>
11-
<name>EJB3 Client Maven</name>
12-
<description>EJB3 Client Maven</description>
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
135

14-
<properties>
15-
<junit.version>4.12</junit.version>
16-
<maven-surefire-plugin.version>2.19</maven-surefire-plugin.version>
17-
</properties>
6+
<parent>
7+
<groupId>com.baeldung.ejb</groupId>
8+
<artifactId>ejb</artifactId>
9+
<version>1.0-SNAPSHOT</version>
10+
</parent>
11+
12+
<artifactId>ejb-client</artifactId>
13+
<name>EJB3 Client Maven</name>
14+
<description>EJB3 Client Maven</description>
1815

1916
<dependencies>
2017
<dependency>
@@ -29,13 +26,8 @@
2926
<type>ejb</type>
3027
</dependency>
3128

32-
<dependency>
33-
<groupId>junit</groupId>
34-
<artifactId>junit</artifactId>
35-
<version>${junit.version}</version>
36-
<scope>test</scope>
37-
</dependency>
3829
</dependencies>
30+
3931
<build>
4032
<plugins>
4133
<plugin>
@@ -50,4 +42,5 @@
5042
</plugin>
5143
</plugins>
5244
</build>
45+
5346
</project>

‎hystrix/pom.xml‎

Lines changed: 5 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -8,33 +8,27 @@
88
<name>hystrix</name>
99

1010
<parent>
11-
<groupId>org.springframework.boot</groupId>
12-
<artifactId>spring-boot-starter-parent</artifactId>
13-
<version>1.4.4.RELEASE</version>
11+
<artifactId>parent-boot-4</artifactId>
12+
<groupId>com.baeldung</groupId>
13+
<version>0.0.1-SNAPSHOT</version>
14+
<relativePath>../parent-boot-4</relativePath>
1415
</parent>
1516

1617

1718
<properties>
1819

19-
<!-- General -->
20-
<java.version>1.8</java.version>
21-
2220
<!-- Hystrix -->
2321
<hystrix-core.version>1.5.8</hystrix-core.version>
2422
<rxjava-core.version>0.20.7</rxjava-core.version>
2523

2624
<!-- Testing -->
2725
<hamcrest-all.version>1.3</hamcrest-all.version>
28-
<junit.version>4.12</junit.version>
2926

3027
<!-- maven plugins -->
31-
<maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
3228
<maven-war-plugin.version>2.6</maven-war-plugin.version>
33-
<maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
3429
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
3530
<hystrix-metrics-event-stream.version>1.5.8</hystrix-metrics-event-stream.version>
3631
<hystrix-dashboard.version>1.5.8</hystrix-dashboard.version>
37-
<spring-boot-starter-test.version>1.4.2.RELEASE</spring-boot-starter-test.version>
3832
</properties>
3933

4034
<dependencies>
@@ -80,54 +74,13 @@
8074
<version>${hamcrest-all.version}</version>
8175
<scope>test</scope>
8276
</dependency>
83-
<dependency>
84-
<groupId>junit</groupId>
85-
<artifactId>junit</artifactId>
86-
<version>${junit.version}</version>
87-
<scope>test</scope>
88-
</dependency>
8977
<dependency>
9078
<groupId>org.springframework</groupId>
9179
<artifactId>spring-test</artifactId>
9280
<scope>test</scope>
9381
</dependency>
94-
<dependency>
95-
<groupId>org.springframework.boot</groupId>
96-
<artifactId>spring-boot-starter-test</artifactId>
97-
<version>${spring-boot-starter-test.version}</version>
98-
<scope>test</scope>
99-
</dependency>
10082
</dependencies>
10183

102-
<build>
103-
<plugins>
104-
<plugin>
105-
<groupId>org.springframework.boot</groupId>
106-
<artifactId>spring-boot-maven-plugin</artifactId>
107-
</plugin>
108-
<plugin>
109-
<groupId>org.apache.maven.plugins</groupId>
110-
<artifactId>maven-compiler-plugin</artifactId>
111-
<version>${maven-compiler-plugin.version}</version>
112-
<configuration>
113-
<source>1.8</source>
114-
<target>1.8</target>
115-
</configuration>
116-
</plugin>
117-
<plugin>
118-
<groupId>org.apache.maven.plugins</groupId>
119-
<artifactId>maven-surefire-plugin</artifactId>
120-
<version>${maven-surefire-plugin.version}</version>
121-
<configuration>
122-
<excludes>
123-
<exclude>**/*IntegrationTest.java</exclude>
124-
<exclude>**/*LiveTest.java</exclude>
125-
</excludes>
126-
</configuration>
127-
</plugin>
128-
</plugins>
129-
</build>
130-
13184
<profiles>
13285
<profile>
13386
<id>integration</id>
@@ -162,7 +115,5 @@
162115
</build>
163116
</profile>
164117
</profiles>
165-
</project>
166-
167-
168118

119+
</project>

‎javaxval/bin/pom.xml‎

Lines changed: 40 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,44 @@
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-
<artifactId>javaxval</artifactId>
6-
<version>0.1-SNAPSHOT</version>
7-
8-
9-
<dependencies>
10-
11-
12-
<dependency>
13-
<groupId>junit</groupId>
14-
<artifactId>junit</artifactId>
15-
<version>4.12</version>
16-
</dependency>
17-
18-
<dependency>
19-
<groupId>javax.validation</groupId>
20-
<artifactId>validation-api</artifactId>
21-
<version>1.1.0.Final</version>
22-
</dependency>
23-
24-
<dependency>
25-
<groupId>org.hibernate</groupId>
26-
<artifactId>hibernate-validator</artifactId>
27-
<version>5.2.1.Final</version>
28-
</dependency>
29-
30-
<dependency>
31-
<groupId>org.hibernate</groupId>
32-
<artifactId>hibernate-validator-annotation-processor</artifactId>
33-
<version>5.2.1.Final</version>
34-
</dependency>
35-
36-
<dependency>
37-
<groupId>javax.el</groupId>
38-
<artifactId>javax.el-api</artifactId>
39-
<version>2.2.4</version>
40-
</dependency>
41-
42-
<dependency>
43-
<groupId>org.glassfish.web</groupId>
44-
<artifactId>javax.el</artifactId>
45-
<version>2.2.4</version>
46-
</dependency>
47-
48-
</dependencies>
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+
<artifactId>javaxval</artifactId>
6+
<version>0.1-SNAPSHOT</version>
7+
8+
9+
<dependencies>
10+
11+
<dependency>
12+
<groupId>javax.validation</groupId>
13+
<artifactId>validation-api</artifactId>
14+
<version>1.1.0.Final</version>
15+
</dependency>
16+
17+
<dependency>
18+
<groupId>org.hibernate</groupId>
19+
<artifactId>hibernate-validator</artifactId>
20+
<version>5.2.1.Final</version>
21+
</dependency>
22+
23+
<dependency>
24+
<groupId>org.hibernate</groupId>
25+
<artifactId>hibernate-validator-annotation-processor</artifactId>
26+
<version>5.2.1.Final</version>
27+
</dependency>
28+
29+
<dependency>
30+
<groupId>javax.el</groupId>
31+
<artifactId>javax.el-api</artifactId>
32+
<version>2.2.4</version>
33+
</dependency>
34+
35+
<dependency>
36+
<groupId>org.glassfish.web</groupId>
37+
<artifactId>javax.el</artifactId>
38+
<version>2.2.4</version>
39+
</dependency>
40+
41+
</dependencies>
4942

5043

5144
</project>

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

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
<modelVersion>4.0.0</modelVersion>
44

55
<parent>
6-
<artifactId>spring-boot-starter-parent</artifactId>
7-
<groupId>org.springframework.boot</groupId>
8-
<version>1.5.2.RELEASE</version>
9-
<relativePath />
6+
<artifactId>parent-boot-5</artifactId>
7+
<groupId>com.baeldung</groupId>
8+
<version>0.0.1-SNAPSHOT</version>
9+
<relativePath>../../../parent-boot-5</relativePath>
1010
</parent>
1111

1212
<groupId>com.car.app</groupId>
@@ -40,12 +40,9 @@
4040
<logstash-logback-encoder.version>4.8</logstash-logback-encoder.version>
4141
<m2e.apt.activation>jdt_apt</m2e.apt.activation>
4242
<mapstruct.version>1.1.0.Final</mapstruct.version>
43-
<maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
4443
<maven-enforcer-plugin.version>1.4.1</maven-enforcer-plugin.version>
4544
<maven-resources-plugin.version>3.0.1</maven-resources-plugin.version>
4645
<maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
47-
<maven.compiler.source>${java.version}</maven.compiler.source>
48-
<maven.compiler.target>${java.version}</maven.compiler.target>
4946
<maven.version>3.0.0</maven.version>
5047
<metrics-spring.version>3.1.3</metrics-spring.version>
5148
<node.version>v6.10.0</node.version>

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

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
<modelVersion>4.0.0</modelVersion>
44

55
<parent>
6-
<artifactId>spring-boot-starter-parent</artifactId>
7-
<groupId>org.springframework.boot</groupId>
8-
<version>1.5.2.RELEASE</version>
9-
<relativePath />
6+
<artifactId>parent-boot-5</artifactId>
7+
<groupId>com.baeldung</groupId>
8+
<version>0.0.1-SNAPSHOT</version>
9+
<relativePath>../../../parent-boot-5</relativePath>
1010
</parent>
1111

1212
<groupId>com.dealer.app</groupId>
@@ -40,12 +40,9 @@
4040
<logstash-logback-encoder.version>4.8</logstash-logback-encoder.version>
4141
<m2e.apt.activation>jdt_apt</m2e.apt.activation>
4242
<mapstruct.version>1.1.0.Final</mapstruct.version>
43-
<maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
4443
<maven-enforcer-plugin.version>1.4.1</maven-enforcer-plugin.version>
4544
<maven-resources-plugin.version>3.0.1</maven-resources-plugin.version>
4645
<maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
47-
<maven.compiler.source>${java.version}</maven.compiler.source>
48-
<maven.compiler.target>${java.version}</maven.compiler.target>
4946
<maven.version>3.0.0</maven.version>
5047
<metrics-spring.version>3.1.3</metrics-spring.version>
5148
<node.version>v6.10.0</node.version>
@@ -326,11 +323,6 @@
326323
<groupId>org.springframework.boot</groupId>
327324
<artifactId>spring-boot-starter-security</artifactId>
328325
</dependency>
329-
<dependency>
330-
<groupId>org.springframework.boot</groupId>
331-
<artifactId>spring-boot-starter-test</artifactId>
332-
<scope>test</scope>
333-
</dependency>
334326
<dependency>
335327
<groupId>org.springframework.security</groupId>
336328
<artifactId>spring-security-test</artifactId>

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
<modelVersion>4.0.0</modelVersion>
44

55
<parent>
6-
<artifactId>spring-boot-starter-parent</artifactId>
7-
<groupId>org.springframework.boot</groupId>
8-
<version>1.5.2.RELEASE</version>
9-
<relativePath />
6+
<artifactId>parent-boot-5</artifactId>
7+
<groupId>com.baeldung</groupId>
8+
<version>0.0.1-SNAPSHOT</version>
9+
<relativePath>../../../parent-boot-5</relativePath>
1010
</parent>
1111

1212
<groupId>com.gateway</groupId>
@@ -32,7 +32,6 @@
3232
<hibernate.version>5.2.8.Final</hibernate.version>
3333
<hikaricp.version>2.6.0</hikaricp.version>
3434
<jacoco-maven-plugin.version>0.7.9</jacoco-maven-plugin.version>
35-
<java.version>1.8</java.version>
3635
<javassist.version>3.21.0-GA</javassist.version>
3736
<jcache.version>1.0.0</jcache.version>
3837
<jhipster.server.version>1.1.0</jhipster.server.version>
@@ -43,12 +42,9 @@
4342
<lz4.version>1.3.0</lz4.version>
4443
<m2e.apt.activation>jdt_apt</m2e.apt.activation>
4544
<mapstruct.version>1.1.0.Final</mapstruct.version>
46-
<maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
4745
<maven-enforcer-plugin.version>1.4.1</maven-enforcer-plugin.version>
4846
<maven-resources-plugin.version>3.0.1</maven-resources-plugin.version>
4947
<maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
50-
<maven.compiler.source>${java.version}</maven.compiler.source>
51-
<maven.compiler.target>${java.version}</maven.compiler.target>
5248
<maven.version>3.0.0</maven.version>
5349
<metrics-spring.version>3.1.3</metrics-spring.version>
5450
<node.version>v6.10.0</node.version>

0 commit comments

Comments
 (0)