Update libraries

emmanuel-keller · emmanuel-keller · commit 7927f0a06614 · 2019-02-19T21:22:25.000Z
diff --git a/pom.xml b/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>qwazr-webapps</artifactId>
@@ -21,6 +22,16 @@
         <tag>HEAD</tag>
     </scm>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>javax.validation</groupId>
+                <artifactId>validation-api</artifactId>
+                <version>2.0.1.Final</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
 
         <dependency>
@@ -66,7 +77,7 @@
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-jersey2-jaxrs</artifactId>
-            <version>1.5.21</version>
+            <version>1.5.22</version>
         </dependency>
         <dependency>
             <groupId>org.webjars</groupId>
@@ -77,7 +88,7 @@
         <dependency>
             <groupId>org.webjars</groupId>
             <artifactId>bootstrap</artifactId>
-            <version>4.1.3</version>
+            <version>4.3.1</version>
             <scope>test</scope>
         </dependency>
 
@@ -101,7 +112,8 @@
                                     <shadedArtifactAttached>true</shadedArtifactAttached>
                                     <shadedClassifierName>exec</shadedClassifierName>
                                     <transformers>
-                                        <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                        <transformer
+                                                implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                             <manifestEntries>
                                                 <Main-Class>com.qwazr.webapps.WebappServer</Main-Class>
                                                 <Implementation-Version>${project.version}-${buildNumber}
@@ -110,7 +122,8 @@
                                                 </Specification-Version>
                                             </manifestEntries>
                                         </transformer>
-                                        <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+                                        <transformer
+                                                implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
                                     </transformers>
                                     <filters>
                                         <filter>
diff --git a/src/test/java/com/qwazr/webapps/example/MyApplicationTest.java b/src/test/java/com/qwazr/webapps/example/MyApplicationTest.java
@@ -38,7 +38,7 @@ public void test() throws JMException, ReflectiveOperationException, ServletExce
 		final String html = target.path("/test").request(MediaType.TEXT_HTML_TYPE).get(String.class);
 		Assert.assertEquals("<html>Hello World</html>\n", html);
 
-		final String css = target.path("webjars/bootstrap/4.1.3/css/bootstrap.css")
+		final String css = target.path("webjars/bootstrap/4.3.1/css/bootstrap.css")
 				.request(MediaType.TEXT_HTML_TYPE)
 				.get(String.class);
 		Assert.assertTrue(css.contains("bootstrap"));
diff --git a/src/test/java/com/qwazr/webapps/test/ServletTest.java b/src/test/java/com/qwazr/webapps/test/ServletTest.java
@@ -92,7 +92,7 @@ public void testAnnotatedServlet2() throws IOException {
 	@Test
 	public void testWebjars() throws IOException {
 		try (final Response response = checkResponse(
-				target.path("webjars/bootstrap/4.1.3/css/bootstrap.css").request().get(), 200)) {
+				target.path("webjars/bootstrap/4.3.1/css/bootstrap.css").request().get(), 200)) {
 			final String content = checkEntity(response, MediaType.valueOf("text/css"));
 			checkContains(content, "bootstrap");
 		}

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public void testAnnotatedServlet2() throws IOException {`
`92`	`92`	`@Test`
`93`	`93`	`public void testWebjars() throws IOException {`
`94`	`94`	`try (final Response response = checkResponse(`
`95`		`- target.path("webjars/bootstrap/4.1.3/css/bootstrap.css").request().get(), 200)) {`
	`95`	`+ target.path("webjars/bootstrap/4.3.1/css/bootstrap.css").request().get(), 200)) {`
`96`	`96`	`final String content = checkEntity(response, MediaType.valueOf("text/css"));`
`97`	`97`	`checkContains(content, "bootstrap");`
`98`	`98`	`}`