Merge pull request eugenp#5153 from dkapil/task/BAEL-8844

lor6 · web-flow · commit 4bb6592cd9bf · 2018-09-04T08:42:56.000+03:00
Task/bael 8844
diff --git a/apache-cxf/sse-jaxrs/sse-jaxrs-server/pom.xml b/apache-cxf/sse-jaxrs/sse-jaxrs-server/pom.xml
@@ -20,7 +20,7 @@
     </properties>
 
     <build>
-        <finalName>${artifactId}</finalName>
+        <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
                 <groupId>net.wasdev.wlp.maven.plugins</groupId>
diff --git a/ejb/ejb-client/pom.xml b/ejb/ejb-client/pom.xml
@@ -16,7 +16,6 @@
             <groupId>org.wildfly</groupId>
             <artifactId>wildfly-ejb-client-bom</artifactId>
             <type>pom</type>
-            <scope>import</scope>
         </dependency>
         <dependency>
             <groupId>com.baeldung.ejb</groupId>
diff --git a/ejb/pom.xml b/ejb/pom.xml
@@ -17,7 +17,6 @@
 
     <modules>
         <module>ejb-remote</module>
-        <module>ejb-client</module>
         <module>ejb-session-beans</module>
     </modules>
 
diff --git a/jee-7/pom.xml b/jee-7/pom.xml
@@ -384,10 +384,6 @@
         </profile>
     </profiles>
 
-    <prerequisites>
-        <maven>${maven.min.version}</maven>
-    </prerequisites>
-
     <repositories>
         <repository>
             <id>bintray-mvc-spec-maven</id>
diff --git a/jhipster/jhipster-monolithic/pom.xml b/jhipster/jhipster-monolithic/pom.xml
@@ -412,6 +412,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-eclipse-plugin</artifactId>
+                <version>${maven-eclipse-plugin.version}</version>
                 <configuration>
                     <downloadSources>true</downloadSources>
                     <downloadJavadocs>true</downloadJavadocs>
@@ -879,10 +880,6 @@
         </profile>
     </profiles>
 
-    <prerequisites>
-        <maven>${maven.version}</maven>
-    </prerequisites>
-
     <properties>
         <argLine>-Djava.security.egd=file:/dev/./urandom -Xmx256m</argLine>
         <assertj.version>3.6.2</assertj.version>
@@ -909,6 +906,7 @@
         <mapstruct.version>1.1.0.Final</mapstruct.version>
         <maven-enforcer-plugin.version>1.4.1</maven-enforcer-plugin.version>
         <maven-resources-plugin.version>3.0.1</maven-resources-plugin.version>
+        <maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
         <maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
         <maven.version>3.0.0</maven.version>
         <metrics-spring.version>3.1.3</metrics-spring.version>
diff --git a/jnosql/jnosql-artemis/pom.xml b/jnosql/jnosql-artemis/pom.xml
@@ -19,7 +19,7 @@
     </properties>
 
     <build>
-        <finalName>${artifactId}</finalName>
+        <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
                 <groupId>net.wasdev.wlp.maven.plugins</groupId>
