From aeb17113973b9d216a9cf9c0eb40fb79bc48d957 Mon Sep 17 00:00:00 2001
From: amit2103 <amit.pandey2103@gmail.com>
Date: Sat, 29 Sep 2018 23:22:40 +0530
Subject: [PATCH] [BAEL-9018] - Fixed malformed POMs and remaining PMD problems

---
 apache-avro/pom.xml                           |  2 +-
 ...> AvroSerealizerDeSerealizerUnitTest.java} |  2 +-
 flyway/pom.xml                                |  1 +
 ...st.java => FlywayApplicationUnitTest.java} |  2 +-
 guest/spring-mvc/pom.xml                      |  2 +-
 guest/spring-security/pom.xml                 |  2 +-
 pom.xml                                       | 32 +++++++++----------
 spring-custom-aop/pom.xml                     |  1 +
 8 files changed, 23 insertions(+), 21 deletions(-)
 rename apache-avro/src/test/java/com/baeldung/avro/util/serealization/{AvroSerealizerDeSerealizerTest.java => AvroSerealizerDeSerealizerUnitTest.java} (98%)
 rename flyway/src/test/java/com/baeldung/flywaycallbacks/{FlywayApplicationTest.java => FlywayApplicationUnitTest.java} (98%)

diff --git a/apache-avro/pom.xml b/apache-avro/pom.xml
index 3e3234ff9614..ddf584427188 100644
--- a/apache-avro/pom.xml
+++ b/apache-avro/pom.xml
@@ -6,7 +6,7 @@
     <groupId>com.baeldung</groupId>
     <artifactId>apache-avro</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-	<name>Apache Avro</version>
+	<name>Apache Avro</name>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/apache-avro/src/test/java/com/baeldung/avro/util/serealization/AvroSerealizerDeSerealizerTest.java b/apache-avro/src/test/java/com/baeldung/avro/util/serealization/AvroSerealizerDeSerealizerUnitTest.java
similarity index 98%
rename from apache-avro/src/test/java/com/baeldung/avro/util/serealization/AvroSerealizerDeSerealizerTest.java
rename to apache-avro/src/test/java/com/baeldung/avro/util/serealization/AvroSerealizerDeSerealizerUnitTest.java
index ecd15ccbbc18..992ea806c326 100644
--- a/apache-avro/src/test/java/com/baeldung/avro/util/serealization/AvroSerealizerDeSerealizerTest.java
+++ b/apache-avro/src/test/java/com/baeldung/avro/util/serealization/AvroSerealizerDeSerealizerUnitTest.java
@@ -13,7 +13,7 @@
 
 import static org.junit.Assert.*;
 
