Merge pull request #347 from micronaut-projects/migrate_to_build_6.1.1

Migrate to build 6.1.1
micronaut-projects · Dec 15, 2022 · a000167 · a000167
2 parents 7ecb9a9 + 84bf587
commit a000167
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 38 deletions.
diff --git a/.github/workflows/graalvm.yml b/.github/workflows/graalvm.yml
@@ -58,7 +58,7 @@ jobs:
            PREDICTIVE_TEST_SELECTION: "${{ github.event_name == 'pull_request' && 'true' || 'false' }}"
       - name: Publish Test Report
         if: always()
-        uses: mikepenz/action-junit-report@v3.5.2
+        uses: mikepenz/action-junit-report@v3.6.2
         with:
           check_name: GraalVM CE CI / Test Report (Java ${{ matrix.java }})
           report_paths: '**/build/test-results/test/TEST-*.xml'

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -60,7 +60,7 @@ jobs:
            PREDICTIVE_TEST_SELECTION: "${{ github.event_name == 'pull_request' && 'true' || 'false' }}"
       - name: Publish Test Report
         if: always()
-        uses: mikepenz/action-junit-report@v3.5.2
+        uses: mikepenz/action-junit-report@v3.6.2
         with:
           check_name: Java CI / Test Report (${{ matrix.java }})
           report_paths: '**/build/test-results/test/TEST-*.xml'

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -119,7 +119,7 @@ jobs:
       actions: read # To read the workflow path.
       id-token: write # To sign the provenance.
       contents: write # To add assets to a release.
-    uses: slsa-framework/slsa-github-generator/.github/workflows/generator_generic_slsa3.yml@v1.2.1
+    uses: slsa-framework/slsa-github-generator/.github/workflows/generator_generic_slsa3.yml@v1.4.0
     with:
       base64-subjects: "${{ needs.release.outputs.hashes }}"
       upload-assets: true # Upload to a new release.

diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
@@ -96,11 +96,13 @@
         <!-- Checks for Javadoc comments.                     -->
         <!-- See https://checkstyle.org/config_javadoc.html -->
         <module name="JavadocMethod">
-            <property name="excludeScope" value="private"/>
+            <property name="accessModifiers" value="public, protected"/>
         </module>
         <module name="JavadocType"/>
         <module name="JavadocStyle"/>
-        <module name="MissingJavadocType"/>
+        <module name="MissingJavadocType">
+            <property name="severity" value="warning"/>
+        </module>
 
         <!-- Checks for Naming Conventions.                  -->
         <!-- See https://checkstyle.org/config_naming.html -->

diff --git a/elasticsearch/build.gradle b/elasticsearch/build.gradle
@@ -4,24 +4,20 @@ plugins {
 
 dependencies {
     annotationProcessor(mn.micronaut.graal)
+
+    compileOnly(libs.graal.svm)
+    implementation(mn.micronaut.management)
+
     api(libs.managed.elasticsearch.java)
     api(libs.managed.elasticsearch.rest.high.level.client)
     api(mn.micronaut.http)
     api(mn.micronaut.validation)
+
     implementation(mn.micronaut.jackson.databind)
-    compileOnly(mn.graal)
-    compileOnly(mn.micronaut.inject.java)
-    compileOnly(mn.micronaut.management)
 
     testImplementation(libs.testcontainers.elasticsearch)
-    testImplementation(libs.testcontainers.spock)
     testImplementation(mn.groovy.json)
-    testImplementation(mn.micronaut.inject.groovy)
-    testImplementation(mn.micronaut.inject.java)
-    testImplementation(mn.micronaut.inject.java.test)
-    testImplementation(mn.micronaut.management)
-    testImplementation(mn.micronaut.runtime)
-    testImplementation(mn.micronaut.security)
+    testImplementation(mnSecurity.micronaut.security)
     testImplementation(mn.reactor)
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,12 +1,6 @@
 projectVersion=5.0.0-SNAPSHOT
 projectGroup=io.micronaut.elasticsearch
 
-micronautDocsVersion=2.0.0
-micronautVersion=4.0.0-SNAPSHOT
-micronautTestVersion=4.0.0-SNAPSHOT
-groovyVersion=4.0.6
-spockVersion=2.3-groovy-4.0
-
 title=Micronaut Elasticsearch
 projectDesc=Integration between Micronaut and Elasticsearch
 projectUrl=https://micronaut.io

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,9 +1,24 @@
 [versions]
+micronaut-docs = "2.0.0"
+micronaut = "4.0.0-SNAPSHOT"
+
+micronaut-security = "4.0.0-SNAPSHOT"
+micronaut-test = "4.0.0-SNAPSHOT"
+
 managed-elasticsearch = "7.16.3"
 
+graal-svm = "22.0.0.2"
+groovy = "4.0.6"
+spock = "2.3-groovy-4.0"
+testcontainers = "1.17.6"
+
 [libraries]
+micronaut-security = { module = "io.micronaut.security:micronaut-security-bom", version.ref = "micronaut-security" }
+
 managed-elasticsearch-java = { module = "co.elastic.clients:elasticsearch-java", version.ref = "managed-elasticsearch" }
 managed-elasticsearch-rest-high-level-client = { module = "org.elasticsearch.client:elasticsearch-rest-high-level-client", version.ref = "managed-elasticsearch" }
 
-testcontainers-elasticsearch = { module = "org.testcontainers:elasticsearch" }
-testcontainers-spock = { module = "org.testcontainers:spock" }
+graal-svm = { module = "org.graalvm.nativeimage:svm", version.ref = "graal-svm" }
+
+testcontainers-elasticsearch = { module = "org.testcontainers:elasticsearch", version.ref = "testcontainers"  }
+
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle b/settings.gradle
@@ -6,7 +6,7 @@ pluginManagement {
 }
 
 plugins {
-    id("io.micronaut.build.shared.settings") version "6.0.2"
+    id("io.micronaut.build.shared.settings") version "6.1.1"
 }
 
 rootProject.name = 'elasticsearch-parent'
@@ -17,13 +17,8 @@ include 'test-suite-groovy'
 
 enableFeaturePreview 'TYPESAFE_PROJECT_ACCESSORS'
 
-dependencyResolutionManagement {
-    repositories {
-        mavenCentral()
-        maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" }
-    }
-}
-
 micronautBuild {
+    addSnapshotRepository()
     importMicronautCatalog()
+    importMicronautCatalog("micronaut-security")
 }
diff --git a/test-suite-groovy/build.gradle b/test-suite-groovy/build.gradle
@@ -6,25 +6,23 @@ plugins {
 dependencies {
     testCompileOnly mn.micronaut.inject.groovy
 
-    testImplementation(platform(mn.micronaut.bom))
+    testImplementation(platform(mn.micronaut.core.bom))
     testImplementation(mn.micronaut.validation)
-    testImplementation(mn.spock)
-    testImplementation(mn.micronaut.test.spock)
+    testImplementation(mnTest.micronaut.test.spock)
 
     // tag::testcontainers-dependencies[]
-    testImplementation(libs.testcontainers.spock)
     testImplementation(libs.testcontainers.elasticsearch)
     // end::testcontainers-dependencies[]
 
     testImplementation(projects.elasticsearch)
-
-    testRuntimeOnly(mn.logback)
+    testRuntimeOnly(mn.logback.classic)
 }
 
 tasks.named('test') {
     useJUnitPlatform()
     systemProperty 'elasticsearch.version', libs.versions.managed.elasticsearch.get()
 }
+
 java {
     sourceCompatibility = JavaVersion.toVersion('17')
     targetCompatibility = JavaVersion.toVersion('17')