From 822ca1a1f6cd2d6c2f2407ead2d8cccd5fafddf4 Mon Sep 17 00:00:00 2001 From: Tim Yates Date: Mon, 8 Jan 2024 20:51:57 +0000 Subject: [PATCH 1/3] Remove chatbots from 3.9.x micronaut-bom (#10340) * Remove chatbots from 3.9.x micronaut-bom It didn't make it into the 3.x branch, and v1.0.0 of chatbots is for Micronaut 4 * Fix build --- bom/build.gradle | 24 +++++++++++++++++++++++- gradle/libs.versions.toml | 2 -- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/bom/build.gradle b/bom/build.gradle index 79178f1f5e6..6d3508f58f0 100644 --- a/bom/build.gradle +++ b/bom/build.gradle @@ -24,6 +24,28 @@ micronautBom { // https://github.com/micronaut-projects/micronaut-serialization/issues/167 dependencies.add("io.micronaut.serde:micronaut-serde-tck:1.0.0") + // ChatBots module removed from 3.9.8, this can be removed after it's released + acceptedVersionRegressions.add("micronaut-chatbots") + acceptedLibraryRegressions.addAll( + "micronaut-chatbots-basecamp-api", + "micronaut-chatbots-basecamp-lambda", + "micronaut-chatbots-telegram-gcp-function", + "micronaut-chatbots-telegram-lambda", + "micronaut-chatbots-telegram-http", + "micronaut-chatbots-basecamp-azure-function", + "micronaut-chatbots-basecamp-http", + "micronaut-chatbots-http", + "micronaut-chatbots-basecamp-core", + "micronaut-chatbots-core", + "micronaut-chatbots-telegram-azure-function", + "micronaut-chatbots-bom", + "micronaut-chatbots-google-api", + "micronaut-chatbots-telegram-api", + "micronaut-chatbots-lambda", + "micronaut-chatbots-telegram-core", + "micronaut-chatbots-basecamp-gcp-function" + ) + // https://github.com/micronaut-projects/micronaut-oracle-cloud/issues/359 dependencies.add("io.micronaut.oraclecloud:micronaut-oraclecloud-sdk-processor:2.1.1") dependencies.add("io.micronaut.oraclecloud:micronaut-oraclecloud-atp-hikari-test:2.1.1") @@ -55,7 +77,7 @@ micronautBom { // The R2DBC bom that we include mentions dependencies which do not belong to io.r2dbc group bomAuthorizedGroupIds.put("io.r2dbc:r2dbc-bom", ["com.google.cloud", "com.oracle.database.r2dbc", "org.mariadb", "dev.miku"] as Set) - + // Tracing bomAuthorizedGroupIds.put( "io.zipkin.brave:brave-bom", diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9171c6a0e64..fd5f4d128ca 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -70,7 +70,6 @@ managed-micronaut-aot = "1.1.2" managed-micronaut-aws = "3.17.3" managed-micronaut-azure = "4.1.1" managed-micronaut-cache = "3.5.0" -managed-micronaut-chatbots = "1.0.0-M1" managed-micronaut-cassandra = "5.1.1" managed-micronaut-coherence = "3.7.2" managed-micronaut-crac = "1.2.3" @@ -151,7 +150,6 @@ micronaut-docs = "2.0.0" boms-micronaut-aws = { module = "io.micronaut.aws:micronaut-aws-bom", version.ref = "managed-micronaut-aws" } boms-micronaut-azure = { module = "io.micronaut.azure:micronaut-azure-bom", version.ref = "managed-micronaut-azure" } boms-micronaut-cache = { module = "io.micronaut.cache:micronaut-cache-bom", version.ref = "managed-micronaut-cache" } -boms-micronaut-chatbots = { module = "io.micronaut.chatbots:micronaut-chatbots-bom", version.ref = "managed-micronaut-chatbots" } boms-micronaut-coherence = { module = "io.micronaut.coherence:micronaut-coherence-bom", version.ref = "managed-micronaut-coherence" } boms-micronaut-crac = { module = "io.micronaut.crac:micronaut-crac-bom", version.ref = "managed-micronaut-crac" } boms-micronaut-email = { module = "io.micronaut.email:micronaut-email-bom", version.ref = "managed-micronaut-email" } From 7f1ce4b23288a62b00ba4f3857f66cdec970c19f Mon Sep 17 00:00:00 2001 From: Sergio del Amo Date: Wed, 20 Mar 2024 16:25:55 +0100 Subject: [PATCH 2/3] ci: delete static analysis step (#10631) ci is failing with: ``` > Task :sonarqube FAILED FAILURE: Build failed with an exception. * What went wrong: Execution failed for task ':sonarqube'. > The plugin [java] does not support Java 11.0.22 289 actionable tasks: 85 executed, 204 up-to-date ``` --- .github/workflows/gradle.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 24680e4eaa4..2a1883c7d9b 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -56,11 +56,6 @@ jobs: run: | ./gradlew check --no-daemon --continue - - name: "🔎 Run static analysis" - if: env.SONAR_TOKEN != '' - run: | - ./gradlew sonar - - name: "📊 Publish Test Report" if: always() uses: mikepenz/action-junit-report@v3 From bc333b172a82f0203b3dc29ef5e3c2f6ea272db3 Mon Sep 17 00:00:00 2001 From: Jonas Konrad Date: Wed, 20 Mar 2024 17:30:24 +0100 Subject: [PATCH 3/3] Update netty to 4.1.107.Final (#10628) Co-authored-by: Sergio del Amo --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b4f0be7cccc..f46300020c4 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -126,7 +126,7 @@ managed-micronaut-views = "3.8.2" managed-micronaut-xml = "3.2.0" managed-neo4j = "3.5.35" managed-neo4j-java-driver = "4.4.9" -managed-netty = "4.1.100.Final" +managed-netty = "4.1.107.Final" managed-reactive-pg-client = "0.11.4" managed-reactive-streams = "1.0.4" # This should be kept aligned with https://github.com/micronaut-projects/micronaut-reactor/blob/master/gradle.properties from the BOM