From 8915610193c0711cdfd1b9040c14059e62c8c222 Mon Sep 17 00:00:00 2001
From: Dhawal Kapil <dhawalkapil@gmail.com>
Date: Wed, 27 Feb 2019 20:37:12 +0530
Subject: [PATCH] BAEL-12770 Aligning module name, artifact id and folder name

---
 jhipster/jhipster-uaa/pom.xml                                 | 3 +--
 lombok-custom/pom.xml                                         | 1 +
 maven/custom-rule/pom.xml                                     | 1 +
 maven/maven-enforcer/pom.xml                                  | 1 +
 osgi/osgi-intro-sample-activator/pom.xml                      | 1 +
 osgi/osgi-intro-sample-client/pom.xml                         | 1 +
 osgi/osgi-intro-sample-service/pom.xml                        | 1 +
 patterns/solid/pom.xml                                        | 1 +
 restx/pom.xml                                                 | 2 +-
 rxjava-2/pom.xml                                              | 1 +
 spring-boot-angular/pom.xml                                   | 3 ++-
 spring-cloud/spring-cloud-kubernetes/liveness-example/pom.xml | 1 +
 .../spring-cloud-kubernetes/readiness-example/pom.xml         | 1 +
 spring-cloud/spring-cloud-vault/pom.xml                       | 2 +-
 .../remoting-hessian-burlap-client/pom.xml                    | 4 ++--
 spring-soap/pom.xml                                           | 3 +--
 spring-zuul/pom.xml                                           | 2 +-
 17 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/jhipster/jhipster-uaa/pom.xml b/jhipster/jhipster-uaa/pom.xml
index 88df59b735..2c890c7b41 100644
--- a/jhipster/jhipster-uaa/pom.xml
+++ b/jhipster/jhipster-uaa/pom.xml
@@ -2,9 +2,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">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.baeldung.jhipster</groupId>
     <artifactId>jhipster-microservice-uaa</artifactId>
-    <name>JHipster Microservice with UAA</name>
+    <name>jhipster-microservice-uaa</name>
     <packaging>pom</packaging>
 
 	<parent>
diff --git a/lombok-custom/pom.xml b/lombok-custom/pom.xml
index f016405fd6..cfbe629945 100644
--- a/lombok-custom/pom.xml
+++ b/lombok-custom/pom.xml
@@ -5,6 +5,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>lombok-custom</artifactId>
+	<name>lombok-custom</name>
     <version>0.1-SNAPSHOT</version>
 
     <parent>
diff --git a/maven/custom-rule/pom.xml b/maven/custom-rule/pom.xml
index f76e0db11e..25a3489fb9 100644
--- a/maven/custom-rule/pom.xml
+++ b/maven/custom-rule/pom.xml
@@ -9,6 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>custom-rule</artifactId>
+	<name>custom-rule</name>
 
     <properties>
         <api.version>3.0.0-M2</api.version>
diff --git a/maven/maven-enforcer/pom.xml b/maven/maven-enforcer/pom.xml
index d54471e66c..9826beb0d9 100644
--- a/maven/maven-enforcer/pom.xml
+++ b/maven/maven-enforcer/pom.xml
@@ -9,6 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>maven-enforcer</artifactId>
+	<name>maven-enforcer</name>
 
     <build>
         <plugins>
diff --git a/osgi/osgi-intro-sample-activator/pom.xml b/osgi/osgi-intro-sample-activator/pom.xml
index 95ac1fc0fb..2bc1c20eed 100644
--- a/osgi/osgi-intro-sample-activator/pom.xml
+++ b/osgi/osgi-intro-sample-activator/pom.xml
@@ -3,6 +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>
     <artifactId>osgi-intro-sample-activator</artifactId>
+    <name>osgi-intro-sample-activator</name>
     <!-- Please, note this is not the usual 'jar'. -->
     <packaging>bundle</packaging>
 
diff --git a/osgi/osgi-intro-sample-client/pom.xml b/osgi/osgi-intro-sample-client/pom.xml
index 7f5faedb30..a630625ed2 100644
--- a/osgi/osgi-intro-sample-client/pom.xml
+++ b/osgi/osgi-intro-sample-client/pom.xml
@@ -5,6 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <!-- mvn:com.baeldung/osgi-intro-sample-client/1.0-SNAPSHOT -->
     <artifactId>osgi-intro-sample-client</artifactId>
+    <name>osgi-intro-sample-client</name>
     <packaging>bundle</packaging>
 
     <parent>
diff --git a/osgi/osgi-intro-sample-service/pom.xml b/osgi/osgi-intro-sample-service/pom.xml
index 8f81645ad4..4f0b108837 100644
--- a/osgi/osgi-intro-sample-service/pom.xml
+++ b/osgi/osgi-intro-sample-service/pom.xml
@@ -3,6 +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>
     <artifactId>osgi-intro-sample-service</artifactId>
+    <name>osgi-intro-sample-service</name>
     <!-- Please, note this is not the usual 'jar'. -->
     <packaging>bundle</packaging>
 
