Skip to content

Commit 5c2850c

Browse files
rogelio-orogelio-o
committed
Merge version conflicts
2 parents 391a297 + 33aefac commit 5c2850c

File tree

133 files changed

+248
-248
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

133 files changed

+248
-248
lines changed

‎amqp-bridge-examples/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>io.vertx</groupId>
88
<artifactId>amqp-bridge-examples</artifactId>
9-
<version>3.8.0</version>
9+
<version>3.8.1</version>
1010

1111
<dependencies>
1212
<!-- primary deps -->
@@ -59,7 +59,7 @@
5959
<repositories>
6060
<repository>
6161
<id>staging</id>
62-
<url>https://oss.sonatype.org/content/repositories/iovertx-3833/</url>
62+
<url>https://oss.sonatype.org/content/repositories/iovertx-3844/</url>
6363
</repository>
6464
</repositories>
6565
</profile>

‎amqp-proton-examples/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>io.vertx</groupId>
88
<artifactId>amqp-proton-examples</artifactId>
9-
<version>3.8.0</version>
9+
<version>3.8.1</version>
1010

1111
<dependencies>
1212
<!-- primary deps -->

‎camel-bridge-examples/README.adoc

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Launch it by running the `main` method in your IDE or, after having build the pr
2525

2626

2727
----
28-
java -jar target/camel-bridge-examples-3.8.0.jar run io.vertx.example.camel.feed.FeedExample
28+
java -jar target/camel-bridge-examples-3.8.1.jar run io.vertx.example.camel.feed.FeedExample
2929
----
3030

3131
== RMI example
@@ -45,7 +45,7 @@ This example demonstrates:
4545
Launch it by running the `main` method in your IDE , after having build the project with `mvn clean package`, with:
4646

4747
----
48-
java -jar target/camel-bridge-examples-3.8.0.jar run io.vertx.example.camel.rmi.RMIExample
48+
java -jar target/camel-bridge-examples-3.8.1.jar run io.vertx.example.camel.rmi.RMIExample
4949
----
5050

5151
Then open your browser to: `http://localhost:8080/?name=world`

‎camel-bridge-examples/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>io.vertx</groupId>
88
<artifactId>camel-bridge-examples</artifactId>
9-
<version>3.8.0</version>
9+
<version>3.8.1</version>
1010

1111
<dependencies>
1212
<dependency>
@@ -101,7 +101,7 @@
101101
<repositories>
102102
<repository>
103103
<id>staging</id>
104-
<url>https://oss.sonatype.org/content/repositories/iovertx-3833/</url>
104+
<url>https://oss.sonatype.org/content/repositories/iovertx-3844/</url>
105105
</repository>
106106
</repositories>
107107
</profile>

‎cassandra-examples/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>io.vertx</groupId>
88
<artifactId>cassandra-examples</artifactId>
9-
<version>3.8.0</version>
9+
<version>3.8.1</version>
1010

1111
<build>
1212
<plugins>
@@ -41,7 +41,7 @@
4141
<repositories>
4242
<repository>
4343
<id>staging</id>
44-
<url>https://oss.sonatype.org/content/repositories/iovertx-3833/</url>
44+
<url>https://oss.sonatype.org/content/repositories/iovertx-3844/</url>
4545
</repository>
4646
</repositories>
4747
</profile>

‎circuit-breaker-examples/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>io.vertx</groupId>
88
<artifactId>circuit-breaker-examples</artifactId>
9-
<version>3.8.0</version>
9+
<version>3.8.1</version>
1010

1111
<build>
1212
<plugins>
@@ -52,7 +52,7 @@
5252
<repositories>
5353
<repository>
5454
<id>staging</id>
55-
<url>https://oss.sonatype.org/content/repositories/iovertx-3833/</url>
55+
<url>https://oss.sonatype.org/content/repositories/iovertx-3844/</url>
5656
</repository>
5757
</repositories>
5858
</profile>

‎consul-examples/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>io.vertx</groupId>
88
<artifactId>consul-examples</artifactId>
9-
<version>3.8.0</version>
9+
<version>3.8.1</version>
1010

1111
<dependencies>
1212
<dependency>
@@ -51,7 +51,7 @@
5151
<repositories>
5252
<repository>
5353
<id>staging</id>
54-
<url>https://oss.sonatype.org/content/repositories/iovertx-3833/</url>
54+
<url>https://oss.sonatype.org/content/repositories/iovertx-3844/</url>
5555
</repository>
5656
</repositories>
5757
</profile>

‎core-examples/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>io.vertx</groupId>
88
<artifactId>core-examples</artifactId>
9-
<version>3.8.0</version>
9+
<version>3.8.1</version>
1010

1111
<dependencies>
1212

@@ -19,7 +19,7 @@
1919
<dependency>
2020
<groupId>io.netty</groupId>
2121
<artifactId>netty-tcnative-boringssl-static</artifactId>
22-
<version>2.0.23.Final</version>
22+
<version>2.0.25.Final</version>
2323
</dependency>
2424

