Merge branch 'release/0.10.0'

Author: LaurentTreguier

.env-example

@@ -13,9 +13,10 @@ [email protected]
 [email protected]
 QUARKUS_MAILER_PASSWORD=password
 
-QUARKUS_SENTRY_DSN=https://sentry.example.org
-QUARKUS_SENTRY_ENVIRONMENT=local
-QUARKUS_SENTRY_TRACES_SAMPLE_RATE=1.0
+QUARKUS_LOG_SENTRY_ENABLED=true
+QUARKUS_LOG_SENTRY_DSN=https://sentry.example.org
+QUARKUS_LOG_SENTRY_ENVIRONMENT=local
+QUARKUS_LOG_SENTRY_TRACES_SAMPLE_RATE=1.0
 
 MP_JWT_VERIFY_PUBLICKEY=public-key-content
 SMALLRYE_JWT_SIGN_KEY=private-key-content

build.gradle

@@ -1,13 +1,20 @@
+import javax.inject.Inject
+
 plugins {
     id "java"
     id "io.quarkus"
     id "com.diffplug.spotless" version "${spotlessPluginVersion}"
     id "io.freefair.lombok" version "${lombokPluginVersion}"
 }
 
+interface ExecOperationsProvider {
+    @Inject
+    ExecOperations getExecOperations()
+}
+
 def gitVersion() {
     def stdout = new ByteArrayOutputStream()
-    exec {
+    project.objects.newInstance(ExecOperationsProvider).execOperations.exec {
         commandLine "git", "describe", "--tags", "--always", "--dirty"
         standardOutput = stdout
     }
@@ -47,13 +54,13 @@ dependencies {
     implementation("io.quarkus:quarkus-smallrye-jwt-build")
     implementation("io.quarkus:quarkus-smallrye-openapi")
     implementation("io.quarkiverse.amazonservices:quarkus-amazon-s3")
+    implementation("io.quarkiverse.loggingsentry:quarkus-logging-sentry:${quarkusLoggingSentry}")
+    implementation("io.quarkiverse.opentelemetry.exporter:quarkus-opentelemetry-exporter-sentry:${quarkusOtelExporter}")
     implementation("io.sentry:sentry-jul")
     implementation("javaxt:javaxt-core:${javaXtVersion}")
     implementation("software.amazon.awssdk:url-connection-client")
     implementation("software.amazon.awssdk.crt:aws-crt")
     implementation("com.twelvemonkeys.imageio:imageio-webp:${twelveMonkeysVersion}")
-    implementation(project(":quarkus-sentry:deployment"))
-    implementation(project(":quarkus-sentry:runtime"))
     testImplementation("io.quarkus:quarkus-junit5")
     testImplementation("io.quarkus:quarkus-test-h2")
     testImplementation("io.quarkus:quarkus-test-security")

gradle.properties

@@ -1,8 +1,10 @@
 org.gradle.jvmargs=-Xmx1024M
-quarkusPlatformVersion=3.16.3
-quarkusPluginVersion=3.16.3
-sentryVersion=7.17.0
-javaXtVersion=2.1.9
+quarkusPlatformVersion=3.21.4
+quarkusPluginVersion=3.21.4
+quarkusLoggingSentry=2.1.3
+quarkusOtelExporter=3.18.3.1
+sentryVersion=8.10.0
+javaXtVersion=2.1.11
 twelveMonkeysVersion=3.12.0
-spotlessPluginVersion=6.25.0
-lombokPluginVersion=8.11
+spotlessPluginVersion=7.0.3
+lombokPluginVersion=8.13.1

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -115,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -206,15 +205,15 @@ fi
 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,
+#   * DEFAULT_JVM_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" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew

@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell