From 4b1f2c50a521114fbe1563da8ada2682e27de521 Mon Sep 17 00:00:00 2001 From: sampadawagde Date: Mon, 17 May 2021 20:22:27 +0530 Subject: [PATCH] JAVA-5223: Fix formatting of POMs (Spring Security Modules) --- spring-security-modules/pom.xml | 9 +++-- .../spring-5-security-cognito/pom.xml | 6 +-- .../spring-5-security-oauth/pom.xml | 7 ++-- .../spring-5-security/pom.xml | 7 ++-- spring-security-modules/spring-ldap/pom.xml | 11 ++--- .../spring-security-acl/pom.xml | 7 ++-- .../spring-security-auth0/pom.xml | 34 ++++++++-------- .../cache-control/pom.xml | 6 +-- .../spring-security-config/cors/pom.xml | 8 ++-- .../spring-security-config/pom.xml | 7 ++-- .../spring-security-core/pom.xml | 5 ++- .../spring-security-ldap/pom.xml | 13 +++--- .../spring-security-legacy-oidc/pom.xml | 6 +-- .../spring-security-oauth2-sso/pom.xml | 7 ++-- .../spring-security-sso-auth-server/pom.xml | 7 ++-- .../spring-security-sso-kerberos/pom.xml | 8 ++-- .../spring-security-sso-ui-2/pom.xml | 13 ++---- .../spring-security-sso-ui/pom.xml | 14 ++----- .../spring-security-oidc/pom.xml | 2 +- .../spring-security-okta/pom.xml | 10 +++-- .../spring-security-saml/pom.xml | 4 +- .../server/pom.xml | 8 ++-- .../spring-security-web-boot-1/pom.xml | 9 ++--- .../spring-security-web-boot-2/pom.xml | 18 ++++----- .../spring-security-web-boot-3/pom.xml | 6 +-- .../spring-security-web-digest-auth/pom.xml | 30 ++------------ .../spring-security-web-login/pom.xml | 21 ++-------- .../spring-security-web-mvc-custom/pom.xml | 28 ++----------- .../spring-security-web-mvc/pom.xml | 13 ++---- .../pom.xml | 40 ++++--------------- .../spring-security-web-react/pom.xml | 29 +++----------- .../pom.xml | 35 ++-------------- .../spring-security-web-rest-custom/pom.xml | 33 ++------------- .../spring-security-web-rest/pom.xml | 37 +++-------------- .../spring-security-web-sockets/pom.xml | 14 ++----- .../spring-security-web-thymeleaf/pom.xml | 7 ++-- .../spring-security-web-x509/pom.xml | 7 ++-- .../pom.xml | 7 ++-- .../pom.xml | 7 ++-- .../spring-session/pom.xml | 7 ++-- .../spring-session-jdbc/pom.xml | 4 +- .../spring-session-mongodb/pom.xml | 8 +--- .../spring-session-redis/pom.xml | 7 ++-- .../spring-social-login/pom.xml | 22 ++-------- 44 files changed, 182 insertions(+), 406 deletions(-) diff --git a/spring-security-modules/pom.xml b/spring-security-modules/pom.xml index bb2702fc9d..0f4ba872ba 100644 --- a/spring-security-modules/pom.xml +++ b/spring-security-modules/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-security-modules 0.0.1-SNAPSHOT @@ -37,7 +38,7 @@ spring-security-web-mvc-custom spring-security-web-mvc spring-security-web-persisted-remember-me - spring-security-web-react + spring-security-web-react spring-security-web-rest-basic-auth spring-security-web-rest-custom spring-security-web-rest @@ -48,4 +49,4 @@ spring-social-login - + \ No newline at end of file diff --git a/spring-security-modules/spring-5-security-cognito/pom.xml b/spring-security-modules/spring-5-security-cognito/pom.xml index 877dbd52fa..4da8b2fae5 100644 --- a/spring-security-modules/spring-5-security-cognito/pom.xml +++ b/spring-security-modules/spring-5-security-cognito/pom.xml @@ -1,5 +1,6 @@ - 4.0.0 spring-5-security-cognito @@ -32,7 +33,6 @@ org.thymeleaf.extras thymeleaf-extras-springsecurity5 - org.springframework.security @@ -62,4 +62,4 @@ com.baeldung.cognito.SpringCognitoApplication - + \ No newline at end of file diff --git a/spring-security-modules/spring-5-security-oauth/pom.xml b/spring-security-modules/spring-5-security-oauth/pom.xml index d31cf293a3..03e1880431 100644 --- a/spring-security-modules/spring-5-security-oauth/pom.xml +++ b/spring-security-modules/spring-5-security-oauth/pom.xml @@ -1,5 +1,6 @@ - 4.0.0 spring-5-security-oauth @@ -36,7 +37,6 @@ org.springframework.boot spring-boot-starter-jersey - org.springframework.security.oauth.boot @@ -51,7 +51,6 @@ org.springframework.security spring-security-oauth2-jose - org.springframework spring-test @@ -72,4 +71,4 @@ com.baeldung.oauth2.SpringOAuthApplication - + \ No newline at end of file diff --git a/spring-security-modules/spring-5-security/pom.xml b/spring-security-modules/spring-5-security/pom.xml index d009115c92..73b956d1e7 100644 --- a/spring-security-modules/spring-5-security/pom.xml +++ b/spring-security-modules/spring-5-security/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-5-security 0.0.1-SNAPSHOT @@ -76,4 +77,4 @@ - + \ No newline at end of file diff --git a/spring-security-modules/spring-ldap/pom.xml b/spring-security-modules/spring-ldap/pom.xml index 60da7d4c0d..44f754673f 100644 --- a/spring-security-modules/spring-ldap/pom.xml +++ b/spring-security-modules/spring-ldap/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-ldap 0.1-SNAPSHOT @@ -14,7 +15,6 @@ - org.springframework.ldap spring-ldap-core @@ -26,13 +26,11 @@ - org.springframework spring-context ${spring-context.version} - org.springframework.ldap @@ -46,7 +44,6 @@ - org.apache.directory.server @@ -84,8 +81,6 @@ ${shared-ldap.version} test - - org.springframework.data diff --git a/spring-security-modules/spring-security-acl/pom.xml b/spring-security-modules/spring-security-acl/pom.xml index 5c04aaa9ca..7facc1b14b 100644 --- a/spring-security-modules/spring-security-acl/pom.xml +++ b/spring-security-modules/spring-security-acl/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-security-acl 0.0.1-SNAPSHOT @@ -58,4 +59,4 @@ 2.6.11 - + \ No newline at end of file diff --git a/spring-security-modules/spring-security-auth0/pom.xml b/spring-security-modules/spring-security-auth0/pom.xml index 0bd879a40b..106a0db29f 100644 --- a/spring-security-modules/spring-security-auth0/pom.xml +++ b/spring-security-modules/spring-security-auth0/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-security-auth0 1.0-SNAPSHOT @@ -23,20 +24,20 @@ org.springframework.boot spring-boot-starter-security - - org.springframework.security - spring-security-core - - - org.springframework.security - spring-security-oauth2-resource-server - - - com.auth0 - mvc-auth-commons - ${mvc-auth-commons.version} - - + + org.springframework.security + spring-security-core + + + org.springframework.security + spring-security-oauth2-resource-server + + + com.auth0 + mvc-auth-commons + ${mvc-auth-commons.version} + + org.json json ${json.version} @@ -72,4 +73,5 @@ 20190722 1.2.0 + \ No newline at end of file diff --git a/spring-security-modules/spring-security-config/cache-control/pom.xml b/spring-security-modules/spring-security-config/cache-control/pom.xml index 753307493d..b10d65615e 100644 --- a/spring-security-modules/spring-security-config/cache-control/pom.xml +++ b/spring-security-modules/spring-security-config/cache-control/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 cache-control 1.0-SNAPSHOT @@ -26,7 +27,6 @@ org.springframework.boot spring-boot-starter-security - org.springframework.boot spring-boot-starter-test diff --git a/spring-security-modules/spring-security-config/cors/pom.xml b/spring-security-modules/spring-security-config/cors/pom.xml index 175b21a77d..2b8efb9add 100644 --- a/spring-security-modules/spring-security-config/cors/pom.xml +++ b/spring-security-modules/spring-security-config/cors/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 cors cors @@ -35,7 +36,6 @@ org.springframework.boot spring-boot-starter-web - org.springframework.boot spring-boot-starter-test @@ -57,4 +57,4 @@ - + \ No newline at end of file diff --git a/spring-security-modules/spring-security-config/pom.xml b/spring-security-modules/spring-security-config/pom.xml index 2b6b6b6b4e..860a602aeb 100644 --- a/spring-security-modules/spring-security-config/pom.xml +++ b/spring-security-modules/spring-security-config/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-security-config 0.0.1-SNAPSHOT @@ -19,4 +20,4 @@ cors - + \ No newline at end of file diff --git a/spring-security-modules/spring-security-core/pom.xml b/spring-security-modules/spring-security-core/pom.xml index 9f1e7cda29..0eb70c0853 100644 --- a/spring-security-modules/spring-security-core/pom.xml +++ b/spring-security-modules/spring-security-core/pom.xml @@ -1,5 +1,6 @@ - 4.0.0 spring-security-core @@ -99,4 +100,4 @@ - + \ No newline at end of file diff --git a/spring-security-modules/spring-security-ldap/pom.xml b/spring-security-modules/spring-security-ldap/pom.xml index baed682186..3755c33125 100644 --- a/spring-security-modules/spring-security-ldap/pom.xml +++ b/spring-security-modules/spring-security-ldap/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-security-ldap 0.1-SNAPSHOT @@ -15,7 +16,6 @@ - org.springframework.boot @@ -33,24 +33,21 @@ org.springframework.boot spring-boot-starter-actuator - org.springframework.security spring-security-ldap - org.apache.directory.server apacheds-server-jndi ${apacheds.version} - - spring-security-mvc-ldap + spring-security-ldap src/main/resources @@ -63,4 +60,4 @@ 1.5.5 - + \ No newline at end of file diff --git a/spring-security-modules/spring-security-legacy-oidc/pom.xml b/spring-security-modules/spring-security-legacy-oidc/pom.xml index a4ead0f6e0..148b836137 100644 --- a/spring-security-modules/spring-security-legacy-oidc/pom.xml +++ b/spring-security-modules/spring-security-legacy-oidc/pom.xml @@ -24,24 +24,20 @@ org.springframework.boot spring-boot-starter-web - org.springframework.boot spring-boot-starter-tomcat - org.springframework.security.oauth spring-security-oauth2 ${spring-security-oauth2.version} - org.springframework.security spring-security-jwt ${spring-security-jwt.version} - com.auth0 jwks-rsa @@ -55,4 +51,4 @@ 0.3.0 - + \ No newline at end of file diff --git a/spring-security-modules/spring-security-oauth2-sso/pom.xml b/spring-security-modules/spring-security-oauth2-sso/pom.xml index a272ba5b50..c9f9274c98 100644 --- a/spring-security-modules/spring-security-oauth2-sso/pom.xml +++ b/spring-security-modules/spring-security-oauth2-sso/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 com.baeldung spring-security-oauth2-sso @@ -30,4 +31,4 @@ 2.0.0-M2 - + \ No newline at end of file diff --git a/spring-security-modules/spring-security-oauth2-sso/spring-security-sso-auth-server/pom.xml b/spring-security-modules/spring-security-oauth2-sso/spring-security-sso-auth-server/pom.xml index 20a43eaf04..1a8d1b580f 100644 --- a/spring-security-modules/spring-security-oauth2-sso/spring-security-sso-auth-server/pom.xml +++ b/spring-security-modules/spring-security-oauth2-sso/spring-security-sso-auth-server/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-security-sso-auth-server spring-security-sso-auth-server @@ -24,4 +25,4 @@ - + \ No newline at end of file diff --git a/spring-security-modules/spring-security-oauth2-sso/spring-security-sso-kerberos/pom.xml b/spring-security-modules/spring-security-oauth2-sso/spring-security-sso-kerberos/pom.xml index f17ca171a5..c18769df1e 100644 --- a/spring-security-modules/spring-security-oauth2-sso/spring-security-sso-kerberos/pom.xml +++ b/spring-security-modules/spring-security-oauth2-sso/spring-security-sso-kerberos/pom.xml @@ -1,7 +1,7 @@ + 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"> 4.0.0 spring-security-sso-kerberos @@ -91,9 +91,9 @@ - + - com.baeldung.intro.Application + com.baeldung.intro.Application \ No newline at end of file diff --git a/spring-security-modules/spring-security-oauth2-sso/spring-security-sso-ui-2/pom.xml b/spring-security-modules/spring-security-oauth2-sso/spring-security-sso-ui-2/pom.xml index 514dd0d0f7..cd510a972a 100644 --- a/spring-security-modules/spring-security-oauth2-sso/spring-security-sso-ui-2/pom.xml +++ b/spring-security-modules/spring-security-oauth2-sso/spring-security-sso-ui-2/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-security-sso-ui-2 spring-security-sso-ui-2 @@ -13,33 +14,27 @@ - org.springframework.boot spring-boot-starter-web - org.springframework.boot spring-boot-starter-security - org.springframework.security.oauth.boot spring-security-oauth2-autoconfigure ${oauth-auto.version} - org.springframework.boot spring-boot-starter-thymeleaf - org.thymeleaf.extras thymeleaf-extras-springsecurity5 - - + \ No newline at end of file diff --git a/spring-security-modules/spring-security-oauth2-sso/spring-security-sso-ui/pom.xml b/spring-security-modules/spring-security-oauth2-sso/spring-security-sso-ui/pom.xml index 5076b1878b..ec2da615f4 100644 --- a/spring-security-modules/spring-security-oauth2-sso/spring-security-sso-ui/pom.xml +++ b/spring-security-modules/spring-security-oauth2-sso/spring-security-sso-ui/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-security-sso-ui spring-security-sso-ui @@ -13,34 +14,27 @@ - org.springframework.boot spring-boot-starter-web - org.springframework.boot spring-boot-starter-security - org.springframework.security.oauth.boot spring-security-oauth2-autoconfigure ${oauth-auto.version} - - org.springframework.boot spring-boot-starter-thymeleaf - org.thymeleaf.extras thymeleaf-extras-springsecurity5 - - + \ No newline at end of file diff --git a/spring-security-modules/spring-security-oidc/pom.xml b/spring-security-modules/spring-security-oidc/pom.xml index b9a4b340a3..2a413b1d27 100644 --- a/spring-security-modules/spring-security-oidc/pom.xml +++ b/spring-security-modules/spring-security-oidc/pom.xml @@ -26,4 +26,4 @@ - + \ No newline at end of file diff --git a/spring-security-modules/spring-security-okta/pom.xml b/spring-security-modules/spring-security-okta/pom.xml index c5ff9013b5..98b8abedb4 100644 --- a/spring-security-modules/spring-security-okta/pom.xml +++ b/spring-security-modules/spring-security-okta/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-security-okta 1.0-SNAPSHOT @@ -55,8 +56,9 @@ - + 1.4.0 - + + \ No newline at end of file diff --git a/spring-security-modules/spring-security-saml/pom.xml b/spring-security-modules/spring-security-saml/pom.xml index 561582045a..8a9b418374 100644 --- a/spring-security-modules/spring-security-saml/pom.xml +++ b/spring-security-modules/spring-security-saml/pom.xml @@ -14,6 +14,7 @@ 0.0.1-SNAPSHOT ../../parent-boot-2 + Shibboleth @@ -70,4 +71,5 @@ 1.0.10.RELEASE - + + \ No newline at end of file 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 07d5d44e8d..2e9ff9969d 100644 --- a/spring-security-modules/spring-security-web-angular/server/pom.xml +++ b/spring-security-modules/spring-security-web-angular/server/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 server 0.0.1-SNAPSHOT @@ -40,7 +41,6 @@ org.springframework.boot spring-boot-starter-web - org.springframework.boot spring-boot-starter-test @@ -62,4 +62,4 @@ - + \ No newline at end of file diff --git a/spring-security-modules/spring-security-web-boot-1/pom.xml b/spring-security-modules/spring-security-web-boot-1/pom.xml index 1f80b62765..a376a49b4c 100644 --- a/spring-security-modules/spring-security-web-boot-1/pom.xml +++ b/spring-security-modules/spring-security-web-boot-1/pom.xml @@ -1,7 +1,7 @@ + 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"> 4.0.0 spring-security-web-boot-1 0.0.1-SNAPSHOT @@ -223,10 +223,9 @@ com.baeldung.roles.custom.Application - + - 1.1.2 1.6.1 2.6.11 diff --git a/spring-security-modules/spring-security-web-boot-2/pom.xml b/spring-security-modules/spring-security-web-boot-2/pom.xml index ca357509a3..ade644741d 100644 --- a/spring-security-modules/spring-security-web-boot-2/pom.xml +++ b/spring-security-modules/spring-security-web-boot-2/pom.xml @@ -1,7 +1,7 @@ + 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"> 4.0.0 spring-security-web-boot-2 0.0.1-SNAPSHOT @@ -184,7 +184,6 @@ - entryPoints @@ -222,19 +221,18 @@ - + com.baeldung.multiplelogin.MultipleLoginApplication - + - + - 1.1.2 1.6.1 2.6.11 - + \ No newline at end of file diff --git a/spring-security-modules/spring-security-web-boot-3/pom.xml b/spring-security-modules/spring-security-web-boot-3/pom.xml index a6e2b48d75..1fff259c16 100644 --- a/spring-security-modules/spring-security-web-boot-3/pom.xml +++ b/spring-security-modules/spring-security-web-boot-3/pom.xml @@ -1,7 +1,7 @@ + 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"> 4.0.0 spring-security-web-boot-3 0.0.1-SNAPSHOT @@ -27,4 +27,4 @@ - + \ No newline at end of file diff --git a/spring-security-modules/spring-security-web-digest-auth/pom.xml b/spring-security-modules/spring-security-web-digest-auth/pom.xml index 39433c1295..710a3dd3b6 100644 --- a/spring-security-modules/spring-security-web-digest-auth/pom.xml +++ b/spring-security-modules/spring-security-web-digest-auth/pom.xml @@ -1,5 +1,6 @@ - 4.0.0 spring-security-web-digest-auth @@ -15,9 +16,7 @@ - - org.springframework.security spring-security-web @@ -28,9 +27,7 @@ spring-security-config ${org.springframework.security.version} - - org.springframework spring-core @@ -72,7 +69,6 @@ spring-expression ${spring.version} - org.springframework spring-web @@ -83,37 +79,30 @@ spring-webmvc ${spring.version} - org.springframework spring-oxm ${spring.version} - - javax.servlet javax.servlet-api ${javax.servlet-api.version} provided - javax.servlet jstl ${jstl.version} runtime - - com.google.guava guava ${guava.version} - org.apache.httpcomponents httpcore @@ -125,7 +114,6 @@ - org.apache.httpcomponents httpclient @@ -137,35 +125,28 @@ - - org.springframework spring-test ${spring.version} test - - - spring-security-mvc-digest-auth + spring-security-web-digest-auth src/main/resources true - - org.apache.maven.plugins maven-war-plugin ${maven-war-plugin.version} - org.codehaus.cargo cargo-maven2-plugin @@ -186,21 +167,16 @@ - - 4.2.6.RELEASE - 19.0 - 4.4.5 4.5.2 - 1.6.1 diff --git a/spring-security-modules/spring-security-web-login/pom.xml b/spring-security-modules/spring-security-web-login/pom.xml index 2b64d157d3..ac5393c1a0 100644 --- a/spring-security-modules/spring-security-web-login/pom.xml +++ b/spring-security-modules/spring-security-web-login/pom.xml @@ -1,5 +1,6 @@ - 4.0.0 spring-security-web-login @@ -15,9 +16,7 @@ - - org.springframework.security spring-security-web @@ -33,9 +32,7 @@ spring-security-taglibs ${spring-security.version} - - org.springframework spring-core @@ -77,7 +74,6 @@ spring-expression ${spring.version} - org.springframework spring-web @@ -88,25 +84,20 @@ spring-webmvc ${spring.version} - - javax.servlet javax.servlet-api ${javax.servlet-api.version} provided - javax.servlet jstl ${jstl.version} runtime - - org.springframework spring-test @@ -119,20 +110,17 @@ ${spring-security.version} test - - spring-security-mvc-login + spring-security-web-login src/main/resources true - - org.apache.maven.plugins maven-war-plugin @@ -147,7 +135,6 @@ - org.codehaus.cargo cargo-maven2-plugin @@ -168,9 +155,7 @@ - - diff --git a/spring-security-modules/spring-security-web-mvc-custom/pom.xml b/spring-security-modules/spring-security-web-mvc-custom/pom.xml index bd4a800bc5..539f83d7b8 100644 --- a/spring-security-modules/spring-security-web-mvc-custom/pom.xml +++ b/spring-security-modules/spring-security-web-mvc-custom/pom.xml @@ -1,5 +1,6 @@ - 4.0.0 spring-security-web-mvc-custom @@ -15,9 +16,7 @@ - - org.springframework.security spring-security-web @@ -33,9 +32,7 @@ spring-security-taglibs ${spring-security.version} - - org.springframework spring-core @@ -77,7 +74,6 @@ spring-expression ${spring.version} - org.springframework spring-web @@ -88,59 +84,48 @@ spring-webmvc ${spring.version} - - javax.servlet javax.servlet-api ${javax.servlet-api.version} provided - javax.servlet jstl ${jstl.version} runtime - - - com.fasterxml.jackson.core jackson-databind ${jackson.version} - org.apache.commons commons-lang3 ${commons-lang3.version} - com.google.guava guava ${guava.version} - - org.springframework spring-test ${spring.version} test - org.springframework.security spring-security-test @@ -150,22 +135,19 @@ - spring-security-mvc-custom + spring-security-web-mvc-custom src/main/resources true - - org.apache.maven.plugins maven-war-plugin ${maven-war-plugin.version} - org.codehaus.cargo cargo-maven2-plugin @@ -186,18 +168,14 @@ - - 19.0 - 1.6.1 - \ No newline at end of file diff --git a/spring-security-modules/spring-security-web-mvc/pom.xml b/spring-security-modules/spring-security-web-mvc/pom.xml index b1e94b2db3..505826d1a2 100644 --- a/spring-security-modules/spring-security-web-mvc/pom.xml +++ b/spring-security-modules/spring-security-web-mvc/pom.xml @@ -1,7 +1,7 @@ + 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"> 4.0.0 spring-security-web-mvc 0.1-SNAPSHOT @@ -16,9 +16,7 @@ - - org.springframework.boot spring-boot-starter-security @@ -27,7 +25,6 @@ org.springframework.security spring-security-taglibs - org.springframework.boot @@ -42,19 +39,16 @@ org.springframework.boot spring-boot-starter-tomcat - javax.servlet jstl runtime - io.dropwizard.metrics metrics-core - org.springframework.boot @@ -67,7 +61,6 @@ ${javax.version} - @@ -86,4 +79,4 @@ 4.0.1 - + \ No newline at end of file diff --git a/spring-security-modules/spring-security-web-persisted-remember-me/pom.xml b/spring-security-modules/spring-security-web-persisted-remember-me/pom.xml index 25c5ddd9d0..66a2b3866b 100644 --- a/spring-security-modules/spring-security-web-persisted-remember-me/pom.xml +++ b/spring-security-modules/spring-security-web-persisted-remember-me/pom.xml @@ -1,5 +1,6 @@ - 4.0.0 spring-security-web-persisted-remember-me @@ -15,9 +16,7 @@ - - org.springframework.security spring-security-web @@ -38,9 +37,7 @@ spring-orm ${spring.version} - - org.springframework spring-core @@ -82,7 +79,6 @@ spring-expression ${spring.version} - org.springframework spring-web @@ -93,81 +89,66 @@ spring-webmvc ${spring.version} - - javax.servlet javax.servlet-api ${javax.servlet-api.version} provided - javax.servlet jstl ${jstl.version} runtime - - com.h2database h2 ${h2.version} - org.postgresql postgresql ${postgresql.version} runtime - - com.google.guava guava ${guava.version} - - org.springframework.boot - spring-boot-starter-test - ${spring-boot.version} - test - - + org.springframework.boot + spring-boot-starter-test + ${spring-boot.version} + test + - - - spring-security-mvc-persisted-remember-me + spring-security-web-persisted-remember-me src/main/resources true - - org.apache.maven.plugins maven-war-plugin ${maven-war-plugin.version} - org.codehaus.cargo cargo-maven2-plugin @@ -188,21 +169,16 @@ - - 4.2.6.RELEASE - 9.4.1212 - 19.0 - 1.6.1 1.5.10.RELEASE diff --git a/spring-security-modules/spring-security-web-react/pom.xml b/spring-security-modules/spring-security-web-react/pom.xml index 663c7d76c3..e8f74413ff 100644 --- a/spring-security-modules/spring-security-web-react/pom.xml +++ b/spring-security-modules/spring-security-web-react/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-security-web-react 0.1-SNAPSHOT @@ -15,9 +16,7 @@ - - org.springframework.security spring-security-web @@ -33,9 +32,7 @@ spring-security-taglibs ${spring-security.version} - - org.springframework spring-core @@ -56,7 +53,6 @@ spring-aop ${spring.version} - org.springframework spring-web @@ -67,9 +63,7 @@ spring-webmvc ${spring.version} - - javax.servlet javax.servlet-api @@ -82,7 +76,6 @@ ${jstl.version} runtime - org.springframework.boot @@ -90,20 +83,17 @@ 1.5.10.RELEASE test - - spring-security-react + spring-security-web-react src/main/resources true - - org.apache.maven.plugins maven-war-plugin @@ -118,7 +108,6 @@ - com.github.eirslett frontend-maven-plugin @@ -152,27 +141,22 @@ - org.eclipse.jetty jetty-maven-plugin 9.4.11.v20180605 - - default-first - com.github.eirslett frontend-maven-plugin - install node and npm @@ -193,13 +177,11 @@ default-second - com.github.eirslett frontend-maven-plugin - install node and npm @@ -223,14 +205,13 @@ 19.0 - 2.7 1.6 9.4.11.v20180605 - v8.11.3 6.1.0 + \ No newline at end of file diff --git a/spring-security-modules/spring-security-web-rest-basic-auth/pom.xml b/spring-security-modules/spring-security-web-rest-basic-auth/pom.xml index 0dc0b9cc42..de28df1933 100644 --- a/spring-security-modules/spring-security-web-rest-basic-auth/pom.xml +++ b/spring-security-modules/spring-security-web-rest-basic-auth/pom.xml @@ -1,5 +1,6 @@ - 4.0.0 spring-security-web-rest-basic-auth @@ -15,9 +16,7 @@ - - org.springframework.security spring-security-web @@ -28,9 +27,7 @@ spring-security-config ${spring-security.version} - - org.springframework spring-core @@ -72,7 +69,6 @@ spring-expression ${spring.version} - org.springframework spring-web @@ -83,23 +79,18 @@ spring-webmvc ${spring.version} - org.springframework spring-oxm ${spring.version} - - com.fasterxml.jackson.core jackson-databind ${jackson.version} - - @@ -111,7 +102,6 @@ - org.apache.httpcomponents httpcore @@ -123,7 +113,6 @@ - org.apache.httpcomponents httpclient @@ -135,59 +124,48 @@ - - javax.servlet javax.servlet-api ${javax.servlet-api.version} provided - javax.servlet jstl ${jstl.version} runtime - - com.google.guava guava ${guava.version} - - org.springframework spring-test ${spring.version} test - - spring-security-rest-basic-auth + spring-security-web-rest-basic-auth src/main/resources true - - org.apache.maven.plugins maven-war-plugin ${maven-war-plugin.version} - org.codehaus.cargo cargo-maven2-plugin @@ -208,9 +186,7 @@ - - @@ -238,7 +214,6 @@ - org.apache.maven.plugins maven-surefire-plugin @@ -262,21 +237,17 @@ - - 4.4.11 4.5.8 - 19.0 - 1.6.1 diff --git a/spring-security-modules/spring-security-web-rest-custom/pom.xml b/spring-security-modules/spring-security-web-rest-custom/pom.xml index 0ba7f95de7..85e50412ad 100644 --- a/spring-security-modules/spring-security-web-rest-custom/pom.xml +++ b/spring-security-modules/spring-security-web-rest-custom/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-security-web-rest-custom 0.1-SNAPSHOT @@ -15,9 +16,7 @@ - - org.springframework.security spring-security-web @@ -34,9 +33,7 @@ org.thymeleaf thymeleaf-spring5 - - org.springframework spring-core @@ -65,7 +62,6 @@ org.springframework spring-expression - org.springframework spring-web @@ -74,53 +70,41 @@ org.springframework spring-webmvc - org.springframework spring-oxm - commons-logging commons-logging ${commons-logging.version} - - com.fasterxml.jackson.core jackson-databind - - javax.servlet javax.servlet-api provided - javax.servlet jstl runtime - - org.apache.httpcomponents httpcore - org.apache.httpcomponents httpclient - - com.google.guava guava @@ -131,32 +115,27 @@ commons-lang3 ${commons-lang3.version} - - org.hamcrest hamcrest test - org.mockito mockito-core test - - spring-security-rest-custom + spring-security-web-rest-custom src/main/resources true - org.springframework.boot @@ -172,7 +151,6 @@ false - org.codehaus.cargo cargo-maven2-plugin @@ -193,16 +171,13 @@ - - 19.0 1.2 - 1.6.1 diff --git a/spring-security-modules/spring-security-web-rest/pom.xml b/spring-security-modules/spring-security-web-rest/pom.xml index 2330243aa6..c3f2c09e9e 100644 --- a/spring-security-modules/spring-security-web-rest/pom.xml +++ b/spring-security-modules/spring-security-web-rest/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-security-web-rest 0.1-SNAPSHOT @@ -15,9 +16,7 @@ - - org.springframework.security spring-security-web @@ -28,9 +27,7 @@ spring-security-config ${spring-security.version} - - org.springframework spring-core @@ -72,7 +69,6 @@ spring-expression ${spring.version} - org.springframework spring-web @@ -83,37 +79,30 @@ spring-webmvc ${spring.version} - - javax.servlet javax.servlet-api ${javax.servlet-api.version} provided - javax.servlet jstl ${jstl.version} runtime - javax.validation validation-api ${javax.validation.version} - - com.fasterxml.jackson.core jackson-databind ${jackson.version} - com.google.guava @@ -125,7 +114,6 @@ commons-lang3 ${commons-lang3.version} - org.springframework @@ -133,15 +121,12 @@ ${spring.version} test - org.springframework.security spring-security-test ${spring-security.version} test - - com.jayway.restassured rest-assured @@ -154,37 +139,32 @@ - io.springfox springfox-swagger2 ${springfox-swagger.version} - io.springfox springfox-swagger-ui ${springfox-swagger.version} - commons-fileupload commons-fileupload ${commons-fileupload.version} - - spring-security-rest + spring-security-web-rest src/main/resources true - org.codehaus.cargo @@ -205,9 +185,7 @@ - - @@ -235,7 +213,6 @@ - org.apache.maven.plugins maven-surefire-plugin @@ -267,18 +244,14 @@ 1.1.0.Final - 26.0-jre - 2.9.0 - 2.9.2 - 1.6.1 - + \ No newline at end of file diff --git a/spring-security-modules/spring-security-web-sockets/pom.xml b/spring-security-modules/spring-security-web-sockets/pom.xml index 4aecf296b4..e822b6beda 100644 --- a/spring-security-modules/spring-security-web-sockets/pom.xml +++ b/spring-security-modules/spring-security-web-sockets/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 com.baeldung.springsecuredsockets spring-security-web-sockets @@ -50,7 +51,6 @@ - org.springframework.security @@ -62,7 +62,6 @@ spring-security-config ${spring-security.version} - org.springframework.data @@ -79,7 +78,6 @@ h2 ${h2.version} - org.springframework @@ -96,7 +94,6 @@ spring-security-messaging ${spring-security.version} - org.slf4j @@ -108,7 +105,6 @@ logback-classic ${logback-classic.version} - javax.servlet @@ -130,7 +126,6 @@ jstl ${jstl.version} - com.fasterxml.jackson.core @@ -147,7 +142,6 @@ jackson-annotations ${jackson.version} - org.springframework.boot @@ -158,7 +152,7 @@ - spring-security-mvc-socket + spring-security-web-sockets org.apache.tomcat.maven diff --git a/spring-security-modules/spring-security-web-thymeleaf/pom.xml b/spring-security-modules/spring-security-web-thymeleaf/pom.xml index 196ec0b86f..8e6e0856af 100644 --- a/spring-security-modules/spring-security-web-thymeleaf/pom.xml +++ b/spring-security-modules/spring-security-web-thymeleaf/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-security-web-thymeleaf 0.0.1-SNAPSHOT @@ -54,4 +55,4 @@ - + \ No newline at end of file diff --git a/spring-security-modules/spring-security-web-x509/pom.xml b/spring-security-modules/spring-security-web-x509/pom.xml index 045c0aba6a..5282ab7d83 100644 --- a/spring-security-modules/spring-security-web-x509/pom.xml +++ b/spring-security-modules/spring-security-web-x509/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-security-web-x509 0.0.1-SNAPSHOT @@ -34,4 +35,4 @@ - + \ No newline at end of file diff --git a/spring-security-modules/spring-security-web-x509/spring-security-web-x509-basic-auth/pom.xml b/spring-security-modules/spring-security-web-x509/spring-security-web-x509-basic-auth/pom.xml index 917ffa6b0e..9598843b63 100644 --- a/spring-security-modules/spring-security-web-x509/spring-security-web-x509-basic-auth/pom.xml +++ b/spring-security-modules/spring-security-web-x509/spring-security-web-x509-basic-auth/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-security-web-x509-basic-auth 0.0.1-SNAPSHOT @@ -35,4 +36,4 @@ - + \ No newline at end of file diff --git a/spring-security-modules/spring-security-web-x509/spring-security-web-x509-client-auth/pom.xml b/spring-security-modules/spring-security-web-x509/spring-security-web-x509-client-auth/pom.xml index fdbc90c0f6..f310ab1e5c 100644 --- a/spring-security-modules/spring-security-web-x509/spring-security-web-x509-client-auth/pom.xml +++ b/spring-security-modules/spring-security-web-x509/spring-security-web-x509-client-auth/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-security-web-x509-client-auth 0.0.1-SNAPSHOT @@ -71,4 +72,4 @@ - + \ No newline at end of file diff --git a/spring-security-modules/spring-session/pom.xml b/spring-security-modules/spring-session/pom.xml index ac10700240..aec64da088 100644 --- a/spring-security-modules/spring-session/pom.xml +++ b/spring-security-modules/spring-session/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 com.baeldung spring-session @@ -21,4 +22,4 @@ spring-session-mongodb - + \ No newline at end of file diff --git a/spring-security-modules/spring-session/spring-session-jdbc/pom.xml b/spring-security-modules/spring-session/spring-session-jdbc/pom.xml index 95c366fc2e..64bbce44f2 100644 --- a/spring-security-modules/spring-session/spring-session-jdbc/pom.xml +++ b/spring-security-modules/spring-session/spring-session-jdbc/pom.xml @@ -1,7 +1,7 @@ + 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"> 4.0.0 spring-session-jdbc 0.0.1-SNAPSHOT diff --git a/spring-security-modules/spring-session/spring-session-mongodb/pom.xml b/spring-security-modules/spring-session/spring-session-mongodb/pom.xml index 82c8520356..878dfeb690 100644 --- a/spring-security-modules/spring-session/spring-session-mongodb/pom.xml +++ b/spring-security-modules/spring-session/spring-session-mongodb/pom.xml @@ -1,7 +1,7 @@ + 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"> 4.0.0 spring-session-mongodb 0.0.1-SNAPSHOT @@ -21,23 +21,19 @@ org.springframework.boot spring-boot-starter-web - org.springframework.session spring-session-data-mongodb - org.springframework.boot spring-boot-starter-data-mongodb - org.springframework.boot spring-boot-starter-test test - de.flapdoodle.embed de.flapdoodle.embed.mongo diff --git a/spring-security-modules/spring-session/spring-session-redis/pom.xml b/spring-security-modules/spring-session/spring-session-redis/pom.xml index 36eb632e1c..6824a3632d 100644 --- a/spring-security-modules/spring-session/spring-session-redis/pom.xml +++ b/spring-security-modules/spring-session/spring-session-redis/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-session-redis 1.0.0-SNAPSHOT @@ -36,7 +37,7 @@ embedded-redis ${embedded-redis.version} - + redis.clients jedis jar diff --git a/spring-security-modules/spring-social-login/pom.xml b/spring-security-modules/spring-social-login/pom.xml index 209a546a5a..ad4b7c72a6 100644 --- a/spring-security-modules/spring-social-login/pom.xml +++ b/spring-security-modules/spring-social-login/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-social-login spring-social-login @@ -14,68 +15,54 @@ - org.springframework.boot spring-boot-starter-web - org.springframework.boot spring-boot-starter-thymeleaf - org.springframework.security spring-security-web - org.springframework.security spring-security-config - org.springframework.security spring-security-taglibs - org.thymeleaf.extras thymeleaf-extras-springsecurity5 - - org.springframework.social spring-social-facebook ${spring.social.facebook.version} - org.springframework.boot spring-boot-starter-data-jpa - com.h2database h2 - - org.springframework spring-test test - org.apache.commons commons-lang3 ${commons-lang3.version} - @@ -86,7 +73,6 @@ true - org.apache.maven.plugins @@ -94,7 +80,7 @@ - + 2.0.3.RELEASE