Merge branch 'akshaykumar3-master'

ramkumarar · Jul 14, 2017 · 48ce3ae · 48ce3ae
2 parents 65f2dce + 352d995
commit 48ce3ae
Show file tree

Hide file tree

Showing 170 changed files with 1,247 additions and 362 deletions.
diff --git a/amqp-bridge-examples/pom.xml b/amqp-bridge-examples/pom.xml
@@ -6,7 +6,7 @@
 
   <groupId>io.vertx</groupId>
   <artifactId>amqp-bridge-examples</artifactId>
-  <version>3.4.1</version>
+  <version>3.4.2</version>
 
   <dependencies>
     <!-- primary deps -->
@@ -59,7 +59,7 @@
       <repositories>
         <repository>
           <id>staging</id>
-          <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+          <url>https://oss.sonatype.org/content/repositories/iovertx-3684/</url>
         </repository>
       </repositories>
     </profile>

diff --git a/camel-bridge-examples/README.adoc b/camel-bridge-examples/README.adoc
@@ -25,7 +25,7 @@ Launch it by running the `main` method in your IDE or, after having build the pr
 
 
 ----
-java -jar target/camel-bridge-examples-3.4.1.jar run io.vertx.example.camel.feed.FeedExample
+java -jar target/camel-bridge-examples-3.4.2.jar run io.vertx.example.camel.feed.FeedExample
 ----
 
 == RMI example
@@ -45,7 +45,7 @@ This example demonstrates:
 Launch it by running the `main` method in your IDE , after having build the project with `mvn clean package`, with:
 
 ----
-java -jar target/camel-bridge-examples-3.4.1.jar run io.vertx.example.camel.rmi.RMIExample
+java -jar target/camel-bridge-examples-3.4.2.jar run io.vertx.example.camel.rmi.RMIExample
 ----
 
 Then open your browser to: `http://localhost:8080/?name=world`
diff --git a/camel-bridge-examples/pom.xml b/camel-bridge-examples/pom.xml
@@ -6,7 +6,7 @@
 
   <groupId>io.vertx</groupId>
   <artifactId>camel-bridge-examples</artifactId>
-  <version>3.4.1</version>
+  <version>3.4.2</version>
 
   <dependencies>
     <dependency>
@@ -101,7 +101,7 @@
       <repositories>
         <repository>
           <id>staging</id>
-          <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+          <url>https://oss.sonatype.org/content/repositories/iovertx-3684/</url>
         </repository>
       </repositories>
     </profile>

diff --git a/circuit-breaker-examples/pom.xml b/circuit-breaker-examples/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>io.vertx</groupId>
 	<artifactId>circuit-breaker-examples</artifactId>
-	<version>3.4.1</version>
+	<version>3.4.2</version>
 
 	<build>
 		<plugins>
@@ -52,7 +52,7 @@
 			<repositories>
 				<repository>
 					<id>staging</id>
-					<url>https://oss.sonatype.org/content/repositories/snapshots</url>
+					<url>https://oss.sonatype.org/content/repositories/iovertx-3684/</url>
 				</repository>
 			</repositories>
 		</profile>

diff --git a/consul-examples/pom.xml b/consul-examples/pom.xml
@@ -6,7 +6,7 @@
 
   <groupId>io.vertx</groupId>
   <artifactId>consul-examples</artifactId>
-  <version>3.4.1</version>
+  <version>3.4.2</version>
 
   <dependencies>
     <dependency>
@@ -51,7 +51,7 @@
       <repositories>
         <repository>
           <id>staging</id>
-          <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+          <url>https://oss.sonatype.org/content/repositories/iovertx-3684/</url>
         </repository>
       </repositories>
     </profile>

diff --git a/core-examples/pom.xml b/core-examples/pom.xml
@@ -6,7 +6,7 @@
 
   <groupId>io.vertx</groupId>
   <artifactId>core-examples</artifactId>
-  <version>3.4.1</version>
+  <version>3.4.2</version>
 
   <dependencies>
 
