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
saihong · May 12, 2017 · 7c73abd · 7c73abd
1 parent 609ba4a
commit 7c73abd
Show file tree

Hide file tree

Showing 214 changed files with 6,422 additions and 7,419 deletions.
diff --git a/algorithms/pom.xml b/algorithms/pom.xml
@@ -1,24 +1,24 @@
 <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/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>com.baeldung</groupId>
-	<artifactId>algorithms</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.baeldung</groupId>
+    <artifactId>algorithms</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
 
-	<properties>
-		<exec-maven-plugin.version>1.5.0</exec-maven-plugin.version>
-		<lombok.version>1.16.12</lombok.version>
-		<commons-math3.version>3.6.1</commons-math3.version>
-	</properties>
+    <properties>
+        <exec-maven-plugin.version>1.5.0</exec-maven-plugin.version>
+        <lombok.version>1.16.12</lombok.version>
+        <commons-math3.version>3.6.1</commons-math3.version>
+    </properties>
 
-            <parent>
-                <groupId>com.baeldung</groupId>
-                <artifactId>parent-modules</artifactId>
-                <version>1.0.0-SNAPSHOT</version>
-             </parent>	
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
 
-	<dependencies>
-		<dependency>
+    <dependencies>
+        <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-math3</artifactId>
             <version>${commons-math3.version}</version>
@@ -30,40 +30,40 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-   	 		<groupId>io.jenetics</groupId>
-    		<artifactId>jenetics</artifactId>
-    		<version>3.7.0</version>
-		</dependency>
-	</dependencies>
+            <groupId>io.jenetics</groupId>
+            <artifactId>jenetics</artifactId>
+            <version>3.7.0</version>
+        </dependency>
+    </dependencies>
 
