iSharkFly-Docs
/
java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

JAVA-11241 Added missing pom.xml for container modules and other cleanup
This commit is contained in:
kwoyke 2022-06-17 09:02:21 +02:00 committed by GitHub
parent 44fa00e0ea a3a0fdfd96
commit d6dd1e2165
23 changed files with 179 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cas/cas-secured-app/pom.xml
View File

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

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

@ -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;

22
cas/pom.xml Normal file
View File

@ -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>

2
core-java-modules/core-java-regex-2/regexMatchToArray/src/regex/array/RegexMatches.java → core-java-modules/core-java-regex-2/src/main/java/com/baeldung/regex/array/RegexMatches.java
View File

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

7
core-java-modules/core-java-regex-2/regexMatchToArray/test/regex/array/RegexMatchesUnitTest.java → core-java-modules/core-java-regex-2/src/test/java/com/baeldung/regex/array/RegexMatchesUnitTest.java
View File

@ -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

10
pom.xml
View File

@ -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 -->
@ -423,7 +423,7 @@
<module>javafx</module>
<module>java-jdi</module>
<module>java-lite</module>
<module>java-lite</module>
<module>java-rmi</module>
<module>java-spi</module>
<module>java-vavr-stream</module>
@ -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 -->
@ -1282,7 +1282,7 @@
<module>core-java-modules/core-java-string-operations-3</module>
<module>core-java-modules/core-java-string-operations-4</module>
<module>core-java-modules/core-java-time-measurements</module>
<module>core-java-modules/core-java-networking-3</module>
<module>core-java-modules/core-java-networking-3</module>
<module>core-java-modules/core-java-strings</module>
<module>core-java-modules/core-java-httpclient</module>
<module>ddd-contexts</module>
@ -1351,7 +1351,7 @@
<module>core-java-modules/core-java-string-operations-3</module>
<module>core-java-modules/core-java-string-operations-4</module>
<module>core-java-modules/core-java-time-measurements</module>
<module>core-java-modules/core-java-networking-3</module>
<module>core-java-modules/core-java-networking-3</module>
<module>core-java-modules/core-java-strings</module>
<module>ddd-contexts</module>
<module>docker-modules</module>

24
regexMatchesToArray/src/regex/array/RegexMatches.java
View File

@ -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;
}
}

33
regexMatchesToArray/test/regex/array/RegexMatchesUnitTest.java
View File

@ -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");
}
}

2
spring-cloud-modules/pom.xml
View File

@ -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>

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

@ -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>
<version>1.0-SNAPSHOT</version>
<relativePath>../../../spring-cloud-kubernetes</relativePath>
<artifactId>kubernetes-guide</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<dependencyManagement>
@ -88,4 +86,4 @@
<spring.cloud.k8s.version>1.1.8.RELEASE</spring.cloud.k8s.version>
</properties>
</project>
</project>

21
spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/pom.xml Normal file
View File

@ -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>

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

@ -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>
<version>1.0-SNAPSHOT</version>
<relativePath>../../../spring-cloud-kubernetes</relativePath>
<artifactId>kubernetes-guide</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<dependencyManagement>
@ -62,4 +61,4 @@
</plugins>
</build>
</project>
</project>

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

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

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

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

21
spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/pom.xml Normal file
View File

@ -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>

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

@ -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>
<version>1.0-SNAPSHOT</version>
<relativePath>../../../spring-cloud-kubernetes</relativePath>
<artifactId>kubernetes-selfhealing</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<dependencies>

21
spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/pom.xml Normal file
View File

@ -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>

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

@ -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>
<version>1.0-SNAPSHOT</version>
<relativePath>../../../spring-cloud-kubernetes</relativePath>
<artifactId>kubernetes-selfhealing</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<dependencies>

12
spring-cloud-modules/spring-cloud-kubernetes/pom.xml
View File

@ -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/demo-backend</module>
<module>kubernetes-selfhealing/liveness-example</module>
<module>kubernetes-selfhealing/readiness-example</module>
<module>kubernetes-guide/client-service</module>
<module>kubernetes-guide/travel-agency-service</module>
<module>kubernetes-minikube</module>
<module>kubernetes-selfhealing</module>
<module>kubernetes-guide</module>
</modules>
<dependencyManagement>
@ -40,4 +36,4 @@
<spring-cloud-dependencies.version>2021.0.0</spring-cloud-dependencies.version>
</properties>
</project>
</project>

37
spring-cloud-modules/spring-cloud-stream-starters/pom.xml Normal file
View File

@ -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>

4
spring-security-modules/pom.xml
View File

@ -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>
@ -50,4 +50,4 @@
<module>spring-security-opa</module>
</modules>
</project>
</project>

21
spring-security-modules/spring-security-web-angular/pom.xml Normal file
View File

@ -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>

8
spring-security-modules/spring-security-web-angular/server/pom.xml
View File

@ -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>
<artifactId>parent-modules</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../../../</relativePath>
<groupId>com.baeldung.spring.security</groupId>
<artifactId>spring-security-web-angular</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
<dependencyManagement>