diff --git a/annotations/annotation-processing/pom.xml b/annotations/annotation-processing/pom.xml
index 6d07394b87..e88e441b3e 100644
--- a/annotations/annotation-processing/pom.xml
+++ b/annotations/annotation-processing/pom.xml
@@ -15,7 +15,7 @@
1.0-rc2
- 3.5.1
+ 3.6.0
diff --git a/annotations/annotation-user/pom.xml b/annotations/annotation-user/pom.xml
index f76f691f93..a365f35c11 100644
--- a/annotations/annotation-user/pom.xml
+++ b/annotations/annotation-user/pom.xml
@@ -13,6 +13,11 @@
annotation-user
+
+ 4.12
+ 3.6.0
+
+
@@ -24,7 +29,7 @@
junit
junit
- 4.12
+ ${junit.version}
test
@@ -37,7 +42,7 @@
org.apache.maven.plugins
maven-compiler-plugin
- 3.5.1
+ ${maven-compiler-plugin.version}
1.8
diff --git a/apache-cxf/cxf-introduction/pom.xml b/apache-cxf/cxf-introduction/pom.xml
index 0902bd690e..6e0ceaba7e 100644
--- a/apache-cxf/cxf-introduction/pom.xml
+++ b/apache-cxf/cxf-introduction/pom.xml
@@ -4,15 +4,18 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
4.0.0
cxf-introduction
+
com.baeldung
apache-cxf
0.0.1-SNAPSHOT
+
- 3.1.6
+ 3.1.8
2.19.1
+
@@ -24,7 +27,7 @@
maven-surefire-plugin
- 2.19.1
+ ${surefire.version}
**/*LiveTest.java
@@ -33,6 +36,7 @@
+
org.apache.cxf
diff --git a/apache-cxf/cxf-jaxrs-implementation/pom.xml b/apache-cxf/cxf-jaxrs-implementation/pom.xml
index b3a81aef82..c3095be5a5 100644
--- a/apache-cxf/cxf-jaxrs-implementation/pom.xml
+++ b/apache-cxf/cxf-jaxrs-implementation/pom.xml
@@ -4,17 +4,20 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
4.0.0
cxf-jaxrs-implementation
+
com.baeldung
apache-cxf
0.0.1-SNAPSHOT
+
UTF-8
- 3.1.7
+ 3.1.8
4.5.2
2.19.1
+
@@ -26,7 +29,7 @@
maven-surefire-plugin
- 2.19.1
+ ${surefire.version}
**/*LiveTest.java
@@ -35,6 +38,7 @@
+
org.apache.cxf
diff --git a/apache-cxf/cxf-spring/pom.xml b/apache-cxf/cxf-spring/pom.xml
index 8f1dee965a..79a7650ced 100644
--- a/apache-cxf/cxf-spring/pom.xml
+++ b/apache-cxf/cxf-spring/pom.xml
@@ -33,7 +33,7 @@
javax.servlet
javax.servlet-api
- 3.1.0
+ ${javax.servlet-api.version}
@@ -41,7 +41,7 @@
maven-war-plugin
- 2.6
+ ${maven-war-plugin.version}
false
@@ -66,7 +66,7 @@
org.codehaus.cargo
cargo-maven2-plugin
- 1.4.19
+ ${cargo-maven2-plugin.version}
tomcat8x
@@ -121,9 +121,13 @@
- 3.1.6
- 4.3.1.RELEASE
+ 3.1.8
+ 4.3.4.RELEASE
+ 3.1.0
+
+ 2.6
2.19.1
+ 1.6.1
diff --git a/apache-cxf/pom.xml b/apache-cxf/pom.xml
index af7949bb6c..d407527c51 100644
--- a/apache-cxf/pom.xml
+++ b/apache-cxf/pom.xml
@@ -5,19 +5,28 @@
apache-cxf
0.0.1-SNAPSHOT
pom
+
cxf-introduction
cxf-spring
cxf-jaxrs-implementation
+
+
+ 4.12
+ 3.6.0
+ 1.5.0
+
+
junit
junit
- 4.12
+ ${junit.version}
test
+
install
@@ -25,7 +34,7 @@
org.apache.maven.plugins
maven-compiler-plugin
- 3.5.1
+ ${maven-compiler-plugin.version}
1.8
@@ -34,7 +43,7 @@
org.codehaus.mojo
exec-maven-plugin
- 1.5.0
+ ${exec-maven-plugin.version}
diff --git a/apache-fop/pom.xml b/apache-fop/pom.xml
index 949843a47e..4dd61d8f4e 100644
--- a/apache-fop/pom.xml
+++ b/apache-fop/pom.xml
@@ -67,7 +67,7 @@
org.apache.xmlgraphics
fop
- 1.1
+ ${fop.version}
org.apache.avalon.framework
@@ -83,18 +83,18 @@
avalon-framework
avalon-framework-api
- 4.2.0
+ ${avalon-framework.version}
avalon-framework
avalon-framework-impl
- 4.2.0
+ ${avalon-framework.version}
org.dbdoclet
dbdoclet
- 8.0.2
+ ${dbdoclet.version}
@@ -108,7 +108,7 @@
net.sf.jtidy
jtidy
- r938
+ ${jtidy.version}
@@ -187,40 +187,22 @@
-
- 4.3.11.Final
- 5.1.38
-
-
- 2.7.2
-
+ 1.1
+ 4.3
+ 8.0.2
+ r938
- 1.7.9
- 1.1.2
-
-
- 5.1.3.Final
-
-
- 19.0
- 3.3.2
+ 1.7.21
+ 1.1.7
1.3
4.12
1.10.19
- 4.4
- 4.4
-
- 2.9.0
-
- 3.5.1
- 2.6
+ 3.6.0
2.19.1
- 2.7
- 1.4.18
diff --git a/aspectj/pom.xml b/aspectj/pom.xml
index 1c409483ec..2fca4031fb 100644
--- a/aspectj/pom.xml
+++ b/aspectj/pom.xml
@@ -121,12 +121,11 @@
1.8
- 1.6.11
UTF-8
1.8.9
1.7.21
1.1.7
- 3.5.1
+ 3.6.0
4.12
diff --git a/assertj/pom.xml b/assertj/pom.xml
index df55ebba4b..0b3bcbacdb 100644
--- a/assertj/pom.xml
+++ b/assertj/pom.xml
@@ -23,13 +23,13 @@
junit
junit
- 4.12
+ ${junit.version}
test
org.assertj
assertj-core
- 3.5.1
+ ${assertj-core.version}
test
@@ -40,7 +40,7 @@
org.apache.maven.plugins
maven-compiler-plugin
- 3.3
+ ${maven-compiler-plugin.version}
1.8
@@ -51,6 +51,11 @@
19.0
+ 3.1.0
+ 4.12
+ 3.6.1
+
+ 3.6.0
\ No newline at end of file
diff --git a/autovalue/pom.xml b/autovalue/pom.xml
index d1f8e825fc..2f6601c30d 100644
--- a/autovalue/pom.xml
+++ b/autovalue/pom.xml
@@ -5,12 +5,13 @@
autovalue-tutorial
1.0
AutoValue
+
org.apache.maven.plugins
maven-compiler-plugin
- 3.3
+ ${maven-compiler-plugin.version}
7
@@ -19,19 +20,25 @@
+
com.google.auto.value
auto-value
- 1.2
+ ${auto-value.version}
junit
junit
- 4.3
+ ${junit.version}
test
-
+
+
+ 1.3
+ 4.12
+ 3.6.0
+
diff --git a/cdi/pom.xml b/cdi/pom.xml
index 30dd167fa8..231390ea5c 100644
--- a/cdi/pom.xml
+++ b/cdi/pom.xml
@@ -22,18 +22,18 @@
org.aspectj
aspectjweaver
- 1.8.9
+ ${aspectjweaver.version}
org.jboss.weld.se
weld-se-core
- 2.3.5.Final
+ ${weld-se-core.version}
junit
junit
- 4.12
+ ${junit.version}
test
@@ -97,7 +97,10 @@
- 4.3.1.RELEASE
+ 4.3.4.RELEASE
+ 1.8.9
+ 2.4.1.Final
+ 4.12
2.19.1
diff --git a/core-java-9/pom.xml b/core-java-9/pom.xml
index 844ad6a782..bf9325c935 100644
--- a/core-java-9/pom.xml
+++ b/core-java-9/pom.xml
@@ -76,9 +76,7 @@
- 1.7.13
- 1.0.13
-
+ 1.7.21
3.6-jigsaw-SNAPSHOT
diff --git a/core-java/pom.xml b/core-java/pom.xml
index c3a9611682..0c14da2245 100644
--- a/core-java/pom.xml
+++ b/core-java/pom.xml
@@ -14,7 +14,7 @@
net.sourceforge.collections
collections-generic
- 4.01
+ ${collections-generic.version}
com.google.guava
@@ -25,13 +25,13 @@
org.apache.commons
commons-collections4
- 4.0
+ ${commons-collections4.version}
commons-io
commons-io
- 2.4
+ ${commons-io.version}
@@ -43,7 +43,7 @@
org.apache.commons
commons-math3
- 3.3
+ ${commons-math3.version}
@@ -122,8 +122,6 @@
test
-
-
org.mockito
mockito-core
@@ -321,44 +319,33 @@
-
- 4.3.11.Final
- 5.1.38
-
- 2.7.8
+ 2.8.5
- 1.7.13
- 1.1.3
-
-
- 5.1.3.Final
+ 1.7.21
+ 1.1.7
19.0
- 3.4
+ 3.5
1.55
1.10
+ 3.6.1
+ 2.5
+ 4.1
+ 4.01
1.3
4.12
1.10.19
- 6.8
- 3.5.1
-
- 4.4.1
- 4.5
-
- 2.9.0
+ 6.10
+ 3.6.1
- 3.5.1
- 2.6
+ 3.6.0
2.19.1
- 2.7
- 1.4.18
diff --git a/core-java/src/main/java/com/baeldung/threadpool/ExitingExecutorServiceExample.java b/core-java/src/main/java/com/baeldung/threadpool/ExitingExecutorServiceExample.java
index 4775fde930..d14a290c46 100644
--- a/core-java/src/main/java/com/baeldung/threadpool/ExitingExecutorServiceExample.java
+++ b/core-java/src/main/java/com/baeldung/threadpool/ExitingExecutorServiceExample.java
@@ -16,10 +16,10 @@ public class ExitingExecutorServiceExample {
public static void main(String... args) {
- ThreadPoolExecutor executor = (ThreadPoolExecutor) Executors.newFixedThreadPool(5);
- ExecutorService executorService = MoreExecutors.getExitingExecutorService(executor, 100, TimeUnit.MILLISECONDS);
+ final ThreadPoolExecutor executor = (ThreadPoolExecutor) Executors.newFixedThreadPool(5);
+ final ExecutorService executorService = MoreExecutors.getExitingExecutorService(executor, 100, TimeUnit.MILLISECONDS);
- executorService.submit(() -> {
+ executorService.submit((Runnable) () -> {
while (true) {
}
});
diff --git a/couchbase-sdk/pom.xml b/couchbase-sdk/pom.xml
index b7b3d1788f..6462cfb57a 100644
--- a/couchbase-sdk/pom.xml
+++ b/couchbase-sdk/pom.xml
@@ -79,10 +79,10 @@
maven-compiler-plugin
- 2.3.2
+ ${maven-compiler-plugin.version}
-
- 1.7
+
+ ${java.version}
@@ -100,14 +100,15 @@
- 1.7
+ 1.8
UTF-8
- 2.2.6
- 4.2.4.RELEASE
- 1.1.3
- 1.7.12
- 4.11
- 3.4
+ 2.3.6
+ 4.3.4.RELEASE
+ 1.1.7
+ 1.7.21
+ 4.12
+ 3.5
+ 3.6.0
2.19.1
diff --git a/deltaspike/pom.xml b/deltaspike/pom.xml
index 22cf8f935c..b4a7657e97 100644
--- a/deltaspike/pom.xml
+++ b/deltaspike/pom.xml
@@ -25,17 +25,22 @@
resources, i.e. build is platform dependent! -->
UTF-8
+ 1.7.21
+ 3.7.4
+ 1.7.2
+
- 1.0.2.Final
+ 1.0.2.Final
- 8.2.1.Final
+ 8.2.2.Final
- 3.1
- 2.16
- 2.5
+ 3.6.0
+ 2.19.1
+ 2.6
+ 1.1.3
1.7
@@ -56,14 +61,14 @@
org.wildfly.bom
jboss-javaee-7.0-with-tools
- ${version.jboss.bom}
+ ${jboss.bom.version}
pom
import
org.wildfly.bom
jboss-javaee-7.0-with-hibernate
- ${version.jboss.bom}
+ ${jboss.bom.version}
pom
import
@@ -187,14 +192,14 @@
org.apache.deltaspike.modules
deltaspike-data-module-api
- 1.7.1
+ ${deltaspike.version}
compile
org.apache.deltaspike.modules
deltaspike-data-module-impl
- 1.7.1
+ ${deltaspike.version}
runtime
@@ -202,20 +207,20 @@
com.mysema.querydsl
querydsl-apt
- 3.7.4
+ ${querydsl.version}
provided
com.mysema.querydsl
querydsl-jpa
- 3.7.4
+ ${querydsl.version}
org.slf4j
slf4j-log4j12
- 1.6.1
+ ${slf4j.version}
@@ -226,7 +231,7 @@
maven-war-plugin
- ${version.war.plugin}
+ ${war.plugin.version}
false
@@ -235,7 +240,7 @@
com.mysema.maven
apt-maven-plugin
- 1.0.9
+ ${apt-maven-plugin.version}
@@ -253,7 +258,7 @@
org.wildfly.plugins
wildfly-maven-plugin
- ${version.wildfly.maven.plugin}
+ ${wildfly.maven.plugin.version}
@@ -272,7 +277,7 @@
maven-surefire-plugin
- ${version.surefire.plugin}
+ ${surefire.plugin.version}
true
diff --git a/dozer/pom.xml b/dozer/pom.xml
index 35ac2394a6..363285f619 100644
--- a/dozer/pom.xml
+++ b/dozer/pom.xml
@@ -13,7 +13,7 @@
org.apache.maven.plugins
maven-compiler-plugin
- 3.3
+ ${maven-compiler-plugin.version}
7
@@ -26,33 +26,41 @@
org.slf4j
slf4j-api
- 1.7.5
+ ${slf4j.version}
org.slf4j
jcl-over-slf4j
- 1.7.5
+ ${slf4j.version}
org.apache.commons
commons-lang3
- 3.2.1
+ ${commons-lang3.version}
net.sf.dozer
dozer
- 5.5.1
+ ${dozer.version}
junit
junit
- 4.3
+ ${junit.version}
test
+
+ 1.7.21
+ 3.5
+ 5.5.1
+ 4.12
+ 3.6.0
+
+
diff --git a/ejb/ejb-client/pom.xml b/ejb/ejb-client/pom.xml
index 6ece63572d..84656b40c5 100755
--- a/ejb/ejb-client/pom.xml
+++ b/ejb/ejb-client/pom.xml
@@ -44,4 +44,10 @@
+
+
+ 4.12
+ 2.19.1
+
+
\ No newline at end of file
diff --git a/ejb/ejb-remote/pom.xml b/ejb/ejb-remote/pom.xml
index d102edd8e3..601ad69447 100755
--- a/ejb/ejb-remote/pom.xml
+++ b/ejb/ejb-remote/pom.xml
@@ -15,7 +15,7 @@
javax
javaee-api
- 7.0
+ ${javaee-api.version}
provided
@@ -25,7 +25,7 @@
org.wildfly.plugins
wildfly-maven-plugin
- 1.1.0.Alpha5
+ ${wildfly-maven-plugin.version}
127.0.0.1
9990
@@ -37,4 +37,9 @@
+
+
+ 7.0
+ 1.1.0.Beta1
+
\ No newline at end of file
diff --git a/ejb/pom.xml b/ejb/pom.xml
index 8176de7936..7676165b8b 100755
--- a/ejb/pom.xml
+++ b/ejb/pom.xml
@@ -38,14 +38,14 @@
javax
javaee-api
- 7.0
+ ${javaee-api.version}
provided
org.wildfly
wildfly-ejb-client-bom
- 10.1.0.Final
+ ${wildfly.version}
pom
import
@@ -57,7 +57,7 @@
maven-compiler-plugin
- 3.1
+ ${maven-compiler-plugin.version}
1.8
@@ -66,7 +66,7 @@
maven-ejb-plugin
- 2.4
+ ${maven-ejb-plugin.version}
3.2
@@ -79,4 +79,11 @@
ejb-remote
ejb-client
+
+
+ 7.0
+ 10.1.0.Final
+ 3.6.0
+ 2.5.1
+
\ No newline at end of file
diff --git a/enterprise-patterns/pom.xml b/enterprise-patterns/pom.xml
index 036a61c44a..763227e45b 100644
--- a/enterprise-patterns/pom.xml
+++ b/enterprise-patterns/pom.xml
@@ -23,7 +23,7 @@
org.apache.maven.plugins
maven-compiler-plugin
- 3.5.1
+ ${maven-compiler-plugin.version}
1.8
@@ -32,4 +32,8 @@
+
+
+ 3.6.0
+
diff --git a/feign/pom.xml b/feign/pom.xml
index af61883f1b..721fa76682 100644
--- a/feign/pom.xml
+++ b/feign/pom.xml
@@ -16,54 +16,62 @@
UTF-8
+ 9.4.0
+ 1.7.21
+ 2.7
+ 1.16.12
+ 4.12
+ 3.6.0
+ 2.19.1
+ 1.4.2.RELEASE
io.github.openfeign
feign-core
- 9.3.1
+ ${feign.version}
io.github.openfeign
feign-okhttp
- 9.3.1
+ ${feign.version}
io.github.openfeign
feign-gson
- 9.3.1
+ ${feign.version}
io.github.openfeign
feign-slf4j
- 9.3.1
+ ${feign.version}
org.slf4j
slf4j-api
- 1.7.21
+ ${slf4j.version}
org.apache.logging.log4j
log4j-core
- 2.6.2
+ ${log4j.version}
org.apache.logging.log4j
log4j-slf4j-impl
- 2.6.2
+ ${log4j.version}
org.projectlombok
lombok
- 1.16.10
+ ${lombok.version}
provided
junit
junit
- 4.12
+ ${junit.version}
test
@@ -74,7 +82,7 @@
org.apache.maven.plugins
maven-compiler-plugin
- 3.5.1
+ ${maven-compiler-plugin.version}
1.8
@@ -83,7 +91,7 @@
org.apache.maven.plugins
maven-surefire-plugin
- 2.19.1
+ ${maven-surefire-plugin.version}
true
@@ -91,9 +99,10 @@
org.springframework.boot
spring-boot-maven-plugin
- 1.4.0.RELEASE
+ ${spring-boot-maven-plugin.version}
+
diff --git a/httpclient/src/test/java/org/baeldung/httpclient/conn/HttpClientConnectionManagementLiveTest.java b/httpclient/src/test/java/org/baeldung/httpclient/conn/HttpClientConnectionManagementLiveTest.java
index e9db8c1e16..e04cd32d65 100644
--- a/httpclient/src/test/java/org/baeldung/httpclient/conn/HttpClientConnectionManagementLiveTest.java
+++ b/httpclient/src/test/java/org/baeldung/httpclient/conn/HttpClientConnectionManagementLiveTest.java
@@ -218,7 +218,7 @@ public class HttpClientConnectionManagementLiveTest {
final HeaderElement he = it.nextElement();
final String param = he.getName();
final String value = he.getValue();
- if (value != null && param.equalsIgnoreCase("timeout")) {
+ if ((value != null) && param.equalsIgnoreCase("timeout")) {
return Long.parseLong(value) * 1000;
}
}
@@ -251,9 +251,9 @@ public class HttpClientConnectionManagementLiveTest {
basicConnManager.connect(conn, route, 1000, context);
basicConnManager.routeComplete(conn, route, context);
final HttpRequestExecutor exeRequest = new HttpRequestExecutor();
- context.setTargetHost((new HttpHost("www.baeldung.com", 80)));
+ context.setTargetHost((new HttpHost("http://httpbin.org", 80)));
- final HttpGet get = new HttpGet("http://www.baeldung.com");
+ final HttpGet get = new HttpGet("http://httpbin.org");
exeRequest.execute(get, conn, context);
conn.isResponseAvailable(1000);
basicConnManager.releaseConnection(conn, null, 1, TimeUnit.SECONDS);
@@ -282,8 +282,9 @@ public class HttpClientConnectionManagementLiveTest {
for (final MultiHttpClientConnThread thread : threads) {
thread.join(10000);
countConnMade++;
- if (countConnMade == 0)
+ if (countConnMade == 0) {
assertTrue(thread.getLeasedConn() == 5);
+ }
}
}
@@ -356,7 +357,7 @@ public class HttpClientConnectionManagementLiveTest {
// @Ignore
// 8.2 ARTICLE VERSION
public final void whenCustomizedIdleConnMonitor_thenNoExceptions() throws InterruptedException, IOException {
- final HttpGet get = new HttpGet("http://google.com");
+ new HttpGet("http://google.com");
poolingConnManager = new PoolingHttpClientConnectionManager();
client = HttpClients.custom().setConnectionManager(poolingConnManager).build();
final IdleConnectionMonitorThread staleMonitor = new IdleConnectionMonitorThread(poolingConnManager);
diff --git a/javax-servlets/.gitignore b/javax-servlets/.gitignore
index a51a433798..dfbd063287 100644
--- a/javax-servlets/.gitignore
+++ b/javax-servlets/.gitignore
@@ -2,4 +2,5 @@
.idea
classes
target
-*.iml
\ No newline at end of file
+*.iml
+out
\ No newline at end of file
diff --git a/javax-servlets/src/main/java/com/root/FormServlet.java b/javax-servlets/src/main/java/com/baeldung.servlets/FormServlet.java
similarity index 97%
rename from javax-servlets/src/main/java/com/root/FormServlet.java
rename to javax-servlets/src/main/java/com/baeldung.servlets/FormServlet.java
index 4f55a02745..fcd9143dff 100644
--- a/javax-servlets/src/main/java/com/root/FormServlet.java
+++ b/javax-servlets/src/main/java/com/baeldung.servlets/FormServlet.java
@@ -1,4 +1,4 @@
-package com.root;
+package com.baeldung.servlets;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletException;
diff --git a/javax-servlets/src/test/java/com/root/FormServletTest.java b/javax-servlets/src/test/java/com/baeldung.servlets/LiveTest.java
similarity index 94%
rename from javax-servlets/src/test/java/com/root/FormServletTest.java
rename to javax-servlets/src/test/java/com/baeldung.servlets/LiveTest.java
index 67b419683f..fac4b6bb9c 100644
--- a/javax-servlets/src/test/java/com/root/FormServletTest.java
+++ b/javax-servlets/src/test/java/com/baeldung.servlets/LiveTest.java
@@ -1,4 +1,4 @@
-package com.root;
+package com.baeldung.servlets;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
@@ -13,7 +13,7 @@ import java.util.List;
import static org.junit.Assert.assertEquals;
-public class FormServletTest {
+public class FormServletLiveTest {
@Test
public void whenPostRequestUsingHttpClient_thenCorrect() throws Exception {
diff --git a/spring-security-rest-full/src/main/java/org/baeldung/spring/Application.java b/spring-security-rest-full/src/main/java/org/baeldung/spring/Application.java
index f8bc6c0160..a43b21c2b7 100644
--- a/spring-security-rest-full/src/main/java/org/baeldung/spring/Application.java
+++ b/spring-security-rest-full/src/main/java/org/baeldung/spring/Application.java
@@ -1,12 +1,18 @@
package org.baeldung.spring;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.support.SpringBootServletInitializer;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.web.context.request.RequestContextListener;
import org.springframework.web.filter.ShallowEtagHeaderFilter;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
/**
* Main Application Class - uses Spring Boot. Just run this as a normal Java
@@ -16,7 +22,19 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
@EnableScheduling
@EnableAutoConfiguration
@ComponentScan("org.baeldung")
-public class Application extends WebMvcConfigurerAdapter {
+@SpringBootApplication
+public class Application extends SpringBootServletInitializer {
+
+ @Override
+ protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
+ return application.sources(Application.class);
+ }
+
+ @Override
+ public void onStartup(ServletContext sc) throws ServletException {
+ // Manages the lifecycle of the root application context
+ sc.addListener(new RequestContextListener());
+ }
public static void main(final String[] args) {
SpringApplication.run(Application.class, args);
diff --git a/spring-security-rest-full/src/main/java/org/baeldung/spring/ListenerConfig.java b/spring-security-rest-full/src/main/java/org/baeldung/spring/ListenerConfig.java
deleted file mode 100644
index 3d727fc19f..0000000000
--- a/spring-security-rest-full/src/main/java/org/baeldung/spring/ListenerConfig.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.baeldung.spring;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-
-import org.springframework.web.WebApplicationInitializer;
-import org.springframework.web.context.request.RequestContextListener;
-
-public class ListenerConfig implements WebApplicationInitializer {
-
- @Override
- public void onStartup(ServletContext sc) throws ServletException {
- // Manages the lifecycle of the root application context
- sc.addListener(new RequestContextListener());
- }
-}
\ No newline at end of file
diff --git a/spring-security-rest-full/src/main/resources/application.properties b/spring-security-rest-full/src/main/resources/application.properties
index 58c6f8eec7..c3e1f0b4bb 100644
--- a/spring-security-rest-full/src/main/resources/application.properties
+++ b/spring-security-rest-full/src/main/resources/application.properties
@@ -1,2 +1,3 @@
server.port=8082
-server.context-path=/spring-security-rest-full
\ No newline at end of file
+server.context-path=/spring-security-rest-full
+endpoints.metrics.enabled=true
\ No newline at end of file