diff --git a/apache-fop/pom.xml b/apache-fop/pom.xml index 2532672c99..13fc2257cf 100644 --- a/apache-fop/pom.xml +++ b/apache-fop/pom.xml @@ -25,7 +25,7 @@ org.slf4j jcl-over-slf4j ${org.slf4j.version} - + org.slf4j diff --git a/apache-fop/src/main/webapp/WEB-INF/web.xml b/apache-fop/src/main/webapp/WEB-INF/web.xml index 48d4b8fe61..935beae648 100644 --- a/apache-fop/src/main/webapp/WEB-INF/web.xml +++ b/apache-fop/src/main/webapp/WEB-INF/web.xml @@ -1,42 +1,41 @@ - + http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0" +> - Spring MVC Application + Spring MVC Application - - - contextClass - + + + contextClass + org.springframework.web.context.support.AnnotationConfigWebApplicationContext - - - contextConfigLocation - org.baeldung.config - + + + contextConfigLocation + org.baeldung.config + - - org.springframework.web.context.ContextLoaderListener - + + org.springframework.web.context.ContextLoaderListener + - - - api - org.springframework.web.servlet.DispatcherServlet - 1 - - - api - / - + + + api + org.springframework.web.servlet.DispatcherServlet + 1 + + + api + / + - - - + + + \ No newline at end of file diff --git a/core-java-8/pom.xml b/core-java-8/pom.xml index ccd3b8843d..b23e309696 100644 --- a/core-java-8/pom.xml +++ b/core-java-8/pom.xml @@ -1,119 +1,118 @@ - - 4.0.0 - org.baeldung - spring-rest - 0.1-SNAPSHOT + + 4.0.0 + org.baeldung + spring-rest + 0.1-SNAPSHOT - spring-rest + spring-rest - + - + - - commons-io - commons-io - 2.4 - + + commons-io + commons-io + 2.4 + - - com.google.guava - guava - ${guava.version} - + + com.google.guava + guava + ${guava.version} + - - org.apache.commons - commons-collections4 - 4.0 - + + org.apache.commons + commons-collections4 + 4.0 + - - org.apache.commons - commons-lang3 - 3.3.2 - + + org.apache.commons + commons-lang3 + 3.3.2 + - - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test - + - - junit - junit - ${junit.version} - test - + + org.hamcrest + hamcrest-library + ${org.hamcrest.version} + test + - - org.mockito - mockito-core - ${mockito.version} - test - + + junit + junit + ${junit.version} + test + - + + org.mockito + mockito-core + ${mockito.version} + test + - - core-java-8 - - - src/main/resources - true - - + - + + core-java-8 + + + src/main/resources + true + + - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.8 - 1.8 - - + - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + 1.8 + 1.8 + + - + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + - + - - - 1.7.12 - 1.0.13 + - - 5.1.3.Final + + + 1.7.12 + 1.0.13 - - 18.0 - 3.4 + + 5.1.3.Final - - 1.3 - 4.12 - 1.10.19 + + 18.0 + 3.4 - - 3.3 - 2.6 - 2.18.1 - 2.7 + + 1.3 + 4.12 + 1.10.19 - + + 3.3 + 2.6 + 2.18.1 + 2.7 + + \ No newline at end of file diff --git a/core-java/pom.xml b/core-java/pom.xml index e34e54b3af..c6f2b32cd8 100644 --- a/core-java/pom.xml +++ b/core-java/pom.xml @@ -1,188 +1,187 @@ - - 4.0.0 - org.baeldung - core-java - 0.1-SNAPSHOT + + 4.0.0 + org.baeldung + core-java + 0.1-SNAPSHOT - core-java + core-java - + - + - - com.google.guava - guava - ${guava.version} - + + com.google.guava + guava + ${guava.version} + - - org.apache.commons - commons-collections4 - 4.0 - + + org.apache.commons + commons-collections4 + 4.0 + - - commons-io - commons-io - 2.4 - + + commons-io + commons-io + 2.4 + - - org.apache.commons - commons-lang3 - ${commons-lang3.version} - + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + - - org.apache.commons - commons-math3 - 3.3 - + + org.apache.commons + commons-math3 + 3.3 + - + - + - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + - + - - org.slf4j - slf4j-api - ${org.slf4j.version} - - - ch.qos.logback - logback-classic - ${logback.version} - - - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - - - - org.slf4j - log4j-over-slf4j - ${org.slf4j.version} - + + org.slf4j + slf4j-api + ${org.slf4j.version} + + + ch.qos.logback + logback-classic + ${logback.version} + + + + org.slf4j + jcl-over-slf4j + ${org.slf4j.version} + + + + org.slf4j + log4j-over-slf4j + ${org.slf4j.version} + - + - - junit - junit-dep - ${junit.version} - test - + + junit + junit-dep + ${junit.version} + test + - - org.hamcrest - hamcrest-core - ${org.hamcrest.version} - test - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test - + + org.hamcrest + hamcrest-core + ${org.hamcrest.version} + test + + + org.hamcrest + hamcrest-library + ${org.hamcrest.version} + test + - - org.mockito - mockito-core - ${mockito.version} - test - + + org.mockito + mockito-core + ${mockito.version} + test + - + - - core-java - - - src/main/resources - true - - + + core-java + + + src/main/resources + true + + - + - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.7 - 1.7 - - + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + 1.7 + 1.7 + + - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - **/*IntegrationTest.java - - - + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + **/*IntegrationTest.java + + + - + - + - - - 4.1.5.RELEASE - 3.2.5.RELEASE + + + 4.1.5.RELEASE + 3.2.5.RELEASE - - 4.3.10.Final - 5.1.35 + + 4.3.10.Final + 5.1.35 - - 2.4.4 + + 2.4.4 - - 1.7.12 - 1.1.3 + + 1.7.12 + 1.1.3 - - 5.1.3.Final + + 5.1.3.Final - - 18.0 - 3.4 + + 18.0 + 3.4 - - 1.3 - 4.11 - 1.10.19 + + 1.3 + 4.11 + 1.10.19 - 4.4.1 - 4.5 + 4.4.1 + 4.5 - 2.4.1 + 2.4.1 - - 3.3 - 2.6 - 2.18.1 - 2.7 - 1.4.14 + + 3.3 + 2.6 + 2.18.1 + 2.7 + 1.4.14 - + \ No newline at end of file diff --git a/core-java/src/main/webapp/WEB-INF/web.xml b/core-java/src/main/webapp/WEB-INF/web.xml index 48d4b8fe61..935beae648 100644 --- a/core-java/src/main/webapp/WEB-INF/web.xml +++ b/core-java/src/main/webapp/WEB-INF/web.xml @@ -1,42 +1,41 @@ - + http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0" +> - Spring MVC Application + Spring MVC Application - - - contextClass - + + + contextClass + org.springframework.web.context.support.AnnotationConfigWebApplicationContext - - - contextConfigLocation - org.baeldung.config - + + + contextConfigLocation + org.baeldung.config + - - org.springframework.web.context.ContextLoaderListener - + + org.springframework.web.context.ContextLoaderListener + - - - api - org.springframework.web.servlet.DispatcherServlet - 1 - - - api - / - + + + api + org.springframework.web.servlet.DispatcherServlet + 1 + + + api + / + - - - + + + \ No newline at end of file diff --git a/gson/pom.xml b/gson/pom.xml index 2160146d8d..500d14c40c 100644 --- a/gson/pom.xml +++ b/gson/pom.xml @@ -1,157 +1,156 @@ - - 4.0.0 - org.baeldung - gson - 0.1-SNAPSHOT + + 4.0.0 + org.baeldung + gson + 0.1-SNAPSHOT - gson + gson - + - + - - joda-time - joda-time - 2.4 - + + joda-time + joda-time + 2.4 + - - com.google.guava - guava - 18.0 - - - commons-io - commons-io - 2.4 - + + com.google.guava + guava + 18.0 + + + commons-io + commons-io + 2.4 + - - org.apache.commons - commons-collections4 - 4.0 - + + org.apache.commons + commons-collections4 + 4.0 + - - org.apache.commons - commons-lang3 - ${commons-lang3.version} - + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + - + - + - - com.google.code.gson - gson - ${gson.version} - + + com.google.code.gson + gson + ${gson.version} + - + - - junit - junit-dep - ${junit.version} - test - + + junit + junit-dep + ${junit.version} + test + - - org.hamcrest - hamcrest-core - ${org.hamcrest.version} - test - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test - + + org.hamcrest + hamcrest-core + ${org.hamcrest.version} + test + + + org.hamcrest + hamcrest-library + ${org.hamcrest.version} + test + - - org.mockito - mockito-core - ${mockito.version} - test - + + org.mockito + mockito-core + ${mockito.version} + test + - + - - gson - - - src/main/resources - true - - + + gson + + + src/main/resources + true + + - + - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.8 - 1.8 - - + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + 1.8 + 1.8 + + - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + - + - + - - - 4.1.5.RELEASE - 3.2.5.RELEASE + + + 4.1.5.RELEASE + 3.2.5.RELEASE - - 4.3.10.Final - 5.1.35 + + 4.3.10.Final + 5.1.35 - - 2.3 + + 2.3 - - 1.7.12 - 1.1.3 + + 1.7.12 + 1.1.3 - - 5.1.3.Final + + 5.1.3.Final - - 18.0 - 3.4 + + 18.0 + 3.4 - - 1.3 - 4.11 - 1.10.19 + + 1.3 + 4.11 + 1.10.19 - 4.4.1 - 4.5 + 4.4.1 + 4.5 - 2.4.1 + 2.4.1 - - 3.3 - 2.6 - 2.18.1 - 2.7 - 1.4.14 + + 3.3 + 2.6 + 2.18.1 + 2.7 + 1.4.14 - + \ No newline at end of file diff --git a/gson/src/main/webapp/WEB-INF/web.xml b/gson/src/main/webapp/WEB-INF/web.xml index 48d4b8fe61..935beae648 100644 --- a/gson/src/main/webapp/WEB-INF/web.xml +++ b/gson/src/main/webapp/WEB-INF/web.xml @@ -1,42 +1,41 @@ - + http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0" +> - Spring MVC Application + Spring MVC Application - - - contextClass - + + + contextClass + org.springframework.web.context.support.AnnotationConfigWebApplicationContext - - - contextConfigLocation - org.baeldung.config - + + + contextConfigLocation + org.baeldung.config + - - org.springframework.web.context.ContextLoaderListener - + + org.springframework.web.context.ContextLoaderListener + - - - api - org.springframework.web.servlet.DispatcherServlet - 1 - - - api - / - + + + api + org.springframework.web.servlet.DispatcherServlet + 1 + + + api + / + - - - + + + \ No newline at end of file diff --git a/guava/src/main/webapp/WEB-INF/web.xml b/guava/src/main/webapp/WEB-INF/web.xml index 48d4b8fe61..935beae648 100644 --- a/guava/src/main/webapp/WEB-INF/web.xml +++ b/guava/src/main/webapp/WEB-INF/web.xml @@ -1,42 +1,41 @@ - + http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0" +> - Spring MVC Application + Spring MVC Application - - - contextClass - + + + contextClass + org.springframework.web.context.support.AnnotationConfigWebApplicationContext - - - contextConfigLocation - org.baeldung.config - + + + contextConfigLocation + org.baeldung.config + - - org.springframework.web.context.ContextLoaderListener - + + org.springframework.web.context.ContextLoaderListener + - - - api - org.springframework.web.servlet.DispatcherServlet - 1 - - - api - / - + + + api + org.springframework.web.servlet.DispatcherServlet + 1 + + + api + / + - - - + + + \ No newline at end of file diff --git a/handling-spring-static-resources/pom.xml b/handling-spring-static-resources/pom.xml index e00eadade8..67591e1844 100644 --- a/handling-spring-static-resources/pom.xml +++ b/handling-spring-static-resources/pom.xml @@ -1,223 +1,223 @@ - 4.0.0 - org.baeldung - handling-spring-static-resources - handling-spring-static-resources - 0.1-SNAPSHOT - war + 4.0.0 + org.baeldung + handling-spring-static-resources + handling-spring-static-resources + 0.1-SNAPSHOT + war - - + + - - org.springframework.security - spring-security-web - ${org.springframework.security.version} - - - org.springframework.security - spring-security-config - ${org.springframework.security.version} - - - org.springframework.security - spring-security-taglibs - ${org.springframework.security.version} - + + org.springframework.security + spring-security-web + ${org.springframework.security.version} + + + org.springframework.security + spring-security-config + ${org.springframework.security.version} + + + org.springframework.security + spring-security-taglibs + ${org.springframework.security.version} + - - - org.springframework - spring-core - ${org.springframework.version} - - - commons-logging - commons-logging - - - - - org.springframework - spring-context - ${org.springframework.version} - - - org.springframework - spring-jdbc - ${org.springframework.version} - - - org.springframework - spring-beans - ${org.springframework.version} - - - org.springframework - spring-aop - ${org.springframework.version} - - - org.springframework - spring-tx - ${org.springframework.version} - - - org.springframework - spring-expression - ${org.springframework.version} - + + + org.springframework + spring-core + ${org.springframework.version} + + + commons-logging + commons-logging + + + + + org.springframework + spring-context + ${org.springframework.version} + + + org.springframework + spring-jdbc + ${org.springframework.version} + + + org.springframework + spring-beans + ${org.springframework.version} + + + org.springframework + spring-aop + ${org.springframework.version} + + + org.springframework + spring-tx + ${org.springframework.version} + + + org.springframework + spring-expression + ${org.springframework.version} + - - org.springframework - spring-web - ${org.springframework.version} - - - org.springframework - spring-webmvc - ${org.springframework.version} - + + org.springframework + spring-web + ${org.springframework.version} + + + org.springframework + spring-webmvc + ${org.springframework.version} + - - - org.aspectj - aspectjrt - ${org.aspectj-version} - - - javax.inject - javax.inject - 1 - + + + org.aspectj + aspectjrt + ${org.aspectj-version} + + + javax.inject + javax.inject + 1 + - - - javax.servlet - javax.servlet-api - 3.1.0 - - - javax.servlet.jsp - javax.servlet.jsp-api - ${javax.servlet.jsp-api.version} - - - javax.servlet - jstl - 1.2 - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - - - org.hibernate - hibernate-validator - ${hibernate-validator.version} - + + + javax.servlet + javax.servlet-api + 3.1.0 + + + javax.servlet.jsp + javax.servlet.jsp-api + ${javax.servlet.jsp-api.version} + + + javax.servlet + jstl + 1.2 + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + org.hibernate + hibernate-validator + ${hibernate-validator.version} + - - - joda-time - joda-time - 2.6 - + + + joda-time + joda-time + 2.6 + - - - com.github.jknack - handlebars - 1.3.2 - + + + com.github.jknack + handlebars + 1.3.2 + - + - - org.slf4j - slf4j-api - ${org.slf4j.version} - - - ch.qos.logback - logback-classic - ${logback.version} - - - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - - - - org.slf4j - log4j-over-slf4j - ${org.slf4j.version} - + + org.slf4j + slf4j-api + ${org.slf4j.version} + + + ch.qos.logback + logback-classic + ${logback.version} + + + + org.slf4j + jcl-over-slf4j + ${org.slf4j.version} + + + + org.slf4j + log4j-over-slf4j + ${org.slf4j.version} + - + - - handling-spring-static-resources - - - src/main/resources - true - - - + + handling-spring-static-resources + + + src/main/resources + true + + + - - 1.7 - - 4.1.5.RELEASE - 3.2.5.RELEASE - - 1.8.1 - 2.3.2-b01 + + 1.7 + + 4.1.5.RELEASE + 3.2.5.RELEASE - - 4.1.5.RELEASE - 3.2.5.RELEASE + 1.8.1 + 2.3.2-b01 - - 4.3.10.Final - 5.1.35 - 1.7.2.RELEASE + + 4.1.5.RELEASE + 3.2.5.RELEASE - + + 4.3.10.Final + 5.1.35 + 1.7.2.RELEASE - 2.4.4 + - - 1.7.12 - 1.1.3 + 2.4.4 - - 5.1.3.Final + + 1.7.12 + 1.1.3 - - 18.0 - 3.4 + + 5.1.3.Final - - 1.3 - 4.11 - 1.10.19 + + 18.0 + 3.4 - 4.4.1 - 4.5 + + 1.3 + 4.11 + 1.10.19 - 2.4.1 + 4.4.1 + 4.5 - - 3.3 - 2.6 - 2.18.1 - 1.4.14 - + 2.4.1 + + + 3.3 + 2.6 + 2.18.1 + 1.4.14 + \ No newline at end of file diff --git a/handling-spring-static-resources/src/main/resources/webSecurityConfig.xml b/handling-spring-static-resources/src/main/resources/webSecurityConfig.xml index 7bb096671b..56d7f9c113 100644 --- a/handling-spring-static-resources/src/main/resources/webSecurityConfig.xml +++ b/handling-spring-static-resources/src/main/resources/webSecurityConfig.xml @@ -1,45 +1,40 @@ - - - - - - - - - - - + http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd" +> + + + + + + + + + + - - - + + + - - - - + - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/handling-spring-static-resources/src/main/webapp/WEB-INF/web.xml b/handling-spring-static-resources/src/main/webapp/WEB-INF/web.xml index 26ac5be1e0..e9d784e940 100644 --- a/handling-spring-static-resources/src/main/webapp/WEB-INF/web.xml +++ b/handling-spring-static-resources/src/main/webapp/WEB-INF/web.xml @@ -1,49 +1,48 @@ - - - - contextClass - + + + + contextClass + org.springframework.web.context.support.AnnotationConfigWebApplicationContext - - - contextConfigLocation - org.baeldung.spring - - - - org.springframework.web.context.ContextLoaderListener - - - - mvc - org.springframework.web.servlet.DispatcherServlet - 1 - - - mvc - / - - - - springSecurityFilterChain - org.springframework.web.filter.DelegatingFilterProxy - - - springSecurityFilterChain - /* - - - localizationFilter - org.springframework.web.filter.RequestContextFilter - - - localizationFilter - /* - - + + + contextConfigLocation + org.baeldung.spring + + + + org.springframework.web.context.ContextLoaderListener + + + + mvc + org.springframework.web.servlet.DispatcherServlet + 1 + + + mvc + / + + + + springSecurityFilterChain + org.springframework.web.filter.DelegatingFilterProxy + + + springSecurityFilterChain + /* + + + localizationFilter + org.springframework.web.filter.RequestContextFilter + + + localizationFilter + /* + + \ No newline at end of file diff --git a/httpclient/pom.xml b/httpclient/pom.xml index 557ed84f3d..a6df3842fd 100644 --- a/httpclient/pom.xml +++ b/httpclient/pom.xml @@ -1,194 +1,189 @@ - 4.0.0 - org.baeldung - httpclient - 0.1-SNAPSHOT + 4.0.0 + org.baeldung + httpclient + 0.1-SNAPSHOT - httpclient + httpclient - + - + - - com.google.guava - guava - ${guava.version} - + + com.google.guava + guava + ${guava.version} + - - org.apache.commons - commons-lang3 - ${commons-lang3.version} - + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + - + - - org.apache.httpcomponents - httpclient - ${httpclient.version} - - - commons-logging - commons-logging - - - - - - - - + + org.apache.httpcomponents + httpclient + ${httpclient.version} + + + commons-logging + commons-logging + + + - - org.apache.httpcomponents - fluent-hc - ${httpclient.version} - + + org.apache.httpcomponents + fluent-hc + ${httpclient.version} + - - org.apache.httpcomponents - httpmime - ${httpclient.version} - + + org.apache.httpcomponents + httpmime + ${httpclient.version} + - - commons-codec - commons-codec - 1.9 - + + commons-codec + commons-codec + 1.9 + - - org.apache.httpcomponents - httpasyncclient - 4.1-beta1 - + + org.apache.httpcomponents + httpasyncclient + 4.1-beta1 + - + - - org.slf4j - slf4j-api - ${org.slf4j.version} - - - ch.qos.logback - logback-classic - ${logback.version} - - - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - - - - org.slf4j - log4j-over-slf4j - ${org.slf4j.version} - + + org.slf4j + slf4j-api + ${org.slf4j.version} + + + ch.qos.logback + logback-classic + ${logback.version} + + + + org.slf4j + jcl-over-slf4j + ${org.slf4j.version} + + + + org.slf4j + log4j-over-slf4j + ${org.slf4j.version} + - + - - junit - junit-dep - ${junit.version} - test - + + junit + junit-dep + ${junit.version} + test + - - org.hamcrest - hamcrest-core - ${org.hamcrest.version} - test - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test - + + org.hamcrest + hamcrest-core + ${org.hamcrest.version} + test + + + org.hamcrest + hamcrest-library + ${org.hamcrest.version} + test + - - org.mockito - mockito-core - ${mockito.version} - test - + + org.mockito + mockito-core + ${mockito.version} + test + - + - - httpclient - - - src/main/resources - true - - + + httpclient + + + src/main/resources + true + + - + - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.8 - 1.8 - - + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + 1.8 + 1.8 + + - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + - + - + - - - 4.1.5.RELEASE - 3.2.5.RELEASE + + + 4.1.5.RELEASE + 3.2.5.RELEASE - - 4.3.10.Final - 5.1.35 + + 4.3.10.Final + 5.1.35 - - 1.7.12 - 1.1.3 + + 1.7.12 + 1.1.3 - - 5.1.3.Final + + 5.1.3.Final - - 18.0 - 3.4 + + 18.0 + 3.4 - - 1.3 - 4.11 - 1.10.19 + + 1.3 + 4.11 + 1.10.19 - 4.4.1 - 4.5 + 4.4.1 + 4.5 - 2.4.1 + 2.4.1 - - 3.3 - 2.6 - 2.18.1 - 2.7 - 1.4.14 + + 3.3 + 2.6 + 2.18.1 + 2.7 + 1.4.14 - + \ No newline at end of file diff --git a/jackson/pom.xml b/jackson/pom.xml index 4c59f80e3e..b2c2465436 100644 --- a/jackson/pom.xml +++ b/jackson/pom.xml @@ -1,176 +1,175 @@ - - 4.0.0 - org.baeldung - jackson - 0.1-SNAPSHOT + + 4.0.0 + org.baeldung + jackson + 0.1-SNAPSHOT - jackson + jackson - + - + - - com.google.guava - guava - ${guava.version} - - - - commons-io - commons-io - 2.4 - + + com.google.guava + guava + ${guava.version} + - - org.apache.commons - commons-collections4 - 4.0 - + + commons-io + commons-io + 2.4 + - - org.apache.commons - commons-lang3 - ${commons-lang3.version} - + + org.apache.commons + commons-collections4 + 4.0 + - + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + - + - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - 2.4.0 - - - - com.fasterxml.jackson.datatype - jackson-datatype-joda - 2.4.0 - + - - joda-time - joda-time - 2.6 - + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + - - com.google.code.gson - gson - 2.3.1 - + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + 2.4.0 + - + + com.fasterxml.jackson.datatype + jackson-datatype-joda + 2.4.0 + - - junit - junit-dep - ${junit.version} - test - + + joda-time + joda-time + 2.6 + - - org.hamcrest - hamcrest-core - ${org.hamcrest.version} - test - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test - + + com.google.code.gson + gson + 2.3.1 + - - org.mockito - mockito-core - ${mockito.version} - test - + - + + junit + junit-dep + ${junit.version} + test + - - jackson - - - src/main/resources - true - - + + org.hamcrest + hamcrest-core + ${org.hamcrest.version} + test + + + org.hamcrest + hamcrest-library + ${org.hamcrest.version} + test + - + + org.mockito + mockito-core + ${mockito.version} + test + - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.8 - 1.8 - - + - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - + + jackson + + + src/main/resources + true + + - + - + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + 1.8 + 1.8 + + - - - 4.1.5.RELEASE - 3.2.5.RELEASE + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + - - 4.3.10.Final - 5.1.35 + - - 2.4.4 + - - 1.7.12 - 1.1.3 + + + 4.1.5.RELEASE + 3.2.5.RELEASE - - 5.1.3.Final + + 4.3.10.Final + 5.1.35 - - 18.0 - 3.4 + + 2.4.4 - - 1.3 - 4.11 - 1.10.19 + + 1.7.12 + 1.1.3 - 4.4.1 - 4.5 + + 5.1.3.Final - 2.4.1 + + 18.0 + 3.4 - - 3.3 - 2.6 - 2.18.1 - 2.7 - 1.4.14 + + 1.3 + 4.11 + 1.10.19 - + 4.4.1 + 4.5 + + 2.4.1 + + + 3.3 + 2.6 + 2.18.1 + 2.7 + 1.4.14 + + \ No newline at end of file diff --git a/mockito/pom.xml b/mockito/pom.xml index 19e88b9db8..a97a017c5c 100644 --- a/mockito/pom.xml +++ b/mockito/pom.xml @@ -1,129 +1,128 @@ - - 4.0.0 - org.baeldung - mockito - 0.1-SNAPSHOT + + 4.0.0 + org.baeldung + mockito + 0.1-SNAPSHOT - mockito + mockito - + - + - - com.google.guava - guava - ${guava.version} - + + com.google.guava + guava + ${guava.version} + - - org.apache.commons - commons-lang3 - ${commons-lang3.version} - + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + - + - + - - junit - junit-dep - ${junit.version} - test - + + junit + junit-dep + ${junit.version} + test + - - org.hamcrest - hamcrest-core - ${org.hamcrest.version} - test - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test - + + org.hamcrest + hamcrest-core + ${org.hamcrest.version} + test + + + org.hamcrest + hamcrest-library + ${org.hamcrest.version} + test + - - org.mockito - mockito-core - ${mockito.version} - test - + + org.mockito + mockito-core + ${mockito.version} + test + - + - - mockito - - - src/main/resources - true - - + + mockito + + + src/main/resources + true + + - + - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.8 - 1.8 - - + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + 1.8 + 1.8 + + - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + - + - + - - - 4.1.5.RELEASE - 3.2.5.RELEASE + + + 4.1.5.RELEASE + 3.2.5.RELEASE - - 4.3.10.Final - 5.1.35 + + 4.3.10.Final + 5.1.35 - - 1.7.12 - 1.1.3 + + 1.7.12 + 1.1.3 - - 5.1.3.Final + + 5.1.3.Final - - 18.0 - 3.4 + + 18.0 + 3.4 - - 1.3 - 4.11 - 1.10.19 + + 1.3 + 4.11 + 1.10.19 - 4.4.1 - 4.5 + 4.4.1 + 4.5 - 2.4.1 + 2.4.1 - - 3.3 - 2.6 - 2.18.1 - 2.7 - 1.4.14 + + 3.3 + 2.6 + 2.18.1 + 2.7 + 1.4.14 - + \ No newline at end of file diff --git a/mockito/src/main/webapp/WEB-INF/web.xml b/mockito/src/main/webapp/WEB-INF/web.xml index 48d4b8fe61..935beae648 100644 --- a/mockito/src/main/webapp/WEB-INF/web.xml +++ b/mockito/src/main/webapp/WEB-INF/web.xml @@ -1,42 +1,41 @@ - + http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0" +> - Spring MVC Application + Spring MVC Application - - - contextClass - + + + contextClass + org.springframework.web.context.support.AnnotationConfigWebApplicationContext - - - contextConfigLocation - org.baeldung.config - + + + contextConfigLocation + org.baeldung.config + - - org.springframework.web.context.ContextLoaderListener - + + org.springframework.web.context.ContextLoaderListener + - - - api - org.springframework.web.servlet.DispatcherServlet - 1 - - - api - / - + + + api + org.springframework.web.servlet.DispatcherServlet + 1 + + + api + / + - - - + + + \ No newline at end of file diff --git a/rest-testing/pom.xml b/rest-testing/pom.xml index f59a5d188c..488a8a3cdb 100644 --- a/rest-testing/pom.xml +++ b/rest-testing/pom.xml @@ -15,13 +15,13 @@ guava ${guava.version} - + commons-io commons-io 2.4 - + org.apache.commons commons-lang3 diff --git a/rest-testing/src/main/webapp/WEB-INF/web.xml b/rest-testing/src/main/webapp/WEB-INF/web.xml index 48d4b8fe61..935beae648 100644 --- a/rest-testing/src/main/webapp/WEB-INF/web.xml +++ b/rest-testing/src/main/webapp/WEB-INF/web.xml @@ -1,42 +1,41 @@ - + http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0" +> - Spring MVC Application + Spring MVC Application - - - contextClass - + + + contextClass + org.springframework.web.context.support.AnnotationConfigWebApplicationContext - - - contextConfigLocation - org.baeldung.config - + + + contextConfigLocation + org.baeldung.config + - - org.springframework.web.context.ContextLoaderListener - + + org.springframework.web.context.ContextLoaderListener + - - - api - org.springframework.web.servlet.DispatcherServlet - 1 - - - api - / - + + + api + org.springframework.web.servlet.DispatcherServlet + 1 + + + api + / + - - - + + + \ No newline at end of file diff --git a/sandbox/src/main/webapp/WEB-INF/web.xml b/sandbox/src/main/webapp/WEB-INF/web.xml index 48d4b8fe61..935beae648 100644 --- a/sandbox/src/main/webapp/WEB-INF/web.xml +++ b/sandbox/src/main/webapp/WEB-INF/web.xml @@ -1,42 +1,41 @@ - + http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0" +> - Spring MVC Application + Spring MVC Application - - - contextClass - + + + contextClass + org.springframework.web.context.support.AnnotationConfigWebApplicationContext - - - contextConfigLocation - org.baeldung.config - + + + contextConfigLocation + org.baeldung.config + - - org.springframework.web.context.ContextLoaderListener - + + org.springframework.web.context.ContextLoaderListener + - - - api - org.springframework.web.servlet.DispatcherServlet - 1 - - - api - / - + + + api + org.springframework.web.servlet.DispatcherServlet + 1 + + + api + / + - - - + + + \ No newline at end of file diff --git a/spring-all/pom.xml b/spring-all/pom.xml index f059209f36..bf924d5753 100644 --- a/spring-all/pom.xml +++ b/spring-all/pom.xml @@ -32,22 +32,22 @@ ${org.springframework.version} - - + + org.springframework spring-aspects ${org.springframework.version} - + org.springframework spring-orm ${org.springframework.version} - + - + org.hibernate hibernate-core @@ -64,11 +64,11 @@ ${mysql-connector-java.version} runtime - - org.hsqldb - hsqldb - 2.3.2 - + + org.hsqldb + hsqldb + 2.3.2 + @@ -149,24 +149,24 @@ - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.8 - 1.8 - - + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + 1.8 + 1.8 + + - - org.apache.maven.plugins - maven-war-plugin - ${maven-war-plugin.version} - - false - - + + org.apache.maven.plugins + maven-war-plugin + ${maven-war-plugin.version} + + false + + org.apache.maven.plugins @@ -238,13 +238,13 @@ 4.5 2.4.1 - - - 3.3 - 2.6 - 2.18.1 - 2.7 - 1.4.14 + + + 3.3 + 2.6 + 2.18.1 + 2.7 + 1.4.14 diff --git a/spring-all/src/main/resources/config.xml b/spring-all/src/main/resources/config.xml index e04692ea22..15c4f7be7a 100644 --- a/spring-all/src/main/resources/config.xml +++ b/spring-all/src/main/resources/config.xml @@ -1,45 +1,42 @@ - + " +> - + - - + + - - + + - - - - + + + + - - - - - - - - - - + + + + + + + + + + - - - - + + + + diff --git a/spring-all/src/main/resources/configForProperties.xml b/spring-all/src/main/resources/configForProperties.xml index 3d3331c1d4..69939e0e4e 100644 --- a/spring-all/src/main/resources/configForProperties.xml +++ b/spring-all/src/main/resources/configForProperties.xml @@ -4,12 +4,13 @@ xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.1.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd"> + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd" +> - + - + \ No newline at end of file diff --git a/spring-all/src/main/resources/configForPropertiesOne.xml b/spring-all/src/main/resources/configForPropertiesOne.xml index 7652894f6c..c92c63392f 100644 --- a/spring-all/src/main/resources/configForPropertiesOne.xml +++ b/spring-all/src/main/resources/configForPropertiesOne.xml @@ -4,12 +4,13 @@ xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.1.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd"> + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd" +> - + - + \ No newline at end of file diff --git a/spring-all/src/main/resources/configForPropertiesTwo.xml b/spring-all/src/main/resources/configForPropertiesTwo.xml index edeb41a463..b1b5c4a66b 100644 --- a/spring-all/src/main/resources/configForPropertiesTwo.xml +++ b/spring-all/src/main/resources/configForPropertiesTwo.xml @@ -4,7 +4,8 @@ xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.1.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd"> + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd" +> diff --git a/spring-all/src/main/resources/jdbc/springJdbc-config.xml b/spring-all/src/main/resources/jdbc/springJdbc-config.xml index 5c792ac3e6..cb3b3a7536 100644 --- a/spring-all/src/main/resources/jdbc/springJdbc-config.xml +++ b/spring-all/src/main/resources/jdbc/springJdbc-config.xml @@ -1,20 +1,19 @@ - + - - - + + + - - - - - - + + + + + + - + \ No newline at end of file diff --git a/spring-all/src/main/resources/springAsync-config.xml b/spring-all/src/main/resources/springAsync-config.xml index 692f381990..403c55ebdb 100644 --- a/spring-all/src/main/resources/springAsync-config.xml +++ b/spring-all/src/main/resources/springAsync-config.xml @@ -1,14 +1,14 @@ - + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd" +> - - + + + + - - \ No newline at end of file diff --git a/spring-all/src/main/resources/springProfiles-config.xml b/spring-all/src/main/resources/springProfiles-config.xml index a290f83b26..6466178c1e 100644 --- a/spring-all/src/main/resources/springProfiles-config.xml +++ b/spring-all/src/main/resources/springProfiles-config.xml @@ -1,15 +1,14 @@ - + - - - - - - - + + + + + + + \ No newline at end of file diff --git a/spring-all/src/main/resources/springScheduled-config.xml b/spring-all/src/main/resources/springScheduled-config.xml index 68d42fdd57..751b25470d 100644 --- a/spring-all/src/main/resources/springScheduled-config.xml +++ b/spring-all/src/main/resources/springScheduled-config.xml @@ -1,26 +1,25 @@ - + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd" +> - + - - + + - + - - + + - - - - - + + + + + \ No newline at end of file diff --git a/spring-all/src/main/webapp/WEB-INF/web_old.xml b/spring-all/src/main/webapp/WEB-INF/web_old.xml index ba2bb591ed..016369ad27 100644 --- a/spring-all/src/main/webapp/WEB-INF/web_old.xml +++ b/spring-all/src/main/webapp/WEB-INF/web_old.xml @@ -1,42 +1,41 @@ - + http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0" +> - Spring MVC Application + Spring MVC Application - - - contextClass - + + + contextClass + org.springframework.web.context.support.AnnotationConfigWebApplicationContext - - - contextConfigLocation - org.baeldung.spring.web.config - + + + contextConfigLocation + org.baeldung.spring.web.config + - - org.springframework.web.context.ContextLoaderListener - + + org.springframework.web.context.ContextLoaderListener + - - - mvc - org.springframework.web.servlet.DispatcherServlet - 1 - - - mvc - / - + + + mvc + org.springframework.web.servlet.DispatcherServlet + 1 + + + mvc + / + - - index.html - + + index.html + \ No newline at end of file diff --git a/spring-boot/pom.xml b/spring-boot/pom.xml index 8bf4c664f3..004d505fe5 100644 --- a/spring-boot/pom.xml +++ b/spring-boot/pom.xml @@ -1,90 +1,73 @@ - - 4.0.0 - org.baeldung - spring-boot - 0.0.1-SNAPSHOT - war - Spring Boot Actuator - This is simple boot application for Spring boot actuator test + + 4.0.0 + org.baeldung + spring-boot + 0.0.1-SNAPSHOT + war + Spring Boot Actuator + This is simple boot application for Spring boot actuator test - - - org.springframework.boot - spring-boot-starter-parent - 1.2.4.RELEASE - + + + org.springframework.boot + spring-boot-starter-parent + 1.2.4.RELEASE + - - - org.springframework.boot - spring-boot-starter-web - - - - + + + org.springframework.boot + spring-boot-starter-web + - + + org.springframework.boot + spring-boot-starter-actuator + - - org.springframework.boot - spring-boot-starter-actuator - + + org.springframework.boot + spring-boot-starter-security + - - org.springframework.boot - spring-boot-starter-security - + + io.dropwizard.metrics + metrics-core + + - - io.dropwizard.metrics - metrics-core - - + + spring-boot + + + src/main/resources + true + + - - spring-boot - - - src/main/resources - true - - + - + + org.springframework.boot + spring-boot-maven-plugin + - - org.springframework.boot - spring-boot-maven-plugin - + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + + - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - + + org.apache.maven.plugins + maven-war-plugin + - - org.apache.maven.plugins - maven-war-plugin - + - - - + \ No newline at end of file diff --git a/spring-exceptions/pom.xml b/spring-exceptions/pom.xml index 1e59f992c3..afd4abf4d8 100644 --- a/spring-exceptions/pom.xml +++ b/spring-exceptions/pom.xml @@ -1,248 +1,247 @@ - - 4.0.0 - org.baeldung - spring-exceptions - 0.1-SNAPSHOT + + 4.0.0 + org.baeldung + spring-exceptions + 0.1-SNAPSHOT - spring-exceptions - war + spring-exceptions + war - + - + - - org.springframework - spring-web - ${org.springframework.version} - - - org.springframework - spring-webmvc - ${org.springframework.version} - - - org.springframework - spring-orm - ${org.springframework.version} - - - org.springframework - spring-context - ${org.springframework.version} - + + org.springframework + spring-web + ${org.springframework.version} + + + org.springframework + spring-webmvc + ${org.springframework.version} + + + org.springframework + spring-orm + ${org.springframework.version} + + + org.springframework + spring-context + ${org.springframework.version} + - + - - org.hibernate - hibernate-core - ${hibernate.version} - - - org.javassist - javassist - ${javassist.version} - - - mysql - mysql-connector-java - ${mysql-connector-java.version} - runtime - - - org.apache.tomcat - tomcat-dbcp - ${tomcat-dbcp.version} - + + org.hibernate + hibernate-core + ${hibernate.version} + + + org.javassist + javassist + ${javassist.version} + + + mysql + mysql-connector-java + ${mysql-connector-java.version} + runtime + + + org.apache.tomcat + tomcat-dbcp + ${tomcat-dbcp.version} + - + - - org.hibernate - hibernate-validator - ${hibernate-validator.version} - + + org.hibernate + hibernate-validator + ${hibernate-validator.version} + - + - - javax.servlet - javax.servlet-api - 3.0.1 - provided - + + javax.servlet + javax.servlet-api + 3.0.1 + provided + - - javax.servlet - jstl - ${jstl.version} - runtime - + + javax.servlet + jstl + ${jstl.version} + runtime + - + - - com.google.guava - guava - ${guava.version} - - - org.apache.commons - commons-lang3 - ${commons-lang3.version} - test - + + com.google.guava + guava + ${guava.version} + + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + test + - + - - org.springframework - spring-test - ${org.springframework.version} - test - + + org.springframework + spring-test + ${org.springframework.version} + test + - - junit - junit-dep - ${junit.version} - test - + + junit + junit-dep + ${junit.version} + test + - - org.hamcrest - hamcrest-core - ${org.hamcrest.version} - test - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test - + + org.hamcrest + hamcrest-core + ${org.hamcrest.version} + test + + + org.hamcrest + hamcrest-library + ${org.hamcrest.version} + test + - - org.mockito - mockito-core - ${mockito.version} - test - + + org.mockito + mockito-core + ${mockito.version} + test + - + - - spring-exceptions - - - src/main/resources - true - - + + spring-exceptions + + + src/main/resources + true + + - + - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.8 - 1.8 - - + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + 1.8 + 1.8 + + - - org.apache.maven.plugins - maven-war-plugin - ${maven-war-plugin.version} - - false - - + + org.apache.maven.plugins + maven-war-plugin + ${maven-war-plugin.version} + + false + + - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - - - - - - - + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + + + + + + + - - org.codehaus.cargo - cargo-maven2-plugin - ${cargo-maven2-plugin.version} - - true - - jetty8x - embedded - - - - - - - 8082 - - - - + + org.codehaus.cargo + cargo-maven2-plugin + ${cargo-maven2-plugin.version} + + true + + jetty8x + embedded + + + + + + + 8082 + + + + - + - + - - - 4.1.6.RELEASE - 3.2.7.RELEASE - 3.19.0-GA - 1.2 + + + 4.1.6.RELEASE + 3.2.7.RELEASE + 3.19.0-GA + 1.2 - - 4.3.10.Final - 5.1.35 - 7.0.42 + + 4.3.10.Final + 5.1.35 + 7.0.42 - - 1.7.12 - 1.1.3 + + 1.7.12 + 1.1.3 - - 5.1.3.Final + + 5.1.3.Final - - 18.0 - 3.4 + + 18.0 + 3.4 - - 1.3 - 4.11 - 1.10.19 + + 1.3 + 4.11 + 1.10.19 - 4.4.1 - 4.5 + 4.4.1 + 4.5 - 2.4.1 - 1.8.9 + 2.4.1 + 1.8.9 - - 3.3 - 2.6 - 2.18.1 - 2.7 - 1.4.14 + + 3.3 + 2.6 + 2.18.1 + 2.7 + 1.4.14 - + \ No newline at end of file diff --git a/spring-exceptions/src/main/resources/configForProperties.xml b/spring-exceptions/src/main/resources/configForProperties.xml index 3d3331c1d4..69939e0e4e 100644 --- a/spring-exceptions/src/main/resources/configForProperties.xml +++ b/spring-exceptions/src/main/resources/configForProperties.xml @@ -4,12 +4,13 @@ xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.1.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd"> + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd" +> - + - + \ No newline at end of file diff --git a/spring-exceptions/src/main/resources/configForPropertiesOne.xml b/spring-exceptions/src/main/resources/configForPropertiesOne.xml index 7652894f6c..c92c63392f 100644 --- a/spring-exceptions/src/main/resources/configForPropertiesOne.xml +++ b/spring-exceptions/src/main/resources/configForPropertiesOne.xml @@ -4,12 +4,13 @@ xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.1.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd"> + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd" +> - + - + \ No newline at end of file diff --git a/spring-exceptions/src/main/resources/configForPropertiesTwo.xml b/spring-exceptions/src/main/resources/configForPropertiesTwo.xml index edeb41a463..b1b5c4a66b 100644 --- a/spring-exceptions/src/main/resources/configForPropertiesTwo.xml +++ b/spring-exceptions/src/main/resources/configForPropertiesTwo.xml @@ -4,7 +4,8 @@ xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.1.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd"> + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd" +> diff --git a/spring-exceptions/src/main/webapp/WEB-INF/web_old.xml b/spring-exceptions/src/main/webapp/WEB-INF/web_old.xml index ba2bb591ed..016369ad27 100644 --- a/spring-exceptions/src/main/webapp/WEB-INF/web_old.xml +++ b/spring-exceptions/src/main/webapp/WEB-INF/web_old.xml @@ -1,42 +1,41 @@ - + http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0" +> - Spring MVC Application + Spring MVC Application - - - contextClass - + + + contextClass + org.springframework.web.context.support.AnnotationConfigWebApplicationContext - - - contextConfigLocation - org.baeldung.spring.web.config - + + + contextConfigLocation + org.baeldung.spring.web.config + - - org.springframework.web.context.ContextLoaderListener - + + org.springframework.web.context.ContextLoaderListener + - - - mvc - org.springframework.web.servlet.DispatcherServlet - 1 - - - mvc - / - + + + mvc + org.springframework.web.servlet.DispatcherServlet + 1 + + + mvc + / + - - index.html - + + index.html + \ No newline at end of file diff --git a/spring-hibernate3/pom.xml b/spring-hibernate3/pom.xml index 17f04077c4..eb6aae204c 100644 --- a/spring-hibernate3/pom.xml +++ b/spring-hibernate3/pom.xml @@ -1,204 +1,203 @@ - - 4.0.0 - org.baeldung - spring-hibernate3 - 0.1-SNAPSHOT + + 4.0.0 + org.baeldung + spring-hibernate3 + 0.1-SNAPSHOT - spring-hibernate3 + spring-hibernate3 - + - + - - org.springframework - spring-context - ${org.springframework.version} - + + org.springframework + spring-context + ${org.springframework.version} + - - - - org.springframework - spring-orm - ${org.springframework.version} - - - - org.hibernate - hibernate-core - ${hibernate.version} - - - org.javassist - javassist - ${javassist.version} - - - mysql - mysql-connector-java - ${mysql-connector-java.version} - runtime - + - - org.apache.tomcat - tomcat-dbcp - ${tomcat-dbcp.version} - + + org.springframework + spring-orm + ${org.springframework.version} + - + + org.hibernate + hibernate-core + ${hibernate.version} + + + org.javassist + javassist + ${javassist.version} + + + mysql + mysql-connector-java + ${mysql-connector-java.version} + runtime + - - com.google.guava - guava - ${guava.version} - + + org.apache.tomcat + tomcat-dbcp + ${tomcat-dbcp.version} + - + - - org.apache.commons - commons-lang3 - ${commons-lang3.version} - test - + + com.google.guava + guava + ${guava.version} + - - org.springframework - spring-test - ${org.springframework.version} - test - + - - junit - junit-dep - ${junit.version} - test - + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + test + - - org.hamcrest - hamcrest-core - ${org.hamcrest.version} - test - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test - + + org.springframework + spring-test + ${org.springframework.version} + test + - - org.mockito - mockito-core - ${mockito.version} - test - + + junit + junit-dep + ${junit.version} + test + - + + org.hamcrest + hamcrest-core + ${org.hamcrest.version} + test + + + org.hamcrest + hamcrest-library + ${org.hamcrest.version} + test + - - spring-hibernate3 - - - src/main/resources - true - - + + org.mockito + mockito-core + ${mockito.version} + test + - + - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.8 - 1.8 - - + + spring-hibernate3 + + + src/main/resources + true + + - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - - - - - - - + - - org.codehaus.cargo - cargo-maven2-plugin - ${cargo-maven2-plugin.version} - - true - - jetty8x - embedded - - - - - - - 8082 - - - - + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + 1.8 + 1.8 + + - + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + + + + + + + - + + org.codehaus.cargo + cargo-maven2-plugin + ${cargo-maven2-plugin.version} + + true + + jetty8x + embedded + + + + + + + 8082 + + + + - - - 4.1.6.RELEASE - 3.2.7.RELEASE - 3.19.0-GA + - - 3.6.10.Final - 5.1.35 - 7.0.47 + - - 1.7.12 - 1.1.3 + + + 4.1.6.RELEASE + 3.2.7.RELEASE + 3.19.0-GA - - 5.1.3.Final + + 3.6.10.Final + 5.1.35 + 7.0.47 - - 18.0 - 3.4 + + 1.7.12 + 1.1.3 - - 1.3 - 4.11 - 1.10.19 + + 5.1.3.Final - 4.4.1 - 4.5 + + 18.0 + 3.4 - 2.4.1 + + 1.3 + 4.11 + 1.10.19 - - 3.3 - 2.18.1 - 2.7 - 1.4.14 + 4.4.1 + 4.5 - + 2.4.1 + + + 3.3 + 2.18.1 + 2.7 + 1.4.14 + + \ No newline at end of file diff --git a/spring-hibernate3/src/main/resources/persistenceConfig.xml b/spring-hibernate3/src/main/resources/persistenceConfig.xml index abb0982a04..1f2f6130a6 100644 --- a/spring-hibernate3/src/main/resources/persistenceConfig.xml +++ b/spring-hibernate3/src/main/resources/persistenceConfig.xml @@ -1,16 +1,15 @@ - + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd" +> + + - - - - + + ${hibernate.hbm2ddl.auto} @@ -20,16 +19,16 @@ - - - - + + + + - + - - + + \ No newline at end of file diff --git a/spring-hibernate3/src/main/webapp/WEB-INF/web.xml b/spring-hibernate3/src/main/webapp/WEB-INF/web.xml index 5db6f59746..ad56bf28c7 100644 --- a/spring-hibernate3/src/main/webapp/WEB-INF/web.xml +++ b/spring-hibernate3/src/main/webapp/WEB-INF/web.xml @@ -1,6 +1,7 @@ + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0" +> Spring Hibernate 3 Application contextClass diff --git a/spring-hibernate4/pom.xml b/spring-hibernate4/pom.xml index dbe9051d77..65ff14ce96 100644 --- a/spring-hibernate4/pom.xml +++ b/spring-hibernate4/pom.xml @@ -1,211 +1,210 @@ - - 4.0.0 - org.baeldung - spring-hibernate4 - 0.1-SNAPSHOT - - spring-hibernate4 + + 4.0.0 + org.baeldung + spring-hibernate4 + 0.1-SNAPSHOT - + spring-hibernate4 - + - - org.springframework - spring-context - ${org.springframework.version} - + - + + org.springframework + spring-context + ${org.springframework.version} + - - org.springframework - spring-orm - ${org.springframework.version} - - - org.hibernate - hibernate-core - ${hibernate.version} - - - org.javassist - javassist - ${javassist.version} - - - mysql - mysql-connector-java - ${mysql-connector-java.version} - runtime - + - - org.apache.tomcat - tomcat-dbcp - ${tomcat-dbcp.version} - + + org.springframework + spring-orm + ${org.springframework.version} + + + org.hibernate + hibernate-core + ${hibernate.version} + + + org.javassist + javassist + ${javassist.version} + + + mysql + mysql-connector-java + ${mysql-connector-java.version} + runtime + - + + org.apache.tomcat + tomcat-dbcp + ${tomcat-dbcp.version} + - - org.hibernate - hibernate-validator - ${hibernate-validator.version} - + - + + org.hibernate + hibernate-validator + ${hibernate-validator.version} + - - com.google.guava - guava - ${guava.version} - + - + + com.google.guava + guava + ${guava.version} + - - org.apache.commons - commons-lang3 - ${commons-lang3.version} - test - + - - org.springframework - spring-test - ${org.springframework.version} - test - + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + test + - - junit - junit-dep - ${junit.version} - test - + + org.springframework + spring-test + ${org.springframework.version} + test + - - org.hamcrest - hamcrest-core - ${org.hamcrest.version} - test - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test - + + junit + junit-dep + ${junit.version} + test + - - org.mockito - mockito-core - ${mockito.version} - test - + + org.hamcrest + hamcrest-core + ${org.hamcrest.version} + test + + + org.hamcrest + hamcrest-library + ${org.hamcrest.version} + test + - + + org.mockito + mockito-core + ${mockito.version} + test + - - spring-hibernate4 - - - src/main/resources - true - - + - + + spring-hibernate4 + + + src/main/resources + true + + - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.8 - 1.8 - - + - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - - - - - - - + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + 1.8 + 1.8 + + - - org.codehaus.cargo - cargo-maven2-plugin - ${cargo-maven2-plugin.version} - - true - - jetty8x - embedded - - - - - - - 8082 - - - - + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + + + + + + + - + + org.codehaus.cargo + cargo-maven2-plugin + ${cargo-maven2-plugin.version} + + true + + jetty8x + embedded + + + + + + + 8082 + + + + - + - - - 4.1.6.RELEASE - 3.2.7.RELEASE - 3.19.0-GA + - - 4.3.10.Final - 5.1.35 - 7.0.42 + + + 4.1.6.RELEASE + 3.2.7.RELEASE + 3.19.0-GA - - 1.7.12 - 1.1.3 + + 4.3.10.Final + 5.1.35 + 7.0.42 - - 5.1.3.Final + + 1.7.12 + 1.1.3 - - 18.0 - 3.4 + + 5.1.3.Final - - 1.3 - 4.11 - 1.10.19 + + 18.0 + 3.4 - 4.4.1 - 4.5 + + 1.3 + 4.11 + 1.10.19 - 2.4.1 + 4.4.1 + 4.5 - - 3.3 - 2.18.1 - 2.7 - 1.4.14 + 2.4.1 - + + 3.3 + 2.18.1 + 2.7 + 1.4.14 + + \ No newline at end of file diff --git a/spring-hibernate4/src/main/resources/hibernate4Config.xml b/spring-hibernate4/src/main/resources/hibernate4Config.xml index 530e816bcf..6e7c5d7f11 100644 --- a/spring-hibernate4/src/main/resources/hibernate4Config.xml +++ b/spring-hibernate4/src/main/resources/hibernate4Config.xml @@ -1,16 +1,15 @@ - + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd" +> + + - - - - + + ${hibernate.hbm2ddl.auto} @@ -20,16 +19,16 @@ - - - - + + + + - + - - + + \ No newline at end of file diff --git a/spring-hibernate4/src/main/resources/webSecurityConfig.xml b/spring-hibernate4/src/main/resources/webSecurityConfig.xml index 8866255479..779a24ba39 100644 --- a/spring-hibernate4/src/main/resources/webSecurityConfig.xml +++ b/spring-hibernate4/src/main/resources/webSecurityConfig.xml @@ -1,36 +1,36 @@ - + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd" +> - - - - - - + + + + + + - - - + + + - + - + - + - + - - - - + + + + - - - + + + \ No newline at end of file diff --git a/spring-jpa/pom.xml b/spring-jpa/pom.xml index ae5a100d22..fd8ae12f00 100644 --- a/spring-jpa/pom.xml +++ b/spring-jpa/pom.xml @@ -1,217 +1,216 @@ - - 4.0.0 + + 4.0.0 - org.baeldung - spring-jpa - 0.1-SNAPSHOT + org.baeldung + spring-jpa + 0.1-SNAPSHOT - spring-jpa + spring-jpa - + - + - - org.springframework - spring-orm - ${org.springframework.version} - - - org.springframework - spring-context - ${org.springframework.version} - + + org.springframework + spring-orm + ${org.springframework.version} + + + org.springframework + spring-context + ${org.springframework.version} + - + - - org.hibernate - hibernate-entitymanager - ${hibernate.version} - - - xml-apis - xml-apis - 1.4.01 - - - org.javassist - javassist - ${javassist.version} - - - mysql - mysql-connector-java - ${mysql-connector-java.version} - runtime - - - org.springframework.data - spring-data-jpa + + org.hibernate + hibernate-entitymanager + ${hibernate.version} + + + xml-apis + xml-apis + 1.4.01 + + + org.javassist + javassist + ${javassist.version} + + + mysql + mysql-connector-java + ${mysql-connector-java.version} + runtime + + + org.springframework.data + spring-data-jpa ${spring-data-jpa.version} - + - + - - org.hibernate - hibernate-validator - ${hibernate-validator.version} - + + org.hibernate + hibernate-validator + ${hibernate-validator.version} + - + - - com.google.guava - guava - ${guava.version} - + + com.google.guava + guava + ${guava.version} + - + - - org.apache.commons - commons-lang3 - ${commons-lang3.version} - test - + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + test + - - org.springframework - spring-test - ${org.springframework.version} - test - + + org.springframework + spring-test + ${org.springframework.version} + test + - - junit - junit-dep - ${junit.version} - test - + + junit + junit-dep + ${junit.version} + test + - - org.hamcrest - hamcrest-core - ${org.hamcrest.version} - test - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test - + + org.hamcrest + hamcrest-core + ${org.hamcrest.version} + test + + + org.hamcrest + hamcrest-library + ${org.hamcrest.version} + test + - - org.mockito - mockito-core - ${mockito.version} - test - + + org.mockito + mockito-core + ${mockito.version} + test + - + - - spring-jpa - - - src/main/resources - true - - + + spring-jpa + + + src/main/resources + true + + - + - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.8 - 1.8 - - + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + 1.8 + 1.8 + + - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - - - - - - - + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + + + + + + + - - org.codehaus.cargo - cargo-maven2-plugin - ${cargo-maven2-plugin.version} - - true - - jetty8x - embedded - - - - - - - 8082 - - - - + + org.codehaus.cargo + cargo-maven2-plugin + ${cargo-maven2-plugin.version} + + true + + jetty8x + embedded + + + + + + + 8082 + + + + - + - + - - - 4.1.6.RELEASE - 3.2.7.RELEASE - 3.19.0-GA - - - 4.3.10.Final - 5.1.35 + + + 4.1.6.RELEASE + 3.2.7.RELEASE + 3.19.0-GA + + + 4.3.10.Final + 5.1.35 1.7.2.RELEASE - - 1.7.12 - 1.1.3 + + 1.7.12 + 1.1.3 - - 5.1.3.Final + + 5.1.3.Final - - 18.0 - 3.4 + + 18.0 + 3.4 - - 1.3 - 4.11 - 1.10.19 + + 1.3 + 4.11 + 1.10.19 - 4.4.1 - 4.5 + 4.4.1 + 4.5 - 2.4.1 + 2.4.1 - - 3.3 - 2.18.1 - 2.7 - 1.4.14 - + + 3.3 + 2.18.1 + 2.7 + 1.4.14 + - + \ No newline at end of file diff --git a/spring-jpa/src/main/resources/jpaConfig.xml b/spring-jpa/src/main/resources/jpaConfig.xml index 8b9c4efff1..982f569840 100644 --- a/spring-jpa/src/main/resources/jpaConfig.xml +++ b/spring-jpa/src/main/resources/jpaConfig.xml @@ -4,19 +4,18 @@ xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.1.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd"> + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd" +> - + - - + + - - + + @@ -27,17 +26,17 @@ - - - - + + + + - + - + - + \ No newline at end of file diff --git a/spring-jpa/src/main/resources/webSecurityConfig.xml b/spring-jpa/src/main/resources/webSecurityConfig.xml index 8866255479..779a24ba39 100644 --- a/spring-jpa/src/main/resources/webSecurityConfig.xml +++ b/spring-jpa/src/main/resources/webSecurityConfig.xml @@ -1,36 +1,36 @@ - + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd" +> - - - - - - + + + + + + - - - + + + - + - + - + - + - - - - + + + + - - - + + + \ No newline at end of file diff --git a/spring-mvc-java/pom.xml b/spring-mvc-java/pom.xml index cbca7bd6a9..a171e78dfd 100644 --- a/spring-mvc-java/pom.xml +++ b/spring-mvc-java/pom.xml @@ -1,181 +1,180 @@ - - 4.0.0 - org.baeldung - spring-mvc-java - 0.1-SNAPSHOT + + 4.0.0 + org.baeldung + spring-mvc-java + 0.1-SNAPSHOT - spring-mvc-java - war + spring-mvc-java + war - + - + - - org.springframework - spring-web - ${org.springframework.version} - - - org.springframework - spring-webmvc - ${org.springframework.version} - + + org.springframework + spring-web + ${org.springframework.version} + + + org.springframework + spring-webmvc + ${org.springframework.version} + - + - - javax.servlet - javax.servlet-api - 3.0.1 - provided - + + javax.servlet + javax.servlet-api + 3.0.1 + provided + - - javax.servlet - jstl - 1.2 - runtime - + + javax.servlet + jstl + 1.2 + runtime + - + - - junit - junit-dep - ${junit.version} - test - + + junit + junit-dep + ${junit.version} + test + - - org.hamcrest - hamcrest-core - ${org.hamcrest.version} - test - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test - + + org.hamcrest + hamcrest-core + ${org.hamcrest.version} + test + + + org.hamcrest + hamcrest-library + ${org.hamcrest.version} + test + - - org.mockito - mockito-core - ${mockito.version} - test - + + org.mockito + mockito-core + ${mockito.version} + test + - + - - spring-mvc-java - - - src/main/resources - true - - + + spring-mvc-java + + + src/main/resources + true + + - + - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.8 - 1.8 - - + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + 1.8 + 1.8 + + - - org.apache.maven.plugins - maven-war-plugin - ${maven-war-plugin.version} - - false - - + + org.apache.maven.plugins + maven-war-plugin + ${maven-war-plugin.version} + + false + + - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - - - - - - - + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + + + + + + + - - org.codehaus.cargo - cargo-maven2-plugin - ${cargo-maven2-plugin.version} - - true - - jetty8x - embedded - - - - - - - 8082 - - - - + + org.codehaus.cargo + cargo-maven2-plugin + ${cargo-maven2-plugin.version} + + true + + jetty8x + embedded + + + + + + + 8082 + + + + - + - + - - - 4.1.6.RELEASE - 3.2.7.RELEASE + + + 4.1.6.RELEASE + 3.2.7.RELEASE - - 4.3.10.Final - 5.1.35 + + 4.3.10.Final + 5.1.35 - - 1.7.12 - 1.1.3 + + 1.7.12 + 1.1.3 - - 5.1.3.Final + + 5.1.3.Final - - 18.0 - 3.4 + + 18.0 + 3.4 - - 1.3 - 4.11 - 1.10.19 + + 1.3 + 4.11 + 1.10.19 - 4.4.1 - 4.5 + 4.4.1 + 4.5 - 2.4.1 + 2.4.1 - - 3.3 - 2.6 - 2.18.1 - 2.7 - 1.4.14 + + 3.3 + 2.6 + 2.18.1 + 2.7 + 1.4.14 - + \ No newline at end of file diff --git a/spring-mvc-java/src/main/webapp/WEB-INF/web_old.xml b/spring-mvc-java/src/main/webapp/WEB-INF/web_old.xml index ba2bb591ed..016369ad27 100644 --- a/spring-mvc-java/src/main/webapp/WEB-INF/web_old.xml +++ b/spring-mvc-java/src/main/webapp/WEB-INF/web_old.xml @@ -1,42 +1,41 @@ - + http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0" +> - Spring MVC Application + Spring MVC Application - - - contextClass - + + + contextClass + org.springframework.web.context.support.AnnotationConfigWebApplicationContext - - - contextConfigLocation - org.baeldung.spring.web.config - + + + contextConfigLocation + org.baeldung.spring.web.config + - - org.springframework.web.context.ContextLoaderListener - + + org.springframework.web.context.ContextLoaderListener + - - - mvc - org.springframework.web.servlet.DispatcherServlet - 1 - - - mvc - / - + + + mvc + org.springframework.web.servlet.DispatcherServlet + 1 + + + mvc + / + - - index.html - + + index.html + \ No newline at end of file diff --git a/spring-mvc-no-xml/pom.xml b/spring-mvc-no-xml/pom.xml index 07f473b38b..ac8d59dfda 100644 --- a/spring-mvc-no-xml/pom.xml +++ b/spring-mvc-no-xml/pom.xml @@ -1,173 +1,172 @@ - - 4.0.0 - org.baeldung - 0.1-SNAPSHOT - spring-mvc-no-xml + + 4.0.0 + org.baeldung + 0.1-SNAPSHOT + spring-mvc-no-xml - spring-mvc-no-xml - war + spring-mvc-no-xml + war - + - + - - org.springframework - spring-web - ${org.springframework.version} - - - org.springframework - spring-webmvc - ${org.springframework.version} - + + org.springframework + spring-web + ${org.springframework.version} + + + org.springframework + spring-webmvc + ${org.springframework.version} + - + - - javax.servlet - javax.servlet-api - 3.0.1 - provided - + + javax.servlet + javax.servlet-api + 3.0.1 + provided + - - javax.servlet - jstl - 1.2 - runtime - + + javax.servlet + jstl + 1.2 + runtime + - + - - org.slf4j - slf4j-api - ${org.slf4j.version} - - - ch.qos.logback - logback-classic - ${logback.version} - - - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - - - - org.slf4j - log4j-over-slf4j - ${org.slf4j.version} - + + org.slf4j + slf4j-api + ${org.slf4j.version} + + + ch.qos.logback + logback-classic + ${logback.version} + + + + org.slf4j + jcl-over-slf4j + ${org.slf4j.version} + + + + org.slf4j + log4j-over-slf4j + ${org.slf4j.version} + - + - - junit - junit-dep - ${junit.version} - test - + + junit + junit-dep + ${junit.version} + test + - - org.hamcrest - hamcrest-core - ${org.hamcrest.version} - test - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test - + + org.hamcrest + hamcrest-core + ${org.hamcrest.version} + test + + + org.hamcrest + hamcrest-library + ${org.hamcrest.version} + test + - - org.mockito - mockito-core - ${mockito.version} - test - + + org.mockito + mockito-core + ${mockito.version} + test + - + - - spring-mvc-no-xml - - - src/main/resources - true - - + + spring-mvc-no-xml + + + src/main/resources + true + + - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.8 - 1.8 - - - - - org.apache.maven.plugins - maven-war-plugin - ${maven-war-plugin.version} - - false - - + - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - - - - - - - + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + 1.8 + 1.8 + + - + + org.apache.maven.plugins + maven-war-plugin + ${maven-war-plugin.version} + + false + + - + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + + + + + + + - - - 4.1.6.RELEASE + - - 1.7.12 - 1.1.3 + - - 1.3 - 4.11 - 1.10.19 + + + 4.1.6.RELEASE - 4.4.1 - 4.5 + + 1.7.12 + 1.1.3 - 2.4.1 + + 1.3 + 4.11 + 1.10.19 - - 3.3 - 2.6 - 2.18.1 - 2.7 - 1.4.14 + 4.4.1 + 4.5 - + 2.4.1 + + + 3.3 + 2.6 + 2.18.1 + 2.7 + 1.4.14 + + \ No newline at end of file diff --git a/spring-mvc-no-xml/src/main/resources/webSecurityConfig.xml b/spring-mvc-no-xml/src/main/resources/webSecurityConfig.xml index 8866255479..779a24ba39 100644 --- a/spring-mvc-no-xml/src/main/resources/webSecurityConfig.xml +++ b/spring-mvc-no-xml/src/main/resources/webSecurityConfig.xml @@ -1,36 +1,36 @@ - + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd" +> - - - - - - + + + + + + - - - + + + - + - + - + - + - - - - + + + + - - - + + + \ No newline at end of file diff --git a/spring-mvc-no-xml/src/main/webapp/WEB-INF/web_old.xml b/spring-mvc-no-xml/src/main/webapp/WEB-INF/web_old.xml index bb6d3ce599..e2f52148c3 100644 --- a/spring-mvc-no-xml/src/main/webapp/WEB-INF/web_old.xml +++ b/spring-mvc-no-xml/src/main/webapp/WEB-INF/web_old.xml @@ -1,44 +1,43 @@ - + http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0" +> - Spring MVC No XML Application + Spring MVC No XML Application - - - contextClass - + + + contextClass + org.springframework.web.context.support.AnnotationConfigWebApplicationContext - - - contextConfigLocation - org.baeldung.spring - + + + contextConfigLocation + org.baeldung.spring + - - org.springframework.web.context.ContextLoaderListener - + + org.springframework.web.context.ContextLoaderListener + - - - mvc - org.springframework.web.servlet.DispatcherServlet - 1 - - - mvc - / - + + + mvc + org.springframework.web.servlet.DispatcherServlet + 1 + + + mvc + / + - + - - index.html - + + index.html + \ No newline at end of file diff --git a/spring-mvc-xml/pom.xml b/spring-mvc-xml/pom.xml index 1a9e7978be..407c350700 100644 --- a/spring-mvc-xml/pom.xml +++ b/spring-mvc-xml/pom.xml @@ -1,175 +1,174 @@ - - 4.0.0 - org.baeldung - 0.1-SNAPSHOT - spring-mvc-xml + + 4.0.0 + org.baeldung + 0.1-SNAPSHOT + spring-mvc-xml - spring-mvc-xml - war + spring-mvc-xml + war - + - + - - org.springframework - spring-web - ${org.springframework.version} - - - org.springframework - spring-webmvc - ${org.springframework.version} - + + org.springframework + spring-web + ${org.springframework.version} + + + org.springframework + spring-webmvc + ${org.springframework.version} + - + - - javax.servlet - javax.servlet-api - 3.1.0 - provided - + + javax.servlet + javax.servlet-api + 3.1.0 + provided + - - javax.servlet - jstl - 1.2 - runtime - + + javax.servlet + jstl + 1.2 + runtime + - - org.hibernate - hibernate-validator - 5.1.1.Final - + + org.hibernate + hibernate-validator + 5.1.1.Final + - + - - org.slf4j - slf4j-api - ${org.slf4j.version} - - - ch.qos.logback - logback-classic - ${logback.version} - - - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - - - - org.slf4j - log4j-over-slf4j - ${org.slf4j.version} - + + org.slf4j + slf4j-api + ${org.slf4j.version} + + + ch.qos.logback + logback-classic + ${logback.version} + + + + org.slf4j + jcl-over-slf4j + ${org.slf4j.version} + + + + org.slf4j + log4j-over-slf4j + ${org.slf4j.version} + - + - - junit - junit-dep - ${junit.version} - test - + + junit + junit-dep + ${junit.version} + test + - - org.hamcrest - hamcrest-core - ${org.hamcrest.version} - test - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test - + + org.hamcrest + hamcrest-core + ${org.hamcrest.version} + test + + + org.hamcrest + hamcrest-library + ${org.hamcrest.version} + test + - - org.mockito - mockito-core - ${mockito.version} - test - + + org.mockito + mockito-core + ${mockito.version} + test + - + - - spring-mvc-xml - - - src/main/resources - true - - + + spring-mvc-xml + + + src/main/resources + true + + - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.8 - 1.8 - - + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + 1.8 + 1.8 + + - - org.apache.maven.plugins - maven-war-plugin - ${maven-war-plugin.version} - + + org.apache.maven.plugins + maven-war-plugin + ${maven-war-plugin.version} + - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - - - - - - - + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + + + + + + + - + - + - - - 4.1.6.RELEASE + + + 4.1.6.RELEASE - - 1.7.12 - 1.1.3 + + 1.7.12 + 1.1.3 - - 1.3 - 4.11 - 1.10.19 + + 1.3 + 4.11 + 1.10.19 - 4.4.1 - 4.5 + 4.4.1 + 4.5 - 2.4.1 + 2.4.1 - - 3.3 - 2.6 - 2.18.1 - 2.7 - 1.4.14 + + 3.3 + 2.6 + 2.18.1 + 2.7 + 1.4.14 - + \ No newline at end of file diff --git a/spring-mvc-xml/src/main/resources/webMvcConfig.xml b/spring-mvc-xml/src/main/resources/webMvcConfig.xml index e249425447..46825235c6 100644 --- a/spring-mvc-xml/src/main/resources/webMvcConfig.xml +++ b/spring-mvc-xml/src/main/resources/webMvcConfig.xml @@ -1,23 +1,22 @@ - + http://www.springframework.org/schema/mvc/spring-mvc-4.1.xsd" +> - - - - - - + + + + + + - + \ No newline at end of file diff --git a/spring-mvc-xml/src/main/webapp/WEB-INF/web.xml b/spring-mvc-xml/src/main/webapp/WEB-INF/web.xml index 1a4128fb50..5275efdf24 100644 --- a/spring-mvc-xml/src/main/webapp/WEB-INF/web.xml +++ b/spring-mvc-xml/src/main/webapp/WEB-INF/web.xml @@ -2,7 +2,8 @@ + http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0" +> Spring MVC XML Application diff --git a/spring-rest/pom.xml b/spring-rest/pom.xml index 542fa1d025..fce9a5699f 100644 --- a/spring-rest/pom.xml +++ b/spring-rest/pom.xml @@ -1,267 +1,266 @@ - - 4.0.0 - org.baeldung - spring-rest - 0.1-SNAPSHOT - spring-rest - war + + 4.0.0 + org.baeldung + spring-rest + 0.1-SNAPSHOT + spring-rest + war - - org.springframework.boot - spring-boot-starter-parent - 1.2.4.RELEASE - + + org.springframework.boot + spring-boot-starter-parent + 1.2.4.RELEASE + - + - - - org.springframework.boot - spring-boot-starter-security - - - org.springframework.boot - spring-boot-starter-thymeleaf - - - org.springframework.boot - spring-boot-starter-actuator - + + + org.springframework.boot + spring-boot-starter-security + + + org.springframework.boot + spring-boot-starter-thymeleaf + + + org.springframework.boot + spring-boot-starter-actuator + - + - - org.springframework - spring-web - ${org.springframework.version} - - - commons-logging - commons-logging - - - - - org.springframework - spring-webmvc - ${org.springframework.version} - - - org.springframework - spring-oxm - ${org.springframework.version} - + + org.springframework + spring-web + ${org.springframework.version} + + + commons-logging + commons-logging + + + + + org.springframework + spring-webmvc + ${org.springframework.version} + + + org.springframework + spring-oxm + ${org.springframework.version} + - - commons-fileupload - commons-fileupload - 1.3.1 - - + + commons-fileupload + commons-fileupload + 1.3.1 + + - - javax.servlet - javax.servlet-api - 3.0.1 - provided - + + javax.servlet + javax.servlet-api + 3.0.1 + provided + - - javax.servlet - jstl - runtime - + + javax.servlet + jstl + runtime + - + - - com.fasterxml.jackson.core - jackson-databind - + + com.fasterxml.jackson.core + jackson-databind + - - com.thoughtworks.xstream - xstream - 1.4.8 - + + com.thoughtworks.xstream + xstream + 1.4.8 + - + - - com.google.guava - guava - ${guava.version} - + + com.google.guava + guava + ${guava.version} + - - org.apache.commons - commons-lang3 - 3.2.1 - + + org.apache.commons + commons-lang3 + 3.2.1 + - + - - org.slf4j - slf4j-api - ${org.slf4j.version} - - - ch.qos.logback - logback-classic - ${logback.version} - - - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - - - - org.slf4j - log4j-over-slf4j - ${org.slf4j.version} - + + org.slf4j + slf4j-api + ${org.slf4j.version} + + + ch.qos.logback + logback-classic + ${logback.version} + + + + org.slf4j + jcl-over-slf4j + ${org.slf4j.version} + + + + org.slf4j + log4j-over-slf4j + ${org.slf4j.version} + - + - - junit - junit-dep - ${junit.version} - test - + + junit + junit-dep + ${junit.version} + test + - - org.hamcrest - hamcrest-core - ${org.hamcrest.version} - test - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test - + + org.hamcrest + hamcrest-core + ${org.hamcrest.version} + test + + + org.hamcrest + hamcrest-library + ${org.hamcrest.version} + test + - - org.mockito - mockito-core - ${mockito.version} - test - + + org.mockito + mockito-core + ${mockito.version} + test + - + - - spring-rest - - - src/main/resources - true - - + + spring-rest + + + src/main/resources + true + + - + - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.8 - 1.8 - - + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + 1.8 + 1.8 + + - - org.apache.maven.plugins - maven-war-plugin - ${maven-war-plugin.version} - + + org.apache.maven.plugins + maven-war-plugin + ${maven-war-plugin.version} + - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - - - - - - - + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + + + + + + + - - org.codehaus.cargo - cargo-maven2-plugin - ${cargo-maven2-plugin.version} - - true - - jetty8x - embedded - - - - - - - 8082 - - - - + + org.codehaus.cargo + cargo-maven2-plugin + ${cargo-maven2-plugin.version} + + true + + jetty8x + embedded + + + + + + + 8082 + + + + - + - + - - - 4.1.6.RELEASE - 3.2.7.RELEASE + + + 4.1.6.RELEASE + 3.2.7.RELEASE - - 4.3.10.Final - 5.1.35 + + 4.3.10.Final + 5.1.35 - + - 2.5.1 + 2.5.1 - - 5.1.3.Final + + 5.1.3.Final - - 18.0 - 3.4 + + 18.0 + 3.4 - - 1.3 - 4.11 - 1.10.19 + + 1.3 + 4.11 + 1.10.19 - 4.4.1 - 4.5 + 4.4.1 + 4.5 - 2.4.1 + 2.4.1 - - 1.7.12 - 1.1.3 + + 1.7.12 + 1.1.3 - - 3.3 - 2.6 - 2.18.1 - 1.4.14 + + 3.3 + 2.6 + 2.18.1 + 1.4.14 - + \ No newline at end of file diff --git a/spring-rest/src/main/webapp/WEB-INF/web.xml b/spring-rest/src/main/webapp/WEB-INF/web.xml index 48d4b8fe61..935beae648 100644 --- a/spring-rest/src/main/webapp/WEB-INF/web.xml +++ b/spring-rest/src/main/webapp/WEB-INF/web.xml @@ -1,42 +1,41 @@ - + http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0" +> - Spring MVC Application + Spring MVC Application - - - contextClass - + + + contextClass + org.springframework.web.context.support.AnnotationConfigWebApplicationContext - - - contextConfigLocation - org.baeldung.config - + + + contextConfigLocation + org.baeldung.config + - - org.springframework.web.context.ContextLoaderListener - + + org.springframework.web.context.ContextLoaderListener + - - - api - org.springframework.web.servlet.DispatcherServlet - 1 - - - api - / - + + + api + org.springframework.web.servlet.DispatcherServlet + 1 + + + api + / + - - - + + + \ No newline at end of file diff --git a/spring-security-basic-auth/pom.xml b/spring-security-basic-auth/pom.xml index 136f40955a..d1152329f7 100644 --- a/spring-security-basic-auth/pom.xml +++ b/spring-security-basic-auth/pom.xml @@ -1,266 +1,265 @@ - - 4.0.0 - org.baeldung - spring-security-mvc-basic-auth - 0.1-SNAPSHOT + + 4.0.0 + org.baeldung + spring-security-mvc-basic-auth + 0.1-SNAPSHOT - spring-security-mvc-basic-auth - war + spring-security-mvc-basic-auth + war - + - + - - org.springframework.security - spring-security-web - ${org.springframework.security.version} - - - org.springframework.security - spring-security-config - ${org.springframework.security.version} - + + org.springframework.security + spring-security-web + ${org.springframework.security.version} + + + org.springframework.security + spring-security-config + ${org.springframework.security.version} + - + - - org.springframework - spring-core - ${org.springframework.version} - - - commons-logging - commons-logging - - - - - org.springframework - spring-context - ${org.springframework.version} - - - org.springframework - spring-jdbc - ${org.springframework.version} - - - org.springframework - spring-beans - ${org.springframework.version} - - - org.springframework - spring-aop - ${org.springframework.version} - - - org.springframework - spring-tx - ${org.springframework.version} - - - org.springframework - spring-expression - ${org.springframework.version} - + + org.springframework + spring-core + ${org.springframework.version} + + + commons-logging + commons-logging + + + + + org.springframework + spring-context + ${org.springframework.version} + + + org.springframework + spring-jdbc + ${org.springframework.version} + + + org.springframework + spring-beans + ${org.springframework.version} + + + org.springframework + spring-aop + ${org.springframework.version} + + + org.springframework + spring-tx + ${org.springframework.version} + + + org.springframework + spring-expression + ${org.springframework.version} + - - org.springframework - spring-web - ${org.springframework.version} - - - org.springframework - spring-webmvc - ${org.springframework.version} - + + org.springframework + spring-web + ${org.springframework.version} + + + org.springframework + spring-webmvc + ${org.springframework.version} + - + - - javax.servlet - javax.servlet-api - 3.0.1 - provided - + + javax.servlet + javax.servlet-api + 3.0.1 + provided + - - javax.servlet - jstl - 1.2 - runtime - + + javax.servlet + jstl + 1.2 + runtime + - + - - com.google.guava - guava - 14.0.1 - + + com.google.guava + guava + 14.0.1 + - + - - org.slf4j - slf4j-api - ${org.slf4j.version} - - - ch.qos.logback - logback-classic - ${logback.version} - - - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - - - - org.slf4j - log4j-over-slf4j - ${org.slf4j.version} - - - + + org.slf4j + slf4j-api + ${org.slf4j.version} + + + ch.qos.logback + logback-classic + ${logback.version} + + + + org.slf4j + jcl-over-slf4j + ${org.slf4j.version} + + + + org.slf4j + log4j-over-slf4j + ${org.slf4j.version} + - - junit - junit-dep - ${junit.version} - test - + - - org.hamcrest - hamcrest-core - ${org.hamcrest.version} - test - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test - + + junit + junit-dep + ${junit.version} + test + - - org.mockito - mockito-core - ${mockito.version} - test - + + org.hamcrest + hamcrest-core + ${org.hamcrest.version} + test + + + org.hamcrest + hamcrest-library + ${org.hamcrest.version} + test + - + + org.mockito + mockito-core + ${mockito.version} + test + - - spring-security-mvc-basic-auth - - - src/main/resources - true - - + - + + spring-security-mvc-basic-auth + + + src/main/resources + true + + - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.8 - 1.8 - - + - - org.apache.maven.plugins - maven-war-plugin - ${maven-war-plugin.version} - + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + 1.8 + 1.8 + + - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - - - - - - - + + org.apache.maven.plugins + maven-war-plugin + ${maven-war-plugin.version} + - - org.codehaus.cargo - cargo-maven2-plugin - ${cargo-maven2-plugin.version} - - true - - jetty8x - embedded - - - - - - - 8082 - - - - + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + + + + + + + - + + org.codehaus.cargo + cargo-maven2-plugin + ${cargo-maven2-plugin.version} + + true + + jetty8x + embedded + + + + + + + 8082 + + + + - + - - - 4.1.6.RELEASE - 3.2.7.RELEASE + - - 4.3.10.Final - 5.1.35 + + + 4.1.6.RELEASE + 3.2.7.RELEASE - - 1.7.12 - 1.1.3 + + 4.3.10.Final + 5.1.35 - - 5.1.3.Final + + 1.7.12 + 1.1.3 - - 18.0 - 3.4 + + 5.1.3.Final - - 1.3 - 4.11 - 1.10.19 + + 18.0 + 3.4 - 4.4.1 - 4.5 + + 1.3 + 4.11 + 1.10.19 - 2.4.1 + 4.4.1 + 4.5 - - 3.3 - 2.6 - 2.18.1 - 2.7 - 1.4.14 + 2.4.1 - + + 3.3 + 2.6 + 2.18.1 + 2.7 + 1.4.14 + + \ No newline at end of file diff --git a/spring-security-basic-auth/src/main/resources/webSecurityConfig.xml b/spring-security-basic-auth/src/main/resources/webSecurityConfig.xml index e5310da187..40ad96c29e 100644 --- a/spring-security-basic-auth/src/main/resources/webSecurityConfig.xml +++ b/spring-security-basic-auth/src/main/resources/webSecurityConfig.xml @@ -1,25 +1,25 @@ - + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd" +> - + - - + + - + - + - - - - - - - + + + + + + + \ No newline at end of file diff --git a/spring-security-basic-auth/src/main/webapp/WEB-INF/web.xml b/spring-security-basic-auth/src/main/webapp/WEB-INF/web.xml index 08183daa24..77a830c6d5 100644 --- a/spring-security-basic-auth/src/main/webapp/WEB-INF/web.xml +++ b/spring-security-basic-auth/src/main/webapp/WEB-INF/web.xml @@ -1,6 +1,7 @@ + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0" +> Spring Security Basic Auth Application diff --git a/spring-security-login-and-registration/src/main/resources/webSecurityConfig.xml b/spring-security-login-and-registration/src/main/resources/webSecurityConfig.xml index b929f1ffa9..d852307ab5 100644 --- a/spring-security-login-and-registration/src/main/resources/webSecurityConfig.xml +++ b/spring-security-login-and-registration/src/main/resources/webSecurityConfig.xml @@ -3,37 +3,38 @@ xmlns:mvc="http://www.springframework.org/schema/mvc" xsi:schemaLocation=" http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.2.xsd - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd"> + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd" +> - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - + + + + - - + default-target-url="/homepage.html"/> + + - + \ No newline at end of file diff --git a/spring-security-login-and-registration/src/main/webapp/WEB-INF/web.xml b/spring-security-login-and-registration/src/main/webapp/WEB-INF/web.xml index ed3d1b3ce7..9ef57810f8 100644 --- a/spring-security-login-and-registration/src/main/webapp/WEB-INF/web.xml +++ b/spring-security-login-and-registration/src/main/webapp/WEB-INF/web.xml @@ -2,7 +2,8 @@ + http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0" +> contextClass @@ -16,11 +17,11 @@ org.springframework.web.context.ContextLoaderListener - + org.springframework.web.context.request.RequestContextListener - - + + mvc org.springframework.web.servlet.DispatcherServlet diff --git a/spring-security-mvc-custom/pom.xml b/spring-security-mvc-custom/pom.xml index 86c5924e38..26d291427a 100644 --- a/spring-security-mvc-custom/pom.xml +++ b/spring-security-mvc-custom/pom.xml @@ -1,271 +1,270 @@ - - 4.0.0 - org.baeldung - spring-security-mvc-custom - 0.1-SNAPSHOT + + 4.0.0 + org.baeldung + spring-security-mvc-custom + 0.1-SNAPSHOT - spring-security-mvc-custom - war + spring-security-mvc-custom + war - + - + - - org.springframework.security - spring-security-web - ${org.springframework.security.version} - - - org.springframework.security - spring-security-config - ${org.springframework.security.version} - - - org.springframework.security - spring-security-taglibs - ${org.springframework.security.version} - + + org.springframework.security + spring-security-web + ${org.springframework.security.version} + + + org.springframework.security + spring-security-config + ${org.springframework.security.version} + + + org.springframework.security + spring-security-taglibs + ${org.springframework.security.version} + - + - - org.springframework - spring-core - ${org.springframework.version} - - - commons-logging - commons-logging - - - - - org.springframework - spring-context - ${org.springframework.version} - - - org.springframework - spring-jdbc - ${org.springframework.version} - - - org.springframework - spring-beans - ${org.springframework.version} - - - org.springframework - spring-aop - ${org.springframework.version} - - - org.springframework - spring-tx - ${org.springframework.version} - - - org.springframework - spring-expression - ${org.springframework.version} - + + org.springframework + spring-core + ${org.springframework.version} + + + commons-logging + commons-logging + + + + + org.springframework + spring-context + ${org.springframework.version} + + + org.springframework + spring-jdbc + ${org.springframework.version} + + + org.springframework + spring-beans + ${org.springframework.version} + + + org.springframework + spring-aop + ${org.springframework.version} + + + org.springframework + spring-tx + ${org.springframework.version} + + + org.springframework + spring-expression + ${org.springframework.version} + - - org.springframework - spring-web - ${org.springframework.version} - - - org.springframework - spring-webmvc - ${org.springframework.version} - + + org.springframework + spring-web + ${org.springframework.version} + + + org.springframework + spring-webmvc + ${org.springframework.version} + - + - - javax.servlet - javax.servlet-api - 3.0.1 - provided - + + javax.servlet + javax.servlet-api + 3.0.1 + provided + - - javax.servlet - jstl - 1.2 - runtime - + + javax.servlet + jstl + 1.2 + runtime + - + - - - - - + + + + + - + - - org.slf4j - slf4j-api - ${org.slf4j.version} - - - ch.qos.logback - logback-classic - ${logback.version} - - - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - - - - org.slf4j - log4j-over-slf4j - ${org.slf4j.version} - - - + + org.slf4j + slf4j-api + ${org.slf4j.version} + + + ch.qos.logback + logback-classic + ${logback.version} + + + + org.slf4j + jcl-over-slf4j + ${org.slf4j.version} + + + + org.slf4j + log4j-over-slf4j + ${org.slf4j.version} + - - junit - junit-dep - ${junit.version} - test - + - - org.hamcrest - hamcrest-core - ${org.hamcrest.version} - test - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test - + + junit + junit-dep + ${junit.version} + test + - - org.mockito - mockito-core - ${mockito.version} - test - + + org.hamcrest + hamcrest-core + ${org.hamcrest.version} + test + + + org.hamcrest + hamcrest-library + ${org.hamcrest.version} + test + - + + org.mockito + mockito-core + ${mockito.version} + test + - - spring-security-mvc-custom - - - src/main/resources - true - - + - + + spring-security-mvc-custom + + + src/main/resources + true + + - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.8 - 1.8 - - + - - org.apache.maven.plugins - maven-war-plugin - ${maven-war-plugin.version} - + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + 1.8 + 1.8 + + - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - - - - - - - + + org.apache.maven.plugins + maven-war-plugin + ${maven-war-plugin.version} + - - org.codehaus.cargo - cargo-maven2-plugin - ${cargo-maven2-plugin.version} - - true - - jetty8x - embedded - - - - - - - 8082 - - - - + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + + + + + + + - + + org.codehaus.cargo + cargo-maven2-plugin + ${cargo-maven2-plugin.version} + + true + + jetty8x + embedded + + + + + + + 8082 + + + + - + - - - 4.1.6.RELEASE - 3.2.7.RELEASE + - - 4.3.10.Final - 5.1.35 + + + 4.1.6.RELEASE + 3.2.7.RELEASE - - 1.7.12 - 1.1.3 + + 4.3.10.Final + 5.1.35 - - 5.1.3.Final + + 1.7.12 + 1.1.3 - - 18.0 - 3.4 + + 5.1.3.Final - - 1.3 - 4.11 - 1.10.19 + + 18.0 + 3.4 - 4.5 - 4.4.1 + + 1.3 + 4.11 + 1.10.19 - 2.4.1 + 4.5 + 4.4.1 - - 3.3 - 2.6 - 2.18.1 - 2.7 - 1.4.14 + 2.4.1 - + + 3.3 + 2.6 + 2.18.1 + 2.7 + 1.4.14 + + \ No newline at end of file diff --git a/spring-security-mvc-custom/src/main/resources/webSecurityConfig.xml b/spring-security-mvc-custom/src/main/resources/webSecurityConfig.xml index 203f1c6a0b..618db12433 100644 --- a/spring-security-mvc-custom/src/main/resources/webSecurityConfig.xml +++ b/spring-security-mvc-custom/src/main/resources/webSecurityConfig.xml @@ -4,28 +4,29 @@ http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.2.xsd http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-4.1.xsd"> + http://www.springframework.org/schema/beans/spring-beans-4.1.xsd" +> - - - + + + - + - + - + - + - - + + diff --git a/spring-security-mvc-custom/src/main/webapp/WEB-INF/web.xml b/spring-security-mvc-custom/src/main/webapp/WEB-INF/web.xml index ff61eb229b..e805828809 100644 --- a/spring-security-mvc-custom/src/main/webapp/WEB-INF/web.xml +++ b/spring-security-mvc-custom/src/main/webapp/WEB-INF/web.xml @@ -2,7 +2,8 @@ + http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0" +> Spring MVC Custom Application diff --git a/spring-security-mvc-digest-auth/pom.xml b/spring-security-mvc-digest-auth/pom.xml index 78f126f799..9b132820ab 100644 --- a/spring-security-mvc-digest-auth/pom.xml +++ b/spring-security-mvc-digest-auth/pom.xml @@ -1,266 +1,265 @@ - - 4.0.0 - org.baeldung - spring-security-mvc-digest-auth - 0.1-SNAPSHOT + + 4.0.0 + org.baeldung + spring-security-mvc-digest-auth + 0.1-SNAPSHOT - spring-security-mvc-digest-auth - war + spring-security-mvc-digest-auth + war - + - + - - org.springframework.security - spring-security-web - ${org.springframework.security.version} - - - org.springframework.security - spring-security-config - ${org.springframework.security.version} - + + org.springframework.security + spring-security-web + ${org.springframework.security.version} + + + org.springframework.security + spring-security-config + ${org.springframework.security.version} + - + - - org.springframework - spring-core - ${org.springframework.version} - - - commons-logging - commons-logging - - - - - org.springframework - spring-context - ${org.springframework.version} - - - org.springframework - spring-jdbc - ${org.springframework.version} - - - org.springframework - spring-beans - ${org.springframework.version} - - - org.springframework - spring-aop - ${org.springframework.version} - - - org.springframework - spring-tx - ${org.springframework.version} - - - org.springframework - spring-expression - ${org.springframework.version} - + + org.springframework + spring-core + ${org.springframework.version} + + + commons-logging + commons-logging + + + + + org.springframework + spring-context + ${org.springframework.version} + + + org.springframework + spring-jdbc + ${org.springframework.version} + + + org.springframework + spring-beans + ${org.springframework.version} + + + org.springframework + spring-aop + ${org.springframework.version} + + + org.springframework + spring-tx + ${org.springframework.version} + + + org.springframework + spring-expression + ${org.springframework.version} + - - org.springframework - spring-web - ${org.springframework.version} - - - org.springframework - spring-webmvc - ${org.springframework.version} - + + org.springframework + spring-web + ${org.springframework.version} + + + org.springframework + spring-webmvc + ${org.springframework.version} + - + - - javax.servlet - javax.servlet-api - 3.0.1 - provided - + + javax.servlet + javax.servlet-api + 3.0.1 + provided + - - javax.servlet - jstl - 1.2 - runtime - + + javax.servlet + jstl + 1.2 + runtime + - + - - com.google.guava - guava - ${guava.version} - + + com.google.guava + guava + ${guava.version} + - + - - org.slf4j - slf4j-api - ${org.slf4j.version} - - - ch.qos.logback - logback-classic - ${logback.version} - - - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - - - - org.slf4j - log4j-over-slf4j - ${org.slf4j.version} - - - + + org.slf4j + slf4j-api + ${org.slf4j.version} + + + ch.qos.logback + logback-classic + ${logback.version} + + + + org.slf4j + jcl-over-slf4j + ${org.slf4j.version} + + + + org.slf4j + log4j-over-slf4j + ${org.slf4j.version} + - - junit - junit-dep - ${junit.version} - test - + - - org.hamcrest - hamcrest-core - ${org.hamcrest.version} - test - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test - + + junit + junit-dep + ${junit.version} + test + - - org.mockito - mockito-core - ${mockito.version} - test - + + org.hamcrest + hamcrest-core + ${org.hamcrest.version} + test + + + org.hamcrest + hamcrest-library + ${org.hamcrest.version} + test + - + + org.mockito + mockito-core + ${mockito.version} + test + - - spring-security-mvc-digest-auth - - - src/main/resources - true - - + - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.8 - 1.8 - - - - - org.apache.maven.plugins - maven-war-plugin - ${maven-war-plugin.version} - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - - - - - - - + + spring-security-mvc-digest-auth + + + src/main/resources + true + + - - org.codehaus.cargo - cargo-maven2-plugin - ${cargo-maven2-plugin.version} - - true - - jetty8x - embedded - - - - - - - 8082 - - - - + - + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + 1.8 + 1.8 + + - + + org.apache.maven.plugins + maven-war-plugin + ${maven-war-plugin.version} + - - - 4.1.6.RELEASE - 3.2.7.RELEASE + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + + + + + + + - - 4.3.10.Final - 5.1.35 + + org.codehaus.cargo + cargo-maven2-plugin + ${cargo-maven2-plugin.version} + + true + + jetty8x + embedded + + + + + + + 8082 + + + + - - 1.7.12 - 1.1.3 + - - 5.1.3.Final + - - 18.0 - 3.4 + + + 4.1.6.RELEASE + 3.2.7.RELEASE - - 1.3 - 4.11 - 1.10.19 + + 4.3.10.Final + 5.1.35 - 4.4.1 - 4.5 + + 1.7.12 + 1.1.3 - 2.4.1 + + 5.1.3.Final - - 3.3 - 2.6 - 2.18.1 - 2.7 - 1.4.14 + + 18.0 + 3.4 - + + 1.3 + 4.11 + 1.10.19 + + 4.4.1 + 4.5 + + 2.4.1 + + + 3.3 + 2.6 + 2.18.1 + 2.7 + 1.4.14 + + \ No newline at end of file diff --git a/spring-security-mvc-digest-auth/src/main/resources/webSecurityConfig.xml b/spring-security-mvc-digest-auth/src/main/resources/webSecurityConfig.xml index 641a8b49dd..be31d44049 100644 --- a/spring-security-mvc-digest-auth/src/main/resources/webSecurityConfig.xml +++ b/spring-security-mvc-digest-auth/src/main/resources/webSecurityConfig.xml @@ -2,28 +2,29 @@ + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd" +> - - + + - - + + - + - + - + diff --git a/spring-security-mvc-digest-auth/src/main/webapp/WEB-INF/web.xml b/spring-security-mvc-digest-auth/src/main/webapp/WEB-INF/web.xml index 461f32bde5..bebd5d9cd3 100644 --- a/spring-security-mvc-digest-auth/src/main/webapp/WEB-INF/web.xml +++ b/spring-security-mvc-digest-auth/src/main/webapp/WEB-INF/web.xml @@ -1,52 +1,51 @@ - + http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0" +> - Spring Security Basic Auth Application + Spring Security Basic Auth Application - - - contextClass - + + + contextClass + org.springframework.web.context.support.AnnotationConfigWebApplicationContext - - - contextConfigLocation - org.baeldung.spring - + + + contextConfigLocation + org.baeldung.spring + - - org.springframework.web.context.ContextLoaderListener - + + org.springframework.web.context.ContextLoaderListener + - - - mvc - org.springframework.web.servlet.DispatcherServlet - 1 - - - mvc - / - + + + mvc + org.springframework.web.servlet.DispatcherServlet + 1 + + + mvc + / + - - - springSecurityFilterChain - org.springframework.web.filter.DelegatingFilterProxy - - - springSecurityFilterChain - /* - + + + springSecurityFilterChain + org.springframework.web.filter.DelegatingFilterProxy + + + springSecurityFilterChain + /* + - - index.html - + + index.html + \ No newline at end of file diff --git a/spring-security-mvc-ldap/pom.xml b/spring-security-mvc-ldap/pom.xml index a5cd9bd0db..28e1f74bbd 100644 --- a/spring-security-mvc-ldap/pom.xml +++ b/spring-security-mvc-ldap/pom.xml @@ -1,127 +1,126 @@ - - 4.0.0 - org.baeldung - spring-security-mvc-ldap - 0.1-SNAPSHOT + + 4.0.0 + org.baeldung + spring-security-mvc-ldap + 0.1-SNAPSHOT - spring-security-mvc-ldap - war + spring-security-mvc-ldap + war - - org.springframework.boot - spring-boot-starter-parent - 1.2.4.RELEASE - + + org.springframework.boot + spring-boot-starter-parent + 1.2.4.RELEASE + - + - - - org.springframework.boot - spring-boot-starter-security - - - org.springframework.boot - spring-boot-starter-thymeleaf - - - org.springframework.boot - spring-boot-starter-actuator - + + + org.springframework.boot + spring-boot-starter-security + + + org.springframework.boot + spring-boot-starter-thymeleaf + + + org.springframework.boot + spring-boot-starter-actuator + - - - org.springframework.security - spring-security-ldap - + + + org.springframework.security + spring-security-ldap + - - org.springframework.ldap - spring-ldap-core - 2.0.3.RELEASE - - - org.springframework.ldap - spring-ldap-core-tiger - 2.0.3.RELEASE - + + org.springframework.ldap + spring-ldap-core + 2.0.3.RELEASE + + + org.springframework.ldap + spring-ldap-core-tiger + 2.0.3.RELEASE + - - - org.apache.directory.server - apacheds-server-jndi - 1.5.5 - - - org.apache.mina - mina-core - 2.0.9 - + + + org.apache.directory.server + apacheds-server-jndi + 1.5.5 + + + org.apache.mina + mina-core + 2.0.9 + - + - - spring-security-mvc-ldap - - - src/main/resources - true - - + + spring-security-mvc-ldap + + + src/main/resources + true + + - + - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.8 - 1.8 - - + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + 1.8 + 1.8 + + - + - + - - - 4.1.6.RELEASE - 3.2.7.RELEASE + + + 4.1.6.RELEASE + 3.2.7.RELEASE - - 4.3.10.Final - 5.1.35 + + 4.3.10.Final + 5.1.35 - - 1.7.12 - 1.1.3 + + 1.7.12 + 1.1.3 - - 5.1.3.Final + + 5.1.3.Final - - 18.0 - 3.4 + + 18.0 + 3.4 - - 1.3 - 4.11 - 1.10.19 + + 1.3 + 4.11 + 1.10.19 - 4.4.1 - 4.5 + 4.4.1 + 4.5 - 2.4.1 + 2.4.1 - - 3.3 - 2.6 - 2.18.1 - 1.4.14 + + 3.3 + 2.6 + 2.18.1 + 1.4.14 - + diff --git a/spring-security-mvc-login/pom.xml b/spring-security-mvc-login/pom.xml index 4d43b65807..b181df8d60 100644 --- a/spring-security-mvc-login/pom.xml +++ b/spring-security-mvc-login/pom.xml @@ -1,263 +1,262 @@ - - 4.0.0 - org.baeldung - spring-security-mvc-login - 0.1-SNAPSHOT + + 4.0.0 + org.baeldung + spring-security-mvc-login + 0.1-SNAPSHOT - spring-security-mvc-login - war + spring-security-mvc-login + war - + - + - - org.springframework.security - spring-security-web - ${org.springframework.security.version} - - - org.springframework.security - spring-security-config - ${org.springframework.security.version} - - - org.springframework.security - spring-security-taglibs - ${org.springframework.security.version} - + + org.springframework.security + spring-security-web + ${org.springframework.security.version} + + + org.springframework.security + spring-security-config + ${org.springframework.security.version} + + + org.springframework.security + spring-security-taglibs + ${org.springframework.security.version} + - + - - org.springframework - spring-core - ${org.springframework.version} - - - commons-logging - commons-logging - - - - - org.springframework - spring-context - ${org.springframework.version} - - - org.springframework - spring-jdbc - ${org.springframework.version} - - - org.springframework - spring-beans - ${org.springframework.version} - - - org.springframework - spring-aop - ${org.springframework.version} - - - org.springframework - spring-tx - ${org.springframework.version} - - - org.springframework - spring-expression - ${org.springframework.version} - + + org.springframework + spring-core + ${org.springframework.version} + + + commons-logging + commons-logging + + + + + org.springframework + spring-context + ${org.springframework.version} + + + org.springframework + spring-jdbc + ${org.springframework.version} + + + org.springframework + spring-beans + ${org.springframework.version} + + + org.springframework + spring-aop + ${org.springframework.version} + + + org.springframework + spring-tx + ${org.springframework.version} + + + org.springframework + spring-expression + ${org.springframework.version} + - - org.springframework - spring-web - ${org.springframework.version} - - - org.springframework - spring-webmvc - ${org.springframework.version} - + + org.springframework + spring-web + ${org.springframework.version} + + + org.springframework + spring-webmvc + ${org.springframework.version} + - + - - javax.servlet - javax.servlet-api - 3.0.1 - provided - + + javax.servlet + javax.servlet-api + 3.0.1 + provided + - - javax.servlet - jstl - 1.2 - runtime - + + javax.servlet + jstl + 1.2 + runtime + - + - - org.slf4j - slf4j-api - ${org.slf4j.version} - - - ch.qos.logback - logback-classic - ${logback.version} - - - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - - - - org.slf4j - log4j-over-slf4j - ${org.slf4j.version} - - - + + org.slf4j + slf4j-api + ${org.slf4j.version} + + + ch.qos.logback + logback-classic + ${logback.version} + + + + org.slf4j + jcl-over-slf4j + ${org.slf4j.version} + + + + org.slf4j + log4j-over-slf4j + ${org.slf4j.version} + - - junit - junit-dep - ${junit.version} - test - + - - org.hamcrest - hamcrest-core - ${org.hamcrest.version} - test - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test - + + junit + junit-dep + ${junit.version} + test + - - org.mockito - mockito-core - ${mockito.version} - test - + + org.hamcrest + hamcrest-core + ${org.hamcrest.version} + test + + + org.hamcrest + hamcrest-library + ${org.hamcrest.version} + test + - + + org.mockito + mockito-core + ${mockito.version} + test + - - spring-security-mvc-login - - - src/main/resources - true - - + - + + spring-security-mvc-login + + + src/main/resources + true + + - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.8 - 1.8 - - + - - org.apache.maven.plugins - maven-war-plugin - ${maven-war-plugin.version} - + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + 1.8 + 1.8 + + - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - - - - - - - + + org.apache.maven.plugins + maven-war-plugin + ${maven-war-plugin.version} + - - org.codehaus.cargo - cargo-maven2-plugin - ${cargo-maven2-plugin.version} - - true - - jetty8x - embedded - - - - - - - 8082 - - - - + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + + + + + + + - + + org.codehaus.cargo + cargo-maven2-plugin + ${cargo-maven2-plugin.version} + + true + + jetty8x + embedded + + + + + + + 8082 + + + + - + - - - 4.1.6.RELEASE - 3.2.7.RELEASE + - - 4.3.10.Final - 5.1.35 + + + 4.1.6.RELEASE + 3.2.7.RELEASE - - 1.7.12 - 1.1.3 + + 4.3.10.Final + 5.1.35 - - 5.1.3.Final + + 1.7.12 + 1.1.3 - - 18.0 - 3.4 + + 5.1.3.Final - - 1.3 - 4.11 - 1.10.19 + + 18.0 + 3.4 - 4.4.1 - 4.5 + + 1.3 + 4.11 + 1.10.19 - 2.4.1 + 4.4.1 + 4.5 - - 3.3 - 2.6 - 2.18.1 - 2.7 - 1.4.14 + 2.4.1 - + + 3.3 + 2.6 + 2.18.1 + 2.7 + 1.4.14 + + \ No newline at end of file diff --git a/spring-security-mvc-login/src/main/resources/webSecurityConfig.xml b/spring-security-mvc-login/src/main/resources/webSecurityConfig.xml index 5bc330d0be..ca7dac9a51 100644 --- a/spring-security-mvc-login/src/main/resources/webSecurityConfig.xml +++ b/spring-security-mvc-login/src/main/resources/webSecurityConfig.xml @@ -1,36 +1,33 @@ - + http://www.springframework.org/schema/beans/spring-beans-4.1.xsd" +> - - - - + + + + - + - + - + - + - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/spring-security-mvc-login/src/main/webapp/WEB-INF/web.xml b/spring-security-mvc-login/src/main/webapp/WEB-INF/web.xml index 6ea0988649..f13ae48c7e 100644 --- a/spring-security-mvc-login/src/main/webapp/WEB-INF/web.xml +++ b/spring-security-mvc-login/src/main/webapp/WEB-INF/web.xml @@ -1,52 +1,51 @@ - + http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0" +> - Spring MVC Application + Spring MVC Application - - - contextClass - + + + contextClass + org.springframework.web.context.support.AnnotationConfigWebApplicationContext - - - contextConfigLocation - org.baeldung.spring - + + + contextConfigLocation + org.baeldung.spring + - - org.springframework.web.context.ContextLoaderListener - + + org.springframework.web.context.ContextLoaderListener + - - - mvc - org.springframework.web.servlet.DispatcherServlet - 1 - - - mvc - / - + + + mvc + org.springframework.web.servlet.DispatcherServlet + 1 + + + mvc + / + - - - springSecurityFilterChain - org.springframework.web.filter.DelegatingFilterProxy - - - springSecurityFilterChain - /* - + + + springSecurityFilterChain + org.springframework.web.filter.DelegatingFilterProxy + + + springSecurityFilterChain + /* + - - - + + + \ No newline at end of file diff --git a/spring-security-mvc-session/pom.xml b/spring-security-mvc-session/pom.xml index 9da9d5b510..3239800743 100644 --- a/spring-security-mvc-session/pom.xml +++ b/spring-security-mvc-session/pom.xml @@ -1,271 +1,270 @@ - - 4.0.0 - org.baeldung - spring-security-mvc-session - 0.1-SNAPSHOT + + 4.0.0 + org.baeldung + spring-security-mvc-session + 0.1-SNAPSHOT - spring-security-mvc-session - war + spring-security-mvc-session + war - + - + - - org.springframework.security - spring-security-web - ${org.springframework.security.version} - - - org.springframework.security - spring-security-config - ${org.springframework.security.version} - - - org.springframework.security - spring-security-taglibs - ${org.springframework.security.version} - + + org.springframework.security + spring-security-web + ${org.springframework.security.version} + + + org.springframework.security + spring-security-config + ${org.springframework.security.version} + + + org.springframework.security + spring-security-taglibs + ${org.springframework.security.version} + - + - - org.springframework - spring-core - ${org.springframework.version} - - - commons-logging - commons-logging - - - - - org.springframework - spring-context - ${org.springframework.version} - - - org.springframework - spring-jdbc - ${org.springframework.version} - - - org.springframework - spring-beans - ${org.springframework.version} - - - org.springframework - spring-aop - ${org.springframework.version} - - - org.springframework - spring-tx - ${org.springframework.version} - - - org.springframework - spring-expression - ${org.springframework.version} - + + org.springframework + spring-core + ${org.springframework.version} + + + commons-logging + commons-logging + + + + + org.springframework + spring-context + ${org.springframework.version} + + + org.springframework + spring-jdbc + ${org.springframework.version} + + + org.springframework + spring-beans + ${org.springframework.version} + + + org.springframework + spring-aop + ${org.springframework.version} + + + org.springframework + spring-tx + ${org.springframework.version} + + + org.springframework + spring-expression + ${org.springframework.version} + - - org.springframework - spring-web - ${org.springframework.version} - - - org.springframework - spring-webmvc - ${org.springframework.version} - + + org.springframework + spring-web + ${org.springframework.version} + + + org.springframework + spring-webmvc + ${org.springframework.version} + - + - - javax.servlet - javax.servlet-api - 3.0.1 - provided - + + javax.servlet + javax.servlet-api + 3.0.1 + provided + - - javax.servlet - jstl - 1.2 - runtime - + + javax.servlet + jstl + 1.2 + runtime + - + - - com.codahale.metrics - metrics-core - 3.0.1 - + + com.codahale.metrics + metrics-core + 3.0.1 + - + - - org.slf4j - slf4j-api - ${org.slf4j.version} - - - ch.qos.logback - logback-classic - ${logback.version} - - - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - - - - org.slf4j - log4j-over-slf4j - ${org.slf4j.version} - - - + + org.slf4j + slf4j-api + ${org.slf4j.version} + + + ch.qos.logback + logback-classic + ${logback.version} + + + + org.slf4j + jcl-over-slf4j + ${org.slf4j.version} + + + + org.slf4j + log4j-over-slf4j + ${org.slf4j.version} + - - junit - junit-dep - ${junit.version} - test - + - - org.hamcrest - hamcrest-core - ${org.hamcrest.version} - test - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test - + + junit + junit-dep + ${junit.version} + test + - - org.mockito - mockito-core - ${mockito.version} - test - + + org.hamcrest + hamcrest-core + ${org.hamcrest.version} + test + + + org.hamcrest + hamcrest-library + ${org.hamcrest.version} + test + - + + org.mockito + mockito-core + ${mockito.version} + test + - - spring-security-mvc-session - - - src/main/resources - true - - + - + + spring-security-mvc-session + + + src/main/resources + true + + - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.8 - 1.8 - - + - - org.apache.maven.plugins - maven-war-plugin - ${maven-war-plugin.version} - + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + 1.8 + 1.8 + + - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - - - - - - - + + org.apache.maven.plugins + maven-war-plugin + ${maven-war-plugin.version} + - - org.codehaus.cargo - cargo-maven2-plugin - ${cargo-maven2-plugin.version} - - true - - jetty8x - embedded - - - - - - - 8082 - - - - + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + + + + + + + - + + org.codehaus.cargo + cargo-maven2-plugin + ${cargo-maven2-plugin.version} + + true + + jetty8x + embedded + + + + + + + 8082 + + + + - + - - - 4.1.6.RELEASE - 3.2.7.RELEASE + - - 4.3.10.Final - 5.1.35 + + + 4.1.6.RELEASE + 3.2.7.RELEASE - - 1.7.12 - 1.1.3 + + 4.3.10.Final + 5.1.35 - - 5.1.3.Final + + 1.7.12 + 1.1.3 - - 18.0 - 3.4 + + 5.1.3.Final - - 1.3 - 4.11 - 1.10.19 + + 18.0 + 3.4 - 4.5 - 4.4.1 + + 1.3 + 4.11 + 1.10.19 - 2.4.1 + 4.5 + 4.4.1 - - 3.3 - 2.6 - 2.18.1 - 2.7 - 1.4.14 + 2.4.1 - + + 3.3 + 2.6 + 2.18.1 + 2.7 + 1.4.14 + + \ No newline at end of file diff --git a/spring-security-mvc-session/src/main/resources/webSecurityConfig.xml b/spring-security-mvc-session/src/main/resources/webSecurityConfig.xml index b1f4674e1e..ca5048aa64 100644 --- a/spring-security-mvc-session/src/main/resources/webSecurityConfig.xml +++ b/spring-security-mvc-session/src/main/resources/webSecurityConfig.xml @@ -4,32 +4,33 @@ http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.2.xsd http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-4.1.xsd"> + http://www.springframework.org/schema/beans/spring-beans-4.1.xsd" +> - - - + + + - + - + - + - + - + - - + + diff --git a/spring-security-mvc-session/src/main/webapp/WEB-INF/web.xml b/spring-security-mvc-session/src/main/webapp/WEB-INF/web.xml index 902cc1ddac..45b49b2a91 100644 --- a/spring-security-mvc-session/src/main/webapp/WEB-INF/web.xml +++ b/spring-security-mvc-session/src/main/webapp/WEB-INF/web.xml @@ -2,7 +2,8 @@ + http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0" +> Spring MVC Session Application diff --git a/spring-security-rest-basic-auth/pom.xml b/spring-security-rest-basic-auth/pom.xml index 31da90da06..5ce1a622be 100644 --- a/spring-security-rest-basic-auth/pom.xml +++ b/spring-security-rest-basic-auth/pom.xml @@ -239,11 +239,11 @@ - - org.apache.maven.plugins - maven-war-plugin - ${maven-war-plugin.version} - + + org.apache.maven.plugins + maven-war-plugin + ${maven-war-plugin.version} + org.apache.maven.plugins @@ -317,11 +317,11 @@ 2.4.1 - 3.3 - 2.6 - 2.18.1 - 1.4.14 - + 3.3 + 2.6 + 2.18.1 + 1.4.14 + \ No newline at end of file diff --git a/spring-security-rest-basic-auth/src/main/resources/webSecurityConfig.xml b/spring-security-rest-basic-auth/src/main/resources/webSecurityConfig.xml index cc8428b162..6e49359621 100644 --- a/spring-security-rest-basic-auth/src/main/resources/webSecurityConfig.xml +++ b/spring-security-rest-basic-auth/src/main/resources/webSecurityConfig.xml @@ -4,22 +4,23 @@ http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.2.xsd http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-4.1.xsd"> + http://www.springframework.org/schema/beans/spring-beans-4.1.xsd" +> - + - + - + \ No newline at end of file diff --git a/spring-security-rest-basic-auth/src/main/webapp/WEB-INF/web.xml b/spring-security-rest-basic-auth/src/main/webapp/WEB-INF/web.xml index 6b70729406..83b4aeb0a7 100644 --- a/spring-security-rest-basic-auth/src/main/webapp/WEB-INF/web.xml +++ b/spring-security-rest-basic-auth/src/main/webapp/WEB-INF/web.xml @@ -1,6 +1,7 @@ + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0" +> Spring Security Custom Application diff --git a/spring-security-rest-custom/pom.xml b/spring-security-rest-custom/pom.xml index 63c7d54ade..c96deced6d 100644 --- a/spring-security-rest-custom/pom.xml +++ b/spring-security-rest-custom/pom.xml @@ -1,298 +1,297 @@ - - 4.0.0 - org.baeldung - spring-security-rest-custom - 0.1-SNAPSHOT + + 4.0.0 + org.baeldung + spring-security-rest-custom + 0.1-SNAPSHOT - spring-security-rest-custom - war + spring-security-rest-custom + war - - org.springframework.boot - spring-boot-starter-parent - 1.2.4.RELEASE - + + org.springframework.boot + spring-boot-starter-parent + 1.2.4.RELEASE + - + - + - - org.springframework.security - spring-security-web - - - org.springframework.security - spring-security-config - + + org.springframework.security + spring-security-web + + + org.springframework.security + spring-security-config + - + - - org.springframework - spring-core - - - commons-logging - commons-logging - - - - - org.springframework - spring-context - - - org.springframework - spring-jdbc - - - org.springframework - spring-beans - - - org.springframework - spring-aop - - - org.springframework - spring-tx - - - org.springframework - spring-expression - + + org.springframework + spring-core + + + commons-logging + commons-logging + + + + + org.springframework + spring-context + + + org.springframework + spring-jdbc + + + org.springframework + spring-beans + + + org.springframework + spring-aop + + + org.springframework + spring-tx + + + org.springframework + spring-expression + - - org.springframework - spring-web - - - org.springframework - spring-webmvc - + + org.springframework + spring-web + + + org.springframework + spring-webmvc + - - org.springframework - spring-oxm - + + org.springframework + spring-oxm + - + - - com.fasterxml.jackson.core - jackson-databind - + + com.fasterxml.jackson.core + jackson-databind + - + - - javax.servlet - javax.servlet-api - provided - + + javax.servlet + javax.servlet-api + provided + - - javax.servlet - jstl - runtime - + + javax.servlet + jstl + runtime + - + - - org.apache.httpcomponents - httpcore - ${httpcore.version} - - - commons-logging - commons-logging - - - + + org.apache.httpcomponents + httpcore + ${httpcore.version} + + + commons-logging + commons-logging + + + - - org.apache.httpcomponents - httpclient - - - commons-logging - commons-logging - - - + + org.apache.httpcomponents + httpclient + + + commons-logging + commons-logging + + + - + - - com.google.guava - guava - ${guava.version} - - - org.apache.commons - commons-lang3 - ${commons-lang3.version} - + + com.google.guava + guava + ${guava.version} + + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + - + - - junit - junit-dep - ${junit.version} - test - + + junit + junit-dep + ${junit.version} + test + - - org.hamcrest - hamcrest-core - test - - - org.hamcrest - hamcrest-library - test - + + org.hamcrest + hamcrest-core + test + + + org.hamcrest + hamcrest-library + test + - - org.mockito - mockito-core - test - + + org.mockito + mockito-core + test + - + - - org.slf4j - slf4j-api - - - ch.qos.logback - logback-classic - - - - org.slf4j - jcl-over-slf4j - - - - org.slf4j - log4j-over-slf4j - + + org.slf4j + slf4j-api + + + ch.qos.logback + logback-classic + + + + org.slf4j + jcl-over-slf4j + + + + org.slf4j + log4j-over-slf4j + - + - - spring-security-rest-custom - - - src/main/resources - true - - + + spring-security-rest-custom + + + src/main/resources + true + + - + - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.8 - 1.8 - true - source - - + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + 1.8 + 1.8 + true + source + + - - org.apache.maven.plugins - maven-war-plugin - ${maven-war-plugin.version} - - false - - + + org.apache.maven.plugins + maven-war-plugin + ${maven-war-plugin.version} + + false + + - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - - - - - - - + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + + + + + + + - - org.codehaus.cargo - cargo-maven2-plugin - ${cargo-maven2-plugin.version} - - true - - jetty8x - embedded - - - - - - - 8082 - - - - + + org.codehaus.cargo + cargo-maven2-plugin + ${cargo-maven2-plugin.version} + + true + + jetty8x + embedded + + + + + + + 8082 + + + + - + - + - - - 4.1.6.RELEASE - 3.2.7.RELEASE + + + 4.1.6.RELEASE + 3.2.7.RELEASE - - 4.3.10.Final - 5.1.35 + + 4.3.10.Final + 5.1.35 - - 1.7.12 - 1.1.3 + + 1.7.12 + 1.1.3 - - 5.1.3.Final + + 5.1.3.Final - - 18.0 - 3.4 + + 18.0 + 3.4 - - 1.3 - 4.11 - 1.10.19 + + 1.3 + 4.11 + 1.10.19 - 4.4.1 - 4.5 + 4.4.1 + 4.5 - 2.4.1 + 2.4.1 - - 3.3 - 2.6 - 2.18.1 - 1.4.14 + + 3.3 + 2.6 + 2.18.1 + 1.4.14 - + \ No newline at end of file diff --git a/spring-security-rest-custom/src/main/resources/webSecurityConfig.xml b/spring-security-rest-custom/src/main/resources/webSecurityConfig.xml index 314684e96c..3e90d34f68 100644 --- a/spring-security-rest-custom/src/main/resources/webSecurityConfig.xml +++ b/spring-security-rest-custom/src/main/resources/webSecurityConfig.xml @@ -4,17 +4,18 @@ http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.2.xsd http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-4.1.xsd"> + http://www.springframework.org/schema/beans/spring-beans-4.1.xsd" +> - - - + + + - + \ No newline at end of file diff --git a/spring-security-rest-custom/src/main/webapp/WEB-INF/web_old.xml b/spring-security-rest-custom/src/main/webapp/WEB-INF/web_old.xml index 15f790d77a..0fa9abd258 100644 --- a/spring-security-rest-custom/src/main/webapp/WEB-INF/web_old.xml +++ b/spring-security-rest-custom/src/main/webapp/WEB-INF/web_old.xml @@ -2,7 +2,8 @@ + http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0" +> Spring Security Custom Application diff --git a/spring-security-rest-digest-auth/pom.xml b/spring-security-rest-digest-auth/pom.xml index 38172f732e..c4722c2c2e 100644 --- a/spring-security-rest-digest-auth/pom.xml +++ b/spring-security-rest-digest-auth/pom.xml @@ -1,318 +1,317 @@ - - 4.0.0 - org.baeldung - spring-security-rest-digest-auth - 0.1-SNAPSHOT + + 4.0.0 + org.baeldung + spring-security-rest-digest-auth + 0.1-SNAPSHOT - spring-security-rest-digest-auth - war + spring-security-rest-digest-auth + war - + - + - - org.springframework.security - spring-security-web - ${org.springframework.security.version} - - - org.springframework.security - spring-security-config - ${org.springframework.security.version} - + + org.springframework.security + spring-security-web + ${org.springframework.security.version} + + + org.springframework.security + spring-security-config + ${org.springframework.security.version} + - + - - org.springframework - spring-core - ${org.springframework.version} - - - commons-logging - commons-logging - - - - - org.springframework - spring-context - ${org.springframework.version} - - - org.springframework - spring-jdbc - ${org.springframework.version} - - - org.springframework - spring-beans - ${org.springframework.version} - - - org.springframework - spring-aop - ${org.springframework.version} - - - org.springframework - spring-tx - ${org.springframework.version} - - - org.springframework - spring-expression - ${org.springframework.version} - + + org.springframework + spring-core + ${org.springframework.version} + + + commons-logging + commons-logging + + + + + org.springframework + spring-context + ${org.springframework.version} + + + org.springframework + spring-jdbc + ${org.springframework.version} + + + org.springframework + spring-beans + ${org.springframework.version} + + + org.springframework + spring-aop + ${org.springframework.version} + + + org.springframework + spring-tx + ${org.springframework.version} + + + org.springframework + spring-expression + ${org.springframework.version} + - - org.springframework - spring-web - ${org.springframework.version} - - - org.springframework - spring-webmvc - ${org.springframework.version} - + + org.springframework + spring-web + ${org.springframework.version} + + + org.springframework + spring-webmvc + ${org.springframework.version} + - - org.springframework - spring-oxm - ${org.springframework.version} - + + org.springframework + spring-oxm + ${org.springframework.version} + - + - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + - + - - org.apache.httpcomponents - httpcore - ${httpcore.version} - - - commons-logging - commons-logging - - - + + org.apache.httpcomponents + httpcore + ${httpcore.version} + + + commons-logging + commons-logging + + + - - org.apache.httpcomponents - httpclient - ${httpclient.version} - - - commons-logging - commons-logging - - - + + org.apache.httpcomponents + httpclient + ${httpclient.version} + + + commons-logging + commons-logging + + + - + - - javax.servlet - javax.servlet-api - 3.0.1 - provided - + + javax.servlet + javax.servlet-api + 3.0.1 + provided + - - javax.servlet - jstl - 1.2 - runtime - + + javax.servlet + jstl + 1.2 + runtime + - + - - com.google.guava - guava - ${guava.version} - + + com.google.guava + guava + ${guava.version} + - + - - org.slf4j - slf4j-api - ${org.slf4j.version} - - - ch.qos.logback - logback-classic - ${logback.version} - - - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - - - - org.slf4j - log4j-over-slf4j - ${org.slf4j.version} - + + org.slf4j + slf4j-api + ${org.slf4j.version} + + + ch.qos.logback + logback-classic + ${logback.version} + + + + org.slf4j + jcl-over-slf4j + ${org.slf4j.version} + + + + org.slf4j + log4j-over-slf4j + ${org.slf4j.version} + - + - - org.springframework - spring-test - ${org.springframework.version} - test - + + org.springframework + spring-test + ${org.springframework.version} + test + - - junit - junit-dep - ${junit.version} - test - + + junit + junit-dep + ${junit.version} + test + - - org.hamcrest - hamcrest-core - ${org.hamcrest.version} - test - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test - + + org.hamcrest + hamcrest-core + ${org.hamcrest.version} + test + + + org.hamcrest + hamcrest-library + ${org.hamcrest.version} + test + - - org.mockito - mockito-core - ${mockito.version} - test - + + org.mockito + mockito-core + ${mockito.version} + test + - + - - spring-security-rest-digest-auth - - - src/main/resources - true - - + + spring-security-rest-digest-auth + + + src/main/resources + true + + - + - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.8 - 1.8 - true - source - - + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + 1.8 + 1.8 + true + source + + - - org.apache.maven.plugins - maven-war-plugin - ${maven-war-plugin.version} - + + org.apache.maven.plugins + maven-war-plugin + ${maven-war-plugin.version} + - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - **/*LiveTest.java - - - - - - + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + **/*LiveTest.java + + + + + + - - org.codehaus.cargo - cargo-maven2-plugin - ${cargo-maven2-plugin.version} - - true - - jetty8x - embedded - - - - - - - 8082 - - - - + + org.codehaus.cargo + cargo-maven2-plugin + ${cargo-maven2-plugin.version} + + true + + jetty8x + embedded + + + + + + + 8082 + + + + - + - + - - - 4.1.6.RELEASE - 3.2.7.RELEASE + + + 4.1.6.RELEASE + 3.2.7.RELEASE - - 4.3.10.Final - 5.1.35 + + 4.3.10.Final + 5.1.35 - - 4.4.1 - 4.5 + + 4.4.1 + 4.5 - - 1.7.12 - 1.1.3 + + 1.7.12 + 1.1.3 - - 2.5.1 - - - 5.1.3.Final + + 2.5.1 - - 18.0 - 3.4 + + 5.1.3.Final - - 1.3 - 4.11 - 1.10.19 + + 18.0 + 3.4 - 2.4.1 + + 1.3 + 4.11 + 1.10.19 - - 3.3 - 2.6 - 2.18.1 - 1.4.14 + 2.4.1 - + + 3.3 + 2.6 + 2.18.1 + 1.4.14 + + \ No newline at end of file diff --git a/spring-security-rest-digest-auth/src/main/resources/webSecurityConfig.xml b/spring-security-rest-digest-auth/src/main/resources/webSecurityConfig.xml index 9e63a24b79..9a0c909eee 100644 --- a/spring-security-rest-digest-auth/src/main/resources/webSecurityConfig.xml +++ b/spring-security-rest-digest-auth/src/main/resources/webSecurityConfig.xml @@ -4,30 +4,31 @@ http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.2.xsd http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-4.1.xsd"> + http://www.springframework.org/schema/beans/spring-beans-4.1.xsd" +> - - + + - - + + - + - - + + - + \ No newline at end of file diff --git a/spring-security-rest-digest-auth/src/main/webapp/WEB-INF/web.xml b/spring-security-rest-digest-auth/src/main/webapp/WEB-INF/web.xml index 372688c8d8..4e05c9f015 100644 --- a/spring-security-rest-digest-auth/src/main/webapp/WEB-INF/web.xml +++ b/spring-security-rest-digest-auth/src/main/webapp/WEB-INF/web.xml @@ -2,7 +2,8 @@ + http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0" +> Spring Security Custom Application @@ -44,8 +45,8 @@ /* - - - + + + \ No newline at end of file diff --git a/spring-security-rest-full/pom.xml b/spring-security-rest-full/pom.xml index 1587653013..f86f1a753d 100644 --- a/spring-security-rest-full/pom.xml +++ b/spring-security-rest-full/pom.xml @@ -107,15 +107,15 @@ querydsl-jpa 3.6.2 - + - - - cz.jirutka.rsql - rsql-parser - 2.0.0 - - + + + cz.jirutka.rsql + rsql-parser + 2.0.0 + + @@ -459,5 +459,5 @@ spring-boot-starter-parent 1.2.4.RELEASE - + \ No newline at end of file diff --git a/spring-security-rest-full/src/main/resources/springDataPersistenceConfig.xml b/spring-security-rest-full/src/main/resources/springDataPersistenceConfig.xml index 8b88167b56..b115448e7d 100644 --- a/spring-security-rest-full/src/main/resources/springDataPersistenceConfig.xml +++ b/spring-security-rest-full/src/main/resources/springDataPersistenceConfig.xml @@ -1,9 +1,9 @@ - + - + \ No newline at end of file diff --git a/spring-security-rest-full/src/main/resources/webSecurityConfig.xml b/spring-security-rest-full/src/main/resources/webSecurityConfig.xml index f5d7b9e16a..6b2ca82377 100644 --- a/spring-security-rest-full/src/main/resources/webSecurityConfig.xml +++ b/spring-security-rest-full/src/main/resources/webSecurityConfig.xml @@ -1,31 +1,29 @@ - + http://www.springframework.org/schema/beans/spring-beans-4.1.xsd" +> - + - + - + - + - + \ No newline at end of file diff --git a/spring-security-rest-full/src/main/webapp/WEB-INF/web.xml b/spring-security-rest-full/src/main/webapp/WEB-INF/web.xml index db23624c3c..49e4d1afa1 100644 --- a/spring-security-rest-full/src/main/webapp/WEB-INF/web.xml +++ b/spring-security-rest-full/src/main/webapp/WEB-INF/web.xml @@ -2,7 +2,8 @@ + http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0" +> Spring Security REST Application @@ -51,17 +52,17 @@ springSecurityFilterChain /* - + - metricFilter - org.baeldung.web.metric.MetricFilter + metricFilter + org.baeldung.web.metric.MetricFilter - - metricFilter - /* - + + metricFilter + /* + index.html diff --git a/spring-security-rest/pom.xml b/spring-security-rest/pom.xml index ca20c87401..0661697b22 100644 --- a/spring-security-rest/pom.xml +++ b/spring-security-rest/pom.xml @@ -1,277 +1,276 @@ - - 4.0.0 - org.baeldung - spring-security-rest - 0.1-SNAPSHOT + + 4.0.0 + org.baeldung + spring-security-rest + 0.1-SNAPSHOT - spring-security-rest - war + spring-security-rest + war - + - + - - org.springframework.security - spring-security-web - ${org.springframework.security.version} - - - org.springframework.security - spring-security-config - ${org.springframework.security.version} - + + org.springframework.security + spring-security-web + ${org.springframework.security.version} + + + org.springframework.security + spring-security-config + ${org.springframework.security.version} + - + - - org.springframework - spring-core - ${org.springframework.version} - - - commons-logging - commons-logging - - - - - org.springframework - spring-context - ${org.springframework.version} - - - org.springframework - spring-jdbc - ${org.springframework.version} - - - org.springframework - spring-beans - ${org.springframework.version} - - - org.springframework - spring-aop - ${org.springframework.version} - - - org.springframework - spring-tx - ${org.springframework.version} - - - org.springframework - spring-expression - ${org.springframework.version} - + + org.springframework + spring-core + ${org.springframework.version} + + + commons-logging + commons-logging + + + + + org.springframework + spring-context + ${org.springframework.version} + + + org.springframework + spring-jdbc + ${org.springframework.version} + + + org.springframework + spring-beans + ${org.springframework.version} + + + org.springframework + spring-aop + ${org.springframework.version} + + + org.springframework + spring-tx + ${org.springframework.version} + + + org.springframework + spring-expression + ${org.springframework.version} + - - org.springframework - spring-web - ${org.springframework.version} - - - org.springframework - spring-webmvc - ${org.springframework.version} - + + org.springframework + spring-web + ${org.springframework.version} + + + org.springframework + spring-webmvc + ${org.springframework.version} + - + - - javax.servlet - javax.servlet-api - 3.0.1 - provided - + + javax.servlet + javax.servlet-api + 3.0.1 + provided + - - javax.servlet - jstl - 1.2 - runtime - + + javax.servlet + jstl + 1.2 + runtime + - + - - com.fasterxml.jackson.core - jackson-databind - 2.2.2 - + + com.fasterxml.jackson.core + jackson-databind + 2.2.2 + - + - - com.google.guava - guava - ${guava.version} - - - org.apache.commons - commons-lang3 - 3.1 - - + + com.google.guava + guava + ${guava.version} + + + org.apache.commons + commons-lang3 + 3.1 + + - - org.slf4j - slf4j-api - ${org.slf4j.version} - - - ch.qos.logback - logback-classic - ${logback.version} - - - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - - - - org.slf4j - log4j-over-slf4j - ${org.slf4j.version} - - - + + org.slf4j + slf4j-api + ${org.slf4j.version} + + + ch.qos.logback + logback-classic + ${logback.version} + + + + org.slf4j + jcl-over-slf4j + ${org.slf4j.version} + + + + org.slf4j + log4j-over-slf4j + ${org.slf4j.version} + - - junit - junit-dep - ${junit.version} - test - + - - org.hamcrest - hamcrest-core - ${org.hamcrest.version} - test - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test - + + junit + junit-dep + ${junit.version} + test + - - org.mockito - mockito-core - ${mockito.version} - test - + + org.hamcrest + hamcrest-core + ${org.hamcrest.version} + test + + + org.hamcrest + hamcrest-library + ${org.hamcrest.version} + test + - + + org.mockito + mockito-core + ${mockito.version} + test + - - spring-security-rest - - - src/main/resources - true - - + - + + spring-security-rest + + + src/main/resources + true + + - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.8 - 1.8 - - + - - org.apache.maven.plugins - maven-war-plugin - ${maven-war-plugin.version} - + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + 1.8 + 1.8 + + - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - - - - - - - + + org.apache.maven.plugins + maven-war-plugin + ${maven-war-plugin.version} + - - org.codehaus.cargo - cargo-maven2-plugin - ${cargo-maven2-plugin.version} - - true - - jetty8x - embedded - - - - - - - 8082 - - - - + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + + + + + + + - + + org.codehaus.cargo + cargo-maven2-plugin + ${cargo-maven2-plugin.version} + + true + + jetty8x + embedded + + + + + + + 8082 + + + + - + - - - 4.1.6.RELEASE - 3.2.7.RELEASE + - - 4.3.10.Final - 5.1.35 + + + 4.1.6.RELEASE + 3.2.7.RELEASE - - 1.7.12 - 1.1.3 + + 4.3.10.Final + 5.1.35 - - 5.1.3.Final + + 1.7.12 + 1.1.3 - - 18.0 - 3.4 + + 5.1.3.Final - - 1.3 - 4.11 - 1.10.19 + + 18.0 + 3.4 - 4.4.1 - 4.5 + + 1.3 + 4.11 + 1.10.19 - 2.4.1 + 4.4.1 + 4.5 - - 3.3 - 2.6 - 2.18.1 - 1.4.14 + 2.4.1 - + + 3.3 + 2.6 + 2.18.1 + 1.4.14 + + \ No newline at end of file diff --git a/spring-security-rest/src/main/resources/webSecurityConfig.xml b/spring-security-rest/src/main/resources/webSecurityConfig.xml index 28fc4ffe1c..9bd95730a0 100644 --- a/spring-security-rest/src/main/resources/webSecurityConfig.xml +++ b/spring-security-rest/src/main/resources/webSecurityConfig.xml @@ -5,24 +5,25 @@ http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.2.xsd http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-4.1.xsd"> + http://www.springframework.org/schema/beans/spring-beans-4.1.xsd" +> - + - + - + - - + + - - + + diff --git a/spring-security-rest/src/main/webapp/WEB-INF/web.xml b/spring-security-rest/src/main/webapp/WEB-INF/web.xml index a33a3fd2c1..54f95d6227 100644 --- a/spring-security-rest/src/main/webapp/WEB-INF/web.xml +++ b/spring-security-rest/src/main/webapp/WEB-INF/web.xml @@ -1,52 +1,51 @@ - + http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0" +> - Spring MVC Application + Spring MVC Application - - - contextClass - + + + contextClass + org.springframework.web.context.support.AnnotationConfigWebApplicationContext - - - contextConfigLocation - org.baeldung.spring - + + + contextConfigLocation + org.baeldung.spring + - - org.springframework.web.context.ContextLoaderListener - + + org.springframework.web.context.ContextLoaderListener + - - - api - org.springframework.web.servlet.DispatcherServlet - 1 - - - api - /api/* - + + + api + org.springframework.web.servlet.DispatcherServlet + 1 + + + api + /api/* + - - - springSecurityFilterChain - org.springframework.web.filter.DelegatingFilterProxy - - - springSecurityFilterChain - /* - + + + springSecurityFilterChain + org.springframework.web.filter.DelegatingFilterProxy + + + springSecurityFilterChain + /* + - - - + + + \ No newline at end of file