From 3130251d3ab0b5b8b4cea3d0056bd163a5aa0a54 Mon Sep 17 00:00:00 2001
From: Dhawal Kapil <dhawalkapil@gmail.com>
Date: Mon, 3 Sep 2018 22:19:38 +0530
Subject: [PATCH] BAEL-8824 Align module names, folder names and artifact id

- Fixed pom of projects as per new project artifacts
---
 osgi/osgi-intro-sample-activator/pom.xml | 2 +-
 osgi/osgi-intro-sample-client/pom.xml    | 2 +-
 osgi/osgi-intro-sample-service/pom.xml   | 2 +-
 patterns/design-patterns/pom.xml         | 3 +--
 patterns/front-controller/pom.xml        | 2 +-
 patterns/intercepting-filter/pom.xml     | 2 +-
 patterns/pom.xml                         | 3 +--
 performance-tests/pom.xml                | 2 +-
 spring-ejb/ejb-beans/pom.xml             | 2 +-
 spring-ejb/ejb-remote-for-spring/pom.xml | 2 +-
 10 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/osgi/osgi-intro-sample-activator/pom.xml b/osgi/osgi-intro-sample-activator/pom.xml
index 42008dafdd..77d7198698 100644
--- a/osgi/osgi-intro-sample-activator/pom.xml
+++ b/osgi/osgi-intro-sample-activator/pom.xml
@@ -8,7 +8,7 @@
 
     <!-- com.baeldung/osgi-intro-sample-activator/1.0-SNAPSHOT -->
     <parent>
-        <artifactId>osgi-intro</artifactId>
+        <artifactId>osgi</artifactId>
         <groupId>com.baeldung</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
diff --git a/osgi/osgi-intro-sample-client/pom.xml b/osgi/osgi-intro-sample-client/pom.xml
index f0cf0a357a..7f5faedb30 100644
--- a/osgi/osgi-intro-sample-client/pom.xml
+++ b/osgi/osgi-intro-sample-client/pom.xml
@@ -8,7 +8,7 @@
     <packaging>bundle</packaging>
 
     <parent>
-        <artifactId>osgi-intro</artifactId>
+        <artifactId>osgi</artifactId>
         <groupId>com.baeldung</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
diff --git a/osgi/osgi-intro-sample-service/pom.xml b/osgi/osgi-intro-sample-service/pom.xml
index 29741e7eb2..8f81645ad4 100644
--- a/osgi/osgi-intro-sample-service/pom.xml
+++ b/osgi/osgi-intro-sample-service/pom.xml
@@ -8,7 +8,7 @@
 
     <!-- mvn:com.baeldung/osgi-intro-sample-service/1.0-SNAPSHOT -->
     <parent>
-        <artifactId>osgi-intro</artifactId>
+        <artifactId>osgi</artifactId>
         <groupId>com.baeldung</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
diff --git a/patterns/design-patterns/pom.xml b/patterns/design-patterns/pom.xml
index 22fc88b75a..dc2631b36e 100644
--- a/patterns/design-patterns/pom.xml
+++ b/patterns/design-patterns/pom.xml
@@ -2,13 +2,12 @@
 <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>design-patterns</artifactId>
     <version>1.0</version>
     <packaging>jar</packaging>
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>patterns-parent</artifactId>
+        <artifactId>patterns</artifactId>
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
diff --git a/patterns/front-controller/pom.xml b/patterns/front-controller/pom.xml
index 96ed86d975..435b0dd9cd 100644
--- a/patterns/front-controller/pom.xml
+++ b/patterns/front-controller/pom.xml
@@ -6,7 +6,7 @@
     <packaging>war</packaging>
 
     <parent>
-        <artifactId>patterns-parent</artifactId>
+        <artifactId>patterns</artifactId>
         <groupId>com.baeldung</groupId>
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
diff --git a/patterns/intercepting-filter/pom.xml b/patterns/intercepting-filter/pom.xml
index ee6fef30c9..fa94d5d1fd 100644
--- a/patterns/intercepting-filter/pom.xml
+++ b/patterns/intercepting-filter/pom.xml
@@ -8,7 +8,7 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>patterns-parent</artifactId>
+        <artifactId>patterns</artifactId>
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
diff --git a/patterns/pom.xml b/patterns/pom.xml
index c8f44227a3..df09f1836a 100644
--- a/patterns/pom.xml
+++ b/patterns/pom.xml
@@ -2,8 +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>patterns-parent</artifactId>
+    <artifactId>patterns</artifactId>
     <packaging>pom</packaging>
 
     <parent>
diff --git a/performance-tests/pom.xml b/performance-tests/pom.xml
index 0240b2c2ea..8c9d027724 100644
--- a/performance-tests/pom.xml
+++ b/performance-tests/pom.xml
@@ -3,7 +3,7 @@
          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>performancetests</artifactId>
+    <artifactId>performance-tests</artifactId>
 
     <parent>
         <artifactId>parent-modules</artifactId>
diff --git a/spring-ejb/ejb-beans/pom.xml b/spring-ejb/ejb-beans/pom.xml
index 6ab48741f3..76c0afadee 100644
--- a/spring-ejb/ejb-beans/pom.xml
+++ b/spring-ejb/ejb-beans/pom.xml
@@ -8,7 +8,7 @@
 
     <parent>
         <groupId>com.baeldung.spring.ejb</groupId>
-        <artifactId>ejb-for-spring</artifactId>
+        <artifactId>spring-ejb</artifactId>
         <version>1.0.1</version>
     </parent>
 
diff --git a/spring-ejb/ejb-remote-for-spring/pom.xml b/spring-ejb/ejb-remote-for-spring/pom.xml
index 5f4869968f..21256fa801 100755
--- a/spring-ejb/ejb-remote-for-spring/pom.xml
+++ b/spring-ejb/ejb-remote-for-spring/pom.xml
@@ -7,7 +7,7 @@
 
     <parent>
         <groupId>com.baeldung.spring.ejb</groupId>
-        <artifactId>ejb-for-spring</artifactId>
+        <artifactId>spring-ejb</artifactId>
         <version>1.0.1</version>
     </parent>