Merge pull request #341 from micronaut-projects/5.0.x

build: master to 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,4 @@
+plugins {
+    id 'groovy-gradle-plugin'
+}
+

buildSrc/src/main/groovy/io.micronaut.build.internal.elasticsearch-base.gradle

@@ -0,0 +1,11 @@
+repositories {
+    mavenCentral()
+    maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" }
+}
+
+configurations.all {
+    resolutionStrategy.dependencySubstitution {
+        substitute(module("org.codehaus.groovy:groovy"))
+                .using(module("org.apache.groovy:groovy:4.0.6"))
+    }
+}

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

@@ -0,0 +1,4 @@
+plugins {
+    id "io.micronaut.build.internal.elasticsearch-base"
+    id "io.micronaut.build.internal.module"
+}

buildSrc/src/main/groovy/io.micronaut.build.internal.elasticsearch-tests.gradle

@@ -0,0 +1,3 @@
+plugins {
+    id "io.micronaut.build.internal.elasticsearch-base"
+}

elasticsearch/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'io.micronaut.build.internal.module'
+    id 'io.micronaut.build.internal.elasticsearch-module'
 }
 
 dependencies {
@@ -8,7 +8,7 @@ dependencies {
     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)

gradle.properties

@@ -1,19 +1,19 @@
-projectVersion=4.3.1-SNAPSHOT
+projectVersion=5.0.0-SNAPSHOT
 projectGroup=io.micronaut.elasticsearch
 
 micronautDocsVersion=2.0.0
-micronautVersion=3.5.4
-micronautTestVersion=3.4.0
-groovyVersion=3.0.12
-spockVersion=2.1-groovy-3.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
 githubSlug=micronaut-projects/micronaut-elasticsearch
 developers=Puneet Behl
 
-githubCoreBranch=3.6.x
+githubCoreBranch=4.0.x
 bomProperty=micronautElasticsearchVersion
 bomProperties=elasticsearchVersion
 

gradlew.bat

@@ -88,4 +88,4 @@ exit /b %EXIT_CODE%
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
 
-:omega
+:omega

settings.gradle

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

test-suite-groovy/build.gradle

@@ -1,9 +1,6 @@
 plugins {
     id 'groovy'
-}
-
-repositories {
-    mavenCentral()
+    id 'io.micronaut.build.internal.elasticsearch-tests'
 }
 
 dependencies {
@@ -28,8 +25,7 @@ tasks.named('test') {
     useJUnitPlatform()
     systemProperty 'elasticsearch.version', libs.versions.managed.elasticsearch.get()
 }
-
 java {
-    sourceCompatibility = JavaVersion.toVersion('1.8')
-    targetCompatibility = JavaVersion.toVersion('1.8')
+    sourceCompatibility = JavaVersion.toVersion('17')
+    targetCompatibility = JavaVersion.toVersion('17')
 }