diff --git a/jsf/pom.xml b/jsf/pom.xml
@@ -36,11 +36,6 @@
             <version>${jstl.version}</version>
         </dependency>
         <!-- Spring -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <version>${org.springframework.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
diff --git a/jws/pom.xml b/jws/pom.xml
@@ -13,20 +13,23 @@
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
+	<repositories>
+	    <repository>
+	        <id>OpenNMS Repository</id>
+	        <url>http://repo.opennms.org/maven2/</url>
+	    </repository>
+	</repositories>
+
     <dependencies>
         <dependency>
-            <groupId>javax.jnlp</groupId>
+            <groupId>javax.samples.jnlp</groupId>
             <artifactId>jnlp-servlet</artifactId>
             <version>${jnlp-servlet.version}</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/java-core-samples-lib/jnlp-servlet.jar</systemPath>
         </dependency>
         <dependency>
-            <groupId>javax.jnlp</groupId>
-            <artifactId>jardiff</artifactId>
-            <version>${jardiff.version}</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/java-core-samples-lib/jardiff.jar</systemPath>
+            <groupId>javax.samples.jnlp</groupId>
+            <artifactId>jnlp-jardiff</artifactId>
+            <version>${jnlp-jardiff.version}</version>
         </dependency>
     </dependencies>
 
@@ -81,8 +84,8 @@
     <properties>
         <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
         <maven-war-plugin.version>3.0.0</maven-war-plugin.version>
-        <jardiff.version>7.0</jardiff.version>
-        <jnlp-servlet.version>7.0</jnlp-servlet.version>
+        <jnlp-jardiff.version>1.6.0</jnlp-jardiff.version>
+        <jnlp-servlet.version>1.6.0</jnlp-servlet.version>
     </properties>
 
 </project>
diff --git a/libraries/pom.xml b/libraries/pom.xml
@@ -716,11 +716,6 @@
             <artifactId>resilience4j-timelimiter</artifactId>
             <version>${resilience4j.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-math3</artifactId>
-            <version>${common-math3-version}</version>
-        </dependency>
         <dependency>
             <groupId>org.knowm.xchart</groupId>
             <artifactId>xchart</artifactId>
@@ -964,7 +959,6 @@
         <jctools.version>2.1.2</jctools.version>
         <typesafe-akka.version>2.5.11</typesafe-akka.version>
         <resilience4j.version>0.12.1</resilience4j.version>
-        <common-math3-version>3.6.1</common-math3-version>
         <xchart-version>3.5.2</xchart-version>
         <commons-net.version>3.6</commons-net.version>
         <mockftpserver.version>2.7.1</mockftpserver.version>
diff --git a/msf4j/pom.xml b/msf4j/pom.xml
@@ -6,12 +6,22 @@
 	<artifactId>msf4j</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 
-	<parent>
-		<groupId>org.wso2.msf4j</groupId>
-		<artifactId>msf4j-service</artifactId>
-		<version>2.6.0</version>
-	</parent>
+    <parent>
+        <artifactId>parent-modules</artifactId>
+        <groupId>com.baeldung</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
 
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+			    <groupId>org.wso2.msf4j</groupId>
+			    <artifactId>msf4j-service</artifactId>
+			    <version>${msf4j.version}</version>
+			    <type>pom</type>
+			</dependency>
+		</dependencies>		
+	</dependencyManagement>
 	<dependencies>
 		<dependency>
 			<groupId>org.wso2.msf4j</groupId>
@@ -27,7 +37,7 @@
 
 	<properties>
 		<microservice.mainClass>com.baeldung.msf4j.msf4jintro.Application</microservice.mainClass>
-		<msf4j.version>2.6.1</msf4j.version>
+		<msf4j.version>2.6.3</msf4j.version>
 	</properties>
 
 </project>
diff --git a/persistence-modules/spring-data-eclipselink/pom.xml b/persistence-modules/spring-data-eclipselink/pom.xml
@@ -2,9 +2,7 @@
 <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>spring-data-eclipselink</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
     <name>spring-data-eclipselink</name>
 
     <parent>
@@ -20,7 +18,6 @@
             <artifactId>spring-boot-dependencies</artifactId>
             <version>${spring.version}</version>
             <type>pom</type>
-            <scope>import</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/persistence-modules/spring-data-neo4j/pom.xml b/persistence-modules/spring-data-neo4j/pom.xml
@@ -1,7 +1,6 @@
 <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>spring-data-neo4j</artifactId>
     <version>1.0</version>
 
@@ -74,11 +73,6 @@
             <version>${neo4j-ogm.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.neo4j</groupId>
-            <artifactId>neo4j-ogm-embedded-driver</artifactId>
-            <version>${neo4j-ogm.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.neo4j.test</groupId>
             <artifactId>neo4j-harness</artifactId>
diff --git a/pom.xml b/pom.xml
@@ -360,6 +360,7 @@
 				<module>dozer</module>
 				<module>ethereum</module>
 				<module>ejb</module>
+				<module>ejb/ejb-client</module>
 				<module>feign</module>
 				<module>flips</module>
 				<module>testing-modules/gatling</module>
diff --git a/spring-5-reactive-client/pom.xml b/spring-5-reactive-client/pom.xml
@@ -3,9 +3,7 @@
     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>spring-5-reactive-client</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>spring-5-reactive-client</name>
     <description>spring 5 sample project about new features</description>
@@ -92,11 +90,6 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
-
     </dependencies>
 
     <build>
diff --git a/spring-boot-ops/pom.xml b/spring-boot-ops/pom.xml
@@ -3,9 +3,7 @@
     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>spring-boot-ops</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <packaging>war</packaging>
     <name>spring-boot-ops</name>
     <description>Demo project for Spring Boot</description>
@@ -19,10 +17,6 @@
 
     <dependencies>
 
-        <!-- add dependency management if you have a different parent pom <dependencyManagement> <dependencies> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-data-jpa</artifactId> 
-            <version>1.5.10.RELEASE</version> </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> <version>1.5.10.RELEASE</version> 
-            <type>pom</type> <scope>import</scope> </dependency> </dependencies> </dependencyManagement> -->
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -95,13 +89,8 @@
     </dependencies>
 
     <build>
-        <finalName>${artifactId}</finalName>
+        <finalName>${project.artifactId}</finalName>
         <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
diff --git a/spring-boot-security/pom.xml b/spring-boot-security/pom.xml
@@ -2,7 +2,6 @@
 <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>spring-boot-security</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
@@ -28,10 +27,6 @@
     </dependencyManagement>
 
     <dependencies>
-        <!--<dependency> -->
-        <!--<groupId>org.springframework.boot</groupId> -->
-        <!--<artifactId>spring-boot-starter-actuator</artifactId> -->
-        <!--</dependency> -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>
@@ -72,11 +67,6 @@
             <artifactId>spring-security-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-test</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/spring-jooq/pom.xml b/spring-jooq/pom.xml
@@ -2,8 +2,7 @@
     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>
     <artifactId>spring-jooq</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-
+    
     <parent>
         <artifactId>parent-boot-1</artifactId>
         <groupId>com.baeldung</groupId>
@@ -54,11 +53,6 @@
             <artifactId>spring-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-        </dependency>
-
     </dependencies>
 
     <build>
diff --git a/spring-security-mvc-digest-auth/pom.xml b/spring-security-mvc-digest-auth/pom.xml
@@ -1,8 +1,6 @@
 <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>spring-security-mvc-digest-auth</artifactId>
     <version>0.1-SNAPSHOT</version>
     <name>spring-security-mvc-digest-auth</name>
@@ -91,12 +89,6 @@
             <version>${spring.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-
         <!-- web -->
 
         <dependency>
diff --git a/spring-swagger-codegen/spring-swagger-codegen-api-client/pom.xml b/spring-swagger-codegen/spring-swagger-codegen-api-client/pom.xml
@@ -2,21 +2,17 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.baeldung</groupId>
     <artifactId>spring-swagger-codegen-api-client</artifactId>
     <packaging>jar</packaging>
     <name>spring-swagger-codegen-api-client</name>
-    <version>0.0.1-SNAPSHOT</version>
     <url>https://github.com/swagger-api/swagger-codegen</url>
     <description>Swagger Java</description>
     <scm>
         <connection>scm:git:git@github.com:swagger-api/swagger-codegen.git</connection>
         <developerConnection>scm:git:git@github.com:swagger-api/swagger-codegen.git</developerConnection>
         <url>https://github.com/swagger-api/swagger-codegen</url>
     </scm>
-    <prerequisites>
-        <maven>2.2.0</maven>
-    </prerequisites>
+
     <licenses>
         <license>
             <name>Unlicense</name>
diff --git a/testing-modules/mockito/pom.xml b/testing-modules/mockito/pom.xml
diff --git a/xml/pom.xml b/xml/pom.xml
