Merge branch '5.7.x' into renovate/micronaut.validation

.github/workflows/gradle.yml

@@ -45,14 +45,14 @@ jobs:
           fetch-depth: 0
 
       - name: "🔧 Setup GraalVM CE"
-        uses: graalvm/setup-graalvm@v1.2.2
+        uses: graalvm/setup-graalvm@v1.2.3
         with:
           distribution: 'graalvm'
           java-version: ${{ matrix.java }}
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: "🔧 Setup Gradle"
-        uses: gradle/gradle-build-action@v3.4.2
+        uses: gradle/gradle-build-action@v3.5.0
 
       - name: "❓ Optional setup step"
         run: |

gradle/libs.versions.toml

@@ -2,32 +2,32 @@
 
 # Micronaut
 
-micronaut = "4.5.3"
+micronaut = "4.5.4"
 micronaut-docs = "2.0.0"
-micronaut-gradle-plugin = "4.3.6"
-micronaut-test-resources = "2.5.2"
+micronaut-gradle-plugin = "4.4.2"
+micronaut-test-resources = "2.5.4"
 
 # Platform dependencies
 micronaut-cache = "4.3.0"
 micronaut-data = "4.7.1"
 micronaut-hibernate-validator = "4.3.0"
 micronaut-logging = "1.2.3"
 micronaut-micrometer = "5.6.0"
-micronaut-r2dbc = "5.4.0"
+micronaut-r2dbc = "5.5.0"
 micronaut-reactor = "3.3.0"
-micronaut-serde = "2.9.0"
+micronaut-serde = "2.10.2"
 micronaut-spring = "5.6.0"
-micronaut-test = "4.3.0"
+micronaut-test = "4.4.0"
 micronaut-validation = "4.6.1"
 
 # Frameworks
 
-managed-vertx = "4.5.8"
+managed-vertx = "4.5.9"
 managed-jooq = "3.19.10"
 managed-hibernate = "6.5.2.Final"
 managed-hibernate-reactive = "2.3.1.Final"
 managed-jasync = "2.2.4"
-managed-jdbi = "3.45.2"
+managed-jdbi = "3.45.3"
 
 # JDBC Drivers
 
@@ -43,14 +43,14 @@ managed-mysql-connector-j = "8.4.0"
 
 managed-hikari = "5.1.0"
 managed-commons-dbcp = "2.12.0"
-managed-tomcat-jdbc = "10.1.25"
+managed-tomcat-jdbc = "10.1.28"
 
 # JPA
 
 managed-jakarta-persistence-api = "3.1.0"
 managed-jakarta-transaction-api = "2.0.1"
 
-managed-h2 = "2.2.224"
+managed-h2 = "2.3.230"
 
 # Other
 

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ 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 "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

jdbc-dbcp/src/main/resources/META-INF/native-image/io.micronaut.sql/jdbc-dbcp-graal/resource-config.json

@@ -0,0 +1,5 @@
+{
+  "bundles": [
+    {"name": "org.apache.commons.dbcp2.LocalStrings"}
+  ]
+}

jdbc-dbcp/src/test/groovy/io/micronaut/configuration/jdbc/dbcp/DatasourceConfigurationSpec.groovy

@@ -96,7 +96,7 @@ class DatasourceConfigurationSpec extends Specification {
         String version = resultSet.getString(1)
 
         then:
-        version == '2.2.224'
+        version == '2.3.230'
 
         cleanup:
         applicationContext.close()

jdbc-hikari/src/test/groovy/io/micronaut/configuration/jdbc/hikari/DatasourceConfigurationSpec.groovy

@@ -117,7 +117,7 @@ class DatasourceConfigurationSpec extends Specification {
         String version = resultSet.getString(1)
 
         then:
-        version == '2.2.224'
+        version == '2.3.230'
 
         cleanup:
         applicationContext.close()

jdbc-tomcat/src/main/resources/META-INF/native-image/io.micronaut.sql/jdbc-tomcat-graal/proxy-config.json

@@ -0,0 +1,7 @@
+[
+  {
+    "interfaces": [
+      "java.sql.ResultSet"
+    ]
+  }
+]

jdbc-tomcat/src/test/groovy/io/micronaut/configuration/jdbc/tomcat/DatasourceConfigurationSpec.groovy

@@ -117,7 +117,7 @@ class DatasourceConfigurationSpec extends Specification {
         String version = resultSet.getString(1)
 
         then:
-        version == '2.2.224'
+        version == '2.3.230'
 
         cleanup:
         applicationContext.close()

jooq/src/main/resources/META-INF/native-image/io.micronaut.sql/jooq-graal/native-image.properties

@@ -15,5 +15,5 @@
 #
 
 Args = -H:ClassInitialization=org.jooq.SQLDialect$ThirdParty:build_time \
-       --initialize-at-run-time=io.micronaut.configuration.jooq.spring.SpringTransactionProvider,io.micronaut.configuration.jooq.spring.JooqExceptionTranslator,io.micronaut.configuration.jooq.$MicronautTransactionProvider$Definition,io.micronaut.configuration.jooq.spring.$SpringTransactionProvider$Definition \
+       --initialize-at-run-time=io.micronaut.configuration.jooq.spring.SpringTransactionProvider,io.micronaut.configuration.jooq.spring.JooqExceptionTranslator \
        --initialize-at-build-time=org.simpleflatmapper.reflect.DefaultReflectionService

settings.gradle

@@ -6,7 +6,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'io.micronaut.build.shared.settings' version '7.0.1'
+    id 'io.micronaut.build.shared.settings' version '7.2.0'
 }
 
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
@@ -67,3 +67,5 @@ include 'tests:jooq-tests:jooq-jdbc-postgres'
 include 'tests:jooq-tests:jooq-r2dbc-postgres'
 
 include 'tests:jdbc-ucp-tests:jdbc-ucp-oracle'
+include 'tests:jdbc-dbcp-tests:jdbc-dbcp-postgres'
+include 'tests:jdbc-tomcat-tests:jdbc-tomcat-mysql'

tests/jdbc-dbcp-tests/jdbc-dbcp-postgres/build.gradle

@@ -0,0 +1,19 @@
+plugins {
+    id 'io.micronaut.build.internal.test-application'
+}
+
+dependencies {
+    implementation projects.micronautJdbcDbcp
+    implementation projects.micronautTests.micronautCommonSync
+
+    runtimeOnly libs.managed.postgresql
+
+    testImplementation projects.micronautTests.micronautCommonTests
+    testImplementation(mnData.micronaut.data.tx.jdbc)
+}
+
+micronaut {
+    testResources {
+        additionalModules.add(JDBC_POSTGRESQL)
+    }
+}

tests/jdbc-dbcp-tests/jdbc-dbcp-postgres/src/main/java/example/jdbc/ucp/sync/Owner.java

@@ -0,0 +1,52 @@
+package example.jdbc.ucp.sync;
+
+import example.domain.IOwner;
+import io.micronaut.core.annotation.Creator;
+import io.micronaut.serde.annotation.Serdeable;
+
+@Serdeable
+public class Owner implements IOwner {
+
+    private Long id;
+    private String name;
+    private int age;
+
+    Owner() {
+    }
+
+    @Creator
+    public Owner(Long id, String name, int age) {
+        this.id = id;
+        this.name = name;
+        this.age = age;
+    }
+
+    @Override
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public int getAge() {
+        return age;
+    }
+
+    @Override
+    public void setAge(int age) {
+        this.age = age;
+    }
+}