From 8ce34393679e6143fbf7cbcc94e217ccc0696c31 Mon Sep 17 00:00:00 2001 From: Joe DiPol Date: Thu, 20 Feb 2025 15:15:43 -0700 Subject: [PATCH] 1.x: Update netty to 4.1.118.Final, grpc-java to 1.65.1, protobuf to 3.25.5 plus pipleline upgrades (#9817) * Upgrade netty to 4.1.118.Final * Upgrade dependency-check-plugin to 12.1.0 * Update copyrights * Update copyrights in pom files * Update ubuntu workflow image version to 22.04 * Upgrade upload-artifact action to v4 * Upgrade grpc-java to 1.65.1 and protobuf to 3.25.5 --- .github/workflows/release.yaml | 6 +-- .github/workflows/validate.yml | 20 ++++----- applications/mp/pom.xml | 2 +- applications/pom.xml | 2 +- applications/se/pom.xml | 2 +- bom/pom.xml | 2 +- bundles/config/pom.xml | 2 +- bundles/jersey/pom.xml | 2 +- bundles/pom.xml | 2 +- bundles/security/pom.xml | 2 +- bundles/webserver/pom.xml | 2 +- common/common/pom.xml | 2 +- common/configurable/pom.xml | 2 +- common/context/pom.xml | 2 +- common/http/pom.xml | 2 +- common/key-util/pom.xml | 2 +- common/mapper/pom.xml | 2 +- common/media-type/pom.xml | 2 +- common/metrics/pom.xml | 2 +- common/pom.xml | 2 +- common/reactive/pom.xml | 2 +- common/service-loader/pom.xml | 2 +- config/config/pom.xml | 2 +- config/encryption/pom.xml | 2 +- config/etcd/pom.xml | 10 +++-- config/etcd/src/main/java9/module-info.java | 8 ++-- config/git/pom.xml | 2 +- config/hocon/pom.xml | 2 +- config/object-mapping/pom.xml | 2 +- config/pom.xml | 2 +- config/test-infrastructure/pom.xml | 2 +- config/testing/pom.xml | 2 +- config/tests/integration-tests/pom.xml | 2 +- config/tests/module-mappers-1-base/pom.xml | 2 +- .../tests/module-mappers-2-override/pom.xml | 2 +- config/tests/module-meta-source-1/pom.xml | 2 +- config/tests/module-meta-source-2/pom.xml | 2 +- .../tests/module-parsers-1-override/pom.xml | 2 +- config/tests/pom.xml | 2 +- config/tests/test-bundle/pom.xml | 2 +- .../test-default_config-1-properties/pom.xml | 2 +- .../test-default_config-2-hocon-json/pom.xml | 2 +- .../tests/test-default_config-3-hocon/pom.xml | 2 +- .../tests/test-default_config-4-yaml/pom.xml | 2 +- .../test-default_config-5-env_vars/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../test-default_config-8-meta-hocon/pom.xml | 2 +- .../test-default_config-9-meta-yaml/pom.xml | 2 +- config/tests/test-mappers-1-common/pom.xml | 2 +- config/tests/test-mappers-2-complex/pom.xml | 2 +- config/tests/test-meta-source/pom.xml | 2 +- config/tests/test-parsers-1-complex/pom.xml | 2 +- config/yaml/pom.xml | 2 +- dependencies/pom.xml | 22 +++++----- docs/pom.xml | 2 +- examples/config/basics/pom.xml | 2 +- examples/config/changes/pom.xml | 2 +- examples/config/git/pom.xml | 2 +- examples/config/mapping/pom.xml | 2 +- examples/config/overrides/pom.xml | 2 +- examples/config/pom.xml | 2 +- examples/config/sources/pom.xml | 2 +- examples/employee-app/pom.xml | 2 +- examples/grpc/basics/pom.xml | 2 +- examples/grpc/common/pom.xml | 2 +- examples/grpc/metrics/pom.xml | 2 +- .../grpc/microprofile/basic-client/pom.xml | 2 +- .../basic-server-implicit/pom.xml | 2 +- examples/grpc/microprofile/metrics/pom.xml | 2 +- examples/grpc/microprofile/pom.xml | 2 +- examples/grpc/opentracing/pom.xml | 2 +- examples/grpc/pom.xml | 2 +- examples/grpc/security-abac/pom.xml | 2 +- examples/grpc/security-outbound/pom.xml | 2 +- examples/grpc/security/pom.xml | 2 +- examples/health/basics/pom.xml | 2 +- examples/health/pom.xml | 2 +- .../cdi/datasource-hikaricp-h2/pom.xml | 2 +- .../cdi/datasource-hikaricp-mysql/pom.xml | 2 +- .../cdi/datasource-hikaricp/pom.xml | 2 +- examples/integrations/cdi/jedis/pom.xml | 2 +- examples/integrations/cdi/jpa/pom.xml | 2 +- .../cdi/oci-objectstorage/pom.xml | 2 +- examples/integrations/cdi/pom.xml | 2 +- examples/integrations/pom.xml | 2 +- .../microprofile/hello-world-explicit/pom.xml | 2 +- .../microprofile/hello-world-implicit/pom.xml | 2 +- examples/microprofile/idcs/pom.xml | 2 +- examples/microprofile/mp1_1-security/pom.xml | 2 +- .../microprofile/mp1_1-static-content/pom.xml | 2 +- examples/microprofile/oidc/pom.xml | 2 +- examples/microprofile/openapi-basic/pom.xml | 2 +- examples/microprofile/pom.xml | 2 +- examples/openapi/pom.xml | 2 +- examples/pom.xml | 2 +- .../helidon-quickstart-mp/build.gradle | 2 +- .../quickstarts/helidon-quickstart-mp/pom.xml | 2 +- .../helidon-quickstart-se/build.gradle | 2 +- .../quickstarts/helidon-quickstart-se/pom.xml | 2 +- .../helidon-standalone-quickstart-mp/pom.xml | 2 +- .../helidon-standalone-quickstart-se/pom.xml | 2 +- examples/quickstarts/pom.xml | 2 +- .../attribute-based-access-control/pom.xml | 2 +- examples/security/google-login/pom.xml | 2 +- examples/security/idcs-login/pom.xml | 2 +- examples/security/jersey/pom.xml | 2 +- examples/security/nohttp-programmatic/pom.xml | 2 +- examples/security/outbound-override/pom.xml | 2 +- examples/security/pom.xml | 2 +- examples/security/spi-examples/pom.xml | 2 +- .../security/webserver-digest-auth/pom.xml | 2 +- .../security/webserver-signatures/pom.xml | 2 +- examples/todo-app/backend/pom.xml | 2 +- examples/todo-app/frontend/pom.xml | 2 +- examples/todo-app/pom.xml | 2 +- examples/translator-app/backend/pom.xml | 2 +- examples/translator-app/frontend/pom.xml | 2 +- examples/translator-app/pom.xml | 2 +- examples/webserver/basics/pom.xml | 2 +- examples/webserver/comment-aas/pom.xml | 2 +- examples/webserver/jersey/pom.xml | 2 +- examples/webserver/opentracing/pom.xml | 2 +- examples/webserver/pom.xml | 2 +- examples/webserver/static-content/pom.xml | 2 +- examples/webserver/streaming/pom.xml | 2 +- examples/webserver/tutorial/pom.xml | 2 +- grpc/client/pom.xml | 2 +- .../grpc/client/GrpcChannelsProviderIT.java | 44 +++++++++++++++++-- grpc/core/pom.xml | 41 ++++++++++------- .../helidon/grpc/core/MarshallerSupplier.java | 12 ++--- grpc/core/src/main/java9/module-info.java | 11 +++-- grpc/io.grpc/pom.xml | 2 +- grpc/metrics/pom.xml | 2 +- grpc/pom.xml | 2 +- grpc/server/pom.xml | 2 +- grpc/server/src/main/java9/module-info.java | 9 ++-- health/common/pom.xml | 2 +- health/health-checks/pom.xml | 2 +- health/health/pom.xml | 2 +- health/pom.xml | 2 +- integrations/cdi/common-cdi/delegates/pom.xml | 2 +- integrations/cdi/common-cdi/pom.xml | 2 +- .../reference-counted-context/pom.xml | 2 +- integrations/cdi/datasource-hikaricp/pom.xml | 2 +- integrations/cdi/datasource-ucp/pom.xml | 2 +- integrations/cdi/datasource/pom.xml | 2 +- integrations/cdi/eclipselink-cdi/pom.xml | 2 +- integrations/cdi/hibernate-cdi/pom.xml | 2 +- integrations/cdi/jedis-cdi/pom.xml | 2 +- integrations/cdi/jpa-cdi/pom.xml | 2 +- integrations/cdi/jpa-weld/pom.xml | 2 +- integrations/cdi/jta-cdi/pom.xml | 2 +- integrations/cdi/jta-weld/pom.xml | 2 +- .../cdi/oci-objectstorage-cdi/pom.xml | 2 +- integrations/cdi/pom.xml | 2 +- .../graal/native-image-extension/pom.xml | 2 +- integrations/graal/pom.xml | 2 +- integrations/pom.xml | 2 +- integrations/serviceconfiguration/pom.xml | 2 +- .../serviceconfiguration-api/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../serviceconfiguration-hikaricp/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../serviceconfiguration-ucp-accs/pom.xml | 2 +- .../pom.xml | 2 +- .../serviceconfiguration-ucp/pom.xml | 2 +- javadocs/pom.xml | 2 +- jersey/client/pom.xml | 2 +- jersey/common/pom.xml | 2 +- jersey/jsonp/pom.xml | 2 +- jersey/pom.xml | 2 +- jersey/server/pom.xml | 2 +- media/common/pom.xml | 2 +- media/jackson/common/pom.xml | 2 +- media/jackson/pom.xml | 2 +- media/jackson/server/pom.xml | 2 +- media/jsonb/common/pom.xml | 2 +- media/jsonb/pom.xml | 2 +- media/jsonb/server/pom.xml | 2 +- media/jsonp/common/pom.xml | 2 +- media/jsonp/pom.xml | 2 +- media/jsonp/server/pom.xml | 2 +- media/pom.xml | 2 +- metrics/metrics/pom.xml | 2 +- metrics/pom.xml | 2 +- metrics/prometheus/pom.xml | 2 +- metrics2/metrics2/pom.xml | 2 +- metrics2/pom.xml | 2 +- microprofile/access-log/pom.xml | 2 +- .../bundles/helidon-microprofile-1.0/pom.xml | 2 +- .../bundles/helidon-microprofile-1.1/pom.xml | 2 +- .../bundles/helidon-microprofile-1.2/pom.xml | 2 +- .../bundles/helidon-microprofile-2.2/pom.xml | 2 +- .../bundles/helidon-microprofile-3.0/pom.xml | 2 +- .../bundles/helidon-microprofile-3.1/pom.xml | 2 +- .../bundles/helidon-microprofile-core/pom.xml | 2 +- .../bundles/helidon-microprofile/pom.xml | 2 +- .../bundles/internal-test-libs/pom.xml | 2 +- microprofile/bundles/pom.xml | 2 +- microprofile/config/config-cdi/pom.xml | 2 +- microprofile/config/config/pom.xml | 2 +- microprofile/config/pom.xml | 2 +- microprofile/fault-tolerance/pom.xml | 2 +- microprofile/grpc/client/pom.xml | 2 +- .../client/src/main/java9/module-info.java | 7 +-- microprofile/grpc/core/pom.xml | 2 +- microprofile/grpc/metrics/pom.xml | 2 +- microprofile/grpc/pom.xml | 2 +- microprofile/grpc/server/pom.xml | 2 +- .../server/src/main/java9/module-info.java | 3 +- microprofile/health/pom.xml | 2 +- microprofile/jwt-auth/jwt-auth-cdi/pom.xml | 2 +- microprofile/jwt-auth/jwt-auth/pom.xml | 2 +- microprofile/jwt-auth/pom.xml | 2 +- microprofile/metrics/pom.xml | 2 +- microprofile/metrics2/pom.xml | 2 +- microprofile/oidc/pom.xml | 2 +- microprofile/openapi/pom.xml | 2 +- microprofile/pom.xml | 2 +- microprofile/rest-client/pom.xml | 2 +- microprofile/security/pom.xml | 2 +- microprofile/server/pom.xml | 2 +- microprofile/tests/arquillian/pom.xml | 2 +- microprofile/tests/pom.xml | 2 +- microprofile/tracing/pom.xml | 2 +- openapi/pom.xml | 2 +- parent/pom.xml | 2 +- pom.xml | 6 +-- security/abac/policy-el/pom.xml | 2 +- security/abac/policy/pom.xml | 2 +- security/abac/pom.xml | 2 +- security/abac/role/pom.xml | 2 +- security/abac/scope/pom.xml | 2 +- security/abac/time/pom.xml | 2 +- security/annotations/pom.xml | 2 +- security/integration/common/pom.xml | 2 +- security/integration/grpc/pom.xml | 2 +- security/integration/jersey-client/pom.xml | 2 +- security/integration/jersey/pom.xml | 2 +- security/integration/pom.xml | 2 +- security/integration/webserver/pom.xml | 2 +- security/jwt/pom.xml | 2 +- security/pom.xml | 2 +- security/providers/abac/pom.xml | 2 +- security/providers/common/pom.xml | 2 +- security/providers/google-login/pom.xml | 2 +- security/providers/header/pom.xml | 2 +- security/providers/http-auth/pom.xml | 2 +- security/providers/http-sign/pom.xml | 2 +- security/providers/idcs-mapper/pom.xml | 2 +- security/providers/jwt/pom.xml | 2 +- security/providers/oidc-common/pom.xml | 2 +- security/providers/oidc/pom.xml | 2 +- security/providers/pom.xml | 2 +- security/security/pom.xml | 2 +- security/util/pom.xml | 2 +- tests/apps/bookstore/bookstore-mp/pom.xml | 2 +- tests/apps/bookstore/bookstore-se/pom.xml | 2 +- tests/apps/bookstore/common/pom.xml | 2 +- tests/apps/bookstore/pom.xml | 2 +- tests/apps/pom.xml | 2 +- tests/functional/bookstore/pom.xml | 2 +- tests/functional/context-propagation/pom.xml | 2 +- tests/functional/jax-rs-subresource/pom.xml | 2 +- tests/functional/multiport/pom.xml | 2 +- tests/functional/pom.xml | 2 +- tests/integration/gh-5792/pom.xml | 2 +- tests/integration/health/mp-disabled/pom.xml | 2 +- tests/integration/health/pom.xml | 2 +- tests/integration/mp-autodiscovery/pom.xml | 2 +- tests/integration/mp-gh-1468/pom.xml | 2 +- tests/integration/mp-gh-1538/pom.xml | 2 +- tests/integration/mp-jaeger-3052/pom.xml | 2 +- tests/integration/mp-security-client/pom.xml | 2 +- tests/integration/mp-ws-services/pom.xml | 2 +- tests/integration/pom.xml | 2 +- tests/integration/security/gh1487/pom.xml | 2 +- .../integration/security/path-params/pom.xml | 2 +- tests/integration/security/pom.xml | 2 +- tests/integration/zipkin-mp-2.2/pom.xml | 2 +- tests/pom.xml | 2 +- tracing/config/pom.xml | 2 +- tracing/jaeger/pom.xml | 2 +- tracing/jersey-client/pom.xml | 2 +- tracing/jersey/pom.xml | 2 +- tracing/pom.xml | 2 +- .../tests/it-tracing-client-zipkin/pom.xml | 2 +- tracing/tests/pom.xml | 2 +- tracing/tracer-resolver/pom.xml | 2 +- tracing/tracing/pom.xml | 2 +- tracing/zipkin/pom.xml | 2 +- webclient/jaxrs/pom.xml | 2 +- webclient/pom.xml | 2 +- webserver/access-log/pom.xml | 2 +- webserver/jersey/pom.xml | 2 +- webserver/pom.xml | 2 +- webserver/test-support/pom.xml | 2 +- webserver/webserver/pom.xml | 2 +- 302 files changed, 413 insertions(+), 364 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 0f2b9366002..a6993382ca5 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -19,7 +19,7 @@ concurrency: jobs: copyright: timeout-minutes: 10 - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 with: @@ -34,7 +34,7 @@ jobs: run: etc/scripts/copyright.sh release: timeout-minutes: 60 - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 environment: release steps: - uses: actions/checkout@v3 @@ -59,7 +59,7 @@ jobs: git config user.name "Helidon Robot" etc/scripts/release.sh release_build - name: Upload Staged Artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: io-helidon-artifacts-${{ github.ref_name }} path: parent/target/nexus-staging/ diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index a12821edd54..46acd3b3f2a 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -15,7 +15,7 @@ concurrency: jobs: copyright: timeout-minutes: 10 - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 with: @@ -30,7 +30,7 @@ jobs: run: etc/scripts/copyright.sh checkstyle: timeout-minutes: 10 - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - name: Set up JDK ${{ env.JAVA_VERSION }} @@ -43,7 +43,7 @@ jobs: run: etc/scripts/checkstyle.sh spotbugs: timeout-minutes: 45 - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - name: Set up JDK ${{ env.JAVA_VERSION }} @@ -58,7 +58,7 @@ jobs: timeout-minutes: 60 strategy: matrix: - os: [ ubuntu-20.04 ] + os: [ ubuntu-22.04 ] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 @@ -71,7 +71,7 @@ jobs: - name: Maven build run: etc/scripts/github-build.sh - name: Archive test results - uses: actions/upload-artifact@v3.1.2 + uses: actions/upload-artifact@v4 if: always() with: name: test-results @@ -80,7 +80,7 @@ jobs: **/target/it/**/*.log docs: timeout-minutes: 20 - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - name: Set up JDK ${{ env.JAVA_VERSION }} @@ -92,7 +92,7 @@ jobs: - name: Docs run: etc/scripts/site.sh - name: Archive Docs - uses: actions/upload-artifact@v3.1.2 + uses: actions/upload-artifact@v4 if: always() with: name: docs @@ -103,7 +103,7 @@ jobs: timeout-minutes: 60 strategy: matrix: - os: [ ubuntu-20.04 ] + os: [ ubuntu-22.04 ] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 @@ -119,7 +119,7 @@ jobs: timeout-minutes: 30 strategy: matrix: - os: [ ubuntu-20.04 ] + os: [ ubuntu-22.04 ] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 @@ -138,7 +138,7 @@ jobs: timeout-minutes: 30 strategy: matrix: - os: [ ubuntu-20.04 ] + os: [ ubuntu-22.04 ] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 diff --git a/applications/mp/pom.xml b/applications/mp/pom.xml index 963b33e8581..3b1ee3b4d0d 100644 --- a/applications/mp/pom.xml +++ b/applications/mp/pom.xml @@ -1,7 +1,7 @@ - io.helidon.grpc - io.grpc + io.grpc + grpc-api + + + io.grpc + grpc-core io.grpc diff --git a/config/etcd/src/main/java9/module-info.java b/config/etcd/src/main/java9/module-info.java index 0c3b5834158..c2ff0c0eb3c 100644 --- a/config/etcd/src/main/java9/module-info.java +++ b/config/etcd/src/main/java9/module-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2023 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2025 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,9 +22,9 @@ requires java.logging; requires transitive io.helidon.config; requires etcd4j; - requires grpc.api; - requires grpc.protobuf; - requires grpc.stub; + requires io.grpc.protobuf; + requires io.grpc.stub; + requires io.grpc; requires com.google.protobuf; requires com.google.common; requires io.helidon.common; diff --git a/config/git/pom.xml b/config/git/pom.xml index 687749e02e2..83a4b03cd1d 100644 --- a/config/git/pom.xml +++ b/config/git/pom.xml @@ -1,7 +1,7 @@ + + io.grpc + grpc-bom + ${version.lib.grpc} + pom + import + com.google.protobuf protobuf-bom @@ -629,13 +636,6 @@ pom import - - io.grpc - grpc-bom - ${version.lib.grpc} - pom - import - org.glassfish.jersey jersey-bom diff --git a/docs/pom.xml b/docs/pom.xml index a1cf5f53ef1..b33a36bdacb 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -1,7 +1,7 @@ - com.google.protobuf:protoc:3.5.1-1:exe:${os.detected.classifier} + com.google.protobuf:protoc:${version.lib.google-protobuf}:exe:${os.detected.classifier} grpc-java diff --git a/security/abac/policy-el/pom.xml b/security/abac/policy-el/pom.xml index dfbe37defe7..3f9570ce8a8 100644 --- a/security/abac/policy-el/pom.xml +++ b/security/abac/policy-el/pom.xml @@ -1,7 +1,7 @@