Skip to content

Commit 7c73abd

Browse files
Doha2012Eugen
Doha2012
authored and
Eugen
committed
cleanup pom (eugenp#1836)
* 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
1 parent 609ba4a commit 7c73abd

File tree

214 files changed

+6422
-7419
lines changed

Some content is hidden

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

214 files changed

+6422
-7419
lines changed

‎algorithms/pom.xml‎

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
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>algorithms</artifactId>
6-
<version>0.0.1-SNAPSHOT</version>
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>algorithms</artifactId>
6+
<version>0.0.1-SNAPSHOT</version>
77

8-
<properties>
9-
<exec-maven-plugin.version>1.5.0</exec-maven-plugin.version>
10-
<lombok.version>1.16.12</lombok.version>
11-
<commons-math3.version>3.6.1</commons-math3.version>
12-
</properties>
8+
<properties>
9+
<exec-maven-plugin.version>1.5.0</exec-maven-plugin.version>
10+
<lombok.version>1.16.12</lombok.version>
11+
<commons-math3.version>3.6.1</commons-math3.version>
12+
</properties>
1313

14-
<parent>
15-
<groupId>com.baeldung</groupId>
16-
<artifactId>parent-modules</artifactId>
17-
<version>1.0.0-SNAPSHOT</version>
18-
</parent>
14+
<parent>
15+
<groupId>com.baeldung</groupId>
16+
<artifactId>parent-modules</artifactId>
17+
<version>1.0.0-SNAPSHOT</version>
18+
</parent>
1919

20-
<dependencies>
21-
<dependency>
20+
<dependencies>
21+
<dependency>
2222
<groupId>org.apache.commons</groupId>
2323
<artifactId>commons-math3</artifactId>
2424
<version>${commons-math3.version}</version>
@@ -30,40 +30,40 @@
3030
<scope>provided</scope>
3131
</dependency>
3232
<dependency>
33-
<groupId>io.jenetics</groupId>
34-
<artifactId>jenetics</artifactId>
35-
<version>3.7.0</version>
36-
</dependency>
37-
</dependencies>
33+
<groupId>io.jenetics</groupId>
34+
<artifactId>jenetics</artifactId>
35+
<version>3.7.0</version>
36+
</dependency>
37+
</dependencies>
3838

39-
<build>
40-
<pluginManagement>
41-
<plugins>
42-
<plugin>
43-
<groupId>org.codehaus.mojo</groupId>
44-
<artifactId>exec-maven-plugin</artifactId>
45-
<version>${exec-maven-plugin.version}</version>
46-
</plugin>
47-
</plugins>
48-
</pluginManagement>
49-
</build>
50-
<reporting>
51-
<plugins>
52-
<plugin>
53-
<groupId>org.codehaus.mojo</groupId>
54-
<artifactId>cobertura-maven-plugin</artifactId>
55-
<version>2.7</version>
56-
<configuration>
57-
<instrumentation>
58-
<ignores>
59-
<ignore>com/baeldung/algorithms/dijkstra/*</ignore>
60-
</ignores>
61-
<excludes>
62-
<exclude>com/baeldung/algorithms/dijkstra/*</exclude>
63-
</excludes>
64-
</instrumentation>
65-
</configuration>
66-
</plugin>
67-
</plugins>
68-
</reporting>
39+
<build>
40+
<pluginManagement>
41+
<plugins>
42+
<plugin>
43+
<groupId>org.codehaus.mojo</groupId>
44+
<artifactId>exec-maven-plugin</artifactId>
45+
<version>${exec-maven-plugin.version}</version>
46+
</plugin>
47+
</plugins>
48+
</pluginManagement>
49+
</build>
50+
<reporting>
51+
<plugins>
52+
<plugin>
53+
<groupId>org.codehaus.mojo</groupId>
54+
<artifactId>cobertura-maven-plugin</artifactId>
55+
<version>2.7</version>
56+
<configuration>
57+
<instrumentation>
58+
<ignores>
59+
<ignore>com/baeldung/algorithms/dijkstra/*</ignore>
60+
</ignores>
61+
<excludes>
62+
<exclude>com/baeldung/algorithms/dijkstra/*</exclude>
63+
</excludes>
64+
</instrumentation>
65+
</configuration>
66+
</plugin>
67+
</plugins>
68+
</reporting>
6969
</project>

‎annotations/annotation-processing/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xmlns="http://maven.apache.org/POM/4.0.0"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
xmlns="http://maven.apache.org/POM/4.0.0"
4+
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>
66

77
<parent>

‎annotations/annotation-user/pom.xml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
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/xsd/maven-4.0.0.xsd">
54
<modelVersion>4.0.0</modelVersion>
65

76
<parent>
@@ -15,9 +14,9 @@
1514

1615
<properties>
1716
<junit.version>4.12</junit.version>
18-
<maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
17+
<maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
1918
</properties>
20-
19+
2120
<dependencies>
2221

2322
<dependency>

‎apache-cxf/cxf-aegis/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<version>0.0.1-SNAPSHOT</version>
99
</parent>
1010
<properties>
11-
<cxf.version>3.1.8</cxf.version>
11+
<cxf.version>3.1.8</cxf.version>
1212
</properties>
1313
<dependencies>
1414
<dependency>

‎apache-cxf/cxf-introduction/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66
<artifactId>cxf-introduction</artifactId>
7-
7+
88
<parent>
99
<groupId>com.baeldung</groupId>
1010
<artifactId>apache-cxf</artifactId>
1111
<version>0.0.1-SNAPSHOT</version>
1212
</parent>
13-
13+
1414
<properties>
1515
<cxf.version>3.1.8</cxf.version>
16-
<surefire.version>2.19.1</surefire.version>
16+
<surefire.version>2.19.1</surefire.version>
1717
</properties>
18-
18+
1919
<build>
2020
<plugins>
2121
<plugin>
@@ -36,7 +36,7 @@
3636
</plugin>
3737
</plugins>
3838
</build>
39-
39+
4040
<dependencies>
4141
<dependency>
4242
<groupId>org.apache.cxf</groupId>

‎apache-cxf/cxf-jaxrs-implementation/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66
<artifactId>cxf-jaxrs-implementation</artifactId>
7-
7+
88
<parent>
99
<groupId>com.baeldung</groupId>
1010
<artifactId>apache-cxf</artifactId>
1111
<version>0.0.1-SNAPSHOT</version>
1212
</parent>
13-
13+
1414
<properties>
1515
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1616
<cxf.version>3.1.8</cxf.version>
1717
<httpclient.version>4.5.2</httpclient.version>
18-
<surefire.version>2.19.1</surefire.version>
18+
<surefire.version>2.19.1</surefire.version>
1919
</properties>
20-
20+
2121
<build>
2222
<plugins>
2323
<plugin>
@@ -38,7 +38,7 @@
3838
</plugin>
3939
</plugins>
4040
</build>
41-
41+
4242
<dependencies>
4343
<dependency>
4444
<groupId>org.apache.cxf</groupId>

‎apache-cxf/cxf-spring/pom.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<artifactId>apache-cxf</artifactId>
99
<version>0.0.1-SNAPSHOT</version>
1010
</parent>
11-
11+
1212
<dependencies>
1313
<dependency>
1414
<groupId>org.apache.cxf</groupId>
@@ -42,7 +42,7 @@
4242
<version>${javax.servlet-api.version}</version>
4343
</dependency>
4444
</dependencies>
45-
45+
4646
<build>
4747
<plugins>
4848
<plugin>
@@ -63,7 +63,7 @@
6363
</plugin>
6464
</plugins>
6565
</build>
66-
66+
6767
<profiles>
6868
<profile>
6969
<id>live</id>
@@ -102,7 +102,7 @@
102102
</execution>
103103
</executions>
104104
</plugin>
105-
105+
106106
<plugin>
107107
<artifactId>maven-surefire-plugin</artifactId>
108108
<version>${surefire.version}</version>
@@ -123,17 +123,17 @@
123123
</plugins>
124124
</build>
125125
</profile>
126-
126+
127127
</profiles>
128-
128+
129129
<properties>
130130
<cxf.version>3.1.8</cxf.version>
131131
<spring.version>4.3.4.RELEASE</spring.version>
132132
<javax.servlet-api.version>3.1.0</javax.servlet-api.version>
133-
134-
<maven-war-plugin.version>2.6</maven-war-plugin.version>
133+
134+
<maven-war-plugin.version>2.6</maven-war-plugin.version>
135135
<surefire.version>2.19.1</surefire.version>
136-
<cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
136+
<cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
137137
</properties>
138-
138+
139139
</project>

‎apache-cxf/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
<groupId>com.baeldung</groupId>
1111
<artifactId>parent-modules</artifactId>
1212
<version>1.0.0-SNAPSHOT</version>
13-
</parent>
14-
13+
</parent>
14+
1515
<modules>
1616
<module>cxf-introduction</module>
1717
<module>cxf-spring</module>

‎apache-fop/pom.xml‎

Lines changed: 4 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -11,41 +11,10 @@
1111
<groupId>com.baeldung</groupId>
1212
<artifactId>parent-modules</artifactId>
1313
<version>1.0.0-SNAPSHOT</version>
14-
</parent>
15-
16-
<dependencies>
17-
18-
<!-- logging -->
19-
<dependency>
20-
<groupId>org.slf4j</groupId>
21-
<artifactId>jcl-over-slf4j</artifactId>
22-
<version>${org.slf4j.version}</version>
23-
<!-- <scope>runtime</scope> --> <!-- some spring dependencies need to compile against jcl -->
24-
</dependency>
25-
26-
<!-- test scoped -->
27-
<dependency>
28-
<groupId>org.hamcrest</groupId>
29-
<artifactId>hamcrest-core</artifactId>
30-
<version>${org.hamcrest.version}</version>
31-
<scope>test</scope>
32-
</dependency>
33-
<dependency>
34-
<groupId>org.hamcrest</groupId>
35-
<artifactId>hamcrest-library</artifactId>
36-
<version>${org.hamcrest.version}</version>
37-
<scope>test</scope>
38-
</dependency>
39-
40-
<dependency>
41-
<groupId>org.mockito</groupId>
42-
<artifactId>mockito-core</artifactId>
43-
<version>${mockito.version}</version>
44-
<scope>test</scope>
45-
</dependency>
14+
</parent>
4615

16+
<dependencies>
4717
<!-- new dependencies -->
48-
4918
<dependency>
5019
<groupId>org.apache.xmlgraphics</groupId>
5120
<artifactId>fop</artifactId>
@@ -62,7 +31,7 @@
6231
<exclusion>
6332
<artifactId>commons-logging</artifactId>
6433
<groupId>commons-logging</groupId>
65-
</exclusion>
34+
</exclusion>
6635
</exclusions>
6736
</dependency>
6837

@@ -80,7 +49,7 @@
8049
<artifactId>commons-logging</artifactId>
8150
<groupId>commons-logging</groupId>
8251
</exclusion>
83-
</exclusions>
52+
</exclusions>
8453
</dependency>
8554

8655
<dependency>
@@ -154,11 +123,6 @@
154123
<avalon-framework.version>4.3</avalon-framework.version>
155124
<dbdoclet.version>8.0.2</dbdoclet.version>
156125
<jtidy.version>r938</jtidy.version>
157-
158-
<!-- testing -->
159-
<org.hamcrest.version>1.3</org.hamcrest.version>
160-
<mockito.version>1.10.19</mockito.version>
161-
162126
</properties>
163127

164128
</project>

‎apache-poi/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<groupId>com.baeldung</groupId>
1010
<artifactId>parent-modules</artifactId>
1111
<version>1.0.0-SNAPSHOT</version>
12-
</parent>
13-
12+
</parent>
13+
1414
<properties>
1515
<poi.version>3.15</poi.version>
1616
<jexcel.version>1.0.6</jexcel.version>
@@ -31,7 +31,7 @@
3131
<artifactId>commons-logging</artifactId>
3232
<groupId>commons-logging</groupId>
3333
</exclusion>
34-
</exclusions>
35-
</dependency>
34+
</exclusions>
35+
</dependency>
3636
</dependencies>
3737
</project>

0 commit comments

Comments
 (0)