Update to 3.2.0

And update API
ramkumarar · Nov 26, 2015 · e954398 · e954398
1 parent 78514e9
commit e954398
Show file tree

Hide file tree

Showing 102 changed files with 194 additions and 186 deletions.
diff --git a/Procfile b/Procfile
@@ -1 +1 @@
-web: java $JAVA_OPTS -Dhttp.port=$PORT -jar heroku-example/target/heroku-example-3.1.0-fat.jar
+web: java $JAVA_OPTS -Dhttp.port=$PORT -jar heroku-example/target/heroku-example-3.2.0-SNAPSHOT-fat.jar
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.1.0</version>
+  <version>3.2.0-SNAPSHOT</version>
 
   <dependencies>
 

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.1.0</version>
+  <version>3.2.0-SNAPSHOT</version>
 
   <name>Sample Docker Image for Fabric8</name>
 

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.1.0</version>
+  <version>3.2.0-SNAPSHOT</version>
 
   <name>Sample Docker Image with Maven</name>
 

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
 
-ENV VERTICLE_FILE hello-verticle-fatjar-3.1.0-fat.jar
+ENV VERTICLE_FILE hello-verticle-fatjar-3.2.0-SNAPSHOT-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.1.0</version>
+  <version>3.2.0-SNAPSHOT</version>
 
   <name>Sample Docker Image for Java - FatJar</name>
 

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.1.0.jar
+ENV VERTICLE_FILE target/hello-verticle-3.2.0-SNAPSHOT.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.1.0</version>
+  <version>3.2.0-SNAPSHOT</version>
 
   <name>Sample Docker Image for Java</name>
 

diff --git a/examples-utils/pom.xml b/examples-utils/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>vertx-examples</artifactId>
     <groupId>io.vertx</groupId>
-    <version>3.1.0</version>
+    <version>3.2.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

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.1.0-fat.jar
+    java -jar build/libs/gradle-simplest-3.2.0-SNAPSHOT-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
@@ -11,7 +11,7 @@ repositories {
   }
 }
 