@@ -64,7 +64,7 @@
       <repositories>
         <repository>
           <id>staging</id>
-          <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+          <url>https://oss.sonatype.org/content/repositories/iovertx-3684/</url>
         </repository>
       </repositories>
     </profile>

diff --git a/core-examples/src/main/js/io/vertx/example/core/http2/h2c/server.js b/core-examples/src/main/js/io/vertx/example/core/http2/h2c/server.js
@@ -3,5 +3,5 @@ var server = vertx.createHttpServer({
 });
 
 server.requestHandler(function (req) {
-  req.response().putHeader("content-type", "text/html").end("<html><body>" + "<h1>Hello from vert.x!</h1>" + "<p>version = " + req.version() + "</p>" + "</body></html>");
+  req.response().putHeader("content-type", "text/html").end("<html><body><h1>Hello from vert.x!</h1><p>version = " + req.version() + "</p></body></html>");
 }).listen(8080);
diff --git a/core-examples/src/main/js/io/vertx/example/core/http2/simple/server.js b/core-examples/src/main/js/io/vertx/example/core/http2/simple/server.js
@@ -9,5 +9,5 @@ var server = vertx.createHttpServer({
 });
 
 server.requestHandler(function (req) {
-  req.response().putHeader("content-type", "text/html").end("<html><body>" + "<h1>Hello from vert.x!</h1>" + "<p>version = " + req.version() + "</p>" + "</body></html>");
+  req.response().putHeader("content-type", "text/html").end("<html><body><h1>Hello from vert.x!</h1><p>version = " + req.version() + "</p></body></html>");
 }).listen(8443);
diff --git a/docker-examples/vertx-docker-example-fabric8/pom.xml b/docker-examples/vertx-docker-example-fabric8/pom.xml
@@ -6,7 +6,7 @@
 
   <groupId>io.vertx</groupId>
   <artifactId>vertx-docker-example-fabric</artifactId>
-  <version>3.4.1</version>
+  <version>3.4.2</version>
 
   <name>Sample Docker Image for Fabric8</name>
 
@@ -109,7 +109,7 @@
       <repositories>
         <repository>
           <id>staging</id>
-          <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+          <url>https://oss.sonatype.org/content/repositories/iovertx-3684/</url>
         </repository>
       </repositories>
     </profile>

diff --git a/docker-examples/vertx-docker-example/pom.xml b/docker-examples/vertx-docker-example/pom.xml
@@ -6,7 +6,7 @@
 
   <groupId>io.vertx</groupId>
   <artifactId>vertx-docker-example</artifactId>
-  <version>3.4.1</version>
+  <version>3.4.2</version>
 
   <name>Sample Docker Image with Maven</name>
 
@@ -78,7 +78,7 @@
       <repositories>
         <repository>
           <id>staging</id>
-          <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+          <url>https://oss.sonatype.org/content/repositories/iovertx-3684/</url>
         </repository>
       </repositories>
     </profile>

diff --git a/docker-examples/vertx-docker-java-fatjar/Dockerfile b/docker-examples/vertx-docker-java-fatjar/Dockerfile
@@ -8,7 +8,7 @@
 
 FROM java:8-jre
 
-ENV VERTICLE_FILE hello-verticle-fatjar-3.4.1-fat.jar
+ENV VERTICLE_FILE hello-verticle-fatjar-3.4.2-fat.jar
 
 # Set the location of the verticles
 ENV VERTICLE_HOME /usr/verticles

diff --git a/docker-examples/vertx-docker-java-fatjar/pom.xml b/docker-examples/vertx-docker-java-fatjar/pom.xml
@@ -6,7 +6,7 @@
 
   <groupId>io.vertx</groupId>
   <artifactId>hello-verticle-fatjar</artifactId>
-  <version>3.4.1</version>
+  <version>3.4.2</version>
 
   <name>Sample Docker Image for Java - FatJar</name>
 
@@ -73,7 +73,7 @@
       <repositories>
         <repository>
           <id>staging</id>
-          <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+          <url>https://oss.sonatype.org/content/repositories/iovertx-3684/</url>
         </repository>
       </repositories>
     </profile>

