Skip to content

Commit

Permalink
Merge pull request #281 from tsegismont/vertx4-first
Browse files Browse the repository at this point in the history 
Migrate all tests and docs to Vert.x 4
  • Loading branch information
@tsegismont
tsegismont authored Mar 15, 2021
2 parents a508c74 + 0c332a8 commit 991a5b8
Show file tree
Hide file tree
Showing 130 changed files with 155 additions and 172 deletions.
2 changes: 1 addition & 1 deletion samples/custom-launcher-example/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<vertx.version>4.0.2</vertx.version>
<vertx.version>4.0.3</vertx.version>
<vertx.launcher>org.vertx.demo.MyLauncher</vertx.launcher>
<vertx.verticle>org.vertx.demo.MainVerticle</vertx.verticle>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion samples/custom-main-example/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<vertx.version>4.0.2</vertx.version>
<vertx.version>4.0.3</vertx.version>
<vertx.launcher>org.vertx.demo.MyMain</vertx.launcher>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion samples/frontend-example/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<packaging>jar</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<vertx.version>4.0.2</vertx.version>
<vertx.version>4.0.3</vertx.version>
<vertx.verticle>io.vertx.demo.MyVerticle</vertx.verticle>
<node_modules.path>${project.build.directory}/node_modules</node_modules.path>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion samples/java-redeploy-example/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<vertx.version>4.0.2</vertx.version>
<vertx.version>4.0.3</vertx.version>
<vertx.verticle>org.vertx.demo.MainVerticle</vertx.verticle>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion samples/kotlin-example/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<kotlin.version>1.2.60</kotlin.version>
<kotlin.compiler.incremental>true</kotlin.compiler.incremental>
<kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
<vertx.version>4.0.2</vertx.version>
<vertx.version>4.0.3</vertx.version>
<vertx.verticle>org.vertx.demo.MyKotlinVerticle</vertx.verticle>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion src/it/help-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<vertx.version>3.4.2</vertx.version>
<vertx.version>4.0.3</vertx.version>
<vertx.verticle>org.vertx.demo.MainVerticle</vertx.verticle>
</properties>
<build>
Expand Down
2 changes: 1 addition & 1 deletion src/it/package-archive-all-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<vertx.version>3.4.2</vertx.version>
<vertx.version>4.0.3</vertx.version>
<vertx.verticle>org.vertx.demo.MainVerticle</vertx.verticle>
</properties>
<build>
Expand Down
1 change: 0 additions & 1 deletion src/it/package-archive-all-it/verify.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,3 @@ Verify.verifyNotContain(primaryArtifactFile, "Log4j-config.dtd")
Verify.verifyNotContain(primaryArtifactFile, "Log4j-events.dtd")