diff --git a/patterns/solid/pom.xml b/patterns/solid/pom.xml
index 2837504197..146a9903cf 100644
--- a/patterns/solid/pom.xml
+++ b/patterns/solid/pom.xml
@@ -5,6 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.baeldung</groupId>
     <artifactId>solid</artifactId>
+    <name>solid</name>
     <version>1.0-SNAPSHOT</version>
 
  <parent>
diff --git a/restx/pom.xml b/restx/pom.xml
index cc503f89b6..3a2e6af6f5 100644
--- a/restx/pom.xml
+++ b/restx/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>restx</artifactId>
     <version>0.1-SNAPSHOT</version>
-    <name>restx-demo</name>
+    <name>restx</name>
     <packaging>war</packaging>
 	
 	<parent>
diff --git a/rxjava-2/pom.xml b/rxjava-2/pom.xml
index 2519516f45..47d16ec8dd 100644
--- a/rxjava-2/pom.xml
+++ b/rxjava-2/pom.xml
@@ -4,6 +4,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>rxjava-2</artifactId>
+	<name>rxjava-2</name>
 	<version>1.0-SNAPSHOT</version>
 
 	<parent>
diff --git a/spring-boot-angular/pom.xml b/spring-boot-angular/pom.xml
index f2ed6d7718..6ea98eb3d0 100644
--- a/spring-boot-angular/pom.xml
+++ b/spring-boot-angular/pom.xml
@@ -2,7 +2,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">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.baeldung.springbootangular</groupId>
-    <artifactId>springbootangular</artifactId>
+    <artifactId>spring-boot-angular</artifactId>
+    <name>spring-boot-angular</name>
     <version>1.0</version>
     <packaging>jar</packaging>
     <parent>
diff --git a/spring-cloud/spring-cloud-kubernetes/liveness-example/pom.xml b/spring-cloud/spring-cloud-kubernetes/liveness-example/pom.xml
index b87f807391..012a81bd8d 100644
--- a/spring-cloud/spring-cloud-kubernetes/liveness-example/pom.xml
+++ b/spring-cloud/spring-cloud-kubernetes/liveness-example/pom.xml
@@ -4,6 +4,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>liveness-example</artifactId>
+	<name>liveness-example</name>
     <version>1.0-SNAPSHOT</version>
 
     <parent>
diff --git a/spring-cloud/spring-cloud-kubernetes/readiness-example/pom.xml b/spring-cloud/spring-cloud-kubernetes/readiness-example/pom.xml
index 42fa10934b..2b2e57a19c 100644
--- a/spring-cloud/spring-cloud-kubernetes/readiness-example/pom.xml
+++ b/spring-cloud/spring-cloud-kubernetes/readiness-example/pom.xml
@@ -4,6 +4,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>readiness-example</artifactId>
+	<name>readiness-example</name>
     <version>1.0-SNAPSHOT</version>
 
     <parent>
diff --git a/spring-cloud/spring-cloud-vault/pom.xml b/spring-cloud/spring-cloud-vault/pom.xml
index abfb0d06f3..fbcf8508c9 100644
--- a/spring-cloud/spring-cloud-vault/pom.xml
+++ b/spring-cloud/spring-cloud-vault/pom.xml
@@ -80,7 +80,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
-        <spring-cloud.version>Greenwich.M3</spring-cloud.version>
+        <spring-cloud.version>Greenwich.RELEASE</spring-cloud.version>
     </properties>
 
 </project>
diff --git a/spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-client/pom.xml b/spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-client/pom.xml
index 104712c3d7..ec237ca815 100644
--- a/spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-client/pom.xml
+++ b/spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-client/pom.xml
@@ -3,8 +3,8 @@
          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>
-    <artifactId>spring-remoting-hessian-burlap-client</artifactId>
-	<name>spring-remoting-hessian-burlap-client</name>
+    <artifactId>remoting-hessian-burlap-client</artifactId>
+    <name>remoting-hessian-burlap-client</name>
 	
 	<parent>
         <artifactId>remoting-hessian-burlap</artifactId>
diff --git a/spring-soap/pom.xml b/spring-soap/pom.xml
index f5c3a1434d..ba05eddf5d 100644
--- a/spring-soap/pom.xml
+++ b/spring-soap/pom.xml
@@ -2,9 +2,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">
     <modelVersion>4.0.0</modelVersion>
-
-    <groupId>com.baeldung</groupId>
     <artifactId>spring-soap</artifactId>
+    <name>spring-soap</name>
     <version>1.0.0</version>
 
     <parent>
diff --git a/spring-zuul/pom.xml b/spring-zuul/pom.xml
index d00a932168..b33aef780b 100644
--- a/spring-zuul/pom.xml
+++ b/spring-zuul/pom.xml
@@ -38,7 +38,7 @@
 
     <properties>
         <!-- Spring -->
-        <spring-cloud.version>2.1.0.RC3</spring-cloud.version>
+        <spring-cloud.version>2.1.0.RELEASE</spring-cloud.version>
         <!-- util -->
         <commons-lang3.version>3.5</commons-lang3.version>
         <!-- Maven plugins -->