-	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>exec-maven-plugin</artifactId>
-					<version>${exec-maven-plugin.version}</version>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-	</build>
-	<reporting>
-		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>cobertura-maven-plugin</artifactId>
-				<version>2.7</version>
-				<configuration>
-					<instrumentation>
-						<ignores>
-							<ignore>com/baeldung/algorithms/dijkstra/*</ignore>
-						</ignores>
-						<excludes>
-							<exclude>com/baeldung/algorithms/dijkstra/*</exclude>
-						</excludes>
-					</instrumentation>
-				</configuration>
-			</plugin>
-		</plugins>
-	</reporting>
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>exec-maven-plugin</artifactId>
+                    <version>${exec-maven-plugin.version}</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>cobertura-maven-plugin</artifactId>
+                <version>2.7</version>
+                <configuration>
+                    <instrumentation>
+                        <ignores>
+                            <ignore>com/baeldung/algorithms/dijkstra/*</ignore>
+                        </ignores>
+                        <excludes>
+                            <exclude>com/baeldung/algorithms/dijkstra/*</exclude>
+                        </excludes>
+                    </instrumentation>
+                </configuration>
+            </plugin>
+        </plugins>
+    </reporting>
 </project>
diff --git a/annotations/annotation-processing/pom.xml b/annotations/annotation-processing/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>

diff --git a/annotations/annotation-user/pom.xml b/annotations/annotation-user/pom.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -15,9 +14,9 @@
 
     <properties>
         <junit.version>4.12</junit.version>
-        <maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>        
+        <maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
     </properties>
-    
+
     <dependencies>
 
         <dependency>

diff --git a/apache-cxf/cxf-aegis/pom.xml b/apache-cxf/cxf-aegis/pom.xml
@@ -8,7 +8,7 @@
         <version>0.0.1-SNAPSHOT</version>
     </parent>
     <properties>
-        <cxf.version>3.1.8</cxf.version>        
+        <cxf.version>3.1.8</cxf.version>
     </properties>
     <dependencies>
         <dependency>

diff --git a/apache-cxf/cxf-introduction/pom.xml b/apache-cxf/cxf-introduction/pom.xml
@@ -4,18 +4,18 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>cxf-introduction</artifactId>
-    
+
     <parent>
         <groupId>com.baeldung</groupId>
         <artifactId>apache-cxf</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
-    
+
     <properties>
         <cxf.version>3.1.8</cxf.version>
-        <surefire.version>2.19.1</surefire.version>        
+        <surefire.version>2.19.1</surefire.version>
     </properties>
-    
+
     <build>
         <plugins>
             <plugin>
@@ -36,7 +36,7 @@
             </plugin>
         </plugins>
     </build>
-    
+
     <dependencies>
         <dependency>
             <groupId>org.apache.cxf</groupId>

diff --git a/apache-cxf/cxf-jaxrs-implementation/pom.xml b/apache-cxf/cxf-jaxrs-implementation/pom.xml
@@ -4,20 +4,20 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>cxf-jaxrs-implementation</artifactId>
-    
+
     <parent>
         <groupId>com.baeldung</groupId>
         <artifactId>apache-cxf</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
-    
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <cxf.version>3.1.8</cxf.version>
         <httpclient.version>4.5.2</httpclient.version>
-        <surefire.version>2.19.1</surefire.version>        
+        <surefire.version>2.19.1</surefire.version>
     </properties>
-    
+
     <build>
         <plugins>
             <plugin>
@@ -38,7 +38,7 @@
             </plugin>
         </plugins>
     </build>
-    
+
     <dependencies>
         <dependency>
             <groupId>org.apache.cxf</groupId>

diff --git a/apache-cxf/cxf-spring/pom.xml b/apache-cxf/cxf-spring/pom.xml
@@ -8,7 +8,7 @@
         <artifactId>apache-cxf</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
-    
+
     <dependencies>
         <dependency>
             <groupId>org.apache.cxf</groupId>
@@ -42,7 +42,7 @@
             <version>${javax.servlet-api.version}</version>
         </dependency>
     </dependencies>
-    
+
     <build>
         <plugins>
             <plugin>
@@ -63,7 +63,7 @@
             </plugin>
         </plugins>
     </build>
-    
+
     <profiles>
         <profile>
             <id>live</id>
@@ -102,7 +102,7 @@
                             </execution>
                         </executions>
                     </plugin>
-                    
+
                     <plugin>
                         <artifactId>maven-surefire-plugin</artifactId>
                         <version>${surefire.version}</version>
@@ -123,17 +123,17 @@
                 </plugins>
             </build>
         </profile>
-        
+
     </profiles>
-    
+
     <properties>
         <cxf.version>3.1.8</cxf.version>
         <spring.version>4.3.4.RELEASE</spring.version>
         <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
-        
-        <maven-war-plugin.version>2.6</maven-war-plugin.version>        
+
+        <maven-war-plugin.version>2.6</maven-war-plugin.version>
         <surefire.version>2.19.1</surefire.version>
-        <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>        
+        <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
     </properties>
-    
+
 </project>
diff --git a/apache-cxf/pom.xml b/apache-cxf/pom.xml
@@ -10,8 +10,8 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
-     </parent>
-     
+    </parent>
+
     <modules>
         <module>cxf-introduction</module>
         <module>cxf-spring</module>

diff --git a/apache-fop/pom.xml b/apache-fop/pom.xml
@@ -11,41 +11,10 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
-     </parent>
-
-    <dependencies>
-
-        <!-- logging -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jcl-over-slf4j</artifactId>
-            <version>${org.slf4j.version}</version>
-            <!-- <scope>runtime</scope> --> <!-- some spring dependencies need to compile against jcl -->
-        </dependency>
-
-        <!-- test scoped -->
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-core</artifactId>
-            <version>${org.hamcrest.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
-            <version>${org.hamcrest.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <version>${mockito.version}</version>
-            <scope>test</scope>
-        </dependency>
+    </parent>
 
+    <dependencies>
         <!-- new dependencies -->
-
         <dependency>
             <groupId>org.apache.xmlgraphics</groupId>
             <artifactId>fop</artifactId>
@@ -62,7 +31,7 @@
                 <exclusion>
                     <artifactId>commons-logging</artifactId>
                     <groupId>commons-logging</groupId>
-                </exclusion>                
+                </exclusion>
             </exclusions>
         </dependency>
 
@@ -80,7 +49,7 @@
                     <artifactId>commons-logging</artifactId>
                     <groupId>commons-logging</groupId>
                 </exclusion>
-            </exclusions>            
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -154,11 +123,6 @@
         <avalon-framework.version>4.3</avalon-framework.version>
         <dbdoclet.version>8.0.2</dbdoclet.version>
         <jtidy.version>r938</jtidy.version>
-
-        <!-- testing -->
-        <org.hamcrest.version>1.3</org.hamcrest.version>
-        <mockito.version>1.10.19</mockito.version>
-
     </properties>
 
 </project>
diff --git a/apache-poi/pom.xml b/apache-poi/pom.xml
@@ -9,8 +9,8 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
-     </parent>
-     
+    </parent>
+
     <properties>
         <poi.version>3.15</poi.version>
         <jexcel.version>1.0.6</jexcel.version>
@@ -31,7 +31,7 @@
                     <artifactId>commons-logging</artifactId>
                     <groupId>commons-logging</groupId>
                 </exclusion>
-            </exclusions>            
-        </dependency>	
+            </exclusions>
+        </dependency>
     </dependencies>
 </project>