Merge pull request #12350 from dkapil/task/JAVA-11241

JAVA-11241 Added missing pom.xml for container modules and other cleanup

cas/cas-secured-app/pom.xml

@@ -10,10 +10,9 @@
     <description>Demo project for CAS</description>
 
     <parent>
-        <groupId>com.baeldung</groupId>
+        <groupId>com.baeldung.cas</groupId>
-        <artifactId>parent-boot-2</artifactId>
+        <artifactId>cas</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>

cas/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/CasSecuredApplication.java

@@ -88,7 +88,6 @@ public class CasSecuredApplication {
     @Bean
     public SingleSignOutFilter singleSignOutFilter() {
         SingleSignOutFilter singleSignOutFilter = new SingleSignOutFilter();
-        singleSignOutFilter.setCasServerUrlPrefix("https://localhost:8443");
         singleSignOutFilter.setLogoutCallbackPath("/exit/cas");
         singleSignOutFilter.setIgnoreInitConfiguration(true);
         return singleSignOutFilter;

cas/pom.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-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.cas</groupId>
+    <artifactId>cas</artifactId>
+    <name>cas</name>
+    <packaging>pom</packaging>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-boot-2</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-boot-2</relativePath>
+    </parent>
+
+    <modules>
+        <module>cas-secured-app</module>
+    </modules>
+
+</project>

core-java-modules/core-java-regex-2/src/main/java/com/baeldung/regex/array/RegexMatches.java

@@ -1,4 +1,4 @@
-package regex.array;
+package com.baeldung.regex.array;
 
 import java.util.ArrayList;
 import java.util.List;

core-java-modules/core-java-regex-2/src/test/java/com/baeldung/regex/array/RegexMatchesUnitTest.java

@@ -1,10 +1,9 @@
-package regex.array;
+package com.baeldung.regex.array;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
-import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
 
-import regex.array.RegexMatches;
-
 class RegexMatchesUnitTest {
 
 	@Test

pom.xml

@@ -365,7 +365,7 @@
                 <module>bazel</module>
                 <module>blade</module>
                 <module>bootique</module>
-                <!-- <module>cas</module> --> <!-- Not a maven project -->
+                <module>cas</module>
                 <module>cdi</module>
                 <module>checker-plugin</module>
                 <!-- <module>clojure</module> --> <!-- Not a maven project -->
@@ -818,7 +818,7 @@
                 <module>bazel</module>
                 <module>blade</module>
                 <module>bootique</module>
-                <!-- <module>cas</module> --> <!-- Not a maven project -->
+                <module>cas</module>
                 <module>cdi</module>
                 <module>checker-plugin</module>
                 <!-- <module>clojure</module> --> <!-- Not a maven project -->

regexMatchesToArray/src/regex/array/RegexMatches.java

@@ -1,24 +0,0 @@
-package regex.array;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.*;
-	
-class RegexMatches {
-	
-    String[] regexMatch(String strSearch)
-	{
-	    List<String> matchesList = new ArrayList<String>();
-	    String stringToSearch = strSearch;
-	    Pattern p1 = Pattern.compile("780{1}\\d{7}");
-	    Matcher m1 = p1.matcher(stringToSearch);
-	    while (m1.find()) 
-	    {
-	    	matchesList.add(m1.group());
-	    }
-	    int sizeOfNewArray = matchesList.size();
-	    String newArrayOfMatches[] = new String[sizeOfNewArray];
-	    matchesList.toArray(newArrayOfMatches);
-	    return newArrayOfMatches;
-	}
-}

regexMatchesToArray/test/regex/array/RegexMatchesUnitTest.java

@@ -1,33 +0,0 @@
-package regex.array;
-
-import static org.junit.jupiter.api.Assertions.*;
-import org.junit.jupiter.api.Test;
-
-import regex.array.RegexMatches;
-
-class RegexMatchesUnitTest {
-
-	@Test
-	void whenFourNums_thenFourMatches() {
-		RegexMatches rm = new RegexMatches();
-		String actual[] = rm.regexMatch("7801111211fsdafasdfa  7802222222  sadfsadfsda7803333333 sadfdasfasd 7804444444");
-		
-		assertArrayEquals(new String[] {"7801111211", "7802222222", "7803333333", "7804444444"}, actual, "success");
-	}
-
-	@Test
-	void whenThreeNums_thenThreeMatches() {
-		RegexMatches rm = new RegexMatches();
-		String actual[] = rm.regexMatch("7801111211fsdafasdfa  780222222  sadfsadfsda7803333333 sadfdasfasd 7804444444");
-		
-		assertArrayEquals(new String[] {"7801111211", "7803333333", "7804444444"}, actual, "success");
-	}
-
-	@Test
-	void whenZeroNums_thenZeroMatches() {
-		RegexMatches rm = new RegexMatches();
-		String actual[] = rm.regexMatch("78011111fsdafasdfa  780222222  sadfsadfsda78033333 sadfdasfasd 7804444");
-		
-		assertArrayEquals(new String[] {}, actual, "success");
-	}
-}

spring-cloud-modules/pom.xml

@@ -27,7 +27,7 @@
         <module>spring-cloud-zookeeper</module>
         <module>spring-cloud-gateway</module>
         <module>spring-cloud-stream</module>
-        <module>spring-cloud-stream-starters/twitterhdfs</module>
+        <module>spring-cloud-stream-starters</module>
         <module>spring-cloud-connectors-heroku</module>
         <module>spring-cloud-aws</module>
         <module>spring-cloud-consul</module>

spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/pom.xml

@@ -4,14 +4,12 @@
     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>client-service</artifactId>
-    <version>1.0-SNAPSHOT</version>
     <name>client-service</name>
 
     <parent>
         <groupId>com.baeldung.spring.cloud</groupId>
-        <artifactId>spring-cloud-kubernetes</artifactId>
+        <artifactId>kubernetes-guide</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../../../spring-cloud-kubernetes</relativePath>
     </parent>
 
     <dependencyManagement>

spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/pom.xml

@@ -0,0 +1,21 @@
+<?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>kubernetes-guide</artifactId>
+    <name>kubernetes-guide</name>
+    <packaging>pom</packaging>
+
+    <parent>
+        <groupId>com.baeldung.spring.cloud</groupId>
+        <artifactId>spring-cloud-kubernetes</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <modules>
+        <module>client-service</module>
+        <module>travel-agency-service</module>
+    </modules>
+
+</project>

spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/pom.xml

@@ -4,13 +4,12 @@
     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>travel-agency-service</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <name>travel-agency-service</name>
 
     <parent>
         <groupId>com.baeldung.spring.cloud</groupId>
-        <artifactId>spring-cloud-kubernetes</artifactId>
+        <artifactId>kubernetes-guide</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../../../spring-cloud-kubernetes</relativePath>
     </parent>
 
     <dependencyManagement>

spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/pom.xml

@@ -8,9 +8,8 @@
 
     <parent>
         <groupId>com.baeldung.spring.cloud</groupId>
-        <artifactId>spring-cloud-kubernetes</artifactId>
+        <artifactId>kubernetes-minikube</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../../../spring-cloud-kubernetes</relativePath>
     </parent>
 
     <dependencies>

spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/pom.xml

@@ -8,9 +8,8 @@
 
     <parent>
         <groupId>com.baeldung.spring.cloud</groupId>
-        <artifactId>spring-cloud-kubernetes</artifactId>
+        <artifactId>kubernetes-minikube</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../../../spring-cloud-kubernetes</relativePath>
     </parent>
 
     <dependencies>

spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/pom.xml

@@ -0,0 +1,21 @@
+<?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>kubernetes-minikube</artifactId>
+    <name>kubernetes-minikube</name>
+    <packaging>pom</packaging>
+
+    <parent>
+        <groupId>com.baeldung.spring.cloud</groupId>
+        <artifactId>spring-cloud-kubernetes</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <modules>
+        <module>demo-backend</module>
+        <module>demo-frontend</module>
+    </modules>
+
+</project>

spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/pom.xml

@@ -4,14 +4,12 @@
     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>
-    <version>1.0-SNAPSHOT</version>
     <name>liveness-example</name>
 
     <parent>
         <groupId>com.baeldung.spring.cloud</groupId>
-        <artifactId>spring-cloud-kubernetes</artifactId>
+        <artifactId>kubernetes-selfhealing</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../../../spring-cloud-kubernetes</relativePath>
     </parent>
 
     <dependencies>

spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/pom.xml

@@ -0,0 +1,21 @@
+<?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>kubernetes-selfhealing</artifactId>
+    <name>kubernetes-selfhealing</name>
+    <packaging>pom</packaging>
+
+    <parent>
+        <groupId>com.baeldung.spring.cloud</groupId>
+        <artifactId>spring-cloud-kubernetes</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <modules>
+        <module>liveness-example</module>
+        <module>readiness-example</module>
+    </modules>
+
+</project>

spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/pom.xml

@@ -4,14 +4,12 @@
     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>
-    <version>1.0-SNAPSHOT</version>
     <name>readiness-example</name>
 
     <parent>
         <groupId>com.baeldung.spring.cloud</groupId>
-        <artifactId>spring-cloud-kubernetes</artifactId>
+        <artifactId>kubernetes-selfhealing</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../../../spring-cloud-kubernetes</relativePath>
     </parent>
 
     <dependencies>

spring-cloud-modules/spring-cloud-kubernetes/pom.xml

@@ -5,7 +5,6 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.baeldung.spring.cloud</groupId>
     <artifactId>spring-cloud-kubernetes</artifactId>
-    <version>1.0-SNAPSHOT</version>
     <name>spring-cloud-kubernetes</name>
     <packaging>pom</packaging>
 
@@ -16,12 +15,9 @@
     </parent>
 
     <modules>
-        <module>kubernetes-minikube/demo-frontend</module>
+        <module>kubernetes-minikube</module>
-        <module>kubernetes-minikube/demo-backend</module>
+        <module>kubernetes-selfhealing</module>
-        <module>kubernetes-selfhealing/liveness-example</module>
+        <module>kubernetes-guide</module>
-        <module>kubernetes-selfhealing/readiness-example</module>
-        <module>kubernetes-guide/client-service</module>
-        <module>kubernetes-guide/travel-agency-service</module>
     </modules>
 
     <dependencyManagement>

spring-cloud-modules/spring-cloud-stream-starters/pom.xml

@@ -0,0 +1,37 @@
+<?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>
+    <groupId>com.baeldung.spring.cloud</groupId>
+    <artifactId>spring-cloud-stream-starters</artifactId>
+    <name>spring-cloud-stream-starters</name>
+    <packaging>pom</packaging>
+
+    <parent>
+        <groupId>com.baeldung.spring.cloud</groupId>
+        <artifactId>spring-cloud-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <modules>
+        <module>twitterhdfs</module>
+    </modules>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>${spring-cloud-dependencies.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <properties>
+        <spring-cloud-dependencies.version>2021.0.0</spring-cloud-dependencies.version>
+    </properties>
+
+</project>

spring-security-modules/pom.xml

@@ -29,7 +29,7 @@
         <module>spring-security-oidc</module>
         <module>spring-security-okta</module>
         <module>spring-security-saml</module>
-        <module>spring-security-web-angular/server</module>
+        <module>spring-security-web-angular</module>
         <module>spring-security-web-boot-1</module>
         <module>spring-security-web-boot-2</module>
         <module>spring-security-web-boot-3</module>

spring-security-modules/spring-security-web-angular/pom.xml

@@ -0,0 +1,21 @@
+<?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>
+    <groupId>com.baeldung.spring.security</groupId>
+    <artifactId>spring-security-web-angular</artifactId>
+    <name>spring-security-web-angular</name>
+    <packaging>pom</packaging>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>spring-security-modules</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+
+    <modules>
+        <module>server</module>
+    </modules>
+
+</project>

spring-security-modules/spring-security-web-angular/server/pom.xml

@@ -4,16 +4,14 @@
     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>server</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <name>server</name>
     <packaging>jar</packaging>
     <description>Spring Security Angular</description>
 
     <parent>
-        <groupId>com.baeldung</groupId>
+        <groupId>com.baeldung.spring.security</groupId>
-        <artifactId>parent-modules</artifactId>
+        <artifactId>spring-security-web-angular</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../../</relativePath>
     </parent>
 
     <dependencyManagement>