Skip to content

Commit 0be7de2

Browse files
Doha2012Eugen
Doha2012
authored and
Eugen
committed
minor fix (eugenp#1847)
* 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 * add missing parent * fix logging issue
1 parent d8cf653 commit 0be7de2

4 files changed

Lines changed: 21 additions & 37 deletions

File tree

‎drools/pom.xml‎

Lines changed: 9 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,19 @@
77
<groupId>com.baeldung</groupId>
88
<artifactId>drools</artifactId>
99
<version>1.0.0-SNAPSHOT</version>
10+
11+
<parent>
12+
<groupId>com.baeldung</groupId>
13+
<artifactId>parent-modules</artifactId>
14+
<version>1.0.0-SNAPSHOT</version>
15+
</parent>
16+
1017
<properties>
1118
<http-component-version>4.4.6</http-component-version>
1219
<drools-version>7.0.0.CR1</drools-version>
1320
<apache-poi-version>3.13</apache-poi-version>
14-
<surefire-plugin-version>2.19.1</surefire-plugin-version>
15-
<junit-version>4.11</junit-version>
1621
</properties>
22+
1723
<dependencies>
1824
<dependency>
1925
<groupId>org.apache.httpcomponents</groupId>
@@ -53,32 +59,13 @@
5359
<artifactId>poi-ooxml</artifactId>
5460
<version>${apache-poi-version}</version>
5561
</dependency>
56-
<dependency>
57-
<groupId>junit</groupId>
58-
<artifactId>junit</artifactId>
59-
<version>${junit-version}</version>
60-
<scope>test</scope>
61-
</dependency>
62+
6263
<dependency>
6364
<groupId>org.springframework</groupId>
6465
<artifactId>spring-core</artifactId>
6566
<version>4.3.6.RELEASE</version>
6667
</dependency>
6768

6869
</dependencies>
69-
<build>
70-
<plugins>
71-
<plugin>
72-
<groupId>org.apache.maven.plugins</groupId>
73-
<artifactId>maven-surefire-plugin</artifactId>
74-
<version>${surefire-plugin-version}</version>
75-
<configuration>
76-
<excludes>
77-
<exclude>**/*IntegrationTest.java</exclude>
78-
</excludes>
79-
</configuration>
80-
</plugin>
81-
</plugins>
82-
</build>
8370

8471
</project>

‎ejb/pom.xml‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@
99
<name>ejb</name>
1010
<description>EJB Tutorial</description>
1111

12+
<parent>
13+
<groupId>com.baeldung</groupId>
14+
<artifactId>parent-modules</artifactId>
15+
<version>1.0.0-SNAPSHOT</version>
16+
</parent>
17+
1218
<repositories>
1319
<repository>
1420
<id>jboss-public-repository-group</id>
@@ -55,15 +61,6 @@
5561
<build>
5662
<pluginManagement>
5763
<plugins>
58-
<plugin>
59-
<artifactId>maven-compiler-plugin</artifactId>
60-
<version>3.1</version>
61-
<configuration>
62-
<source>1.8</source>
63-
<target>1.8</target>
64-
</configuration>
65-
</plugin>
66-
6764
<plugin>
6865
<artifactId>maven-ejb-plugin</artifactId>
6966
<version>2.4</version>

‎spring-all/pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,6 @@
2626
<dependency>
2727
<groupId>org.springframework</groupId>
2828
<artifactId>spring-web</artifactId>
29-
<exclusions>
30-
<exclusion>
31-
<artifactId>commons-logging</artifactId>
32-
<groupId>commons-logging</groupId>
33-
</exclusion>
34-
</exclusions>
3529
</dependency>
3630
<dependency>
3731
<groupId>org.springframework</groupId>

‎spring-cloud/spring-cloud-rest/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,12 @@
1717

1818
<name>spring-cloud-rest</name>
1919

20+
<parent>
21+
<groupId>com.baeldung.spring.cloud</groupId>
22+
<artifactId>spring-cloud</artifactId>
23+
<version>1.0.0-SNAPSHOT</version>
24+
</parent>
25+
2026
<properties>
2127
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2228
<maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>

0 commit comments

Comments
 (0)