JAVA-14673 - Fix formatting of POMs (#12722)

* JAVA-14673 - Fix formatting of POMs

* cleanup
This commit is contained in:
freelansam
2022-09-13 21:22:49 +05:30
committed by GitHub
parent 6279ebc0fb
commit 0583091fa2
75 changed files with 654 additions and 634 deletions

View File

@@ -14,7 +14,7 @@
<version>1.0.0-SNAPSHOT</version>
</parent>
<modules>
<modules>
<module>spring-security-acl</module>
<module>spring-security-auth0</module>
<module>spring-security-cognito</module>
@@ -45,9 +45,9 @@
<module>spring-security-web-rest</module>
<module>spring-security-web-sockets</module>
<module>spring-security-web-thymeleaf</module>
<module>spring-security-web-x509</module>
<module>spring-security-web-x509</module>
<module>spring-security-opa</module>
<module>spring-security-pkce</module>
</modules>
</project>
</project>

View File

@@ -44,7 +44,7 @@
<artifactId>apacheds-server-jndi</artifactId>
<version>${apacheds.version}</version>
</dependency>
<!-- Spring Data LDAP -->
<!-- Spring Data LDAP -->
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-ldap</artifactId>

View File

@@ -80,8 +80,8 @@
</dependencies>
<properties>
<!-- Remove this explicit override once more recent version of spring-security-oauth2-autoconfigure
is available -->
<!-- Remove this explicit override once more recent version of spring-security-oauth2-autoconfigure -->
<!-- is available -->
<spring-boot.version>2.5.2</spring-boot.version>
<start-class>com.baeldung.oauth2.SpringOAuthApplication</start-class>
<log4j2.version>2.17.1</log4j2.version>

View File

@@ -1,25 +1,29 @@
<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.baeldung</groupId>
<artifactId>spring-security-pkce</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>pkce-auth-server</artifactId>
<properties>
<spring-authorization-server.version>0.3.1</spring-authorization-server.version>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-oauth2-authorization-server</artifactId>
<version>${spring-authorization-server.version}</version>
</dependency>
</dependencies>
<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>pkce-auth-server</artifactId>
<parent>
<groupId>com.baeldung</groupId>
<artifactId>spring-security-pkce</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-oauth2-authorization-server</artifactId>
<version>${spring-authorization-server.version}</version>
</dependency>
</dependencies>
<properties>
<spring-authorization-server.version>0.3.1</spring-authorization-server.version>
</properties>
</project>

View File

@@ -1,24 +1,28 @@
<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.baeldung</groupId>
<artifactId>spring-security-pkce</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>pkce-client</artifactId>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webflux</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-oauth2-client</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-thymeleaf</artifactId>
</dependency>
</dependencies>
<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>pkce-client</artifactId>
<parent>
<groupId>com.baeldung</groupId>
<artifactId>spring-security-pkce</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webflux</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-oauth2-client</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-thymeleaf</artifactId>
</dependency>
</dependencies>
</project>

View File

@@ -1,75 +1,77 @@
<?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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-security-pkce</artifactId>
<packaging>pom</packaging>
<name>spring-security-pkce</name>
<description>Demo project for Spring Boot</description>
<parent>
<groupId>com.baeldung</groupId>
<artifactId>parent-boot-2</artifactId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../../parent-boot-2</relativePath>
</parent>
<artifactId>spring-security-pkce</artifactId>
<packaging>pom</packaging>
<name>spring-security-pkce</name>
<description>Demo project for Spring Boot</description>
<properties>
<!-- Need 2.7.x to bring spring-security 5.7.x-->
<spring-boot.version>2.7.2</spring-boot.version>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<modules>
<module>pkce-auth-server</module>
<module>pkce-client</module>
</modules>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<excludes>
<exclude>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<modules>
<module>pkce-auth-server</module>
<module>pkce-client</module>
</modules>
</project>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<excludes>
<exclude>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</build>
<properties>
<!-- Need 2.7.x to bring spring-security 5.7.x -->
<spring-boot.version>2.7.2</spring-boot.version>
</properties>
</project>

View File

@@ -217,8 +217,8 @@
<properties>
<start-class>com.baeldung.roles.custom.Application</start-class>
<!--If you want to run the example with the voters comment the tag above and uncomment the one
below -->
<!--If you want to run the example with the voters comment the tag above and uncomment the one -->
<!-- below -->
<!--<start-class>com.baeldung.roles.voter.VoterApplication</start-class> -->
<taglibs-standard.version>1.1.2</taglibs-standard.version>
<cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>

View File

@@ -219,11 +219,11 @@
<!-- <start-class>com.baeldung.jdbcauthentication.postgre.PostgreJdbcAuthenticationApplication</start-class> -->
<!--This runs the example with the multiple logins application -->
<start-class>com.baeldung.multiplelogin.MultipleLoginApplication</start-class>
<!--If you want to run the example with the multiple http elements, comment the tag above and
uncomment the one below -->
<!--If you want to run the example with the multiple http elements, comment the tag above and -->
<!-- uncomment the one below -->
<!--<start-class>com.baeldung.multipleentrypoints.MultipleEntryPointsApplication</start-class> -->
<!--If you want to run the example with the Https enabled endpoints, comment the tag above and
uncomment the one below -->
<!--If you want to run the example with the Https enabled endpoints, comment the tag above and -->
<!--uncomment the one below -->
<!-- <start-class>com.baeldung.ssl.HttpsEnabledApplication</start-class> -->
<taglibs-standard.version>1.1.2</taglibs-standard.version>
<cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>

View File

@@ -1,7 +1,7 @@
<?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">
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-security-web-boot-4</artifactId>
<version>0.0.1-SNAPSHOT</version>
@@ -36,4 +36,5 @@
<scope>test</scope>
</dependency>
</dependencies>
</project>

View File

@@ -6,7 +6,7 @@
<artifactId>spring-security-web-login-2</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>spring-security-web-login-2</name>
<packaging>jar</packaging>
<packaging>jar</packaging>
<parent>
<groupId>com.baeldung</groupId>

View File

@@ -108,17 +108,19 @@
</warSourceExcludes>
</configuration>
</plugin>
<!-- NPM build is disabled from profile specific configurations because in a multi-threaded
run environment like Jenkins this build was not succeeding due to issues totally unrelated to this module
This can be enabled manually while running this module on local, or directly npm can be run inside the
webapp folder -->
<!-- <plugin> <groupId>com.github.eirslett</groupId> <artifactId>frontend-maven-plugin</artifactId>
<version>${frontend-maven-plugin.version}</version> <configuration> <nodeVersion>${node.version}</nodeVersion>
<workingDirectory>src/main/webapp/WEB-INF/view/react</workingDirectory> </configuration> <executions>
<execution> <id>install node and npm</id> <goals> <goal>install-node-and-npm</goal> </goals> </execution>
<execution> <id>npm install</id> <goals> <goal>npm</goal> </goals> </execution> <execution> <id>npm run
build</id> <goals> <goal>npm</goal> </goals> <configuration> <arguments>run build</arguments> </configuration>
</execution> </executions> </plugin> -->
<!-- NPM build is disabled from profile specific configurations because in a multi-threaded -->
<!-- run environment like Jenkins this build was not succeeding due to issues totally unrelated -->
<!-- to this module. This can be enabled manually while running this module on local, or -->
<!-- directly npm can be run inside the webapp folder -->
<!-- <plugin> <groupId>com.github.eirslett</groupId> <artifactId>frontend-maven-plugin</artifactId> -->
<!-- <version>${frontend-maven-plugin.version}</version> <configuration> <nodeVersion>${node.version}</nodeVersion> -->
<!-- <workingDirectory>src/main/webapp/WEB-INF/view/react</workingDirectory> </configuration> -->
<!-- <executions> <execution> <id>install node and npm</id> <goals> <goal>install-node-and-npm</goal> -->
<!-- </goals> </execution><execution> -->
<!-- <id>npm install</id> <goals> <goal>npm</goal> </goals> </execution> <execution> -->
<!-- <id>npm run build</id> <goals> <goal>npm</goal> </goals> -->
<!-- <configuration> <arguments>run build</arguments> </configuration> -->
<!-- </execution> </executions> </plugin> -->
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
@@ -128,17 +130,21 @@
</build>
<!-- NPM build is disabled from profile specific configurations because in a multi-threaded run environment
like Jenkins this build was not succeeding due to issues totally unrelated to this module This can be
enabled manually while running this module on local, or directly npm can be run inside the webapp folder -->
<!-- <profiles> <profile> <id>default-first</id> <build> <plugins> <plugin> <groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId> <executions> <execution> <id>install node and npm</id>
<phase>none</phase> </execution> <execution> <id>npm install</id> <phase>none</phase> </execution> <execution>
<id>npm run build</id> <phase>none</phase> </execution> </executions> </plugin> </plugins> </build> </profile>
<profile> <id>default-second</id> <build> <plugins> <plugin> <groupId>com.github.eirslett</groupId> <artifactId>frontend-maven-plugin</artifactId>
<executions> <execution> <id>install node and npm</id> <phase>none</phase> </execution> <execution> <id>npm
install</id> <phase>none</phase> </execution> <execution> <id>npm run build</id> <phase>none</phase>
</execution> </executions> </plugin> </plugins> </build> </profile> </profiles> -->
<!-- NPM build is disabled from profile specific configurations because in a multi-threaded run environment -->
<!-- like Jenkins this build was not succeeding due to issues totally unrelated to this module This -->
<!-- can be enabled manually while running this module on local, or directly npm can be run inside -->
<!-- the webapp folder -->
<!-- <profiles> <profile> <id>default-first</id> <build> <plugins> <plugin> <groupId>com.github.eirslett</groupId> -->
<!-- <artifactId>frontend-maven-plugin</artifactId> <executions> <execution> -->
<!-- <id>install node and npm</id> -->
<!--<phase>none</phase> </execution> <execution> <id>npm install</id> <phase>none</phase> </execution> -->
<!-- <execution> <id>npm run build</id> <phase>none</phase> </execution> </executions> </plugin> -->
<!--</plugins> </build> </profile> -->
<!--<profile> <id>default-second</id> <build> <plugins> <plugin> <groupId>com.github.eirslett</groupId> -->
<!-- <artifactId>frontend-maven-plugin</artifactId> -->
<!--<executions> <execution> <id>install node and npm</id> <phase>none</phase> </execution> <execution> -->
<!-- <id>npm install</id> <phase>none</phase> </execution> <execution> <id>npm run build</id> <phase>none</phase> -->
<!--</execution> </executions> </plugin> </plugins> </build> </profile> </profiles> -->
<properties>
<!-- Maven plugins -->

View File

@@ -12,11 +12,11 @@
<groupId>com.baeldung</groupId>
<artifactId>parent-boot-2</artifactId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../../parent-boot-2</relativePath>
<relativePath>../../parent-boot-2</relativePath>
</parent>
<dependencies>
<dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>