Verify.verifyContains(primaryArtifactFile,"META-INF/services/com.fasterxml.jackson.core.JsonFactory")
Verify.verifyContains(primaryArtifactFile,"META-INF/services/io.vertx.core.spi.FutureFactory")
2 changes: 1 addition & 1 deletion src/it/package-archive-combination-it/package-spi-deps-order-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<vertx.version>3.3.0</vertx.version>
<vertx.version>4.0.3</vertx.version>
<vertx.verticle>org.vertx.demo.MainVerticle</vertx.verticle>
</properties>
<build>
Expand Down
2 changes: 1 addition & 1 deletion src/it/package-archive-combination-it/package-spi-deps-order2-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<vertx.version>3.3.0</vertx.version>
<vertx.version>4.0.3</vertx.version>
<vertx.verticle>org.vertx.demo.MainVerticle</vertx.verticle>
</properties>
<build>
Expand Down
2 changes: 1 addition & 1 deletion src/it/package-archive-dependencies-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<vertx.version>3.4.2</vertx.version>
<vertx.version>4.0.3</vertx.version>
<vertx.verticle>org.vertx.demo.MainVerticle</vertx.verticle>
</properties>
<build>
Expand Down
2 changes: 1 addition & 1 deletion src/it/package-archive-file-inclusion-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<vertx.version>3.4.2</vertx.version>
<vertx.version>4.0.3</vertx.version>
<vertx.verticle>org.vertx.demo.MainVerticle</vertx.verticle>
</properties>
<build>
Expand Down
2 changes: 1 addition & 1 deletion src/it/package-archive-fileset-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<vertx.version>3.4.2</vertx.version>
<vertx.version>4.0.3</vertx.version>
<vertx.verticle>org.vertx.demo.MainVerticle</vertx.verticle>
</properties>
<build>
Expand Down
2 changes: 1 addition & 1 deletion src/it/package-archive-include-classes-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<vertx.version>3.4.2</vertx.version>
<vertx.version>4.0.3</vertx.version>
<vertx.verticle>org.vertx.demo.MainVerticle</vertx.verticle>
</properties>
<build>
Expand Down
2 changes: 1 addition & 1 deletion src/it/package-archive-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<vertx.version>3.4.2</vertx.version>
<vertx.version>4.0.3</vertx.version>
<vertx.verticle>org.vertx.demo.MainVerticle</vertx.verticle>
</properties>
<build>
Expand Down
2 changes: 1 addition & 1 deletion src/it/package-archive-manifest-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<vertx.version>3.4.2</vertx.version>
<vertx.version>4.0.3</vertx.version>
<vertx.verticle>org.vertx.demo.MainVerticle</vertx.verticle>
</properties>
<build>
Expand Down
2 changes: 1 addition & 1 deletion src/it/package-archive-no-jar-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<vertx.version>3.4.2</vertx.version>
<vertx.version>4.0.3</vertx.version>
<vertx.verticle>org.vertx.demo.MainVerticle</vertx.verticle>
</properties>
<build>
Expand Down
2 changes: 1 addition & 1 deletion src/it/package-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<vertx.version>3.4.2</vertx.version>
<vertx.version>4.0.3</vertx.version>
<vertx.verticle>org.vertx.demo.MainVerticle</vertx.verticle>
</properties>
<build>
Expand Down
2 changes: 1 addition & 1 deletion src/it/package-log4j2-plugin-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<vertx.version>3.4.2</vertx.version>
<vertx.version>4.0.3</vertx.version>
<vertx.launcher>org.vertx.demo.Main</vertx.launcher>
</properties>
<build>
Expand Down
2 changes: 1 addition & 1 deletion src/it/package-no-jar-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<vertx.version>3.4.2</vertx.version>
<vertx.version>4.0.3</vertx.version>
<vertx.verticle>org.vertx.demo.MainVerticle</vertx.verticle>
</properties>
<build>
Expand Down
2 changes: 1 addition & 1 deletion src/it/package-nofinal-name-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<vertx.version>3.4.2</vertx.version>
<vertx.version>4.0.3</vertx.version>
<vertx.verticle>org.vertx.demo.MainVerticle</vertx.verticle>
</properties>
<build>
Expand Down
2 changes: 1 addition & 1 deletion src/it/package-spi-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<vertx.version>3.3.0</vertx.version>
<vertx.version>4.0.3</vertx.version>
<vertx.verticle>org.vertx.demo.MainVerticle</vertx.verticle>
</properties>
<build>
Expand Down
2 changes: 1 addition & 1 deletion src/it/package-spi-order-combination-it/package-spi-deps-order-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<vertx.version>3.3.0</vertx.version>
<vertx.version>4.0.3</vertx.version>
<vertx.verticle>org.vertx.demo.MainVerticle</vertx.verticle>
</properties>
<build>
Expand Down
2 changes: 1 addition & 1 deletion src/it/package-spi-order-combination-it/package-spi-deps-order2-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<vertx.version>3.3.0</vertx.version>
<vertx.version>4.0.3</vertx.version>
<vertx.verticle>org.vertx.demo.MainVerticle</vertx.verticle>
</properties>
<build>
Expand Down
2 changes: 1 addition & 1 deletion src/it/package-with-classifier-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<vertx.version>3.4.2</vertx.version>
<vertx.version>4.0.3</vertx.version>
<vertx.verticle>org.vertx.demo.MainVerticle</vertx.verticle>
</properties>
<build>
Expand Down
2 changes: 1 addition & 1 deletion src/it/package-withfinal-name-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<vertx.version>3.4.2</vertx.version>
<vertx.version>4.0.3</vertx.version>
<vertx.verticle>org.vertx.demo.MainVerticle</vertx.verticle>
</properties>
<build>
Expand Down
2 changes: 1 addition & 1 deletion src/it/run-args-custom-launcher-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<vertx.version>3.4.2</vertx.version>
<vertx.version>4.0.3</vertx.version>
</properties>
<build>
<plugins>
Expand Down
2 changes: 1 addition & 1 deletion src/it/run-args-extended-launcher-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<vertx.version>3.4.2</vertx.version>
<vertx.version>4.0.3</vertx.version>
</properties>
<build>
<plugins>
Expand Down
2 changes: 1 addition & 1 deletion src/it/run-args-extended-launcher-it/src/main/java/demo/SimpleVerticle.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
package demo;

import io.vertx.core.AbstractVerticle;
import io.vertx.core.Future;
import io.vertx.core.Promise;

