prepare for 2.0.6 release

jknack · jknack · commit 9c68b137e5f4 · 2019-08-22T21:40:53.000-03:00
diff --git a/jooby/src/main/java/io/jooby/TraceHandler.java b/jooby/src/main/java/io/jooby/TraceHandler.java
@@ -13,7 +13,7 @@
 /**
  * The TRACE method performs a message loop-back test along the path to the target resource.
  *
- * @author
+ * @author edgar
  * @since 2.0.4
  */
 public class TraceHandler implements Route.Decorator {
diff --git a/modules/jooby-apt/pom.xml b/modules/jooby-apt/pom.xml
@@ -56,12 +56,6 @@
       <version>${jooby.version}</version>
     </dependency>
 
-    <!-- JAXRS -->
-    <dependency>
-      <groupId>jakarta.ws.rs</groupId>
-      <artifactId>jakarta.ws.rs-api</artifactId>
-    </dependency>
-
     <!-- Test dependencies -->
     <dependency>
       <groupId>org.junit.jupiter</groupId>
diff --git a/modules/jooby-bom/pom.xml b/modules/jooby-bom/pom.xml
@@ -16,7 +16,7 @@
   <!-- THIS FILE IS AUTO GENERATED. DON'T EDIT -->
 
   <properties>
-  <jooby.version>2.0.6-SNAPSHOT</jooby.version>
+  <jooby.version>2.0.6</jooby.version>
   <HikariCP.version>3.3.1</HikariCP.version>
   <apt-maven-plugin.version>1.1.3</apt-maven-plugin.version>
   <archetype-packaging.version>2.2</archetype-packaging.version>
@@ -36,15 +36,14 @@
   <duplicate-finder-maven-plugin.version>1.2.1</duplicate-finder-maven-plugin.version>
   <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
   <flyway.version>5.2.4</flyway.version>
-  <freemarker.version>2.3.28</freemarker.version>
+  <freemarker.version>2.3.29</freemarker.version>
   <gradle-core.version>2.6</gradle-core.version>
   <gradle-plugins.version>0.9-rc-1</gradle-plugins.version>
   <gradle-tooling-api.version>2.6</gradle-tooling-api.version>
   <guava.version>28.0-jre</guava.version>
   <guice.version>4.2.2</guice.version>
   <h2.version>1.4.199</h2.version>
   <handlebars.version>4.1.2</handlebars.version>
-  <pebble.version>3.0.10</pebble.version>
   <hibernate.version>5.4.3.Final</hibernate.version>
   <jackson-databind.version>2.9.9.2</jackson-databind.version>
   <jackson.version>2.9.9</jackson.version>
@@ -54,13 +53,13 @@
   <javax.inject.version>1</javax.inject.version>
   <jboss-modules.version>1.9.1.Final</jboss-modules.version>
   <jdbi.version>3.9.1</jdbi.version>
-  <jetty.version>9.4.19.v20190610</jetty.version>
+  <jetty.version>9.4.20.v20190813</jetty.version>
   <jfiglet.version>0.0.8</jfiglet.version>
-  <jooby-maven-plugin.version>2.0.6-SNAPSHOT</jooby-maven-plugin.version>
-  <jooby.version>2.0.6-SNAPSHOT</jooby.version>
+  <jooby-maven-plugin.version>2.0.6</jooby-maven-plugin.version>
+  <jooby.version>2.0.6</jooby.version>
   <jsr305.version>3.0.2</jsr305.version>
   <junit.version>5.5.1</junit.version>
-  <kotlin.version>1.3.41</kotlin.version>
+  <kotlin.version>1.3.50</kotlin.version>
   <kotlinx-coroutines-core.version>1.2.2</kotlinx-coroutines-core.version>
   <license-maven-plugin.version>3.0</license-maven-plugin.version>
   <log4j.version>2.12.1</log4j.version>
@@ -92,9 +91,10 @@
   <mockito.version>3.0.0</mockito.version>
   <mojo-executor.version>2.3.0</mojo-executor.version>
   <mysql-connector-java.version>8.0.17</mysql-connector-java.version>
-  <netty.version>4.1.38.Final</netty.version>
+  <netty.version>4.1.39.Final</netty.version>
   <nexus-staging-maven-plugin.version>1.6.5</nexus-staging-maven-plugin.version>
   <okhttp.version>4.1.0</okhttp.version>
+  <pebble.version>3.0.10</pebble.version>
   <plexus-utils.version>3.2.1</plexus-utils.version>
   <reactor.version>3.2.11.RELEASE</reactor.version>
   <rest-assured.version>4.0.0</rest-assured.version>
@@ -104,7 +104,8 @@
   <spring.version>5.1.9.RELEASE</spring.version>
   <stork-maven-plugin.version>2.7.0</stork-maven-plugin.version>
   <truth.version>1.0</truth.version>
-  <undertow.version>2.0.24.Final</undertow.version>
+  <unbescape.version>1.1.6.RELEASE</unbescape.version>
+  <undertow.version>2.0.25.Final</undertow.version>
   <versions-maven-plugin.version>2.1</versions-maven-plugin.version>
   <weld.version>3.1.2.Final</weld.version>
 </properties>
@@ -341,6 +342,11 @@
       <artifactId>commons-io</artifactId>
       <version>${commons-io.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.unbescape</groupId>
+      <artifactId>unbescape</artifactId>
+      <version>${unbescape.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-core</artifactId>
diff --git a/modules/jooby-cli/pom.xml b/modules/jooby-cli/pom.xml
@@ -80,7 +80,7 @@
             </path>
           </annotationProcessorPaths>
           <compilerArgs>
-            <arg>-Aproject=${groupId}/${artifactId}</arg>
+            <arg>-Aproject=${project.groupId}/${project.artifactId}</arg>
           </compilerArgs>
         </configuration>
       </plugin>
diff --git a/modules/jooby-cli/src/main/java/io/jooby/cli/Version.java b/modules/jooby-cli/src/main/java/io/jooby/cli/Version.java
@@ -48,7 +48,7 @@ private static String doVersion() {
       return Optional.ofNullable(Version.class.getPackage())
           .map(Package::getImplementationVersion)
           .filter(Objects::nonNull)
-          .orElse("2.0.5");
+          .orElse("2.0.6");
     }
   }
 }
diff --git a/modules/jooby-cli/src/main/resources/cli/build.gradle.hbs b/modules/jooby-cli/src/main/resources/cli/build.gradle.hbs
@@ -1,6 +1,6 @@
 buildscript {
   ext {
-    kotlinVersion = "1.3.41"
+    kotlinVersion = "1.3.50"
     joobyVersion = "{{joobyVersion}}"
   }
 
diff --git a/modules/jooby-cli/src/main/resources/cli/pom.xml.hbs b/modules/jooby-cli/src/main/resources/cli/pom.xml.hbs
@@ -18,7 +18,7 @@
     <jooby.version>{{joobyVersion}}</jooby.version>
 
     {{#if kotlin}}
-    <kotlin.version>1.3.41</kotlin.version>
+    <kotlin.version>1.3.50</kotlin.version>
     <kotlin.compiler.incremental>true</kotlin.compiler.incremental>
     {{/if}}
     <maven.compiler.source>1.8</maven.compiler.source>
diff --git a/modules/jooby-jetty/src/main/java/io/jooby/internal/jetty/JettyContext.java b/modules/jooby-jetty/src/main/java/io/jooby/internal/jetty/JettyContext.java
@@ -63,7 +63,7 @@
 
 import static org.eclipse.jetty.http.HttpHeader.CONTENT_TYPE;
 import static org.eclipse.jetty.http.HttpHeader.SET_COOKIE;
-import static org.eclipse.jetty.server.Request.__MULTIPART_CONFIG_ELEMENT;
+import static org.eclipse.jetty.server.Request.MULTIPART_CONFIG_ELEMENT;
 
 public class JettyContext implements Callback, DefaultContext {
   private final int bufferSize;
@@ -172,7 +172,7 @@ public JettyContext(Request request, Router router, int bufferSize, long maxRequ
       multipart = Multipart.create();
       form = multipart;
 
-      request.setAttribute(__MULTIPART_CONFIG_ELEMENT,
+      request.setAttribute(MULTIPART_CONFIG_ELEMENT,
           new MultipartConfigElement(router.getTmpdir().toString(), -1L, maxRequestSize,
               bufferSize));
 
diff --git a/pom.xml b/pom.xml
@@ -17,7 +17,7 @@
 
   <properties>
     <!-- Parser and Renderer -->
-    <freemarker.version>2.3.28</freemarker.version>
+    <freemarker.version>2.3.29</freemarker.version>
     <handlebars.version>4.1.2</handlebars.version>
     <pebble.version>3.0.10</pebble.version>
     <jackson.version>2.9.9</jackson.version>
@@ -55,9 +55,9 @@
     <asm.version>7.2-beta</asm.version>
 
     <!-- Server -->
-    <undertow.version>2.0.24.Final</undertow.version>
-    <jetty.version>9.4.19.v20190610</jetty.version>
-    <netty.version>4.1.38.Final</netty.version>
+    <undertow.version>2.0.25.Final</undertow.version>
+    <jetty.version>9.4.20.v20190813</jetty.version>
+    <netty.version>4.1.39.Final</netty.version>
 
     <!-- Reactive -->
     <rxjava.version>2.2.11</rxjava.version>
@@ -75,7 +75,7 @@
     <unbescape.version>1.1.6.RELEASE</unbescape.version>
 
     <!-- Kotlin -->
-    <kotlin.version>1.3.41</kotlin.version>
+    <kotlin.version>1.3.50</kotlin.version>
     <kotlinx-coroutines-core.version>1.2.2</kotlinx-coroutines-core.version>
 
     <!-- Test dependencies -->

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`/**`
`14`	`14`	`* The TRACE method performs a message loop-back test along the path to the target resource.`
`15`	`15`	`*`
`16`		`- * @author`
	`16`	`+ * @author edgar`
`17`	`17`	`* @since 2.0.4`
`18`	`18`	`*/`
`19`	`19`	`public class TraceHandler implements Route.Decorator {`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ private static String doVersion() {`
`48`	`48`	`return Optional.ofNullable(Version.class.getPackage())`
`49`	`49`	`.map(Package::getImplementationVersion)`
`50`	`50`	`.filter(Objects::nonNull)`
`51`		`- .orElse("2.0.5");`
	`51`	`+ .orElse("2.0.6");`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`buildscript {`
`2`	`2`	`ext {`
`3`		`- kotlinVersion = "1.3.41"`
	`3`	`+ kotlinVersion = "1.3.50"`
`4`	`4`	`joobyVersion = "{{joobyVersion}}"`
`5`	`5`	`}`
`6`	`6`