-public class AvroSerealizerDeSerealizerTest {
+public class AvroSerealizerDeSerealizerUnitTest {
 
     AvroSerealizer serealizer;
     AvroDeSerealizer deSerealizer;
diff --git a/flyway/pom.xml b/flyway/pom.xml
index b1cc58af3d97..353bbfb1ec2a 100644
--- a/flyway/pom.xml
+++ b/flyway/pom.xml
@@ -65,6 +65,7 @@
     <properties>
         <flyway-core.version>5.0.2</flyway-core.version>
         <flyway-maven-plugin.version>5.0.2</flyway-maven-plugin.version>
+        <h2.version>1.4.195</h2.version>
     </properties>
 
 </project>
diff --git a/flyway/src/test/java/com/baeldung/flywaycallbacks/FlywayApplicationTest.java b/flyway/src/test/java/com/baeldung/flywaycallbacks/FlywayApplicationUnitTest.java
similarity index 98%
rename from flyway/src/test/java/com/baeldung/flywaycallbacks/FlywayApplicationTest.java
rename to flyway/src/test/java/com/baeldung/flywaycallbacks/FlywayApplicationUnitTest.java
index 5e96fff64d1f..bf30ce604d32 100644
--- a/flyway/src/test/java/com/baeldung/flywaycallbacks/FlywayApplicationTest.java
+++ b/flyway/src/test/java/com/baeldung/flywaycallbacks/FlywayApplicationUnitTest.java
@@ -16,7 +16,7 @@
 @RunWith(SpringRunner.class)
 @DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD)
 @ContextConfiguration(classes = FlywayCallbackTestConfig.class)
-public class FlywayApplicationTest {
+public class FlywayApplicationUnitTest {
 
     private Log log = LogFactory.getLog(getClass());
 
diff --git a/guest/spring-mvc/pom.xml b/guest/spring-mvc/pom.xml
index 42543b5be09b..c0ef4516051a 100644
--- a/guest/spring-mvc/pom.xml
+++ b/guest/spring-mvc/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.0.M5</version>
+        <version>2.0.0.RELEASE</version>
         <relativePath /> <!-- lookup parent from repository -->
     </parent>
 
diff --git a/guest/spring-security/pom.xml b/guest/spring-security/pom.xml
index baca3bce85ab..8be42ba32b15 100644
--- a/guest/spring-security/pom.xml
+++ b/guest/spring-security/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.0.M6</version>
+        <version>2.0.0.RELEASE</version>
         <relativePath />
     </parent>
 
diff --git a/pom.xml b/pom.xml
index 495aeb434b7d..d322b713436a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -611,11 +611,11 @@
 				<module>java-websocket</module>
 				<module>activejdbc</module>
 				<!-- <module>animal-sniffer-mvn-plugin</module> --><!-- PMD voilation -->
-				<!-- <module>apache-avro</module> --><!-- Malformed POM -->
+				<module>apache-avro</module>
 				<module>apache-bval</module>
 				<module>apache-shiro</module>
 				<module>apache-spark</module>
-				<!-- <module>asciidoctor</module> --><!-- Malformed POM -->
+				<module>asciidoctor</module>
 				<module>checker-plugin</module>
 				<!-- <module>core-java-10</module> --><!-- Not upgraded to java 10 -->
 				<!-- <module>core-java-11</module> --><!-- Not upgraded to java 11 -->
@@ -624,7 +624,7 @@
 				<module>dagger</module>
 				<module>data-structures</module>
 				<module>dubbo</module>
-				<!-- <module>flyway</module> --><!-- Malformed POM -->
+				<module>flyway</module>
 				<!-- <module>grpc</module> --><!-- protobuf-maven-plugin filecopy failure -->
 				<!-- <module>java-difference-date</module> --><!-- PMD voilation -->
 				<!-- <module>JGit</module> --><!-- Unit test failure -->
@@ -638,7 +638,7 @@
 				<module>spring-boot-autoconfiguration</module>
 				<module>spring-boot-custom-starter</module>
 				<module>spring-boot-jasypt</module>
-				<!-- <module>spring-custom-aop</module> --><!-- Malformed POM -->
+				<module>spring-custom-aop</module>
 				<module>spring-data-rest-querydsl</module>
 				<!-- <module>spring-groovy</module> --><!-- PMD voilation -->
 				<module>spring-mobile</module>
@@ -667,8 +667,8 @@
 				<!-- <module>guest/memory-leaks</module> --><!-- guest post on different site -->
 				<!-- <module>guest/remote-debugging</module> --><!-- guest post on different site -->
 				<!-- <module>guest/spring-boot-app</module> --><!-- guest post on different site -->
-				<!-- <module>guest/spring-mvc</module> --><!-- Malformed POM -->
-				<!-- <module>guest/spring-security</module> --><!-- Malformed POM -->
+				<!-- <module>guest/spring-mvc</module> --><!-- guest post on different site -->
+				<!-- <module>guest/spring-security</module> --><!-- guest post on different site -->
 				<!-- <module>guest/thread-pools</module> --><!-- guest post on different site -->
 				<!-- <module>guest/tomcat-app</module> --><!-- guest post on different site -->
 				<module>jenkins/hello-world</module>
@@ -1096,9 +1096,9 @@
 				<module>dagger</module>
 				<module>data-structures</module>
 				<module>dubbo</module>
-				<!-- <module>flyway</module> --><!-- Malformed POM -->
+				<module>flyway</module>
 				<!-- <module>grpc</module> --><!-- protobuf-maven-plugin filecopy failure -->
-				<!-- <module>java-difference-date</module> --><!-- PMD voilation -->
+				<module>java-difference-date</module>
 				<!-- <module>JGit</module> --><!-- Unit test failure -->
 				<module>jni</module>
 				<module>jooby</module>
@@ -1106,13 +1106,13 @@
 				<!-- <module>microprofile</module> --><!-- Takes too much time : Downloads 93 MBs zip and .. -->
 				<!-- <module>muleesb</module> --><!-- load main class org.mule.munit.remote.RemoteRunner -->
 				<module>ratpack</module>
-				<!-- <module>rest-with-spark-java</module> --><!-- PMD voilation -->
+				<module>rest-with-spark-java</module>
 				<module>spring-boot-autoconfiguration</module>
 				<module>spring-boot-custom-starter</module>
-				<!-- <module>spring-boot-jasypt</module> --><!-- PMD voilation -->
-				<!-- <module>spring-custom-aop</module> --><!-- Malformed POM -->
+				<module>spring-boot-jasypt</module>
+				<module>spring-custom-aop</module>
 				<module>spring-data-rest-querydsl</module>
-				<!-- <module>spring-groovy</module> --><!-- PMD voilation -->
+				<module>spring-groovy</module>
 				<module>spring-mobile</module>
 				<module>spring-mustache</module>
 				<module>spring-mvc-simple</module>
@@ -1123,7 +1123,7 @@
 				<module>spring-roo</module>
 				<module>spring-security-stormpath</module>
 				<module>sse-jaxrs</module>
-				<!-- <module>static-analysis</module> --><!-- PMD voilation -->
+				<module>static-analysis</module>
 				<module>stripe</module>
 				<!-- <module>structurizr</module> --><!-- Artiifact not found -->
 				<!-- <module>Twitter4J</module> --><!-- Test failure -->
@@ -1139,8 +1139,8 @@
 				<!-- <module>guest/memory-leaks</module> --><!-- guest post on different site -->
 				<!-- <module>guest/remote-debugging</module> --><!-- guest post on different site -->
 				<!-- <module>guest/spring-boot-app</module> --><!-- guest post on different site -->
-				<!-- <module>guest/spring-mvc</module> --><!-- Malformed POM -->
-				<!-- <module>guest/spring-security</module> --><!-- Malformed POM -->
+				<!-- <module>guest/spring-mvc</module> --><!-- guest post on different site -->
+				<!-- <module>guest/spring-security</module> --><!-- guest post on different site -->
 				<!-- <module>guest/thread-pools</module> --><!-- guest post on different site -->
 				<!-- <module>guest/tomcat-app</module> --><!-- guest post on different site -->
 				<module>jenkins/hello-world</module>
@@ -1151,7 +1151,7 @@
 				<module>spring-boot-h2/spring-boot-h2-database</module>
 				<!--module>spring-boot-h2/spring-boot-h2-remote-app</module-->
 				<!-- <module>guest\webservices\rest-client</module> --><!-- guest post on different site -->
-				<!-- <module>guest\webservices\rest-server</module> --><!-- PMD voilation -->
+				<!-- <module>guest\webservices\rest-server</module> --><!-- guest post on different site -->
 				<!-- <module>guest\webservices\spring-rest-service</module> --><!-- guest post on different site -->
 			</modules>
 
diff --git a/spring-custom-aop/pom.xml b/spring-custom-aop/pom.xml
index fd5f87a476f5..f0b1dbb5ac4e 100644
--- a/spring-custom-aop/pom.xml
+++ b/spring-custom-aop/pom.xml
@@ -149,6 +149,7 @@
         <subethasmtp.version>3.1.7</subethasmtp.version>
         <tomee-servlet-api.version>8.5.11</tomee-servlet-api.version>
         <guava.version>18.0</guava.version>
+        <tomcat.version>8.0.43</tomcat.version>
     </properties>
 
 </project>