-version = '3.1.0'
+version = '3.2.0-SNAPSHOT'
 sourceCompatibility = '1.8'
 
 dependencies {

diff --git a/gradle-verticles/gradle-verticle-groovy-compiled/README.adoc b/gradle-verticles/gradle-verticle-groovy-compiled/README.adoc
@@ -11,7 +11,7 @@ To build the "fat jar"
 
 To run the fat jar:
 
-    java -jar build/libs/gradle-verticle-groovy-compiled-3.1.0-fat.jar
+    java -jar build/libs/gradle-verticle-groovy-compiled-3.2.0-SNAPSHOT-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-verticles/gradle-verticle-groovy-compiled/build.gradle b/gradle-verticles/gradle-verticle-groovy-compiled/build.gradle
@@ -13,7 +13,7 @@ repositories {
 }
 
 
-version = '3.1.0'
+version = '3.2.0-SNAPSHOT'
 
 sourceCompatibility = '1.8'
 mainClassName = 'io.vertx.core.Launcher'

diff --git a/gradle-verticles/gradle-verticle-groovy/README.adoc b/gradle-verticles/gradle-verticle-groovy/README.adoc
@@ -11,7 +11,7 @@ To build the "fat jar"
 
 To run the fat jar:
 
-    java -jar build/libs/gradle-verticle-groovy-3.1.0-fat.jar
+    java -jar build/libs/gradle-verticle-groovy-3.2.0-SNAPSHOT-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-verticles/gradle-verticle-groovy/build.gradle b/gradle-verticles/gradle-verticle-groovy/build.gradle
@@ -12,7 +12,7 @@ repositories {
 }
 
 
-version = '3.1.0'
+version = '3.2.0-SNAPSHOT'
 
 sourceCompatibility = '1.8'
 mainClassName = 'io.vertx.core.Launcher'

diff --git a/gradle-verticles/gradle-verticle-js/README.adoc b/gradle-verticles/gradle-verticle-js/README.adoc
@@ -11,7 +11,7 @@ To build the "fat jar"
 
 To run the fat jar:
 
-    java -jar build/libs/gradle-verticle-js-3.1.0-fat.jar
+    java -jar build/libs/gradle-verticle-js-3.2.0-SNAPSHOT-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-verticles/gradle-verticle-js/build.gradle b/gradle-verticles/gradle-verticle-js/build.gradle
@@ -13,7 +13,7 @@ repositories {
 
 sourceCompatibility = '1.8'
 mainClassName = 'io.vertx.core.Launcher'
-version = '3.1.0'
+version = '3.2.0-SNAPSHOT'
 
 repositories {
     mavenCentral()

diff --git a/gradle-verticles/gradle-verticle-rb/README.adoc b/gradle-verticles/gradle-verticle-rb/README.adoc
@@ -11,7 +11,7 @@ To build the "fat jar"
 
 To run the fat jar:
 
-    java -jar build/libs/gradle-verticle-rb-3.1.0-fat.jar
+    java -jar build/libs/gradle-verticle-rb-3.2.0-SNAPSHOT-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-verticles/gradle-verticle-rb/build.gradle b/gradle-verticles/gradle-verticle-rb/build.gradle
@@ -12,7 +12,7 @@ repositories {
 }
 sourceCompatibility = '1.8'
 mainClassName = 'io.vertx.core.Launcher'
-version = '3.1.0'
+version = '3.2.0-SNAPSHOT'
 
 dependencies {
     compile "io.vertx:vertx-core:$version"

diff --git a/gradle-verticles/gradle-verticle/README.adoc b/gradle-verticles/gradle-verticle/README.adoc
@@ -14,7 +14,7 @@ To build the "fat jar"
 
 To run the fat jar:
 
-    java -jar build/libs/gradle-verticle-3.1.0-fat.jar
+    java -jar build/libs/gradle-verticle-3.2.0-SNAPSHOT-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).
@@ -24,13 +24,13 @@ Now point your browser at http://localhost:8080
 Writing code in verticles allow you to scale it more easily, e.g. let's say you have 8 cores on your server and you
 want to utilise them all, you can deploy 8 instances as follows:
 
-java -jar build/libs/gradle-verticle-3.1.0-fat.jar -instances 8
+java -jar build/libs/gradle-verticle-3.2.0-SNAPSHOT-fat.jar -instances 8
 
 You can also enable clustering and ha at the command line, e.g.
 
-java -jar build/libs/gradle-verticle-3.1.0-fat.jar -cluster
+java -jar build/libs/gradle-verticle-3.2.0-SNAPSHOT-fat.jar -cluster
 
-java -jar build/libs/gradle-verticle-3.1.0-fat.jar -ha
+java -jar build/libs/gradle-verticle-3.2.0-SNAPSHOT-fat.jar -ha
 
 Please see the docs for a full list of Vert.x command line options.
 
diff --git a/gradle-verticles/gradle-verticle/build.gradle b/gradle-verticles/gradle-verticle/build.gradle
@@ -11,7 +11,7 @@ repositories {
     }
 }
 
-version = '3.1.0'
+version = '3.2.0-SNAPSHOT'
 sourceCompatibility = '1.8'
 mainClassName = 'io.vertx.core.Launcher'
 

diff --git a/heroku-example/pom.xml b/heroku-example/pom.xml
@@ -6,7 +6,7 @@
 
   <groupId>io.vertx</groupId>
   <artifactId>heroku-example</artifactId>
-  <version>3.1.0</version>
+  <version>3.2.0-SNAPSHOT</version>
 
   <properties>
     <!-- the main verticle -->
@@ -77,7 +77,7 @@
         <version>0.5.6</version>
         <configuration>
           <processTypes>
-            <web>java $JAVA_OPTS -Dhttp.port=$PORT -jar target/heroku-example-3.1.0-fat.jar</web>
+            <web>java $JAVA_OPTS -Dhttp.port=$PORT -jar target/heroku-example-3.2.0-SNAPSHOT-fat.jar</web>
           </processTypes>
         </configuration>
       </plugin>

diff --git a/jca-examples/ear/pom.xml b/jca-examples/ear/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>io.vertx</groupId>
     <artifactId>vertx-jca-examples</artifactId>
-    <version>3.1.0</version>
+    <version>3.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>vertx-jca-examples-app</artifactId>

diff --git a/jca-examples/ejb/pom.xml b/jca-examples/ejb/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>io.vertx</groupId>
     <artifactId>vertx-jca-examples</artifactId>
-    <version>3.1.0</version>
+    <version>3.2.0-SNAPSHOT</version>
   </parent>
 
   <properties>

diff --git a/jca-examples/pom.xml b/jca-examples/pom.xml
@@ -6,7 +6,7 @@
 
   <groupId>io.vertx</groupId>
   <artifactId>vertx-jca-examples</artifactId>
-  <version>3.1.0</version>
+  <version>3.2.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Vert.x JCA Examples</name>

diff --git a/jca-examples/war/pom.xml b/jca-examples/war/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.vertx</groupId>
     <artifactId>vertx-jca-examples</artifactId>
-    <version>3.1.0</version>
+    <version>3.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>vertx-jca-examples-web</artifactId>

diff --git a/jdbc-examples/pom.xml b/jdbc-examples/pom.xml
@@ -6,7 +6,7 @@
 
   <groupId>io.vertx</groupId>
   <artifactId>jdbc-examples</artifactId>
-  <version>3.1.0</version>
+  <version>3.2.0-SNAPSHOT</version>
 
   <dependencies>
     <dependency>

diff --git a/mail-examples/pom.xml b/mail-examples/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>io.vertx</groupId>
   <artifactId>mail-examples</artifactId>
-  <version>3.1.0</version>
+  <version>3.2.0-SNAPSHOT</version>
 
   <dependencies>
     <dependency>

diff --git a/mail-examples/src/main/groovy/io/vertx/example/mail/mail_headers.groovy b/mail-examples/src/main/groovy/io/vertx/example/mail/mail_headers.groovy
@@ -15,7 +15,7 @@ def email = [
 
 def headers = MultiMap.caseInsensitiveMultiMap()
 
-headers.add("X-Mailer", "Vert.x Mail-Client 3.0")
+headers.add("X-Mailer", "Vert.x Mail-Client 3.1")
 headers.add("Message-ID", "[email protected]")
 headers.add("Reply-To", "[email protected]")
 headers.add("Received", "by vertx mail service")

diff --git a/mail-examples/src/main/js/io/vertx/example/mail/mail_headers.js b/mail-examples/src/main/js/io/vertx/example/mail/mail_headers.js
@@ -15,7 +15,7 @@ var email = {
 
 var headers = MultiMap.caseInsensitiveMultiMap();
 
-headers.add("X-Mailer", "Vert.x Mail-Client 3.0");
+headers.add("X-Mailer", "Vert.x Mail-Client 3.1");
 headers.add("Message-ID", "[email protected]");
 headers.add("Reply-To", "[email protected]");
 headers.add("Received", "by vertx mail service");

diff --git a/mail-examples/src/main/rb/io/vertx/example/mail/mail_headers.rb b/mail-examples/src/main/rb/io/vertx/example/mail/mail_headers.rb
@@ -15,7 +15,7 @@
 
 headers = Vertx::MultiMap.case_insensitive_multi_map()
 
-headers.add("X-Mailer", "Vert.x Mail-Client 3.0")
+headers.add("X-Mailer", "Vert.x Mail-Client 3.1")
 headers.add("Message-ID", "[email protected]")
 headers.add("Reply-To", "[email protected]")
 headers.add("Received", "by vertx mail service")

diff --git a/maven-service-factory-examples/README.adoc b/maven-service-factory-examples/README.adoc
@@ -18,7 +18,7 @@ You can run the verticle from anywhere using:
 
 [source]
 ----
-vertx run maven:io.vertx:maven-service-factory-verticle:3.1.0::my-verticle
+vertx run maven:io.vertx:maven-service-factory-verticle:3.2.0-SNAPSHOT::my-verticle
 ----
 
 The identifier is constructed as follows:
@@ -34,13 +34,13 @@ link:maven-service-factory-api/src/main/java/io/vertx/examples/MyDeployingVertic
 verticle is deployed using:
 
 ----
-vertx.deployVerticle("maven:io.vertx:maven-service-factory-verticle:3.1.0::my-verticle", r -> { ... });
+vertx.deployVerticle("maven:io.vertx:maven-service-factory-verticle:3.2.0-SNAPSHOT::my-verticle", r -> { ... });
 ----
 
 To run this project just launch:
 
 ----
 cd maven-service-factory-api
 mvn clean package
-vertx run io.vertx.examples.MyDeployingVerticle -cp target/maven-service-factory-api-3.1.0.jar
+vertx run io.vertx.examples.MyDeployingVerticle -cp target/maven-service-factory-api-3.2.0-SNAPSHOT.jar
 ----
diff --git a/maven-service-factory-examples/maven-service-factory-api/pom.xml b/maven-service-factory-examples/maven-service-factory-api/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>io.vertx</groupId>
     <artifactId>maven-service-factory-examples</artifactId>
-    <version>3.1.0</version>
+    <version>3.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-service-factory-api</artifactId>

diff --git a/...amples/maven-service-factory-api/src/main/java/io/vertx/examples/MyDeployingVerticle.java b/...amples/maven-service-factory-api/src/main/java/io/vertx/examples/MyDeployingVerticle.java
@@ -13,7 +13,7 @@ public class MyDeployingVerticle extends AbstractVerticle {
   public void start(Future<Void> future) throws Exception {
     // The `my-verticle` is deployed using the following convention:
     // `maven:` + groupId + `:` + artifactId + `:` + version + `::` + verticle name
-    vertx.deployVerticle("maven:io.vertx:maven-service-factory-verticle:3.1.0::my-verticle",
+    vertx.deployVerticle("maven:io.vertx:maven-service-factory-verticle:3.2.0-SNAPSHOT::my-verticle",
         ar -> {
           if (ar.succeeded()) {
             future.complete();

diff --git a/maven-service-factory-examples/maven-service-factory-verticle/pom.xml b/maven-service-factory-examples/maven-service-factory-verticle/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>io.vertx</groupId>
     <artifactId>maven-service-factory-examples</artifactId>
-    <version>3.1.0</version>
+    <version>3.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-service-factory-verticle</artifactId>

diff --git a/maven-service-factory-examples/pom.xml b/maven-service-factory-examples/pom.xml
@@ -6,7 +6,7 @@
 
   <groupId>io.vertx</groupId>
   <artifactId>maven-service-factory-examples</artifactId>
-  <version>3.1.0</version>
+  <version>3.2.0-SNAPSHOT</version>
 
   <packaging>pom</packaging>
 

diff --git a/maven-simplest/README.adoc b/maven-simplest/README.adoc
@@ -20,7 +20,7 @@ To build a "fat jar"
 
 To run the fat jar:
 
-    java -jar target/maven-simplest-3.1.0-fat.jar
+    java -jar target/maven-simplest-3.2.0-SNAPSHOT-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/maven-simplest/pom.xml b/maven-simplest/pom.xml
@@ -7,7 +7,7 @@
 
   <groupId>io.vertx</groupId>
   <artifactId>maven-simplest</artifactId>
-  <version>3.1.0</version>
+  <version>3.2.0-SNAPSHOT</version>
 
   <properties>
     <!-- the main class -->

diff --git a/maven-verticles/maven-verticle-groovy-compiled/README.adoc b/maven-verticles/maven-verticle-groovy-compiled/README.adoc
@@ -12,7 +12,7 @@ To build a "fat jar"
 
 To run the fat jar:
 
-    java -jar target/maven-verticle-compiled-groovy-3.1.0-fat.jar
+    java -jar target/maven-verticle-compiled-groovy-3.2.0-SNAPSHOT-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/maven-verticles/maven-verticle-groovy-compiled/pom.xml b/maven-verticles/maven-verticle-groovy-compiled/pom.xml
@@ -7,7 +7,7 @@
 
   <groupId>io.vertx</groupId>
   <artifactId>maven-verticle-compiled-groovy</artifactId>
-  <version>3.1.0</version>
+  <version>3.2.0-SNAPSHOT</version>
 
   <properties>
     <!-- the Groovy class, must be prefixed by `groovy:` to use the Groovy Vert.x support -->
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		web: java $JAVA_OPTS -Dhttp.port=$PORT -jar heroku-example/target/heroku-example-3.1.0-fat.jar
		web: java $JAVA_OPTS -Dhttp.port=$PORT -jar heroku-example/target/heroku-example-3.2.0-SNAPSHOT-fat.jar