From a3a0fdfd96dfb0c91a0cf7a57c088099e438063c Mon Sep 17 00:00:00 2001 From: Dhawal Kapil Date: Tue, 14 Jun 2022 22:47:10 +0530 Subject: [PATCH] JAVA-11241 Added missing pom.xml for container modules and other cleanup --- cas/cas-secured-app/pom.xml | 5 +-- .../cassecuredapp/CasSecuredApplication.java | 1 - cas/pom.xml | 22 +++++++++++ .../baeldung}/regex/array/RegexMatches.java | 2 +- .../regex/array/RegexMatchesUnitTest.java | 7 ++-- pom.xml | 10 ++--- .../src/regex/array/RegexMatches.java | 24 ------------ .../regex/array/RegexMatchesUnitTest.java | 33 ----------------- spring-cloud-modules/pom.xml | 4 +- .../kubernetes-guide/client-service/pom.xml | 8 ++-- .../kubernetes-guide/pom.xml | 21 +++++++++++ .../travel-agency-service/pom.xml | 9 ++--- .../kubernetes-minikube/demo-backend/pom.xml | 5 +-- .../kubernetes-minikube/demo-frontend/pom.xml | 5 +-- .../kubernetes-minikube/pom.xml | 21 +++++++++++ .../liveness-example/pom.xml | 6 +-- .../kubernetes-selfhealing/pom.xml | 21 +++++++++++ .../readiness-example/pom.xml | 6 +-- .../spring-cloud-kubernetes/pom.xml | 12 ++---- .../spring-cloud-stream-starters/pom.xml | 37 +++++++++++++++++++ spring-security-modules/pom.xml | 4 +- .../spring-security-web-angular/pom.xml | 21 +++++++++++ .../server/pom.xml | 8 ++-- 23 files changed, 180 insertions(+), 112 deletions(-) create mode 100644 cas/pom.xml rename core-java-modules/core-java-regex-2/{regexMatchToArray/src => src/main/java/com/baeldung}/regex/array/RegexMatches.java (94%) rename core-java-modules/core-java-regex-2/{regexMatchToArray/test => src/test/java/com/baeldung}/regex/array/RegexMatchesUnitTest.java (90%) delete mode 100644 regexMatchesToArray/src/regex/array/RegexMatches.java delete mode 100644 regexMatchesToArray/test/regex/array/RegexMatchesUnitTest.java create mode 100644 spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/pom.xml create mode 100644 spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/pom.xml create mode 100644 spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/pom.xml create mode 100644 spring-cloud-modules/spring-cloud-stream-starters/pom.xml create mode 100644 spring-security-modules/spring-security-web-angular/pom.xml diff --git a/cas/cas-secured-app/pom.xml b/cas/cas-secured-app/pom.xml index bcce82c94c..eac47bc093 100644 --- a/cas/cas-secured-app/pom.xml +++ b/cas/cas-secured-app/pom.xml @@ -10,10 +10,9 @@ Demo project for CAS - com.baeldung - parent-boot-2 + com.baeldung.cas + cas 0.0.1-SNAPSHOT - ../../parent-boot-2 diff --git a/cas/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/CasSecuredApplication.java b/cas/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/CasSecuredApplication.java index 4a2c609758..ca37535f2c 100644 --- a/cas/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/CasSecuredApplication.java +++ b/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; diff --git a/cas/pom.xml b/cas/pom.xml new file mode 100644 index 0000000000..4d8695dad8 --- /dev/null +++ b/cas/pom.xml @@ -0,0 +1,22 @@ + + + 4.0.0 + com.baeldung.cas + cas + cas + pom + + + com.baeldung + parent-boot-2 + 0.0.1-SNAPSHOT + ../parent-boot-2 + + + + cas-secured-app + + + diff --git a/core-java-modules/core-java-regex-2/regexMatchToArray/src/regex/array/RegexMatches.java b/core-java-modules/core-java-regex-2/src/main/java/com/baeldung/regex/array/RegexMatches.java similarity index 94% rename from core-java-modules/core-java-regex-2/regexMatchToArray/src/regex/array/RegexMatches.java rename to core-java-modules/core-java-regex-2/src/main/java/com/baeldung/regex/array/RegexMatches.java index d7b50d95ca..35d96077b3 100644 --- a/core-java-modules/core-java-regex-2/regexMatchToArray/src/regex/array/RegexMatches.java +++ b/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; diff --git a/core-java-modules/core-java-regex-2/regexMatchToArray/test/regex/array/RegexMatchesUnitTest.java b/core-java-modules/core-java-regex-2/src/test/java/com/baeldung/regex/array/RegexMatchesUnitTest.java similarity index 90% rename from core-java-modules/core-java-regex-2/regexMatchToArray/test/regex/array/RegexMatchesUnitTest.java rename to core-java-modules/core-java-regex-2/src/test/java/com/baeldung/regex/array/RegexMatchesUnitTest.java index 3e8f23c4bb..fd41cb31ef 100644 --- a/core-java-modules/core-java-regex-2/regexMatchToArray/test/regex/array/RegexMatchesUnitTest.java +++ b/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 diff --git a/pom.xml b/pom.xml index d7943fa8d3..03b9d2ac7f 100644 --- a/pom.xml +++ b/pom.xml @@ -365,7 +365,7 @@ bazel blade bootique - + cas cdi checker-plugin @@ -423,7 +423,7 @@ javafx java-jdi - java-lite + java-lite java-rmi java-spi java-vavr-stream @@ -821,7 +821,7 @@ bazel blade bootique - + cas cdi checker-plugin @@ -1285,7 +1285,7 @@ core-java-modules/core-java-string-operations-3 core-java-modules/core-java-string-operations-4 core-java-modules/core-java-time-measurements - core-java-modules/core-java-networking-3 + core-java-modules/core-java-networking-3 core-java-modules/core-java-strings core-java-modules/core-java-httpclient ddd-contexts @@ -1354,7 +1354,7 @@ core-java-modules/core-java-string-operations-3 core-java-modules/core-java-string-operations-4 core-java-modules/core-java-time-measurements - core-java-modules/core-java-networking-3 + core-java-modules/core-java-networking-3 core-java-modules/core-java-strings ddd-contexts docker-modules diff --git a/regexMatchesToArray/src/regex/array/RegexMatches.java b/regexMatchesToArray/src/regex/array/RegexMatches.java deleted file mode 100644 index d7b50d95ca..0000000000 --- a/regexMatchesToArray/src/regex/array/RegexMatches.java +++ /dev/null @@ -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 matchesList = new ArrayList(); - 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; - } -} diff --git a/regexMatchesToArray/test/regex/array/RegexMatchesUnitTest.java b/regexMatchesToArray/test/regex/array/RegexMatchesUnitTest.java deleted file mode 100644 index 3e8f23c4bb..0000000000 --- a/regexMatchesToArray/test/regex/array/RegexMatchesUnitTest.java +++ /dev/null @@ -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"); - } -} diff --git a/spring-cloud-modules/pom.xml b/spring-cloud-modules/pom.xml index d2f3845922..f43e56cde3 100644 --- a/spring-cloud-modules/pom.xml +++ b/spring-cloud-modules/pom.xml @@ -27,7 +27,7 @@ spring-cloud-zookeeper spring-cloud-gateway spring-cloud-stream - spring-cloud-stream-starters/twitterhdfs + spring-cloud-stream-starters spring-cloud-connectors-heroku spring-cloud-aws spring-cloud-consul @@ -92,4 +92,4 @@ 3.1.3 - \ No newline at end of file + diff --git a/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/pom.xml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/pom.xml index cedd46dfef..98828a76f2 100644 --- a/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/pom.xml +++ b/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"> 4.0.0 client-service - 1.0-SNAPSHOT client-service com.baeldung.spring.cloud - spring-cloud-kubernetes - 1.0-SNAPSHOT - ../../../spring-cloud-kubernetes + kubernetes-guide + 1.0.0-SNAPSHOT @@ -88,4 +86,4 @@ 1.1.8.RELEASE - \ No newline at end of file + diff --git a/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/pom.xml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/pom.xml new file mode 100644 index 0000000000..ffd9097f2a --- /dev/null +++ b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/pom.xml @@ -0,0 +1,21 @@ + + + 4.0.0 + kubernetes-guide + kubernetes-guide + pom + + + com.baeldung.spring.cloud + spring-cloud-kubernetes + 1.0.0-SNAPSHOT + + + + client-service + travel-agency-service + + + diff --git a/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/pom.xml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/pom.xml index ba5ba93682..1e93f7eaac 100644 --- a/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/pom.xml +++ b/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"> 4.0.0 travel-agency-service - 1.0-SNAPSHOT + travel-agency-service com.baeldung.spring.cloud - spring-cloud-kubernetes - 1.0-SNAPSHOT - ../../../spring-cloud-kubernetes + kubernetes-guide + 1.0.0-SNAPSHOT @@ -62,4 +61,4 @@ - \ No newline at end of file + diff --git a/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/pom.xml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/pom.xml index 81455eb259..2b3f849145 100644 --- a/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/pom.xml +++ b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/pom.xml @@ -8,9 +8,8 @@ com.baeldung.spring.cloud - spring-cloud-kubernetes - 1.0-SNAPSHOT - ../../../spring-cloud-kubernetes + kubernetes-minikube + 1.0.0-SNAPSHOT diff --git a/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/pom.xml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/pom.xml index 558b2cfc3c..85eb944b27 100644 --- a/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/pom.xml +++ b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/pom.xml @@ -8,9 +8,8 @@ com.baeldung.spring.cloud - spring-cloud-kubernetes - 1.0-SNAPSHOT - ../../../spring-cloud-kubernetes + kubernetes-minikube + 1.0.0-SNAPSHOT diff --git a/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/pom.xml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/pom.xml new file mode 100644 index 0000000000..4550750f58 --- /dev/null +++ b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/pom.xml @@ -0,0 +1,21 @@ + + + 4.0.0 + kubernetes-minikube + kubernetes-minikube + pom + + + com.baeldung.spring.cloud + spring-cloud-kubernetes + 1.0.0-SNAPSHOT + + + + demo-backend + demo-frontend + + + diff --git a/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/pom.xml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/pom.xml index 928f401405..3f93abdb69 100644 --- a/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/pom.xml +++ b/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"> 4.0.0 liveness-example - 1.0-SNAPSHOT liveness-example com.baeldung.spring.cloud - spring-cloud-kubernetes - 1.0-SNAPSHOT - ../../../spring-cloud-kubernetes + kubernetes-selfhealing + 1.0.0-SNAPSHOT diff --git a/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/pom.xml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/pom.xml new file mode 100644 index 0000000000..ff49aa12d4 --- /dev/null +++ b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/pom.xml @@ -0,0 +1,21 @@ + + + 4.0.0 + kubernetes-selfhealing + kubernetes-selfhealing + pom + + + com.baeldung.spring.cloud + spring-cloud-kubernetes + 1.0.0-SNAPSHOT + + + + liveness-example + readiness-example + + + diff --git a/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/pom.xml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/pom.xml index b86c13d2f0..6b5b488834 100644 --- a/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/pom.xml +++ b/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"> 4.0.0 readiness-example - 1.0-SNAPSHOT readiness-example com.baeldung.spring.cloud - spring-cloud-kubernetes - 1.0-SNAPSHOT - ../../../spring-cloud-kubernetes + kubernetes-selfhealing + 1.0.0-SNAPSHOT diff --git a/spring-cloud-modules/spring-cloud-kubernetes/pom.xml b/spring-cloud-modules/spring-cloud-kubernetes/pom.xml index 1131db150a..1bd1aaeebd 100644 --- a/spring-cloud-modules/spring-cloud-kubernetes/pom.xml +++ b/spring-cloud-modules/spring-cloud-kubernetes/pom.xml @@ -5,7 +5,6 @@ 4.0.0 com.baeldung.spring.cloud spring-cloud-kubernetes - 1.0-SNAPSHOT spring-cloud-kubernetes pom @@ -16,12 +15,9 @@ - kubernetes-minikube/demo-frontend - kubernetes-minikube/demo-backend - kubernetes-selfhealing/liveness-example - kubernetes-selfhealing/readiness-example - kubernetes-guide/client-service - kubernetes-guide/travel-agency-service + kubernetes-minikube + kubernetes-selfhealing + kubernetes-guide @@ -40,4 +36,4 @@ 2021.0.0 - \ No newline at end of file + diff --git a/spring-cloud-modules/spring-cloud-stream-starters/pom.xml b/spring-cloud-modules/spring-cloud-stream-starters/pom.xml new file mode 100644 index 0000000000..82252b3a55 --- /dev/null +++ b/spring-cloud-modules/spring-cloud-stream-starters/pom.xml @@ -0,0 +1,37 @@ + + + 4.0.0 + com.baeldung.spring.cloud + spring-cloud-stream-starters + spring-cloud-stream-starters + pom + + + com.baeldung.spring.cloud + spring-cloud-modules + 1.0.0-SNAPSHOT + + + + twitterhdfs + + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud-dependencies.version} + pom + import + + + + + + 2021.0.0 + + + diff --git a/spring-security-modules/pom.xml b/spring-security-modules/pom.xml index eb643c78c7..8d98395ab7 100644 --- a/spring-security-modules/pom.xml +++ b/spring-security-modules/pom.xml @@ -29,7 +29,7 @@ spring-security-oidc spring-security-okta spring-security-saml - spring-security-web-angular/server + spring-security-web-angular spring-security-web-boot-1 spring-security-web-boot-2 spring-security-web-boot-3 @@ -50,4 +50,4 @@ spring-security-opa - \ No newline at end of file + diff --git a/spring-security-modules/spring-security-web-angular/pom.xml b/spring-security-modules/spring-security-web-angular/pom.xml new file mode 100644 index 0000000000..18d35708f6 --- /dev/null +++ b/spring-security-modules/spring-security-web-angular/pom.xml @@ -0,0 +1,21 @@ + + + 4.0.0 + com.baeldung.spring.security + spring-security-web-angular + spring-security-web-angular + pom + + + com.baeldung + spring-security-modules + 0.0.1-SNAPSHOT + + + + server + + + diff --git a/spring-security-modules/spring-security-web-angular/server/pom.xml b/spring-security-modules/spring-security-web-angular/server/pom.xml index 9f4f0a5caa..a1f4a9f998 100644 --- a/spring-security-modules/spring-security-web-angular/server/pom.xml +++ b/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"> 4.0.0 server - 0.0.1-SNAPSHOT server jar Spring Security Angular - com.baeldung - parent-modules - 1.0.0-SNAPSHOT - ../../../ + com.baeldung.spring.security + spring-security-web-angular + 0.0.1-SNAPSHOT