2525
<dependency>
@@ -64,7 +64,7 @@
6464
<repositories>
6565
<repository>
6666
<id>staging</id>
67-
<url>https://oss.sonatype.org/content/repositories/iovertx-3833/</url>
67+
<url>https://oss.sonatype.org/content/repositories/iovertx-3844/</url>
6868
</repository>
6969
</repositories>
7070
</profile>

‎docker-examples/vertx-docker-example-fabric8/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>io.vertx</groupId>
88
<artifactId>vertx-docker-example-fabric</artifactId>
9-
<version>3.8.0</version>
9+
<version>3.8.1</version>
1010

1111
<name>Sample Docker Image for Fabric8</name>
1212

@@ -109,7 +109,7 @@
109109
<repositories>
110110
<repository>
111111
<id>staging</id>
112-
<url>https://oss.sonatype.org/content/repositories/iovertx-3833/</url>
112+
<url>https://oss.sonatype.org/content/repositories/iovertx-3844/</url>
113113
</repository>
114114
</repositories>
115115
</profile>

‎docker-examples/vertx-docker-example/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>io.vertx</groupId>
88
<artifactId>vertx-docker-example</artifactId>
9-
<version>3.8.0</version>
9+
<version>3.8.1</version>
1010

1111
<name>Sample Docker Image with Maven</name>
1212

@@ -78,7 +78,7 @@
7878
<repositories>
7979
<repository>
8080
<id>staging</id>
81-
<url>https://oss.sonatype.org/content/repositories/iovertx-3833/</url>
81+
<url>https://oss.sonatype.org/content/repositories/iovertx-3844/</url>
8282
</repository>
8383
</repositories>
8484
</profile>

‎docker-examples/vertx-docker-java-fatjar/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
FROM java:8-jre
1010

11-
ENV VERTICLE_FILE hello-verticle-fatjar-3.8.0-fat.jar
11+
ENV VERTICLE_FILE hello-verticle-fatjar-3.8.1-fat.jar
1212

1313
# Set the location of the verticles
1414
ENV VERTICLE_HOME /usr/verticles

‎docker-examples/vertx-docker-java-fatjar/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>io.vertx</groupId>
88
<artifactId>hello-verticle-fatjar</artifactId>
9-
<version>3.8.0</version>
9+
<version>3.8.1</version>
1010

1111
<name>Sample Docker Image for Java - FatJar</name>
1212

@@ -73,7 +73,7 @@
7373
<repositories>
7474
<repository>
7575
<id>staging</id>
76-
<url>https://oss.sonatype.org/content/repositories/iovertx-3833/</url>
76+
<url>https://oss.sonatype.org/content/repositories/iovertx-3844/</url>
7777
</repository>
7878
</repositories>
7979
</profile>

‎docker-examples/vertx-docker-java/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
FROM vertx/vertx3
1111

1212
ENV VERTICLE_NAME io.vertx.sample.hello.HelloVerticle
13-
ENV VERTICLE_FILE target/hello-verticle-3.8.0.jar
13+
ENV VERTICLE_FILE target/hello-verticle-3.8.1.jar
1414

1515
# Set the location of the verticles
1616
ENV VERTICLE_HOME /usr/verticles

‎docker-examples/vertx-docker-java/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>io.vertx</groupId>
88
<artifactId>hello-verticle</artifactId>
9-
<version>3.8.0</version>
9+
<version>3.8.1</version>
1010

1111
<name>Sample Docker Image for Java</name>
1212

@@ -38,7 +38,7 @@
3838
<repositories>
3939
<repository>
4040
<id>staging</id>
41-
<url>https://oss.sonatype.org/content/repositories/iovertx-3833/</url>
41+
<url>https://oss.sonatype.org/content/repositories/iovertx-3844/</url>
4242
</repository>
4343
</repositories>
4444
</profile>

‎examples-utils/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>io.vertx</groupId>
88
<artifactId>examples-utils</artifactId>
9-
<version>3.8.0</version>
9+
<version>3.8.1</version>
1010

1111
<properties>
1212
<tools.jar>${java.home}/../lib/tools.jar</tools.jar>
@@ -82,7 +82,7 @@
8282
<repositories>
8383
<repository>
8484
<id>staging</id>
85-
<url>https://oss.sonatype.org/content/repositories/iovertx-3833/</url>
85+
<url>https://oss.sonatype.org/content/repositories/iovertx-3844/</url>
8686
</repository>
8787
</repositories>
8888
</profile>

‎fatjar-examples/README.adoc

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ To build with Maven
1414

1515
To run the fat jar:
1616

17-
java -jar target/http2-fatjar-3.8.0.jar
17+
java -jar target/http2-fatjar-3.8.1.jar
1818

1919
The build.gradle uses the Gradle shadowJar plugin to assemble the application and all it's dependencies into a single "fat" jar.
2020

