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/jackson/src/test/java/org/baeldung/jackson/annotation/BeanWithCreator.java b/jackson/src/test/java/org/baeldung/jackson/annotation/BeanWithCreator.java index d6153032a7..01507ab4d6 100644 --- a/jackson/src/test/java/org/baeldung/jackson/annotation/BeanWithCreator.java +++ b/jackson/src/test/java/org/baeldung/jackson/annotation/BeanWithCreator.java @@ -3,7 +3,6 @@ package org.baeldung.jackson.annotation; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; - public class BeanWithCreator { public int id; public String name; diff --git a/jackson/src/test/java/org/baeldung/jackson/annotation/Zoo.java b/jackson/src/test/java/org/baeldung/jackson/annotation/Zoo.java index 3c7682f7a9..d59be09f12 100644 --- a/jackson/src/test/java/org/baeldung/jackson/annotation/Zoo.java +++ b/jackson/src/test/java/org/baeldung/jackson/annotation/Zoo.java @@ -16,12 +16,8 @@ public class Zoo { this.animal = animal; } - @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = As.PROPERTY, property = "type") - @JsonSubTypes({ - @JsonSubTypes.Type(value = Dog.class, name = "dog"), - @JsonSubTypes.Type(value = Cat.class, name = "cat") - }) + @JsonSubTypes({ @JsonSubTypes.Type(value = Dog.class, name = "dog"), @JsonSubTypes.Type(value = Cat.class, name = "cat") }) public static class Animal { public String name; diff --git a/jackson/src/test/java/org/baeldung/jackson/test/JacksonAnnotationTest.java b/jackson/src/test/java/org/baeldung/jackson/test/JacksonAnnotationTest.java index 2bdce9b446..c188e9bce1 100644 --- a/jackson/src/test/java/org/baeldung/jackson/test/JacksonAnnotationTest.java +++ b/jackson/src/test/java/org/baeldung/jackson/test/JacksonAnnotationTest.java @@ -49,7 +49,6 @@ import com.fasterxml.jackson.databind.ser.FilterProvider; import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter; import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider; - public class JacksonAnnotationTest { @Test diff --git a/jackson/src/test/java/org/baeldung/jackson/test/JacksonDeserializationUnitTest.java b/jackson/src/test/java/org/baeldung/jackson/test/JacksonDeserializationUnitTest.java index eb62ba9ded..2ecca664a4 100644 --- a/jackson/src/test/java/org/baeldung/jackson/test/JacksonDeserializationUnitTest.java +++ b/jackson/src/test/java/org/baeldung/jackson/test/JacksonDeserializationUnitTest.java @@ -66,7 +66,7 @@ public class JacksonDeserializationUnitTest { @Test public final void givenJsonHasUnknownValuesButJacksonIsIgnoringUnknownFields_whenDeserializing_thenCorrect() throws JsonParseException, JsonMappingException, IOException { - final String jsonAsString =// @formatter:off + final String jsonAsString = // @formatter:off "{\"stringValue\":\"a\"," + "\"intValue\":1," + "\"booleanValue\":true," + @@ -84,7 +84,7 @@ public class JacksonDeserializationUnitTest { @Test public final void givenJsonHasUnknownValuesButUnknownFieldsAreIgnoredOnClass_whenDeserializing_thenCorrect() throws JsonParseException, JsonMappingException, IOException { - final String jsonAsString =// @formatter:off + final String jsonAsString = // @formatter:off "{\"stringValue\":\"a\"," + "\"intValue\":1," + "\"booleanValue\":true," + diff --git a/jackson/src/test/java/org/baeldung/jackson/test/UnitTestSuite.java b/jackson/src/test/java/org/baeldung/jackson/test/UnitTestSuite.java index 886b43d05d..3bc5715e2a 100644 --- a/jackson/src/test/java/org/baeldung/jackson/test/UnitTestSuite.java +++ b/jackson/src/test/java/org/baeldung/jackson/test/UnitTestSuite.java @@ -6,7 +6,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Suite; @RunWith(Suite.class) -@Suite.SuiteClasses({// @formatter:off +@Suite.SuiteClasses({ // @formatter:off JacksonCollectionDeserializationUnitTest.class ,JacksonSerializationEnumsUnitTest.class ,JacksonDeserializationUnitTest.class 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/.classpath b/spring-all/.classpath index c91caa1b09..6b533711d3 100644 --- a/spring-all/.classpath +++ b/spring-all/.classpath @@ -30,7 +30,7 @@ - + diff --git a/spring-all/pom.xml b/spring-all/pom.xml index f059209f36..3fb515a0bd 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,12 @@ ${mysql-connector-java.version} runtime - - org.hsqldb - hsqldb - 2.3.2 - + + org.hsqldb + hsqldb + 2.3.2 + + @@ -149,24 +150,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 +239,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-all/src/test/java/org/baeldung/properties/parentchild/ChildValueHolder.java b/spring-all/src/test/java/org/baeldung/properties/parentchild/ChildValueHolder.java index 6df8fc31f0..0ed66d3c68 100644 --- a/spring-all/src/test/java/org/baeldung/properties/parentchild/ChildValueHolder.java +++ b/spring-all/src/test/java/org/baeldung/properties/parentchild/ChildValueHolder.java @@ -11,7 +11,6 @@ public class ChildValueHolder { @Value("${child.name:-}") private String childName; - public String getParentName() { return parentName; } diff --git a/spring-all/src/test/java/org/baeldung/properties/parentchild/ParentValueHolder.java b/spring-all/src/test/java/org/baeldung/properties/parentchild/ParentValueHolder.java index fef9a614dc..abfafa8a7d 100644 --- a/spring-all/src/test/java/org/baeldung/properties/parentchild/ParentValueHolder.java +++ b/spring-all/src/test/java/org/baeldung/properties/parentchild/ParentValueHolder.java @@ -11,7 +11,6 @@ public class ParentValueHolder { @Value("${child.name:-}") private String childName; - public String getParentName() { return parentName; } diff --git a/spring-all/src/test/java/org/baeldung/test/IntegrationTestSuite.java b/spring-all/src/test/java/org/baeldung/test/IntegrationTestSuite.java index 9957b19516..86ec917bd6 100644 --- a/spring-all/src/test/java/org/baeldung/test/IntegrationTestSuite.java +++ b/spring-all/src/test/java/org/baeldung/test/IntegrationTestSuite.java @@ -11,7 +11,7 @@ import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; @RunWith(Suite.class) -@SuiteClasses({//@formatter:off +@SuiteClasses({ //@formatter:off PropertiesWithXmlIntegrationTest.class, ExternalPropertiesWithJavaIntegrationTest.class, ExternalPropertiesWithMultipleXmlsIntegrationTest.class, 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-boot/src/main/java/org/baeldung/common/error/MyCustomErrorController.java b/spring-boot/src/main/java/org/baeldung/common/error/MyCustomErrorController.java index 0b644143c0..510e607dfa 100644 --- a/spring-boot/src/main/java/org/baeldung/common/error/MyCustomErrorController.java +++ b/spring-boot/src/main/java/org/baeldung/common/error/MyCustomErrorController.java @@ -4,14 +4,14 @@ import org.springframework.boot.autoconfigure.web.ErrorController; import org.springframework.web.bind.annotation.RequestMapping; public class MyCustomErrorController implements ErrorController { - + private static final String PATH = "/error"; - + public MyCustomErrorController() { // TODO Auto-generated constructor stub } - - @RequestMapping(value=PATH) + + @RequestMapping(value = PATH) public String error() { return "Error heaven"; } diff --git a/spring-boot/src/main/java/org/baeldung/common/error/controller/ErrorController.java b/spring-boot/src/main/java/org/baeldung/common/error/controller/ErrorController.java index 14ba885168..ecabde7d9d 100644 --- a/spring-boot/src/main/java/org/baeldung/common/error/controller/ErrorController.java +++ b/spring-boot/src/main/java/org/baeldung/common/error/controller/ErrorController.java @@ -8,12 +8,12 @@ public class ErrorController { public ErrorController() { } - + @RequestMapping("/400") String error400() { return "Error Code: 400 occured."; } - + @RequestMapping("/errorHeaven") String errorHeaven() { return "You have reached the heaven of errors!!!"; diff --git a/spring-boot/src/main/java/org/baeldung/common/properties/MyServletContainerCustomizationBean.java b/spring-boot/src/main/java/org/baeldung/common/properties/MyServletContainerCustomizationBean.java index b2a776e751..97130bed6a 100644 --- a/spring-boot/src/main/java/org/baeldung/common/properties/MyServletContainerCustomizationBean.java +++ b/spring-boot/src/main/java/org/baeldung/common/properties/MyServletContainerCustomizationBean.java @@ -17,7 +17,7 @@ public class MyServletContainerCustomizationBean implements EmbeddedServletConta public void customize(ConfigurableEmbeddedServletContainer container) { container.setPort(8084); container.setContextPath("/springbootapp"); - + container.addErrorPages(new ErrorPage(HttpStatus.BAD_REQUEST, "/400")); container.addErrorPages(new ErrorPage("/errorHeaven")); } diff --git a/spring-boot/src/main/java/org/baeldung/common/resources/ExecutorServiceExitCodeGenerator.java b/spring-boot/src/main/java/org/baeldung/common/resources/ExecutorServiceExitCodeGenerator.java index 1af0227f81..451abdfc37 100644 --- a/spring-boot/src/main/java/org/baeldung/common/resources/ExecutorServiceExitCodeGenerator.java +++ b/spring-boot/src/main/java/org/baeldung/common/resources/ExecutorServiceExitCodeGenerator.java @@ -6,9 +6,9 @@ import java.util.concurrent.ExecutorService; import org.springframework.boot.ExitCodeGenerator; public class ExecutorServiceExitCodeGenerator implements ExitCodeGenerator { - + private ExecutorService executorService; - + public ExecutorServiceExitCodeGenerator(ExecutorService executorService) { } @@ -20,8 +20,7 @@ public class ExecutorServiceExitCodeGenerator implements ExitCodeGenerator { executorService.shutdownNow(); returnCode = 1; } - } - catch (SecurityException ex) { + } catch (SecurityException ex) { returnCode = 0; } return returnCode; diff --git a/spring-boot/src/main/java/org/baeldung/controller/servlet/HelloWorldServlet.java b/spring-boot/src/main/java/org/baeldung/controller/servlet/HelloWorldServlet.java index 0f874f759b..9adaf7fd29 100644 --- a/spring-boot/src/main/java/org/baeldung/controller/servlet/HelloWorldServlet.java +++ b/spring-boot/src/main/java/org/baeldung/controller/servlet/HelloWorldServlet.java @@ -10,34 +10,32 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; public class HelloWorldServlet extends HttpServlet { - private static final long serialVersionUID = 1L; - + private static final long serialVersionUID = 1L; + public HelloWorldServlet() { super(); } - + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { PrintWriter out = null; try { out = response.getWriter(); out.println("HelloWorldServlet: GET METHOD"); out.flush(); - } - finally { - if (!Objects.isNull(out)) + } finally { + if (!Objects.isNull(out)) out.close(); } } - + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { PrintWriter out = null; try { out = response.getWriter(); out.println("HelloWorldServlet: POST METHOD"); out.flush(); - } - finally { - if (!Objects.isNull(out)) + } finally { + if (!Objects.isNull(out)) out.close(); } } diff --git a/spring-boot/src/main/java/org/baeldung/controller/servlet/SpringHelloWorldServlet.java b/spring-boot/src/main/java/org/baeldung/controller/servlet/SpringHelloWorldServlet.java index df14b2af4b..9a62bdbbf2 100644 --- a/spring-boot/src/main/java/org/baeldung/controller/servlet/SpringHelloWorldServlet.java +++ b/spring-boot/src/main/java/org/baeldung/controller/servlet/SpringHelloWorldServlet.java @@ -10,8 +10,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; public class SpringHelloWorldServlet extends HttpServlet { - private static final long serialVersionUID = 1L; - + private static final long serialVersionUID = 1L; + public SpringHelloWorldServlet() { super(); } @@ -22,9 +22,8 @@ public class SpringHelloWorldServlet extends HttpServlet { out = response.getWriter(); out.println("SpringHelloWorldServlet: GET METHOD"); out.flush(); - } - finally { - if (!Objects.isNull(out)) + } finally { + if (!Objects.isNull(out)) out.close(); } } @@ -35,9 +34,8 @@ public class SpringHelloWorldServlet extends HttpServlet { out = response.getWriter(); out.println("SpringHelloWorldServlet: POST METHOD"); out.flush(); - } - finally { - if (!Objects.isNull(out)) + } finally { + if (!Objects.isNull(out)) out.close(); } } diff --git a/spring-boot/src/main/java/org/baeldung/main/SpringBootApplication.java b/spring-boot/src/main/java/org/baeldung/main/SpringBootApplication.java index c71082ba0a..59955cc990 100644 --- a/spring-boot/src/main/java/org/baeldung/main/SpringBootApplication.java +++ b/spring-boot/src/main/java/org/baeldung/main/SpringBootApplication.java @@ -19,13 +19,11 @@ import org.springframework.web.bind.annotation.RestController; @RestController @EnableAutoConfiguration -@ComponentScan({ "org.baeldung.common.error", "org.baeldung.common.error.controller", - "org.baeldung.common.properties", "org.baeldung.common.resources", "org.baeldung.endpoints", - "org.baeldung.service", "org.baeldung.monitor.jmx", "org.baeldung.service"}) +@ComponentScan({ "org.baeldung.common.error", "org.baeldung.common.error.controller", "org.baeldung.common.properties", "org.baeldung.common.resources", "org.baeldung.endpoints", "org.baeldung.service", "org.baeldung.monitor.jmx", "org.baeldung.service" }) public class SpringBootApplication { - + private static ApplicationContext applicationContext; - + @Autowired private LoginService service; @@ -34,21 +32,21 @@ public class SpringBootApplication { service.login("admin", "admin".toCharArray()); return "TADA!!! You are in Spring Boot Actuator test application."; } - + public static void main(String[] args) { applicationContext = SpringApplication.run(SpringBootApplication.class, args); } - + @Bean public ExecutorService executorService() { - return Executors.newFixedThreadPool(10); + return Executors.newFixedThreadPool(10); } - + @Bean public HelloWorldServlet helloWorldServlet() { return new HelloWorldServlet(); } - + @Bean public SpringHelloServletRegistrationBean servletRegistrationBean() { SpringHelloServletRegistrationBean bean = new SpringHelloServletRegistrationBean(new SpringHelloWorldServlet(), "/springHelloWorld/*"); @@ -56,35 +54,35 @@ public class SpringBootApplication { bean.addInitParameter("message", "SpringHelloWorldServlet special message"); return bean; } - -/* @Bean + + /* @Bean public JettyEmbeddedServletContainerFactory jettyEmbeddedServletContainerFactory() { JettyEmbeddedServletContainerFactory jettyContainer = new JettyEmbeddedServletContainerFactory(); jettyContainer.setPort(9000); jettyContainer.setContextPath("/springbootapp"); return jettyContainer; } - + @Bean public UndertowEmbeddedServletContainerFactory embeddedServletContainerFactory() { UndertowEmbeddedServletContainerFactory factory = new UndertowEmbeddedServletContainerFactory(); factory.addBuilderCustomizers(new UndertowBuilderCustomizer() { - + @Override public void customize(io.undertow.Undertow.Builde builder) { builder.addHttpListener(8080, "0.0.0.0"); } - + }); return factory; }*/ - - @Bean + + @Bean @Autowired public ExecutorServiceExitCodeGenerator executorServiceExitCodeGenerator(ExecutorService executorService) { return new ExecutorServiceExitCodeGenerator(executorService); } - + public void shutDown(ExecutorServiceExitCodeGenerator executorServiceExitCodeGenerator) { SpringApplication.exit(applicationContext, executorServiceExitCodeGenerator); } 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/java/org/baeldung/persistence/dao/impl/ChildDao.java b/spring-exceptions/src/main/java/org/baeldung/persistence/dao/impl/ChildDao.java index e068573c5c..771da435c6 100644 --- a/spring-exceptions/src/main/java/org/baeldung/persistence/dao/impl/ChildDao.java +++ b/spring-exceptions/src/main/java/org/baeldung/persistence/dao/impl/ChildDao.java @@ -8,7 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; @Repository -public class ChildDao extends AbstractHibernateDao implements IChildDao { +public class ChildDao extends AbstractHibernateDaoimplements IChildDao { @Autowired private SessionFactory sessionFactory; diff --git a/spring-exceptions/src/main/java/org/baeldung/persistence/dao/impl/FooDao.java b/spring-exceptions/src/main/java/org/baeldung/persistence/dao/impl/FooDao.java index baf29c9ecd..a5d995cec0 100644 --- a/spring-exceptions/src/main/java/org/baeldung/persistence/dao/impl/FooDao.java +++ b/spring-exceptions/src/main/java/org/baeldung/persistence/dao/impl/FooDao.java @@ -8,7 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; @Repository -public class FooDao extends AbstractHibernateDao implements IFooDao { +public class FooDao extends AbstractHibernateDaoimplements IFooDao { @Autowired private SessionFactory sessionFactory; diff --git a/spring-exceptions/src/main/java/org/baeldung/persistence/dao/impl/ParentDao.java b/spring-exceptions/src/main/java/org/baeldung/persistence/dao/impl/ParentDao.java index 5634137b63..207e01de58 100644 --- a/spring-exceptions/src/main/java/org/baeldung/persistence/dao/impl/ParentDao.java +++ b/spring-exceptions/src/main/java/org/baeldung/persistence/dao/impl/ParentDao.java @@ -8,7 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; @Repository -public class ParentDao extends AbstractHibernateDao implements IParentDao { +public class ParentDao extends AbstractHibernateDaoimplements IParentDao { @Autowired private SessionFactory sessionFactory; diff --git a/spring-exceptions/src/main/java/org/baeldung/persistence/service/impl/ChildService.java b/spring-exceptions/src/main/java/org/baeldung/persistence/service/impl/ChildService.java index 89597313ea..987466643b 100644 --- a/spring-exceptions/src/main/java/org/baeldung/persistence/service/impl/ChildService.java +++ b/spring-exceptions/src/main/java/org/baeldung/persistence/service/impl/ChildService.java @@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @Service -public class ChildService extends AbstractService implements IChildService { +public class ChildService extends AbstractServiceimplements IChildService { @Autowired private IChildDao dao; diff --git a/spring-exceptions/src/main/java/org/baeldung/persistence/service/impl/FooService.java b/spring-exceptions/src/main/java/org/baeldung/persistence/service/impl/FooService.java index f0a4d7a649..382368bbd4 100644 --- a/spring-exceptions/src/main/java/org/baeldung/persistence/service/impl/FooService.java +++ b/spring-exceptions/src/main/java/org/baeldung/persistence/service/impl/FooService.java @@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @Service -public class FooService extends AbstractService implements IFooService { +public class FooService extends AbstractServiceimplements IFooService { @Autowired private IFooDao dao; diff --git a/spring-exceptions/src/main/java/org/baeldung/persistence/service/impl/ParentService.java b/spring-exceptions/src/main/java/org/baeldung/persistence/service/impl/ParentService.java index 97c44f4a2f..e40ccfd2f8 100644 --- a/spring-exceptions/src/main/java/org/baeldung/persistence/service/impl/ParentService.java +++ b/spring-exceptions/src/main/java/org/baeldung/persistence/service/impl/ParentService.java @@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @Service -public class ParentService extends AbstractService implements IParentService { +public class ParentService extends AbstractServiceimplements IParentService { @Autowired private IParentDao dao; 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-exceptions/src/test/java/org/baeldung/ex/beancreationexception/BeanCreationExceptionTestSuite.java b/spring-exceptions/src/test/java/org/baeldung/ex/beancreationexception/BeanCreationExceptionTestSuite.java index ab5b14f787..f88138fec2 100644 --- a/spring-exceptions/src/test/java/org/baeldung/ex/beancreationexception/BeanCreationExceptionTestSuite.java +++ b/spring-exceptions/src/test/java/org/baeldung/ex/beancreationexception/BeanCreationExceptionTestSuite.java @@ -4,7 +4,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Suite; @RunWith(Suite.class) -@Suite.SuiteClasses({// @formatter:off +@Suite.SuiteClasses({ // @formatter:off Cause1BeanCreationExceptionIntegrationTest.class ,Cause2BeanCreationExceptionIntegrationTest.class ,Cause3BeanCreationExceptionIntegrationTest.class 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/java/org/baeldung/persistence/dao/FooDao.java b/spring-hibernate3/src/main/java/org/baeldung/persistence/dao/FooDao.java index 23de04169e..cb8d7488ea 100644 --- a/spring-hibernate3/src/main/java/org/baeldung/persistence/dao/FooDao.java +++ b/spring-hibernate3/src/main/java/org/baeldung/persistence/dao/FooDao.java @@ -4,7 +4,7 @@ import org.baeldung.persistence.model.Foo; import org.springframework.stereotype.Repository; @Repository -public class FooDao extends AbstractHibernateDao implements IFooDao { +public class FooDao extends AbstractHibernateDaoimplements IFooDao { public FooDao() { super(); 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/java/org/baeldung/persistence/dao/common/GenericHibernateDao.java b/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/common/GenericHibernateDao.java index 47ed130878..018e367209 100644 --- a/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/common/GenericHibernateDao.java +++ b/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/common/GenericHibernateDao.java @@ -8,6 +8,6 @@ import org.springframework.stereotype.Repository; @Repository @Scope(BeanDefinition.SCOPE_PROTOTYPE) -public class GenericHibernateDao extends AbstractHibernateDao implements IGenericDao { +public class GenericHibernateDao extends AbstractHibernateDaoimplements IGenericDao { // } \ No newline at end of file diff --git a/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/impl/ChildDao.java b/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/impl/ChildDao.java index 017362bd14..80a4007633 100644 --- a/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/impl/ChildDao.java +++ b/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/impl/ChildDao.java @@ -6,7 +6,7 @@ import org.baeldung.persistence.model.Child; import org.springframework.stereotype.Repository; @Repository -public class ChildDao extends AbstractHibernateDao implements IChildDao { +public class ChildDao extends AbstractHibernateDaoimplements IChildDao { public ChildDao() { super(); diff --git a/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/impl/FooDao.java b/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/impl/FooDao.java index b8360160da..eb3a66126c 100644 --- a/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/impl/FooDao.java +++ b/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/impl/FooDao.java @@ -6,7 +6,7 @@ import org.baeldung.persistence.model.Foo; import org.springframework.stereotype.Repository; @Repository -public class FooDao extends AbstractHibernateDao implements IFooDao { +public class FooDao extends AbstractHibernateDaoimplements IFooDao { public FooDao() { super(); diff --git a/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/impl/ParentDao.java b/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/impl/ParentDao.java index a93f1c39d5..fca4c69338 100644 --- a/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/impl/ParentDao.java +++ b/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/impl/ParentDao.java @@ -6,7 +6,7 @@ import org.baeldung.persistence.model.Parent; import org.springframework.stereotype.Repository; @Repository -public class ParentDao extends AbstractHibernateDao implements IParentDao { +public class ParentDao extends AbstractHibernateDaoimplements IParentDao { public ParentDao() { super(); diff --git a/spring-hibernate4/src/main/java/org/baeldung/persistence/service/impl/ChildService.java b/spring-hibernate4/src/main/java/org/baeldung/persistence/service/impl/ChildService.java index 2ea64285b3..71b1bc697e 100644 --- a/spring-hibernate4/src/main/java/org/baeldung/persistence/service/impl/ChildService.java +++ b/spring-hibernate4/src/main/java/org/baeldung/persistence/service/impl/ChildService.java @@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @Service -public class ChildService extends AbstractService implements IChildService { +public class ChildService extends AbstractServiceimplements IChildService { @Autowired private IChildDao dao; diff --git a/spring-hibernate4/src/main/java/org/baeldung/persistence/service/impl/FooService.java b/spring-hibernate4/src/main/java/org/baeldung/persistence/service/impl/FooService.java index 4b76eba3e5..8a89153dd0 100644 --- a/spring-hibernate4/src/main/java/org/baeldung/persistence/service/impl/FooService.java +++ b/spring-hibernate4/src/main/java/org/baeldung/persistence/service/impl/FooService.java @@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @Service -public class FooService extends AbstractService implements IFooService { +public class FooService extends AbstractServiceimplements IFooService { @Autowired private IFooDao dao; diff --git a/spring-hibernate4/src/main/java/org/baeldung/persistence/service/impl/ParentService.java b/spring-hibernate4/src/main/java/org/baeldung/persistence/service/impl/ParentService.java index 73239f1d00..1f9b602350 100644 --- a/spring-hibernate4/src/main/java/org/baeldung/persistence/service/impl/ParentService.java +++ b/spring-hibernate4/src/main/java/org/baeldung/persistence/service/impl/ParentService.java @@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @Service -public class ParentService extends AbstractService implements IParentService { +public class ParentService extends AbstractServiceimplements IParentService { @Autowired private IParentDao dao; 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-hibernate4/src/test/java/org/baeldung/persistence/IntegrationTestSuite.java b/spring-hibernate4/src/test/java/org/baeldung/persistence/IntegrationTestSuite.java index 938e8f359c..42fcc28378 100644 --- a/spring-hibernate4/src/test/java/org/baeldung/persistence/IntegrationTestSuite.java +++ b/spring-hibernate4/src/test/java/org/baeldung/persistence/IntegrationTestSuite.java @@ -9,7 +9,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Suite; @RunWith(Suite.class) -@Suite.SuiteClasses({// @formatter:off +@Suite.SuiteClasses({ // @formatter:off FooServiceBasicPersistenceIntegrationTest.class ,FooPaginationPersistenceIntegrationTest.class ,FooServicePersistenceIntegrationTest.class diff --git a/spring-jpa/.classpath b/spring-jpa/.classpath index 8b7cba482d..fa5dbd4c0e 100644 --- a/spring-jpa/.classpath +++ b/spring-jpa/.classpath @@ -29,7 +29,7 @@ - + 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/java/org/baeldung/persistence/dao/FooDao.java b/spring-jpa/src/main/java/org/baeldung/persistence/dao/FooDao.java index 77978c5cf2..becd8d5f67 100644 --- a/spring-jpa/src/main/java/org/baeldung/persistence/dao/FooDao.java +++ b/spring-jpa/src/main/java/org/baeldung/persistence/dao/FooDao.java @@ -4,7 +4,7 @@ import org.baeldung.persistence.model.Foo; import org.springframework.stereotype.Repository; @Repository -public class FooDao extends AbstractJpaDAO implements IFooDao { +public class FooDao extends AbstractJpaDAOimplements IFooDao { public FooDao() { super(); 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-jpa/src/test/java/org/baeldung/persistence/service/PersistenceTestSuite.java b/spring-jpa/src/test/java/org/baeldung/persistence/service/PersistenceTestSuite.java index 35f648b5a0..f6c41258d4 100644 --- a/spring-jpa/src/test/java/org/baeldung/persistence/service/PersistenceTestSuite.java +++ b/spring-jpa/src/test/java/org/baeldung/persistence/service/PersistenceTestSuite.java @@ -4,7 +4,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Suite; @RunWith(Suite.class) -@Suite.SuiteClasses({// @formatter:off +@Suite.SuiteClasses({ // @formatter:off FooPaginationPersistenceIntegrationTest.class ,FooServicePersistenceIntegrationTest.class ,FooServiceSortingTests.class 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/java/org/baeldung/servlet/WebAppOld.java b/spring-mvc-no-xml/src/main/java/org/baeldung/servlet/WebAppOld.java index a2589e465f..85c67c094d 100644 --- a/spring-mvc-no-xml/src/main/java/org/baeldung/servlet/WebAppOld.java +++ b/spring-mvc-no-xml/src/main/java/org/baeldung/servlet/WebAppOld.java @@ -1,23 +1,23 @@ package org.baeldung.servlet; -//public class WebApp implements WebApplicationInitializer { +// public class WebApp implements WebApplicationInitializer { // -// public WebApp() { -// super(); -// } +// public WebApp() { +// super(); +// } // -// // API +// // API // -// @Override -// public void onStartup(final ServletContext servletContext) throws ServletException { -// final AnnotationConfigWebApplicationContext root = new AnnotationConfigWebApplicationContext(); -// root.setServletContext(servletContext); -// root.scan("org.baeldung.spring"); -// root.refresh(); +// @Override +// public void onStartup(final ServletContext servletContext) throws ServletException { +// final AnnotationConfigWebApplicationContext root = new AnnotationConfigWebApplicationContext(); +// root.setServletContext(servletContext); +// root.scan("org.baeldung.spring"); +// root.refresh(); // -// final Dynamic servlet = servletContext.addServlet("mvc", new DispatcherServlet(root)); -// servlet.setLoadOnStartup(1); -// servlet.addMapping("/"); -// } +// final Dynamic servlet = servletContext.addServlet("mvc", new DispatcherServlet(root)); +// servlet.setLoadOnStartup(1); +// servlet.addMapping("/"); +// } // // } 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 abc28ace44..f04d04e8ec 100644 --- a/spring-rest/pom.xml +++ b/spring-rest/pom.xml @@ -159,7 +159,6 @@ ${spring.version} - diff --git a/spring-rest/src/main/webapp/WEB-INF/web.xml b/spring-rest/src/main/webapp/WEB-INF/web.xml index c28bb9a20a..01e7620c44 100644 --- a/spring-rest/src/main/webapp/WEB-INF/web.xml +++ b/spring-rest/src/main/webapp/WEB-INF/web.xml @@ -35,7 +35,7 @@ - + diff --git a/spring-rest/src/test/java/org/baeldung/web/controller/redirect/RedirectControllerTest.java b/spring-rest/src/test/java/org/baeldung/web/controller/redirect/RedirectControllerTest.java index ab2b9f3f87..cafaff7b07 100644 --- a/spring-rest/src/test/java/org/baeldung/web/controller/redirect/RedirectControllerTest.java +++ b/spring-rest/src/test/java/org/baeldung/web/controller/redirect/RedirectControllerTest.java @@ -39,19 +39,19 @@ public class RedirectControllerTest { @Test public void whenRedirectOnUrlWithUsingXMLConfig_thenStatusRedirectionAndRedirectedOnUrl() throws Exception { mockMvc.perform(get("/redirectWithXMLConfig")).andExpect(status().is3xxRedirection()).andExpect(view().name("RedirectedUrl")).andExpect(model().attribute("attribute", is("redirectWithXMLConfig"))) - .andExpect(redirectedUrl("redirectedUrl?attribute=redirectWithXMLConfig")); + .andExpect(redirectedUrl("redirectedUrl?attribute=redirectWithXMLConfig")); } @Test public void whenRedirectOnUrlWithUsingRedirectPrefix_thenStatusRedirectionAndRedirectedOnUrl() throws Exception { mockMvc.perform(get("/redirectWithRedirectPrefix")).andExpect(status().is3xxRedirection()).andExpect(view().name("redirect:/redirectedUrl")).andExpect(model().attribute("attribute", is("redirectWithRedirectPrefix"))) - .andExpect(redirectedUrl("/redirectedUrl?attribute=redirectWithRedirectPrefix")); + .andExpect(redirectedUrl("/redirectedUrl?attribute=redirectWithRedirectPrefix")); } @Test public void whenRedirectOnUrlWithUsingRedirectAttributes_thenStatusRedirectionAndRedirectedOnUrlAndAddedAttributeToFlashScope() throws Exception { mockMvc.perform(get("/redirectWithRedirectAttributes")).andExpect(status().is3xxRedirection()).andExpect(flash().attribute("flashAttribute", is("redirectWithRedirectAttributes"))) - .andExpect(model().attribute("attribute", is("redirectWithRedirectAttributes"))).andExpect(model().attribute("flashAttribute", is(nullValue()))).andExpect(redirectedUrl("redirectedUrl?attribute=redirectWithRedirectAttributes")); + .andExpect(model().attribute("attribute", is("redirectWithRedirectAttributes"))).andExpect(model().attribute("flashAttribute", is(nullValue()))).andExpect(redirectedUrl("redirectedUrl?attribute=redirectWithRedirectAttributes")); } @Test 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/java/org/baeldung/persistence/model/Role.java b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/model/Role.java index c656f134d9..c7053fc56a 100644 --- a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/model/Role.java +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/model/Role.java @@ -21,7 +21,7 @@ public class Role { private Collection users; @ManyToMany - @JoinTable(name = "roles_privileges", joinColumns = @JoinColumn(name = "role_id", referencedColumnName = "id"), inverseJoinColumns = @JoinColumn(name = "privilege_id", referencedColumnName = "id")) + @JoinTable(name = "roles_privileges", joinColumns = @JoinColumn(name = "role_id", referencedColumnName = "id") , inverseJoinColumns = @JoinColumn(name = "privilege_id", referencedColumnName = "id") ) private Collection privileges; private String name; diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/model/User.java b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/model/User.java index 4fc2d57f5b..277ddef1dc 100644 --- a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/model/User.java +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/model/User.java @@ -32,7 +32,7 @@ public class User { private boolean tokenExpired; @ManyToMany - @JoinTable(name = "users_roles", joinColumns = @JoinColumn(name = "user_id", referencedColumnName = "id"), inverseJoinColumns = @JoinColumn(name = "role_id", referencedColumnName = "id")) + @JoinTable(name = "users_roles", joinColumns = @JoinColumn(name = "user_id", referencedColumnName = "id") , inverseJoinColumns = @JoinColumn(name = "role_id", referencedColumnName = "id") ) private Collection roles; public User() { diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/validation/PasswordMatches.java b/spring-security-login-and-registration/src/main/java/org/baeldung/validation/PasswordMatches.java index a8322ad2f3..6a9b906b36 100644 --- a/spring-security-login-and-registration/src/main/java/org/baeldung/validation/PasswordMatches.java +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/validation/PasswordMatches.java @@ -18,7 +18,7 @@ public @interface PasswordMatches { String message() default "Passwords don't match"; - Class[] groups() default {}; + Class[]groups() default {}; - Class[] payload() default {}; + Class[]payload() default {}; } diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/validation/ValidEmail.java b/spring-security-login-and-registration/src/main/java/org/baeldung/validation/ValidEmail.java index fa556c417c..1d5795ce16 100644 --- a/spring-security-login-and-registration/src/main/java/org/baeldung/validation/ValidEmail.java +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/validation/ValidEmail.java @@ -18,7 +18,7 @@ public @interface ValidEmail { String message() default "Invalid Email"; - Class[] groups() default {}; + Class[]groups() default {}; - Class[] payload() default {}; + Class[]payload() default {}; } diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/validation/ValidPassword.java b/spring-security-login-and-registration/src/main/java/org/baeldung/validation/ValidPassword.java index 37b217213a..5b92f4d133 100644 --- a/spring-security-login-and-registration/src/main/java/org/baeldung/validation/ValidPassword.java +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/validation/ValidPassword.java @@ -20,8 +20,8 @@ public @interface ValidPassword { String message() default "Invalid Password"; - Class[] groups() default {}; + Class[]groups() default {}; - Class[] payload() default {}; + Class[]payload() default {}; } 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/java/org/baeldung/persistence/dao/rsql/RsqlSearchOperation.java b/spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/rsql/RsqlSearchOperation.java index 769063cbee..7f9ad79f63 100644 --- a/spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/rsql/RsqlSearchOperation.java +++ b/spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/rsql/RsqlSearchOperation.java @@ -4,8 +4,8 @@ import cz.jirutka.rsql.parser.ast.ComparisonOperator; import cz.jirutka.rsql.parser.ast.RSQLOperators; public enum RsqlSearchOperation { - EQUAL(RSQLOperators.EQUAL), NOT_EQUAL(RSQLOperators.NOT_EQUAL), GREATER_THAN(RSQLOperators.GREATER_THAN), GREATER_THAN_OR_EQUAL(RSQLOperators.GREATER_THAN_OR_EQUAL), LESS_THAN(RSQLOperators.LESS_THAN), LESS_THAN_OR_EQUAL(RSQLOperators.LESS_THAN_OR_EQUAL), IN( - RSQLOperators.IN), NOT_IN(RSQLOperators.NOT_IN); + EQUAL(RSQLOperators.EQUAL), NOT_EQUAL(RSQLOperators.NOT_EQUAL), GREATER_THAN(RSQLOperators.GREATER_THAN), GREATER_THAN_OR_EQUAL(RSQLOperators.GREATER_THAN_OR_EQUAL), LESS_THAN(RSQLOperators.LESS_THAN), LESS_THAN_OR_EQUAL( + RSQLOperators.LESS_THAN_OR_EQUAL), IN(RSQLOperators.IN), NOT_IN(RSQLOperators.NOT_IN); private ComparisonOperator operator; diff --git a/spring-security-rest-full/src/main/java/org/baeldung/persistence/service/impl/FooService.java b/spring-security-rest-full/src/main/java/org/baeldung/persistence/service/impl/FooService.java index 533c0f5082..c449cde8e2 100644 --- a/spring-security-rest-full/src/main/java/org/baeldung/persistence/service/impl/FooService.java +++ b/spring-security-rest-full/src/main/java/org/baeldung/persistence/service/impl/FooService.java @@ -16,7 +16,7 @@ import com.google.common.collect.Lists; @Service @Transactional -public class FooService extends AbstractService implements IFooService { +public class FooService extends AbstractServiceimplements IFooService { @Autowired private IFooDao dao; 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/java/org/baeldung/spring/SecurityJavaConfig.java b/spring-security-rest/src/main/java/org/baeldung/spring/SecurityJavaConfig.java index 244b6e2e33..ca882909f0 100644 --- a/spring-security-rest/src/main/java/org/baeldung/spring/SecurityJavaConfig.java +++ b/spring-security-rest/src/main/java/org/baeldung/spring/SecurityJavaConfig.java @@ -55,12 +55,12 @@ public class SecurityJavaConfig extends WebSecurityConfigurerAdapter { } // @formatter:on @Bean - public MySavedRequestAwareAuthenticationSuccessHandler mySuccessHandler(){ + public MySavedRequestAwareAuthenticationSuccessHandler mySuccessHandler() { return new MySavedRequestAwareAuthenticationSuccessHandler(); } @Bean - public SimpleUrlAuthenticationFailureHandler myFailureHandler(){ + public SimpleUrlAuthenticationFailureHandler myFailureHandler() { return new SimpleUrlAuthenticationFailureHandler(); } 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