diff --git a/pom.xml b/pom.xml
index 73d69a0f2..4111cdcd6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
io.smallrye
smallrye-parent
- 47
+ 48
smallrye-open-api-parent
diff --git a/testsuite/extra/pom.xml b/testsuite/extra/pom.xml
index 71a4370cc..88c8fe6bc 100644
--- a/testsuite/extra/pom.xml
+++ b/testsuite/extra/pom.xml
@@ -52,6 +52,7 @@
org.jboss.shrinkwrap
shrinkwrap-api
+ ${version.shrinkwrap_core}
test
@@ -103,17 +104,9 @@
-
org.apache.maven.plugins
maven-surefire-plugin
-
-
- org.apache.maven.surefire
- surefire-junit-platform
- ${version.surefire.plugin}
-
-
${project.build.testOutputDirectory}/logging.properties
diff --git a/testsuite/pom.xml b/testsuite/pom.xml
index 8c1910b64..9b7866522 100644
--- a/testsuite/pom.xml
+++ b/testsuite/pom.xml
@@ -56,22 +56,6 @@
pom
import
-
-
- org.jboss.shrinkwrap
- shrinkwrap-bom
- ${version.shrinkwrap_core}
- pom
- import
-
-
-
- org.jboss.shrinkwrap.resolver
- shrinkwrap-resolver-bom
- ${version.shrinkwrap_resolver}
- pom
- import
-
diff --git a/testsuite/tck/pom.xml b/testsuite/tck/pom.xml
index 281dcfd37..39570a1e9 100644
--- a/testsuite/tck/pom.xml
+++ b/testsuite/tck/pom.xml
@@ -102,16 +102,19 @@
org.jboss.shrinkwrap
shrinkwrap-api
+ ${version.shrinkwrap_core}
test
org.jboss.shrinkwrap.resolver
shrinkwrap-resolver-impl-maven
+ ${version.shrinkwrap_resolver}
test
org.jboss.shrinkwrap.resolver
shrinkwrap-resolver-api-maven
+ ${version.shrinkwrap_resolver}
test
diff --git a/tools/gradle-plugin/build.gradle b/tools/gradle-plugin/build.gradle
index a5fb57dc8..a3f240009 100644
--- a/tools/gradle-plugin/build.gradle
+++ b/tools/gradle-plugin/build.gradle
@@ -8,8 +8,8 @@ group = "io.smallrye"
compileJava {
options.encoding = 'UTF-8'
- sourceCompatibility = '11'
- targetCompatibility = '11'
+ sourceCompatibility = JavaVersion.VERSION_11
+ targetCompatibility = JavaVersion.VERSION_11
}
compileTestJava {
@@ -20,7 +20,7 @@ repositories {
mavenLocal()
mavenCentral()
maven {
- url = uri("file:./target/dependencies")
+ url = uri("./target/dependencies")
}
}
@@ -31,7 +31,8 @@ dependencies {
implementation("io.smallrye:smallrye-open-api-vertx:${version}")
implementation("io.smallrye.config:smallrye-config:${versionConfig}")
- testImplementation("org.junit.jupiter:junit-jupiter:${versionJunit5}")
+ testRuntimeOnly("org.junit.platform:junit-platform-launcher:${versionJunit}")
+ testImplementation("org.junit.jupiter:junit-jupiter:${versionJunit}")
testImplementation(gradleTestKit())
testImplementation("org.assertj:assertj-core:3.27.6")
testImplementation("com.fasterxml.jackson.core:jackson-databind:${versionJackson}")
@@ -41,10 +42,13 @@ test {
testLogging {
events "passed", "skipped", "failed"
}
+
useJUnitPlatform()
+
// multiple Gradle invocations executed from the same testing JVM cause problems, so fork
// for each test, and make sure we only run one Gradle execution in each test
- forkEvery 1
+ forkEvery = 1
+
// For Gradle testing :(
jvmArgs("--add-opens=java.base/java.lang.invoke=ALL-UNNAMED",
"--add-opens=java.base/java.util=ALL-UNNAMED")
diff --git a/tools/gradle-plugin/gradle/wrapper/gradle-wrapper.jar b/tools/gradle-plugin/gradle/wrapper/gradle-wrapper.jar
index ccebba771..d64cd4917 100644
Binary files a/tools/gradle-plugin/gradle/wrapper/gradle-wrapper.jar and b/tools/gradle-plugin/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/tools/gradle-plugin/gradle/wrapper/gradle-wrapper.properties b/tools/gradle-plugin/gradle/wrapper/gradle-wrapper.properties
index c01d7459b..70155355f 100644
--- a/tools/gradle-plugin/gradle/wrapper/gradle-wrapper.properties
+++ b/tools/gradle-plugin/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,8 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionSha256Sum=c16d517b50dd28b3f5838f0e844b7520b8f1eb610f2f29de7e4e04a1b7c9c79b
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
+distributionSha256Sum=f86344275d1b194688dd330abf9f6f2344cd02872ffee035f2d1ea2fd60cf7f3
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-all.zip
networkTimeout=10000
+validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/tools/gradle-plugin/gradlew b/tools/gradle-plugin/gradlew
index 79a61d421..1aa94a426 100755
--- a/tools/gradle-plugin/gradlew
+++ b/tools/gradle-plugin/gradlew
@@ -83,10 +83,8 @@ done
# This is normally unused
# shellcheck disable=SC2034
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.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
@@ -133,10 +131,13 @@ location of your Java installation."
fi
else
JAVACMD=java
- which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+ if ! command -v java >/dev/null 2>&1
+ then
+ die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
+ fi
fi
# Increase the maximum file descriptors if we can.
@@ -144,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
- # shellcheck disable=SC3045
+ # shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
@@ -152,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
- # shellcheck disable=SC3045
+ # shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
@@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then
done
fi
-# Collect all arguments for the java command;
-# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-# shell script including quotes and variable substitutions, so put them in
-# double quotes to make sure that they get re-expanded; and
-# * put everything else in single quotes, so that it's not re-expanded.
+
+# 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"'
+
+# Collect all arguments for the java command:
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+# and any embedded shellness will be escaped.
+# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+# treated as '${Hostname}' itself on the command line.
set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
diff --git a/tools/gradle-plugin/src/maven-build/gradle.properties b/tools/gradle-plugin/src/maven-build/gradle.properties
index 0cfe26c71..899a0c34a 100644
--- a/tools/gradle-plugin/src/maven-build/gradle.properties
+++ b/tools/gradle-plugin/src/maven-build/gradle.properties
@@ -4,4 +4,4 @@
version=${project.version}
versionConfig=${version.io.smallrye.smallrye-config}
versionJackson=${jackson-bom.version}
-versionJunit5=${version.junit5}
+versionJunit=${version.junit}
diff --git a/tools/gradle-plugin/src/test/java/io/smallrye/openapi/gradleplugin/SmallryeOpenApiPluginTest.java b/tools/gradle-plugin/src/test/java/io/smallrye/openapi/gradleplugin/SmallryeOpenApiPluginTest.java
index 0e553305b..8082abd08 100644
--- a/tools/gradle-plugin/src/test/java/io/smallrye/openapi/gradleplugin/SmallryeOpenApiPluginTest.java
+++ b/tools/gradle-plugin/src/test/java/io/smallrye/openapi/gradleplugin/SmallryeOpenApiPluginTest.java
@@ -185,7 +185,7 @@ void smokeProject(Path buildDir, boolean withQuarkus, String taskName, String ou
"plugins {",
" id 'java-library'",
" id 'io.smallrye.openapi'",
- withQuarkus ? " id 'io.quarkus' version '2.15.2.Final'" : "",
+ withQuarkus ? " id 'io.quarkus' version '3.27.1'" : "",
"}",
"",
"repositories {",
@@ -294,7 +294,7 @@ private static void checkGeneratedFiles(Path buildDir, String expectedOutputFile
assertThat(targetOpenapiDir.resolve("my-openapi-schema-file.json")).isRegularFile();
JsonNode root = new ObjectMapper().readValue(
- targetOpenapiDir.resolve("my-openapi-schema-file.json").toUri().toURL(),
+ targetOpenapiDir.resolve("my-openapi-schema-file.json").toFile(),
JsonNode.class);
assertThat(root.get("openapi").asText()).isEqualTo("999.999.999");
assertThat(root.get("x-smallrye-gradle-generated").booleanValue()).isTrue();