Skip to content

Commit 096cc56

Browse files
ShreckYefranz1981
ShreckYe
authored and
franz1981
committed
Bump the dependency versions and upgrade the JDK version to 17 in all Vert.x-related portions except "vertx-web-scala" (TechEmpower#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
1 parent c5401bf commit 096cc56

15 files changed

+73
-53
lines changed

‎frameworks/Java/vertx-web/pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77

88
<groupId>io.vertx</groupId>
99
<artifactId>vertx-web-benchmark</artifactId>
10-
<version>4.1.5</version>
10+
<version>4.3.8</version>
1111

1212
<properties>
1313
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
14-
<maven.compiler.source>11</maven.compiler.source>
15-
<maven.compiler.target>11</maven.compiler.target>
14+
<maven.compiler.source>17</maven.compiler.source>
15+
<maven.compiler.target>17</maven.compiler.target>
1616
<!-- the main class -->
1717
<main.verticle>io.vertx.benchmark.App</main.verticle>
1818
</properties>
@@ -38,7 +38,7 @@
3838
<dependency>
3939
<groupId>com.fasterxml.jackson.module</groupId>
4040
<artifactId>jackson-module-blackbird</artifactId>
41-
<version>2.12.4</version>
41+
<version>2.14.2</version>
4242
</dependency>
4343

4444
<dependency>
@@ -81,7 +81,7 @@
8181
<configuration>
8282
<templateDirectory>${project.basedir}/src/main/resources</templateDirectory>
8383
<optimize>true</optimize>
84-
<javaVersion>1.8</javaVersion>
84+
<javaVersion>17</javaVersion>
8585
</configuration>
8686
</execution>
8787
</executions>
@@ -94,7 +94,7 @@
9494
<plugin>
9595
<groupId>org.apache.maven.plugins</groupId>
9696
<artifactId>maven-shade-plugin</artifactId>
97-
<version>2.3</version>
97+
<version>2.4.1</version>
9898
<executions>
9999
<execution>
100100
<phase>package</phase>

‎frameworks/Java/vertx-web/vertx-web-postgres.dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM maven:3.6.1-jdk-11-slim as maven
1+
FROM maven:3.9.0-eclipse-temurin-17 as maven
22
WORKDIR /vertx-web
33
COPY scripts scripts
44
COPY src src
@@ -11,7 +11,6 @@ CMD java \
1111
-server \
1212
-XX:+UseNUMA \
1313
-XX:+UseParallelGC \
14-
-XX:+AggressiveOpts \
1514
-Dvertx.disableMetrics=true \
1615
-Dvertx.disableH2c=true \
1716
-Dvertx.disableWebsockets=true \
@@ -24,7 +23,7 @@ CMD java \
2423
-Dio.netty.buffer.checkBounds=false \
2524
-Dio.netty.buffer.checkAccessible=false \
2625
-jar \
27-
target/vertx-web-benchmark-4.1.5-fat.jar \
26+
target/vertx-web-benchmark-4.3.8-fat.jar \
2827
--instances \
2928
`grep --count ^processor /proc/cpuinfo` \
3029
--conf \

‎frameworks/Java/vertx-web/vertx-web.dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM maven:3.6.1-jdk-11-slim as maven
1+
FROM maven:3.9.0-eclipse-temurin-17 as maven
22
WORKDIR /vertx-web
33
COPY scripts scripts
44
COPY src src
@@ -11,7 +11,6 @@ CMD java \
1111
-server \
1212
-XX:+UseNUMA \
1313
-XX:+UseParallelGC \
14-
-XX:+AggressiveOpts \
1514
-Dvertx.disableMetrics=true \
1615
-Dvertx.disableH2c=true \
1716
-Dvertx.disableWebsockets=true \
@@ -24,7 +23,7 @@ CMD java \
2423
-Dio.netty.buffer.checkBounds=false \
2524
-Dio.netty.buffer.checkAccessible=false \
2625
-jar \
27-
target/vertx-web-benchmark-4.1.5-fat.jar \
26+
target/vertx-web-benchmark-4.3.8-fat.jar \
2827
--instances \
2928
`grep --count ^processor /proc/cpuinfo` \
3029
--conf \

‎frameworks/Java/vertx/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ This is the Vert.x portion of a [benchmarking test suite](../) comparing a varie
3232

3333
## Versions
3434

35-
* [Java 11](https://jdk.java.net)
36-
* [vertx 4.3.5](http://vertx.io/)
35+
* [Java 17](https://jdk.java.net)
36+
* [vertx 4.3.8](http://vertx.io/)
3737

3838
## Test URLs
3939

‎frameworks/Java/vertx/pom.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
<version>0.0.1-SNAPSHOT</version>
77

88
<properties>
9-
<maven.compiler.source>11</maven.compiler.source>
10-
<maven.compiler.target>11</maven.compiler.target>
9+
<maven.compiler.source>17</maven.compiler.source>
10+
<maven.compiler.target>17</maven.compiler.target>
1111
<!-- the main class -->
1212
<main.class>vertx.App</main.class>
13-
<stack.version>4.3.5</stack.version>
14-
<jackson.version>2.14.0</jackson.version>
15-
<netty.version>4.1.85.Final</netty.version>
13+
<stack.version>4.3.8</stack.version>
14+
<jackson.version>2.14.2</jackson.version>
15+
<netty.version>4.1.89.Final</netty.version>
1616
</properties>
1717

1818
<dependencies>
@@ -51,17 +51,17 @@
5151
<dependency>
5252
<groupId>com.github.ben-manes.caffeine</groupId>
5353
<artifactId>caffeine</artifactId>
54-
<version>3.1.1</version>
54+
<version>3.1.3</version>
5555
</dependency>
5656
<dependency>
5757
<groupId>com.fizzed</groupId>
5858
<artifactId>rocker-compiler</artifactId>
59-
<version>1.2.1</version>
59+
<version>1.3.0</version>
6060
</dependency>
6161
<dependency>
6262
<groupId>javax.xml.bind</groupId>
6363
<artifactId>jaxb-api</artifactId>
64-
<version>2.2.12</version>
64+
<version>2.3.1</version>
6565
</dependency>
6666
</dependencies>
6767

@@ -70,15 +70,15 @@
7070
<plugin>
7171
<groupId>org.apache.maven.plugins</groupId>
7272
<artifactId>maven-compiler-plugin</artifactId>
73-
<version>3.8.0</version>
73+
<version>3.10.1</version>
7474
<configuration>
7575
<debug>false</debug>
7676
</configuration>
7777
</plugin>
7878
<plugin>
7979
<groupId>com.fizzed</groupId>
8080
<artifactId>rocker-maven-plugin</artifactId>
81-
<version>1.2.1</version>
81+
<version>1.3.0</version>
8282
<executions>
8383
<execution>
8484
<id>generate-rocker-templates</id>
@@ -87,7 +87,7 @@
8787
<goal>generate</goal>
8888
</goals>
8989
<configuration>
90-
<javaVersion>11</javaVersion>
90+
<javaVersion>17</javaVersion>
9191
<templateDirectory>${basedir}/src/main/templates</templateDirectory>
9292
<outputDirectory>${basedir}/target/generated-sources/rocker</outputDirectory>
9393
<discardLogicWhitespace>false</discardLogicWhitespace>
@@ -101,7 +101,7 @@
101101
<plugin>
102102
<groupId>org.apache.maven.plugins</groupId>
103103
<artifactId>maven-shade-plugin</artifactId>
104-
<version>2.3</version>
104+
<version>2.4.1</version>
105105
<executions>
106106
<execution>
107107
<phase>package</phase>

‎frameworks/Java/vertx/vertx-postgres.dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM maven:3.6.1-jdk-11-slim as maven
1+
FROM maven:3.9.0-eclipse-temurin-17 as maven
22
WORKDIR /vertx
33
COPY src src
44
COPY pom.xml pom.xml
@@ -14,7 +14,6 @@ CMD export DBIP=`getent hosts tfb-database | awk '{ print $1 }'` && \
1414
-server \
1515
-XX:+UseNUMA \
1616
-XX:+UseParallelGC \
17-
-XX:+AggressiveOpts \
1817
-Dvertx.disableMetrics=true \
1918
-Dvertx.disableH2c=true \
2019
-Dvertx.disableWebsockets=true \

‎frameworks/Java/vertx/vertx.dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM maven:3.6.1-jdk-11-slim as maven
1+
FROM maven:3.9.0-eclipse-temurin-17 as maven
22
WORKDIR /vertx
33
COPY src src
44
COPY pom.xml pom.xml
55
RUN mvn package -q
66

77
EXPOSE 8080
88

9-
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"]
9+
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"]

‎frameworks/Kotlin/vertx-web-kotlin-coroutines/.gitattributes

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#
2+
# https://help.github.com/articles/dealing-with-line-endings/
3+
#
4+
# These are explicitly windows files and should use crlf
5+
*.bat text eol=crlf
6+

‎frameworks/Kotlin/vertx-web-kotlin-coroutines/build.gradle.kts

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,30 @@
11
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
2+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
23
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
34

5+
tasks.wrapper {
6+
distributionType = Wrapper.DistributionType.ALL
7+
}
8+
49
plugins {
5-
kotlin("jvm") version "1.6.10"
10+
kotlin("jvm") version "1.8.10"
611
application
712
id("nu.studer.rocker") version "3.0.4"
813
id("com.github.johnrengelman.shadow") version "7.1.2"
914
}
1015

1116
group = "io.vertx"
12-
version = "4.1.5"
17+
version = "4.3.8"
1318

1419
repositories {
1520
mavenCentral()
1621
}
1722

1823
dependencies {
19-
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0")
24+
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
2025
implementation(platform("io.vertx:vertx-stack-depchain:$version"))
2126
implementation("io.vertx:vertx-core")
22-
implementation("com.fasterxml.jackson.module:jackson-module-blackbird:2.12.4")
27+
implementation("com.fasterxml.jackson.module:jackson-module-blackbird:2.14.2")
2328
implementation("io.vertx:vertx-web")
2429
implementation("io.vertx:vertx-pg-client")
2530
implementation("io.vertx:vertx-web-templ-rocker")
@@ -33,13 +38,13 @@ rocker {
3338
create("main") {
3439
templateDir.set(file("src/main/resources"))
3540
optimize.set(true)
36-
javaVersion.set("1.8")
41+
javaVersion.set("17")
3742
}
3843
}
3944
}
4045

4146
tasks.withType<KotlinCompile> {
42-
kotlinOptions.jvmTarget = "11"
47+
compilerOptions.jvmTarget.set(JvmTarget.JVM_17)
4348
}
4449

4550

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

1.99 KB
Binary file not shown.

‎frameworks/Kotlin/vertx-web-kotlin-coroutines/gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
4+
networkTimeout=10000
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists

‎frameworks/Kotlin/vertx-web-kotlin-coroutines/gradlew

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
# Darwin, MinGW, and NonStop.
5656
#
5757
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
58+
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5959
# within the Gradle project.
6060
#
6161
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
8080
esac
8181
done
8282

83-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
84-
85-
APP_NAME="Gradle"
83+
# This is normally unused
84+
# shellcheck disable=SC2034
8685
APP_BASE_NAME=${0##*/}
86+
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
8787

8888
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
8989
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
143143
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
144144
case $MAX_FD in #(
145145
max*)
146+
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
147+
# shellcheck disable=SC3045
146148
MAX_FD=$( ulimit -H -n ) ||
147149
warn "Could not query maximum file descriptor limit"
148150
esac
149151
case $MAX_FD in #(
150152
'' | soft) :;; #(
151153
*)
154+
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
155+
# shellcheck disable=SC3045
152156
ulimit -n "$MAX_FD" ||
153157
warn "Could not set maximum file descriptor limit to $MAX_FD"
154158
esac
@@ -205,6 +209,12 @@ set -- \
205209
org.gradle.wrapper.GradleWrapperMain \
206210
"$@"
207211

212+
# Stop when "xargs" is not available.
213+
if ! command -v xargs >/dev/null 2>&1
214+
then
215+
die "xargs is not available"
216+
fi
217+
208218
# Use "xargs" to parse quoted args.
209219
#
210220
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.

‎frameworks/Kotlin/vertx-web-kotlin-coroutines/gradlew.bat

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
@rem limitations under the License.
1515
@rem
1616

17-
@if "%DEBUG%" == "" @echo off
17+
@if "%DEBUG%"=="" @echo off
1818
@rem ##########################################################################
1919
@rem
2020
@rem Gradle startup script for Windows
@@ -25,7 +25,8 @@
2525
if "%OS%"=="Windows_NT" setlocal
2626

2727
set DIRNAME=%~dp0
28-
if "%DIRNAME%" == "" set DIRNAME=.
28+
if "%DIRNAME%"=="" set DIRNAME=.
29+
@rem This is normally unused
2930
set APP_BASE_NAME=%~n0
3031
set APP_HOME=%DIRNAME%
3132

@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
4041

4142
set JAVA_EXE=java.exe
4243
%JAVA_EXE% -version >NUL 2>&1
43-
if "%ERRORLEVEL%" == "0" goto execute
44+
if %ERRORLEVEL% equ 0 goto execute
4445

4546
echo.
4647
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
7576

7677
:end
7778
@rem End local scope for the variables with windows NT shell
78-
if "%ERRORLEVEL%"=="0" goto mainEnd
79+
if %ERRORLEVEL% equ 0 goto mainEnd
7980

8081
:fail
8182
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
8283
rem the _cmd.exe /c_ return code!
83-
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
84-
exit /b 1
84+
set EXIT_CODE=%ERRORLEVEL%
85+
if %EXIT_CODE% equ 0 set EXIT_CODE=1
86+
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
87+
exit /b %EXIT_CODE%
8588

8689
:mainEnd
8790
if "%OS%"=="Windows_NT" endlocal

‎frameworks/Kotlin/vertx-web-kotlin-coroutines/vertx-web-kotlin-coroutines-postgres.dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM gradle:7.3.3-jdk11 as gradle
1+
FROM gradle:7.6-jdk17 as gradle
22
WORKDIR /vertx-web-kotlin-coroutines
33
COPY gradle gradle
44
COPY src src
@@ -14,7 +14,6 @@ CMD java \
1414
-server \
1515
-XX:+UseNUMA \
1616
-XX:+UseParallelGC \
17-
-XX:+AggressiveOpts \
1817
-Dvertx.disableMetrics=true \
1918
-Dvertx.disableH2c=true \
2019
-Dvertx.disableWebsockets=true \
@@ -27,7 +26,7 @@ CMD java \
2726
-Dio.netty.buffer.checkBounds=false \
2827
-Dio.netty.buffer.checkAccessible=false \
2928
-jar \
30-
build/libs/vertx-web-kotlin-coroutines-benchmark-4.1.5-fat.jar \
29+
build/libs/vertx-web-kotlin-coroutines-benchmark-4.3.8-fat.jar \
3130
--instances \
3231
`grep --count ^processor /proc/cpuinfo` \
3332
--conf \

0 commit comments

Comments
 (0)