diff --git a/docker-examples/vertx-docker-java/Dockerfile b/docker-examples/vertx-docker-java/Dockerfile
@@ -10,7 +10,7 @@
 FROM vertx/vertx3
 
 ENV VERTICLE_NAME io.vertx.sample.hello.HelloVerticle
-ENV VERTICLE_FILE target/hello-verticle-3.4.1.jar
+ENV VERTICLE_FILE target/hello-verticle-3.4.2.jar
 
 # Set the location of the verticles
 ENV VERTICLE_HOME /usr/verticles

diff --git a/docker-examples/vertx-docker-java/pom.xml b/docker-examples/vertx-docker-java/pom.xml
@@ -6,7 +6,7 @@
 
   <groupId>io.vertx</groupId>
   <artifactId>hello-verticle</artifactId>
-  <version>3.4.1</version>
+  <version>3.4.2</version>
 
   <name>Sample Docker Image for Java</name>
 
@@ -38,7 +38,7 @@
       <repositories>
         <repository>
           <id>staging</id>
-          <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+          <url>https://oss.sonatype.org/content/repositories/iovertx-3684/</url>
         </repository>
       </repositories>
     </profile>

diff --git a/examples-utils/pom.xml b/examples-utils/pom.xml
@@ -6,7 +6,7 @@
 
   <groupId>io.vertx</groupId>
   <artifactId>examples-utils</artifactId>
-  <version>3.4.1</version>
+  <version>3.4.2</version>
 
   <properties>
     <tools.jar>${java.home}/../lib/tools.jar</tools.jar>
@@ -72,7 +72,7 @@
       <repositories>
         <repository>
           <id>staging</id>
-          <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+          <url>https://oss.sonatype.org/content/repositories/iovertx-3684/</url>
         </repository>
       </repositories>
     </profile>

diff --git a/fatjar-examples/README.adoc b/fatjar-examples/README.adoc
@@ -14,7 +14,7 @@ To build with Maven
 
 To run the fat jar:
 
-    java -jar target/http2-fatjar-3.4.1.jar
+    java -jar target/http2-fatjar-3.4.2.jar
 
 The build.gradle uses the Gradle shadowJar plugin to assemble the application and all it's dependencies into a single "fat" jar.
 
@@ -24,7 +24,7 @@ To build with Gradle
 
 To run the fat jar:
 
-    java -jar build/libs/http2-fatjar-3.4.1-all.jar
+    java -jar build/libs/http2-fatjar-3.4.2-all.jar
 
 NOTE: embedding the key in the jar is a discouraged practice - it is done purposely to keep the example simple
 
@@ -40,7 +40,7 @@ To build with Maven
 
 To run the fat jar:
 
-    java -jar target/ruby-fatjar-3.4.1.jar.jar
+    java -jar target/ruby-fatjar-3.4.2.jar.jar
 
 The build.gradle uses the Gradle shadowJar plugin to assemble the application and all it's dependencies into a single "fat" jar.
 
@@ -50,4 +50,4 @@ To build with Gradle
 
 To run the fat jar:
 
