diff --git a/.github/workflows/central-sync.yml b/.github/workflows/central-sync.yml index 89b2b3ac..ea5a5aa5 100644 --- a/.github/workflows/central-sync.yml +++ b/.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 }} diff --git a/.github/workflows/graalvm.yml b/.github/workflows/graalvm.yml index d0cf0939..23d72277 100644 --- a/.github/workflows/graalvm.yml +++ b/.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 diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 5a508e0c..be9c116a 100644 --- a/.github/workflows/gradle.yml +++ b/.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 }} diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml index f7c23e57..5dec33e1 100644 --- a/.github/workflows/publish-snapshot.yml +++ b/.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: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 31474dbf..19e791bb 100644 --- a/.github/workflows/release.yml +++ b/.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} diff --git a/.github/workflows/sonarqube.yml b/.github/workflows/sonarqube.yml index 71518e53..d238115f 100644 --- a/.github/workflows/sonarqube.yml +++ b/.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 }} diff --git a/build.gradle b/build.gradle index cf34f01f..5ea08f11 100644 --- a/build.gradle +++ b/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/" } +} diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle new file mode 100644 index 00000000..67840524 --- /dev/null +++ b/buildSrc/build.gradle @@ -0,0 +1,3 @@ +plugins { + id 'groovy-gradle-plugin' +} diff --git a/buildSrc/src/main/groovy/io.micronaut.build.internal.cassandra-module.gradle b/buildSrc/src/main/groovy/io.micronaut.build.internal.cassandra-module.gradle new file mode 100644 index 00000000..beae5c47 --- /dev/null +++ b/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/" } +} diff --git a/cassandra/build.gradle b/cassandra/build.gradle index ff8327f2..955c5324 100644 --- a/cassandra/build.gradle +++ b/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) diff --git a/cassandra/src/main/java/io/micronaut/cassandra/CassandraSessionFactory.java b/cassandra/src/main/java/io/micronaut/cassandra/CassandraSessionFactory.java index 58a33468..2c6142a4 100644 --- a/cassandra/src/main/java/io/micronaut/cassandra/CassandraSessionFactory.java +++ b/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; diff --git a/cassandra/src/test/groovy/io/micronaut/cassandra/health/CassandraHealthIndicatorSpec.groovy b/cassandra/src/test/groovy/io/micronaut/cassandra/health/CassandraHealthIndicatorSpec.groovy index bd79e076..07074690 100644 --- a/cassandra/src/test/groovy/io/micronaut/cassandra/health/CassandraHealthIndicatorSpec.groovy +++ b/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[] diff --git a/gradle.properties b/gradle.properties index f20b0862..ec3b503c 100755 --- a/gradle.properties +++ b/gradle.properties @@ -1,12 +1,12 @@ -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 @@ -14,7 +14,7 @@ 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 diff --git a/settings.gradle b/settings.gradle index f95dae1a..8d45c8a9 100644 --- a/settings.gradle +++ b/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() -} \ No newline at end of file +}