Merge pull request #280 from micronaut-projects/6.0.0

build: Micronaut 4.0.0-SNAPSHOT

.github/workflows/central-sync.yml

@@ -23,7 +23,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '17'
       - name: Publish to Sonatype OSSRH
         env:
           SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}

.github/workflows/graalvm.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: ['11', '17']
+        java: ['17']
         graalvm: ['latest', 'dev']
     steps:
        # https://github.com/actions/virtual-environments/issues/709

.github/workflows/gradle.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: ['8', '11', '17']
+        java: ['17']
     steps:
        # https://github.com/actions/virtual-environments/issues/709
       - name: Free disk space
@@ -72,7 +72,7 @@ jobs:
           name: binary-compatibility-reports
           path: "**/build/reports/binary-compatibility-*.html"
       - name: Publish to Sonatype Snapshots
-        if: success() && github.event_name == 'push' && matrix.java == '11'
+        if: success() && github.event_name == 'push' && matrix.java == '17'
         env:
           SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
           SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
@@ -88,7 +88,7 @@ jobs:
           if_true: "micronaut-projects/micronaut-docs"
           if_false: ${{ github.repository }}
       - name: Publish to Github Pages
-        if: success() && github.event_name == 'push' && matrix.java == '11'
+        if: success() && github.event_name == 'push' && matrix.java == '17'
         uses: micronaut-projects/github-pages-deploy-action@master
         env:
           TARGET_REPOSITORY: ${{ steps.docs_target.outputs.value }}

.github/workflows/publish-snapshot.yml

@@ -21,7 +21,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '17'
       - name: Publish to Sonatype Snapshots
         if: success()
         env:

.github/workflows/release.yml

@@ -22,7 +22,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '17'
       - name: Set the current release version
         id: release_version
         run: echo ::set-output name=release_version::${GITHUB_REF:11}

.github/workflows/sonarqube.yml

@@ -38,7 +38,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: 11
+          java-version: 17
       - name: Optional setup step
         env:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}

build.gradle

@@ -1,5 +1,9 @@
 plugins {
     id "io.micronaut.build.internal.docs"
-    id "io.micronaut.build.internal.dependency-updates"
     id "io.micronaut.build.internal.quality-reporting"
 }
+
+repositories {
+    mavenCentral()
+    maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" }
+}

buildSrc/build.gradle

@@ -0,0 +1,3 @@
+plugins {
+    id 'groovy-gradle-plugin'
+}

buildSrc/src/main/groovy/io.micronaut.build.internal.cassandra-module.gradle

@@ -0,0 +1,8 @@
+plugins {
+    id "io.micronaut.build.internal.module"
+}
+
+repositories {
+    mavenCentral()
+    maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" }
+}

cassandra/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id "io.micronaut.build.internal.module"
+    id "io.micronaut.build.internal.cassandra-module"
 }
 
 dependencies {
@@ -8,7 +8,7 @@ dependencies {
 
     compileOnly(mn.micronaut.management)
 
-    testImplementation(libs.reactor.core)
+    testImplementation(mn.reactor)
 
     testImplementation(libs.testcontainers.spock)
     testImplementation(libs.testcontainers.cassandra)

cassandra/src/main/java/io/micronaut/cassandra/CassandraSessionFactory.java

@@ -24,10 +24,10 @@
 import io.micronaut.context.annotation.Factory;
 import io.micronaut.core.naming.conventions.StringConvention;
 import io.micronaut.core.value.PropertyResolver;
+import jakarta.annotation.PreDestroy;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.PreDestroy;
 import java.util.ArrayList;
 import java.util.List;
 

cassandra/src/test/groovy/io/micronaut/cassandra/health/CassandraHealthIndicatorSpec.groovy

@@ -124,7 +124,7 @@ class CassandraHealthIndicatorSpec extends Specification {
         // tag::single[]
         ApplicationContext applicationContext = new DefaultApplicationContext("test")
         applicationContext.environment.addPropertySource(MapPropertySource.of(
-                'test'
+                'test', Collections.emptyMap()
         ))
         applicationContext.start()
         // end::single[]

gradle.properties

@@ -1,20 +1,20 @@
-projectVersion=5.2.0-SNAPSHOT
+projectVersion=6.0.0-SNAPSHOT
 projectGroup=io.micronaut.cassandra
 
 micronautDocsVersion=2.0.0
-micronautVersion=3.5.3
-micronautTestVersion=3.4.0
+micronautVersion=4.0.0-SNAPSHOT
+micronautTestVersion=4.0.0-SNAPSHOT
 
-groovyVersion=3.0.13
-spockVersion=2.2-groovy-3.0
+groovyVersion=4.0.6
+spockVersion=2.3-groovy-4.0
 
 title=Micronaut Cassandra
 projectDesc=Provides integration between Micronaut and Cassandra
 projectUrl=https://micronaut.io
 githubSlug=micronaut-projects/micronaut-cassandra
 developers=Graeme Rocher
 
-githubCoreBranch=3.8.x
+githubCoreBranch=4.0.x
 bomProperty=micronautCassandraVersion
 
 org.gradle.caching=true

settings.gradle

@@ -6,13 +6,20 @@ pluginManagement {
 }
 
 plugins {
-    id("io.micronaut.build.shared.settings") version "5.3.15"
+    id("io.micronaut.build.shared.settings") version "6.0.2"
 }
 
 rootProject.name = 'cassandra-parent'
 include 'cassandra'
 include 'cassandra-bom'
 
+dependencyResolutionManagement {
+    repositories {
+        mavenCentral()
+        maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" }
+    }
+}
+
 micronautBuild {
     importMicronautCatalog()
-}
+}