Merge branch 'eclipse-vertx:master' into migrate/provider-class-usage

Author: yeikel

.github/workflows/ci-4.x.yml

@@ -17,7 +17,7 @@ jobs:
             jdk: 8
             profile: '-PtestDomainSockets'
           - os: ubuntu-latest
-            jdk: 17
+            jdk: 21
             profile: ''
           - os: windows-latest
             jdk: 8

.github/workflows/ci-5.x.yml

@@ -23,7 +23,7 @@ jobs:
             jdk: 11
             profile: '-PtestDomainSockets'
           - os: ubuntu-latest
-            jdk: 17
+            jdk: 21
             profile: ''
           - os: windows-latest
             jdk: 11

README.md

@@ -23,6 +23,12 @@ Runs the tests
 > mvn test
 ```
 
+Tests can be run with specified HTTP port and/or HTTPS port.
+
+```
+> mvn test -Dvertx.httpPort=8888 -Dvertx.httpsPort=4044
+```
+
 Vert.x supports native transport on BSD and Linux, to run the tests with native transport
 
 ```

pom.xml

@@ -195,7 +195,7 @@
     <dependency>
       <groupId>com.aayushatharva.brotli4j</groupId>
       <artifactId>brotli4j</artifactId>
-      <version>1.8.0</version>
+      <version>1.12.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -416,7 +416,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.19.1</version>
+        <version>3.2.5</version>
         <executions>
           <execution>
             <id>ssl-engine:default</id>
@@ -479,6 +479,10 @@
               <includes>
                 <include>io/vertx/it/SLF4JLogDelegateTest.java</include>
               </includes>
+              <systemProperties>
+                <org.slf4j.simpleLogger.logFile>System.out</org.slf4j.simpleLogger.logFile>
+                <org.slf4j.simpleLogger.cacheOutputStream>false</org.slf4j.simpleLogger.cacheOutputStream>
+              </systemProperties>
             </configuration>
           </execution>
           <execution>
@@ -567,6 +571,29 @@
               </classpathDependencyExcludes>
             </configuration>
           </execution>
+          <execution>
+            <id>no-recycler-pool-jackson</id>
+            <goals>
+              <goal>integration-test</goal>
+              <goal>verify</goal>
+            </goals>
+            <configuration>
+              <includes>
+                <include>io/vertx/it/NoRecyclerPoolJacksonTest.java</include>
+              </includes>
+              <additionalClasspathDependencies>
+                <additionalClasspathDependency>
+                  <groupId>com.fasterxml.jackson.core</groupId>
+                  <artifactId>jackson-core</artifactId>
+                  <version>2.15.1</version>
+                </additionalClasspathDependency>
+              </additionalClasspathDependencies>
+              <classpathDependencyExcludes>
+                <classpathDependencyExclude>com.fasterxml.jackson.core:jackson-core</classpathDependencyExclude>
+                <classpathDependencyExclude>com.fasterxml.jackson.core:jackson-databind</classpathDependencyExclude>
+              </classpathDependencyExcludes>
+            </configuration>
+          </execution>
           <execution>
             <id>no-jackson-databind</id>
             <goals>

src/main/asciidoc/buffers.adoc

@@ -35,7 +35,12 @@ Create a buffer from a String: The String will be encoded using the specified en
 {@link examples.BufferExamples#example3}
 ----
 
-include::override/buffer_from_bytes.adoc[]
+Create a buffer from a byte[]
+
+[source,java]
+----
+{@link examples.BufferExamples#example4}
+----
 
 Create a buffer with an initial size hint. If you know your buffer will have a certain amount of data written to it
 you can create the buffer and specify this size. This makes the buffer initially allocate that much memory and is

src/main/asciidoc/cli-for-java.adoc

@@ -26,7 +26,7 @@ and NetClient (see above).
 
 === Creating a DatagramSocket
 
-To use UDP you first need t create a {@link io.vertx.core.datagram.DatagramSocket}. It does not matter here if you only want to send data or send
+To use UDP you first need to create a {@link io.vertx.core.datagram.DatagramSocket}. It does not matter here if you only want to send data or send
 and receive.
 
 [source,$lang]
@@ -54,7 +54,7 @@ Sending packets is as easy as shown here:
 === Receiving Datagram packets
 
 If you want to receive packets you need to bind the {@link io.vertx.core.datagram.DatagramSocket} by calling
-`listen(...)}` on it.
+`listen(...)` on it.
 
 This way you will be able to receive {@link io.vertx.core.datagram.DatagramPacket}s that were sent to the address and port on
 which the {@link io.vertx.core.datagram.DatagramSocket} listens.