Browse Source

Bump the dependency versions and upgrade the JDK version to 17 in all Vert.x-related portions except "vertx-web-scala" (#7932)

* Bump the dependency versions in vertx-web-kotlin-coroutines

In the meanwhile, set "gradlew" to executable, add ".gitattributes", and change the wrapper distribution type to all.

The Java version is bumped to 17 and the `-XX:+AggressiveOpts` argument in the Dockerfiles is removed for the benchmark to run.

* Bump the dependency versions again in vertx-web-kotlin-coroutines

The Gradle 8.0 Docker Image is not available yet.

* Bump the dependency versions and the JDK version (mainly Vert.x 4.3.8 and JDK 17) in the vertx-web portion

* Bump the dependency versions and the JDK version (mainly Vert.x 4.3.8 and JDK 17) in the vertx portion and fix some mistakes in the previous commits
Shreck Ye 2 years ago
parent
commit
952b5243a0

+ 6 - 6
frameworks/Java/vertx-web/pom.xml

@@ -7,12 +7,12 @@
 
 
   <groupId>io.vertx</groupId>
   <groupId>io.vertx</groupId>
   <artifactId>vertx-web-benchmark</artifactId>
   <artifactId>vertx-web-benchmark</artifactId>
-  <version>4.1.5</version>
+  <version>4.3.8</version>
 
 
   <properties>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>
     <!-- the main class -->
     <!-- the main class -->
     <main.verticle>io.vertx.benchmark.App</main.verticle>
     <main.verticle>io.vertx.benchmark.App</main.verticle>
   </properties>
   </properties>
@@ -38,7 +38,7 @@
     <dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.module</groupId>
       <groupId>com.fasterxml.jackson.module</groupId>
       <artifactId>jackson-module-blackbird</artifactId>
       <artifactId>jackson-module-blackbird</artifactId>
-      <version>2.12.4</version>
+      <version>2.14.2</version>
     </dependency>
     </dependency>
 
 
     <dependency>
     <dependency>
@@ -81,7 +81,7 @@
             <configuration>
             <configuration>
               <templateDirectory>${project.basedir}/src/main/resources</templateDirectory>
               <templateDirectory>${project.basedir}/src/main/resources</templateDirectory>
               <optimize>true</optimize>
               <optimize>true</optimize>
-              <javaVersion>1.8</javaVersion>
+              <javaVersion>17</javaVersion>
             </configuration>
             </configuration>
           </execution>
           </execution>
         </executions>
         </executions>
@@ -94,7 +94,7 @@
       <plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>2.3</version>
+        <version>2.4.1</version>
         <executions>
         <executions>
           <execution>
           <execution>
             <phase>package</phase>
             <phase>package</phase>

+ 2 - 3
frameworks/Java/vertx-web/vertx-web-postgres.dockerfile

@@ -1,4 +1,4 @@
-FROM maven:3.6.1-jdk-11-slim as maven
+FROM maven:3.9.0-eclipse-temurin-17 as maven
 WORKDIR /vertx-web
 WORKDIR /vertx-web
 COPY scripts scripts
 COPY scripts scripts
 COPY src src
 COPY src src
@@ -11,7 +11,6 @@ CMD java \
     -server                                           \
     -server                                           \
     -XX:+UseNUMA                                      \
     -XX:+UseNUMA                                      \
     -XX:+UseParallelGC                                \
     -XX:+UseParallelGC                                \
-    -XX:+AggressiveOpts                               \
     -Dvertx.disableMetrics=true                       \
     -Dvertx.disableMetrics=true                       \
     -Dvertx.disableH2c=true                           \
     -Dvertx.disableH2c=true                           \
     -Dvertx.disableWebsockets=true                    \
     -Dvertx.disableWebsockets=true                    \
@@ -24,7 +23,7 @@ CMD java \
     -Dio.netty.buffer.checkBounds=false               \
     -Dio.netty.buffer.checkBounds=false               \
     -Dio.netty.buffer.checkAccessible=false           \
     -Dio.netty.buffer.checkAccessible=false           \
     -jar                                              \
     -jar                                              \
-    target/vertx-web-benchmark-4.1.5-fat.jar          \
+    target/vertx-web-benchmark-4.3.8-fat.jar          \
     --instances                                       \
     --instances                                       \
     `grep --count ^processor /proc/cpuinfo`           \
     `grep --count ^processor /proc/cpuinfo`           \
     --conf                                            \
     --conf                                            \

+ 2 - 3
frameworks/Java/vertx-web/vertx-web.dockerfile

@@ -1,4 +1,4 @@
-FROM maven:3.6.1-jdk-11-slim as maven
+FROM maven:3.9.0-eclipse-temurin-17 as maven
 WORKDIR /vertx-web
 WORKDIR /vertx-web
 COPY scripts scripts
 COPY scripts scripts
 COPY src src
 COPY src src
@@ -11,7 +11,6 @@ CMD java \
     -server                                           \
     -server                                           \
     -XX:+UseNUMA                                      \
     -XX:+UseNUMA                                      \
     -XX:+UseParallelGC                                \
     -XX:+UseParallelGC                                \
-    -XX:+AggressiveOpts                               \
     -Dvertx.disableMetrics=true                       \
     -Dvertx.disableMetrics=true                       \
     -Dvertx.disableH2c=true                           \
     -Dvertx.disableH2c=true                           \
     -Dvertx.disableWebsockets=true                    \
     -Dvertx.disableWebsockets=true                    \
@@ -24,7 +23,7 @@ CMD java \
     -Dio.netty.buffer.checkBounds=false               \
     -Dio.netty.buffer.checkBounds=false               \
     -Dio.netty.buffer.checkAccessible=false           \
     -Dio.netty.buffer.checkAccessible=false           \
     -jar                                              \
     -jar                                              \
-    target/vertx-web-benchmark-4.1.5-fat.jar          \
+    target/vertx-web-benchmark-4.3.8-fat.jar          \
     --instances                                       \
     --instances                                       \
     `grep --count ^processor /proc/cpuinfo`           \
     `grep --count ^processor /proc/cpuinfo`           \
     --conf                                            \
     --conf                                            \

+ 2 - 2
frameworks/Java/vertx/README.md

@@ -32,8 +32,8 @@ This is the Vert.x portion of a [benchmarking test suite](../) comparing a varie
 
 
 ## Versions
 ## Versions
 
 
-* [Java 11](https://jdk.java.net)
-* [vertx 4.3.5](http://vertx.io/)
+* [Java 17](https://jdk.java.net)
+* [vertx 4.3.8](http://vertx.io/)
 
 
 ## Test URLs
 ## Test URLs
 
 

+ 12 - 12
frameworks/Java/vertx/pom.xml

@@ -6,13 +6,13 @@
 	<version>0.0.1-SNAPSHOT</version>
 	<version>0.0.1-SNAPSHOT</version>
 
 
 	<properties>
 	<properties>
-		<maven.compiler.source>11</maven.compiler.source>
-		<maven.compiler.target>11</maven.compiler.target>
+		<maven.compiler.source>17</maven.compiler.source>
+		<maven.compiler.target>17</maven.compiler.target>
 		<!-- the main class -->
 		<!-- the main class -->
 		<main.class>vertx.App</main.class>
 		<main.class>vertx.App</main.class>
-		<stack.version>4.3.5</stack.version>
-		<jackson.version>2.14.0</jackson.version>
-		<netty.version>4.1.85.Final</netty.version>
+		<stack.version>4.3.8</stack.version>
+		<jackson.version>2.14.2</jackson.version>
+		<netty.version>4.1.89.Final</netty.version>
 	</properties>
 	</properties>
 
 
 	<dependencies>
 	<dependencies>
@@ -51,17 +51,17 @@
 		<dependency>
 		<dependency>
 			<groupId>com.github.ben-manes.caffeine</groupId>
 			<groupId>com.github.ben-manes.caffeine</groupId>
 			<artifactId>caffeine</artifactId>
 			<artifactId>caffeine</artifactId>
-			<version>3.1.1</version>
+			<version>3.1.3</version>
 		</dependency>
 		</dependency>
 		<dependency>
 		<dependency>
 			<groupId>com.fizzed</groupId>
 			<groupId>com.fizzed</groupId>
 			<artifactId>rocker-compiler</artifactId>
 			<artifactId>rocker-compiler</artifactId>
-			<version>1.2.1</version>
+			<version>1.3.0</version>
 		</dependency>
 		</dependency>
 		<dependency>
 		<dependency>
 			<groupId>javax.xml.bind</groupId>
 			<groupId>javax.xml.bind</groupId>
 			<artifactId>jaxb-api</artifactId>
 			<artifactId>jaxb-api</artifactId>
-			<version>2.2.12</version>
+			<version>2.3.1</version>
 		</dependency>
 		</dependency>
 	</dependencies>
 	</dependencies>
 
 
@@ -70,7 +70,7 @@
 			<plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.8.0</version>
+				<version>3.10.1</version>
 				<configuration>
 				<configuration>
 					<debug>false</debug>
 					<debug>false</debug>
 				</configuration>
 				</configuration>
@@ -78,7 +78,7 @@
 			<plugin>
 			<plugin>
 				<groupId>com.fizzed</groupId>
 				<groupId>com.fizzed</groupId>
 				<artifactId>rocker-maven-plugin</artifactId>
 				<artifactId>rocker-maven-plugin</artifactId>
-				<version>1.2.1</version>
+				<version>1.3.0</version>
 				<executions>
 				<executions>
 					<execution>
 					<execution>
 						<id>generate-rocker-templates</id>
 						<id>generate-rocker-templates</id>
@@ -87,7 +87,7 @@
 							<goal>generate</goal>
 							<goal>generate</goal>
 						</goals>
 						</goals>
 						<configuration>
 						<configuration>
-							<javaVersion>11</javaVersion>
+							<javaVersion>17</javaVersion>
 							<templateDirectory>${basedir}/src/main/templates</templateDirectory>
 							<templateDirectory>${basedir}/src/main/templates</templateDirectory>
 							<outputDirectory>${basedir}/target/generated-sources/rocker</outputDirectory>
 							<outputDirectory>${basedir}/target/generated-sources/rocker</outputDirectory>
 							<discardLogicWhitespace>false</discardLogicWhitespace>
 							<discardLogicWhitespace>false</discardLogicWhitespace>
@@ -101,7 +101,7 @@
 			<plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
 				<artifactId>maven-shade-plugin</artifactId>
-				<version>2.3</version>
+				<version>2.4.1</version>
 				<executions>
 				<executions>
 					<execution>
 					<execution>
 						<phase>package</phase>
 						<phase>package</phase>

+ 1 - 2
frameworks/Java/vertx/vertx-postgres.dockerfile

@@ -1,4 +1,4 @@
-FROM maven:3.6.1-jdk-11-slim as maven
+FROM maven:3.9.0-eclipse-temurin-17 as maven
 WORKDIR /vertx
 WORKDIR /vertx
 COPY src src
 COPY src src
 COPY pom.xml pom.xml
 COPY pom.xml pom.xml
@@ -14,7 +14,6 @@ CMD export DBIP=`getent hosts tfb-database | awk '{ print $1 }'` && \
       -server \
       -server \
       -XX:+UseNUMA \
       -XX:+UseNUMA \
       -XX:+UseParallelGC \
       -XX:+UseParallelGC \
-      -XX:+AggressiveOpts \
       -Dvertx.disableMetrics=true \
       -Dvertx.disableMetrics=true \
       -Dvertx.disableH2c=true \
       -Dvertx.disableH2c=true \
       -Dvertx.disableWebsockets=true \
       -Dvertx.disableWebsockets=true \

+ 2 - 2
frameworks/Java/vertx/vertx.dockerfile

@@ -1,4 +1,4 @@
-FROM maven:3.6.1-jdk-11-slim as maven
+FROM maven:3.9.0-eclipse-temurin-17 as maven
 WORKDIR /vertx
 WORKDIR /vertx
 COPY src src
 COPY src src
 COPY pom.xml pom.xml
 COPY pom.xml pom.xml
@@ -6,4 +6,4 @@ RUN mvn package -q
 
 
 EXPOSE 8080
 EXPOSE 8080
 
 
-CMD ["java", "-Xms2G", "-Xmx2G", "-server", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:+AggressiveOpts", "-Dvertx.disableMetrics=true", "-Dvertx.disableH2c=true", "-Dvertx.disableWebsockets=true", "-Dvertx.flashPolicyHandler=false", "-Dvertx.threadChecks=false", "-Dvertx.disableContextTimings=true", "-Dvertx.disableTCCL=true", "-Dvertx.disableHttpHeadersValidation=true", "-Dio.netty.buffer.checkBounds=false", "-Dio.netty.buffer.checkAccessible=false", "-jar", "target/vertx.benchmark-0.0.1-SNAPSHOT-fat.jar", "src/main/conf/config.json"]
+CMD ["java", "-Xms2G", "-Xmx2G", "-server", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-Dvertx.disableMetrics=true", "-Dvertx.disableH2c=true", "-Dvertx.disableWebsockets=true", "-Dvertx.flashPolicyHandler=false", "-Dvertx.threadChecks=false", "-Dvertx.disableContextTimings=true", "-Dvertx.disableTCCL=true", "-Dvertx.disableHttpHeadersValidation=true", "-Dio.netty.buffer.checkBounds=false", "-Dio.netty.buffer.checkAccessible=false", "-jar", "target/vertx.benchmark-0.0.1-SNAPSHOT-fat.jar", "src/main/conf/config.json"]

+ 6 - 0
frameworks/Kotlin/vertx-web-kotlin-coroutines/.gitattributes

@@ -0,0 +1,6 @@
+#
+# https://help.github.com/articles/dealing-with-line-endings/
+#
+# These are explicitly windows files and should use crlf
+*.bat           text eol=crlf
+

+ 11 - 6
frameworks/Kotlin/vertx-web-kotlin-coroutines/build.gradle.kts

@@ -1,25 +1,30 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 
+tasks.wrapper {
+    distributionType = Wrapper.DistributionType.ALL
+}
+
 plugins {
 plugins {
-    kotlin("jvm") version "1.6.10"
+    kotlin("jvm") version "1.8.10"
     application
     application
     id("nu.studer.rocker") version "3.0.4"
     id("nu.studer.rocker") version "3.0.4"
     id("com.github.johnrengelman.shadow") version "7.1.2"
     id("com.github.johnrengelman.shadow") version "7.1.2"
 }
 }
 
 
 group = "io.vertx"
 group = "io.vertx"
-version = "4.1.5"
+version = "4.3.8"
 
 
 repositories {
 repositories {
     mavenCentral()
     mavenCentral()
 }
 }
 
 
 dependencies {
 dependencies {
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
     implementation(platform("io.vertx:vertx-stack-depchain:$version"))
     implementation(platform("io.vertx:vertx-stack-depchain:$version"))
     implementation("io.vertx:vertx-core")
     implementation("io.vertx:vertx-core")
-    implementation("com.fasterxml.jackson.module:jackson-module-blackbird:2.12.4")
+    implementation("com.fasterxml.jackson.module:jackson-module-blackbird:2.14.2")
     implementation("io.vertx:vertx-web")
     implementation("io.vertx:vertx-web")
     implementation("io.vertx:vertx-pg-client")
     implementation("io.vertx:vertx-pg-client")
     implementation("io.vertx:vertx-web-templ-rocker")
     implementation("io.vertx:vertx-web-templ-rocker")
@@ -33,13 +38,13 @@ rocker {
         create("main") {
         create("main") {
             templateDir.set(file("src/main/resources"))
             templateDir.set(file("src/main/resources"))
             optimize.set(true)
             optimize.set(true)
-            javaVersion.set("1.8")
+            javaVersion.set("17")
         }
         }
     }
     }
 }
 }
 
 
 tasks.withType<KotlinCompile> {
 tasks.withType<KotlinCompile> {
-    kotlinOptions.jvmTarget = "11"
+    compilerOptions.jvmTarget.set(JvmTarget.JVM_17)
 }
 }
 
 
 
 

BIN
frameworks/Kotlin/vertx-web-kotlin-coroutines/gradle/wrapper/gradle-wrapper.jar


+ 2 - 1
frameworks/Kotlin/vertx-web-kotlin-coroutines/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
 zipStorePath=wrapper/dists

+ 14 - 4
frameworks/Kotlin/vertx-web-kotlin-coroutines/gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #       Darwin, MinGW, and NonStop.
 #
 #
 #   (3) This script is generated from the Groovy template
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #       within the Gradle project.
 #
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
     esac
 done
 done
 
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
     case $MAX_FD in #(
       max*)
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
             warn "Could not query maximum file descriptor limit"
     esac
     esac
     case $MAX_FD in  #(
     case $MAX_FD in  #(
       '' | soft) :;; #(
       '' | soft) :;; #(
       *)
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
     esac
@@ -205,6 +209,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
         "$@"
 
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 # Use "xargs" to parse quoted args.
 #
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

+ 9 - 6
frameworks/Kotlin/vertx-web-kotlin-coroutines/gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem limitations under the License.
 @rem
 @rem
 
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem ##########################################################################
 @rem
 @rem
 @rem  Gradle startup script for Windows
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 if "%OS%"=="Windows_NT" setlocal
 
 
 set DIRNAME=%~dp0
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 set APP_HOME=%DIRNAME%
 
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 
 set JAVA_EXE=java.exe
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 
 echo.
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 :end
 :end
 @rem End local scope for the variables with windows NT shell
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 
 :fail
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 
 :mainEnd
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
 if "%OS%"=="Windows_NT" endlocal

+ 2 - 3
frameworks/Kotlin/vertx-web-kotlin-coroutines/vertx-web-kotlin-coroutines-postgres.dockerfile

@@ -1,4 +1,4 @@
-FROM gradle:7.3.3-jdk11 as gradle
+FROM gradle:7.6-jdk17 as gradle
 WORKDIR /vertx-web-kotlin-coroutines
 WORKDIR /vertx-web-kotlin-coroutines
 COPY gradle gradle
 COPY gradle gradle
 COPY src src
 COPY src src
@@ -14,7 +14,6 @@ CMD java \
     -server                                           \
     -server                                           \
     -XX:+UseNUMA                                      \
     -XX:+UseNUMA                                      \
     -XX:+UseParallelGC                                \
     -XX:+UseParallelGC                                \
-    -XX:+AggressiveOpts                               \
     -Dvertx.disableMetrics=true                       \
     -Dvertx.disableMetrics=true                       \
     -Dvertx.disableH2c=true                           \
     -Dvertx.disableH2c=true                           \
     -Dvertx.disableWebsockets=true                    \
     -Dvertx.disableWebsockets=true                    \
@@ -27,7 +26,7 @@ CMD java \
     -Dio.netty.buffer.checkBounds=false               \
     -Dio.netty.buffer.checkBounds=false               \
     -Dio.netty.buffer.checkAccessible=false           \
     -Dio.netty.buffer.checkAccessible=false           \
     -jar                                              \
     -jar                                              \
-    build/libs/vertx-web-kotlin-coroutines-benchmark-4.1.5-fat.jar \
+    build/libs/vertx-web-kotlin-coroutines-benchmark-4.3.8-fat.jar \
     --instances                                       \
     --instances                                       \
     `grep --count ^processor /proc/cpuinfo`           \
     `grep --count ^processor /proc/cpuinfo`           \
     --conf                                            \
     --conf                                            \

+ 2 - 3
frameworks/Kotlin/vertx-web-kotlin-coroutines/vertx-web-kotlin-coroutines.dockerfile

@@ -1,4 +1,4 @@
-FROM gradle:7.3.3-jdk11 as gradle
+FROM gradle:7.6-jdk17 as gradle
 WORKDIR /vertx-web-kotlin-coroutines
 WORKDIR /vertx-web-kotlin-coroutines
 COPY src src
 COPY src src
 COPY build.gradle.kts build.gradle.kts
 COPY build.gradle.kts build.gradle.kts
@@ -12,7 +12,6 @@ CMD java \
     -server                                           \
     -server                                           \
     -XX:+UseNUMA                                      \
     -XX:+UseNUMA                                      \
     -XX:+UseParallelGC                                \
     -XX:+UseParallelGC                                \
-    -XX:+AggressiveOpts                               \
     -Dvertx.disableMetrics=true                       \
     -Dvertx.disableMetrics=true                       \
     -Dvertx.disableH2c=true                           \
     -Dvertx.disableH2c=true                           \
     -Dvertx.disableWebsockets=true                    \
     -Dvertx.disableWebsockets=true                    \
@@ -25,7 +24,7 @@ CMD java \
     -Dio.netty.buffer.checkBounds=false               \
     -Dio.netty.buffer.checkBounds=false               \
     -Dio.netty.buffer.checkAccessible=false           \
     -Dio.netty.buffer.checkAccessible=false           \
     -jar                                              \
     -jar                                              \
-    build/libs/vertx-web-kotlin-coroutines-benchmark-4.1.5-fat.jar \
+    build/libs/vertx-web-kotlin-coroutines-benchmark-4.3.8-fat.jar \
     --instances                                       \
     --instances                                       \
     `grep --count ^processor /proc/cpuinfo`           \
     `grep --count ^processor /proc/cpuinfo`           \
     --conf                                            \
     --conf                                            \