@@ -24,7 +24,7 @@ To build with Gradle
2424

2525
To run the fat jar:
2626

27-
java -jar build/libs/http2-fatjar-3.8.0-all.jar
27+
java -jar build/libs/http2-fatjar-3.8.1-all.jar
2828

2929
NOTE: embedding the key in the jar is a discouraged practice - it is done purposely to keep the example simple
3030

@@ -40,7 +40,7 @@ To build with Maven
4040

4141
To run the fat jar:
4242

43-
java -jar target/ruby-fatjar-3.8.0.jar.jar
43+
java -jar target/ruby-fatjar-3.8.1.jar.jar
4444

4545
The build.gradle uses the Gradle shadowJar plugin to assemble the application and all it's dependencies into a single "fat" jar.
4646

@@ -50,4 +50,4 @@ To build with Gradle
5050

5151
To run the fat jar:
5252

53-
java -jar build/libs/ruby-fatjar-3.8.0-all.jar
53+
java -jar build/libs/ruby-fatjar-3.8.1-all.jar

‎fatjar-examples/http2-fatjar/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ plugins {
77
repositories {
88
jcenter()
99
// maven {
10-
// url "https://oss.sonatype.org/content/repositories/iovertx-3833/"
10+
// url "https://oss.sonatype.org/content/repositories/iovertx-3844/"
1111
// }
1212
}
1313

14-
version = '3.8.0'
14+
version = '3.8.1'
1515
sourceCompatibility = '1.8'
1616

1717
dependencies {
1818
compile "io.vertx:vertx-core:$version"
19-
compile "io.netty:netty-tcnative-boringssl-static:2.0.23.Final"
19+
compile "io.netty:netty-tcnative-boringssl-static:2.0.25.Final"
2020
}
2121

2222
mainClassName = 'io.vertx.core.Launcher'

‎fatjar-examples/http2-fatjar/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
<groupId>io.vertx</groupId>
2424
<artifactId>http2-fatjar</artifactId>
25-
<version>3.8.0</version>
25+
<version>3.8.1</version>
2626

2727
<name>HTTP/2 fatjar</name>
2828

@@ -37,7 +37,7 @@
3737
<dependency>
3838
<groupId>io.netty</groupId>
3939
<artifactId>netty-tcnative-boringssl-static</artifactId>
40-
<version>2.0.23.Final</version>
40+
<version>2.0.25.Final</version>
4141
</dependency>
4242

4343
</dependencies>
@@ -97,7 +97,7 @@
9797
<repositories>
9898
<repository>
9999
<id>staging</id>
100-
<url>https://oss.sonatype.org/content/repositories/iovertx-3833/</url>
100+
<url>https://oss.sonatype.org/content/repositories/iovertx-3844/</url>
101101
</repository>
102102
</repositories>
103103
</profile>

‎fatjar-examples/ruby-fatjar/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ plugins {
77
repositories {
88
jcenter()
99
// maven {
10-
// url "https://oss.sonatype.org/content/repositories/iovertx-3833/"
10+
// url "https://oss.sonatype.org/content/repositories/iovertx-3844/"
1111
// }
1212
}
1313

14-
version = '3.8.0'
14+
version = '3.8.1'
1515
sourceCompatibility = '1.8'
1616

1717
dependencies {

‎fatjar-examples/ruby-fatjar/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
<groupId>io.vertx</groupId>
2424
<artifactId>ruby-fatjar</artifactId>
25-
<version>3.8.0</version>
25+
<version>3.8.1</version>
2626

2727
<name>Ruby fatjar</name>
2828

@@ -83,7 +83,7 @@
8383
<repositories>
8484
<repository>
8585
<id>staging</id>
86-
<url>https://oss.sonatype.org/content/repositories/iovertx-3833/</url>
86+
<url>https://oss.sonatype.org/content/repositories/iovertx-3844/</url>
8787
</repository>
8888
</repositories>
8989
</profile>

‎gradle-redeploy/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ plugins {
77
repositories {
88
jcenter()
99
maven {
10-
url "https://oss.sonatype.org/content/repositories/iovertx-3833/"
10+
url "https://oss.sonatype.org/content/repositories/iovertx-3844/"
1111
}
1212
}
1313

14-
version = '3.8.0'
14+
version = '3.8.1'
1515
sourceCompatibility = '1.8'
1616

1717
dependencies {

‎gradle-simplest/README.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Because the application plugin is being used, you may directly run the applicati
2020

2121
You may also run the fat jar as a standalone runnable jar:
2222

23-
java -jar build/libs/gradle-simplest-3.8.0-fat.jar
23+
java -jar build/libs/gradle-simplest-3.8.1-fat.jar
2424

2525
(You can take that jar and run it anywhere there is a Java 8+ JDK. It contains all the dependencies it needs so you
2626
don't need to install Vert.x on the target machine).

0 commit comments

Comments
 (0)