From 3fc3dcec71c85627ab592c26b0c4ff8d57bf3066 Mon Sep 17 00:00:00 2001 From: Dean Wette Date: Tue, 15 Nov 2022 11:04:07 -0600 Subject: [PATCH] ci: build to 6.0.1, test to 4.0.0-SNAPSHOT, groovy to 4.0.6, spock to 2.3-groovy-4.0, github workflows to Java 17 (#279) * ci: build to 6.0.1, test to 4.0.0-SNAPSHOT, groovy to 4.0.6, spock to 2.3-groovy-4.0, github workflows to Java 17 * revert change that isn't java version --- .github/workflows/central-sync.yml | 2 +- .github/workflows/graalvm.yml | 2 +- .github/workflows/gradle.yml | 6 +++--- .github/workflows/publish-snapshot.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/sonarqube.yml | 2 +- build.gradle | 1 - cassandra/build.gradle | 2 +- .../io/micronaut/cassandra/CassandraSessionFactory.java | 2 +- .../cassandra/health/CassandraHealthIndicatorSpec.groovy | 2 +- gradle.properties | 6 +++--- gradle/libs.versions.toml | 4 +--- settings.gradle | 2 +- 13 files changed, 16 insertions(+), 19 deletions(-) diff --git a/.github/workflows/central-sync.yml b/.github/workflows/central-sync.yml index 3d550abb..add5cc43 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: 'adopt' - 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 2fa66fa3..b7278470 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 e1e63f97..1e37c151 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 8b70c7e4..5c8bd293 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: 'adopt' - 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 13dcbbca..8d933603 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,7 +20,7 @@ jobs: uses: actions/setup-java@v3 with: distribution: 'adopt' - 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 93ae8a94..4ed20609 100644 --- a/.github/workflows/sonarqube.yml +++ b/.github/workflows/sonarqube.yml @@ -38,7 +38,7 @@ jobs: uses: actions/setup-java@v3 with: distribution: 'adopt' - 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 f7a13198..5ea08f11 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,5 @@ plugins { id "io.micronaut.build.internal.docs" - id "io.micronaut.build.internal.dependency-updates" id "io.micronaut.build.internal.quality-reporting" } diff --git a/cassandra/build.gradle b/cassandra/build.gradle index a557d2d7..955c5324 100644 --- a/cassandra/build.gradle +++ b/cassandra/build.gradle @@ -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 40dc3df0..ec3b503c 100755 --- a/gradle.properties +++ b/gradle.properties @@ -3,10 +3,10 @@ projectGroup=io.micronaut.cassandra micronautDocsVersion=2.0.0 micronautVersion=4.0.0-SNAPSHOT -micronautTestVersion=3.4.0 +micronautTestVersion=4.0.0-SNAPSHOT -groovyVersion=3.0.12 -spockVersion=2.1-groovy-3.0 +groovyVersion=4.0.6 +spockVersion=2.3-groovy-4.0 title=Micronaut Cassandra projectDesc=Provides integration between Micronaut and Cassandra diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 80ab6eb6..07ca329e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,13 +2,11 @@ managed-datastax-cassandra-driver = "4.14.1" testcontainers = "1.17.3" -spock = "2.1-groovy-3.0" +spock = "2.3-groovy-4.0" [libraries] managed-datastax-cassandra-driver-core = { module = "com.datastax.oss:java-driver-core", version.ref = "managed-datastax-cassandra-driver" } managed-datastax-cassandra-driver-mapper-processor = { module = "com.datastax.oss:java-driver-mapper-processor", version.ref = "managed-datastax-cassandra-driver" } -reactor-core = { module = "io.projectreactor:reactor-core" } - testcontainers-cassandra = { module = "org.testcontainers:cassandra", version.ref = "testcontainers" } testcontainers-spock = { module = "org.testcontainers:spock", version.ref = "testcontainers" } diff --git a/settings.gradle b/settings.gradle index bcadd201..08324c2e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -6,7 +6,7 @@ pluginManagement { } plugins { - id("io.micronaut.build.shared.settings") version "5.3.14" + id("io.micronaut.build.shared.settings") version "6.0.1" } rootProject.name = 'cassandra-parent'