[BAEL-17651] - spring-boot-angular & spring-boot-angular-ecommerce merge (#7866)

* [BAEL-17651] - angular merge

* Added article link the readme

* added colon

* removed spring-boot-angular-ecommerce from parent pom

pom.xml

@@ -671,7 +671,6 @@
 				<module>spring-boot</module>
 				<module>spring-boot-admin</module>
 				<module>spring-boot-angular</module>
-				<module>spring-boot-angular-ecommerce</module>
 				<module>spring-boot-autoconfiguration</module>
 				<module>spring-boot-bootstrap</module>
 				<module>spring-boot-camel</module>
@@ -1389,7 +1388,6 @@
 				<module>spring-boot</module>
 				<module>spring-boot-admin</module>
 				<module>spring-boot-angular</module>
-				<module>spring-boot-angular-ecommerce</module>
 				<module>spring-boot-autoconfiguration</module>
 				<module>spring-boot-bootstrap</module>
 				<module>spring-boot-camel</module>

spring-boot-angular-ecommerce/README.md

@@ -1,6 +0,0 @@
-## Spring Boot Angular Ecommerce
-
-This module contains articles about Spring Boot with Angular in regards to ecommerce applications. 
-
-### Relevant Articles:
-- [A Simple E-Commerce Implementation with Spring](https://www.baeldung.com/spring-angular-ecommerce)

spring-boot-angular-ecommerce/pom.xml

@@ -1,81 +0,0 @@
-<?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">
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>spring-boot-angular-ecommerce</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <name>spring-boot-angular-ecommerce</name>
-    <packaging>jar</packaging>
-    <description>Spring Boot Angular E-commerce Appliciation</description>
-
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </parent>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-dependencies</artifactId>
-                <version>${spring.boot.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-jpa</artifactId>
-            <version>${spring.boot.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-            <version>${spring.boot.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-devtools</artifactId>
-            <version>${spring.boot.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <version>1.4.197</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-jsr310</artifactId>
-            <version>2.9.6</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <version>${spring.boot.version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${spring-boot-maven-plugin.version}</version>
-            </plugin>
-        </plugins>
-    </build>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <spring.boot.version>2.0.3.RELEASE</spring.boot.version>
-        <spring-boot-maven-plugin.version>2.0.4.RELEASE</spring-boot-maven-plugin.version>
-    </properties>
-</project>

spring-boot-angular/README.md

@@ -1,7 +1,8 @@
 ## Spring Boot Angular
 
-This module contains articles about Spring Boot with Angular 
+This module contains articles about Spring Boot with Angular
 
 ### Relevant Articles:
-- [Building a Web Application with Spring Boot and Angular](https://www.baeldung.com/spring-boot-angular-web)
 
+- [Building a Web Application with Spring Boot and Angular](https://www.baeldung.com/spring-boot-angular-web)
+- [A Simple E-Commerce Implementation with Spring](https://www.baeldung.com/spring-angular-ecommerce)

spring-boot-angular/pom.xml

@@ -7,11 +7,12 @@
     <version>1.0</version>
     <packaging>jar</packaging>
 
+
     <parent>
         <artifactId>parent-boot-2</artifactId>
 	    <groupId>com.baeldung</groupId>
 	    <version>0.0.1-SNAPSHOT</version>
-	    <relativePath>../../parent-boot-2</relativePath>
+	    <relativePath>../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>

spring-boot-angular/src/main/js/application/.gitignore

@@ -36,8 +36,8 @@ testem.log
 /typings
 
 # e2e
-/e2e/*.js
+/spring-boot-angular/src/main/js/application/e2e/*.js
-/e2e/*.map
+/spring-boot-angular/src/main/js/application/e2e/*.map
 
 # System Files
 .DS_Store