public class SimpleVerticle extends AbstractVerticle {
@Override
Expand Down
2 changes: 1 addition & 1 deletion src/it/run-cluster-defaults-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<vertx.version>3.4.2</vertx.version>
<vertx.version>4.0.3</vertx.version>
<vertx.verticle>org.vertx.demo.SimpleVerticle</vertx.verticle>
</properties>
<build>
Expand Down
2 changes: 1 addition & 1 deletion src/it/run-cluster-defaults-it/src/main/java/org/vertx/demo/SimpleVerticle.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
package org.vertx.demo;

import io.vertx.core.AbstractVerticle;
import io.vertx.core.Future;
import io.vertx.core.Promise;

/**
* @author kameshs
Expand Down
2 changes: 1 addition & 1 deletion src/it/run-config-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<vertx.version>3.4.2</vertx.version>
<vertx.version>4.0.3</vertx.version>
<vertx.verticle>org.vertx.demo.SimpleVerticle</vertx.verticle>
</properties>
<build>
Expand Down
4 changes: 2 additions & 2 deletions src/it/run-config-it/src/main/java/org/vertx/demo/SimpleVerticle.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@
package org.vertx.demo;

import io.vertx.core.AbstractVerticle;
import io.vertx.core.Future;
import io.vertx.core.Promise;

/**
* @author kameshs
*/
public class SimpleVerticle extends AbstractVerticle {
@Override
public void start(Future<Void> startFuture) throws Exception {
public void start(Promise<Void> startFuture) throws Exception {
int httpPort = config().getInteger("http.port");
System.out.println("Configured HTTP Port is :" + httpPort);
startFuture.complete();
Expand Down
2 changes: 1 addition & 1 deletion src/it/run-config-param-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<vertx.version>3.4.2</vertx.version>
<vertx.version>4.0.3</vertx.version>
<vertx.verticle>org.vertx.demo.SimpleVerticle</vertx.verticle>
</properties>
<build>
Expand Down
4 changes: 2 additions & 2 deletions src/it/run-config-param-it/src/main/java/org/vertx/demo/SimpleVerticle.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@
package org.vertx.demo;

import io.vertx.core.AbstractVerticle;
import io.vertx.core.Future;
import io.vertx.core.Promise;

/**
* @author kameshs
*/
public class SimpleVerticle extends AbstractVerticle {
@Override
public void start(Future<Void> startFuture) throws Exception {
public void start(Promise<Void> startFuture) throws Exception {
int httpPort = config().getInteger("http.port");
System.out.println("Configured HTTP Port is :" + httpPort);
startFuture.complete();
Expand Down
5 changes: 3 additions & 2 deletions src/it/run-ha-defaults-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<vertx.version>3.4.2</vertx.version>
<vertx.version>4.0.3</vertx.version>
<vertx.verticle>org.vertx.demo.SimpleVerticle</vertx.verticle>
</properties>
<build>
Expand All @@ -51,6 +51,7 @@
<configuration>
<runArgs>
<runArg>--ha</runArg>
<runArg>-Djava.net.preferIPv4Stack=true</runArg>
</runArgs>
</configuration>
</execution>
Expand All @@ -65,7 +66,7 @@
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-jgroups</artifactId>
<artifactId>vertx-infinispan</artifactId>
</dependency>
</dependencies>
<dependencyManagement>
Expand Down
4 changes: 2 additions & 2 deletions src/it/run-ha-defaults-it/src/main/java/org/vertx/demo/SimpleVerticle.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@
package org.vertx.demo;

import io.vertx.core.AbstractVerticle;
import io.vertx.core.Future;
import io.vertx.core.Promise;

/**
* @author kameshs
*/
public class SimpleVerticle extends AbstractVerticle {
@Override
public void start(Future<Void> startFuture) throws Exception {
public void start(Promise<Void> startFuture) throws Exception {
startFuture.complete();
vertx.close();
System.exit(0);
Expand Down
2 changes: 1 addition & 1 deletion src/it/run-ha-defaults-it/verify.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ String base = basedir
def file = new File(base, "build.log")
assert file.exists()
assert file.text.contains("Starting clustering...")
assert file.text.contains("io.vertx.spi.cluster.jgroups.JGroupsClusterManager")
assert file.text.contains("io.vertx.ext.cluster.infinispan.InfinispanClusterManager")
assert file.text.contains("io.vertx.core.impl.HAManager")
assert file.text.contains("A quorum has been obtained. Any deploymentIDs waiting on a quorum will now be deployed")

Loading

0 comments on commit 991a5b8

Please sign in to comment.