-    java -jar build/libs/ruby-fatjar-3.4.1-all.jar
+    java -jar build/libs/ruby-fatjar-3.4.2-all.jar
diff --git a/fatjar-examples/http2-fatjar/build.gradle b/fatjar-examples/http2-fatjar/build.gradle
@@ -7,11 +7,11 @@ plugins {
 repositories {
   jcenter()
 //  maven {
-//    url "https://oss.sonatype.org/content/repositories/snapshots"
+//    url "https://oss.sonatype.org/content/repositories/iovertx-3684/"
 //  }
 }
 
-version = '3.4.1'
+version = '3.4.2'
 sourceCompatibility = '1.8'
 
 dependencies {
@@ -31,5 +31,5 @@ shadowJar {
 }
 
 task wrapper(type: Wrapper) {
-  gradleVersion = '3.4.1'
+  gradleVersion = '4.0'
 }
diff --git a/fatjar-examples/http2-fatjar/pom.xml b/fatjar-examples/http2-fatjar/pom.xml
@@ -22,7 +22,7 @@
 
   <groupId>io.vertx</groupId>
   <artifactId>http2-fatjar</artifactId>
-  <version>3.4.1</version>
+  <version>3.4.2</version>
 
   <name>HTTP/2 fatjar</name>
 
@@ -97,7 +97,7 @@
       <repositories>
         <repository>
           <id>staging</id>
-          <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+          <url>https://oss.sonatype.org/content/repositories/iovertx-3684/</url>
         </repository>
       </repositories>
     </profile>

diff --git a/fatjar-examples/ruby-fatjar/build.gradle b/fatjar-examples/ruby-fatjar/build.gradle
@@ -7,11 +7,11 @@ plugins {
 repositories {
   jcenter()
 //  maven {
-//    url "https://oss.sonatype.org/content/repositories/snapshots"
+//    url "https://oss.sonatype.org/content/repositories/iovertx-3684/"
 //  }
 }
 
-version = '3.4.1'
+version = '3.4.2'
 sourceCompatibility = '1.8'
 
 dependencies {
@@ -31,5 +31,5 @@ shadowJar {
 }
 
 task wrapper(type: Wrapper) {
-  gradleVersion = '3.4.1'
+  gradleVersion = '4.0'
 }
diff --git a/fatjar-examples/ruby-fatjar/pom.xml b/fatjar-examples/ruby-fatjar/pom.xml
@@ -22,7 +22,7 @@
 
   <groupId>io.vertx</groupId>
   <artifactId>ruby-fatjar</artifactId>
-  <version>3.4.1</version>
+  <version>3.4.2</version>
 
   <name>Ruby fatjar</name>
 
@@ -83,7 +83,7 @@
       <repositories>
         <repository>
           <id>staging</id>
-          <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+          <url>https://oss.sonatype.org/content/repositories/iovertx-3684/</url>
         </repository>
       </repositories>
     </profile>

diff --git a/gradle-redeploy/build.gradle b/gradle-redeploy/build.gradle
@@ -7,11 +7,11 @@ plugins {
 repositories {
   jcenter()
   maven {
-    url "https://oss.sonatype.org/content/repositories/snapshots"
+    url "https://oss.sonatype.org/content/repositories/iovertx-3684/"
   }
 }
 
-version = '3.4.1'
+version = '3.4.2'
 sourceCompatibility = '1.8'
 
 dependencies {

diff --git a/gradle-simplest/README.adoc b/gradle-simplest/README.adoc
@@ -20,7 +20,7 @@ Because the application plugin is being used, you may directly run the applicati
 
 You may also run the fat jar as a standalone runnable jar:
 
-    java -jar build/libs/gradle-simplest-3.4.1-fat.jar
+    java -jar build/libs/gradle-simplest-3.4.2-fat.jar
 
 (You can take that jar and run it anywhere there is a Java 8+ JDK. It contains all the dependencies it needs so you
 don't need to install Vert.x on the target machine).

diff --git a/gradle-simplest/build.gradle b/gradle-simplest/build.gradle
@@ -7,11 +7,11 @@ plugins {
 repositories {
   jcenter()
   maven {
-    url "https://oss.sonatype.org/content/repositories/snapshots"
+    url "https://oss.sonatype.org/content/repositories/iovertx-3684/"
   }
 }
 
-version = '3.4.1'
+version = '3.4.2'
 sourceCompatibility = '1.8'
 
 dependencies {
@@ -28,5 +28,5 @@ shadowJar {
 }
 
 task wrapper(type: Wrapper) {
-  gradleVersion = '3.4.1'
+  gradleVersion = '4.0'
 }
diff --git a/gradle-simplest/gradle/wrapper/gradle-wrapper.jar b/gradle-simplest/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle-simplest/gradle/wrapper/gradle-wrapper.properties b/gradle-simplest/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Mar 05 16:06:08 CET 2017
+#Sun Jun 18 18:59:44 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-bin.zip