From f4f7ef5e041253a1fd4879c1a40eec245ad0f676 Mon Sep 17 00:00:00 2001 From: ravinperera00 Date: Fri, 8 Nov 2024 01:07:06 +0530 Subject: [PATCH 1/3] Migrate to Java 21 --- .../workflows/build-timestamped-master.yml | 2 +- .github/workflows/publish-release.yml | 2 +- .github/workflows/pull-request.yml | 2 +- README.md | 2 +- gradle.properties | 46 +++++++++---------- tooling-tests/build.gradle | 7 ++- 6 files changed, 32 insertions(+), 29 deletions(-) diff --git a/.github/workflows/build-timestamped-master.yml b/.github/workflows/build-timestamped-master.yml index 9b3d710..a25507c 100644 --- a/.github/workflows/build-timestamped-master.yml +++ b/.github/workflows/build-timestamped-master.yml @@ -9,5 +9,5 @@ jobs: call_workflow: name: Run Build Workflow if: ${{ github.repository_owner == 'ballerina-platform' }} - uses: ballerina-platform/ballerina-library/.github/workflows/build-timestamp-master-template.yml@main + uses: ballerina-platform/ballerina-library/.github/workflows/build-timestamp-master-template.yml@java21 secrets: inherit diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 09ad41b..e87025f 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -7,7 +7,7 @@ jobs: call_workflow: name: Run Release Workflow if: ${{ github.repository_owner == 'ballerina-platform' }} - uses: ballerina-platform/ballerina-library/.github/workflows/release-package-template.yml@main + uses: ballerina-platform/ballerina-library/.github/workflows/release-package-template.yml@java21 secrets: inherit with: package-name: protoc-tools diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index bf10678..3f428e7 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -10,4 +10,4 @@ jobs: call_workflow: name: Run PR Build Workflow if: ${{ github.repository_owner == 'ballerina-platform' }} - uses: ballerina-platform/ballerina-library/.github/workflows/pull-request-build-template.yml@main + uses: ballerina-platform/ballerina-library/.github/workflows/pull-request-build-template.yml@java21 diff --git a/README.md b/README.md index 806df14..9c0e337 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ For information on how to generate Ballerina code for Protocol Buffers definitio ### Set Up the prerequisites -* Download and install Java SE Development Kit (JDK) version 17 (from one of the following locations). +* Download and install Java SE Development Kit (JDK) version 21 (from one of the following locations). * [Oracle](https://www.oracle.com/java/technologies/downloads/) diff --git a/gradle.properties b/gradle.properties index 15a18e8..75882a3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,44 +2,44 @@ org.gradle.caching=true group=io.ballerina version=0.3.2-SNAPSHOT #dependency versions -ballerinaLangVersion=2201.9.1 +ballerinaLangVersion=2201.10.0-20241025-103700-5c9e6a27 checkstylePluginVersion=10.12.1 commonsLang3Version=3.8.1 slf4jVersion=1.7.30 protoGoogleCommonsVersion=1.17.0 protobufJavaVersion=3.23.4 picocliVersion=4.0.1 -githubSpotbugsVersion=5.0.14 +githubSpotbugsVersion=6.0.18 githubJohnrengelmanShadowVersion=8.1.1 underCouchDownloadVersion=5.4.0 researchgateReleaseVersion=2.8.0 testngVersion=7.6.1 jacocoVersion=0.8.10 -stdlibGrpcVersion=1.11.2 -stdlibIoVersion=1.6.1 -stdlibTimeVersion=2.5.0 -stdlibUrlVersion=2.4.0 +stdlibGrpcVersion=1.12.2-20241106-150300-3da09ef +stdlibIoVersion=1.6.2-20240928-084100-656404f +stdlibTimeVersion=2.5.1-20240930-120200-e59222b +stdlibUrlVersion=2.4.1-20240930-120200-b7fb9e1 -stdlibConstraintVersion=1.5.0 -stdlibCryptoVersion=2.7.2 -stdlibLogVersion=2.9.0 -stdlibOsVersion=1.8.0 -stdlibProtobufVersion=1.6.1 -stdlibRandomVersion=1.5.0 -stdlibTaskVersion=2.5.0 +stdlibConstraintVersion=1.5.1-20240930-123400-5ecd396 +stdlibCryptoVersion=2.7.3-20240930-132000-5ecc9ab +stdlibLogVersion=2.10.1-20240930-154200-5ab2aa4 +stdlibOsVersion=1.8.1-20241001-120600-dd1626e +stdlibProtobufVersion=1.6.2-20240930-192700-1e42210 +stdlibRandomVersion=1.5.1-20240930-193000-e5c6c0e +stdlibTaskVersion=2.5.1-20241002-145700-5bdb843 -stdlibCacheVersion=3.8.0 -stdlibFileVersion=1.9.0 -stdlibMimeVersion=2.9.0 -stdlibUuidVersion=1.8.0 +stdlibCacheVersion=3.8.1-20241007-154900-63f4403 +stdlibFileVersion=1.10.1-20241007-160900-03f7b64 +stdlibMimeVersion=2.10.1-20241009-141200-8b6c9f0 +stdlibUuidVersion=1.8.1-20241009-134600-a05012b -stdlibAuthVersion=2.11.2 -stdlibJwtVersion=2.12.1 -stdlibOAuth2Version=2.11.0 +stdlibAuthVersion=2.12.1-20241010-130800-733dbef +stdlibJwtVersion=2.13.1-20241010-123600-5ea6a94 +stdlibOAuth2Version=2.12.1-20241029-084800-d7ba9e5 -stdlibHttpVersion=2.11.4 +stdlibHttpVersion=2.13.0-20241029-110700-30ed05b # Ballerinax Observer -observeVersion=1.2.3 -observeInternalVersion=1.2.2 +observeVersion=1.3.1-20241007-161000-645452d +observeInternalVersion=1.3.1-20241015-172900-cdc3cb3 diff --git a/tooling-tests/build.gradle b/tooling-tests/build.gradle index 5dbb711..a3e9bc0 100644 --- a/tooling-tests/build.gradle +++ b/tooling-tests/build.gradle @@ -132,8 +132,11 @@ checkstyle { checkstyleTest.dependsOn(":checkstyle:downloadCheckstyleRuleFiles") spotbugsTest { - effort "max" - reportLevel "low" + def classLoader = plugins["com.github.spotbugs"].class.classLoader + def SpotBugsConfidence = classLoader.findLoadedClass("com.github.spotbugs.snom.Confidence") + def SpotBugsEffort = classLoader.findLoadedClass("com.github.spotbugs.snom.Effort") + effort = SpotBugsEffort.MAX + reportLevel = SpotBugsConfidence.LOW reportsDir = file("$project.buildDir/reports/spotbugs") reports { html.enabled true From f64173f1cded3a7c162996e4b5ed3a4233193e9a Mon Sep 17 00:00:00 2001 From: hindujaB Date: Sun, 17 Nov 2024 22:44:04 +0530 Subject: [PATCH 2/3] Update java 21 versions --- gradle.properties | 44 +++++++++---------- .../io/ballerina/protoc/GrpcConstants.java | 2 +- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/gradle.properties b/gradle.properties index 75882a3..7fa464f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.caching=true group=io.ballerina version=0.3.2-SNAPSHOT #dependency versions -ballerinaLangVersion=2201.10.0-20241025-103700-5c9e6a27 +ballerinaLangVersion=2201.11.0-20241117-133400-a3054b77 checkstylePluginVersion=10.12.1 commonsLang3Version=3.8.1 slf4jVersion=1.7.30 @@ -16,30 +16,30 @@ researchgateReleaseVersion=2.8.0 testngVersion=7.6.1 jacocoVersion=0.8.10 -stdlibGrpcVersion=1.12.2-20241106-150300-3da09ef -stdlibIoVersion=1.6.2-20240928-084100-656404f -stdlibTimeVersion=2.5.1-20240930-120200-e59222b -stdlibUrlVersion=2.4.1-20240930-120200-b7fb9e1 +stdlibGrpcVersion=1.13.0-20241114-195700-5188f60 +stdlibIoVersion=1.6.2-20241112-233100-995cf5f +stdlibTimeVersion=2.6.0-20241113-073800-201b904 +stdlibUrlVersion=2.4.1-20241113-073900-335ff51 -stdlibConstraintVersion=1.5.1-20240930-123400-5ecd396 -stdlibCryptoVersion=2.7.3-20240930-132000-5ecc9ab -stdlibLogVersion=2.10.1-20240930-154200-5ab2aa4 -stdlibOsVersion=1.8.1-20241001-120600-dd1626e -stdlibProtobufVersion=1.6.2-20240930-192700-1e42210 -stdlibRandomVersion=1.5.1-20240930-193000-e5c6c0e -stdlibTaskVersion=2.5.1-20241002-145700-5bdb843 +stdlibConstraintVersion=1.6.0-20241113-090900-d276ad5 +stdlibCryptoVersion=2.7.3-20241113-081400-d015a39 +stdlibLogVersion=2.10.1-20241113-120000-4577868 +stdlibOsVersion=1.8.1-20241113-122000-cca973b +stdlibProtobufVersion=1.6.2-20241113-122200-13cac06 +stdlibRandomVersion=1.5.1-20241113-122300-1bc770e +stdlibTaskVersion=2.5.1-20241113-123500-f905281 -stdlibCacheVersion=3.8.1-20241007-154900-63f4403 -stdlibFileVersion=1.10.1-20241007-160900-03f7b64 -stdlibMimeVersion=2.10.1-20241009-141200-8b6c9f0 -stdlibUuidVersion=1.8.1-20241009-134600-a05012b +stdlibCacheVersion=3.8.1-20241113-125700-b75a1bf +stdlibFileVersion=1.10.1-20241113-151700-e1a2e38 +stdlibMimeVersion=2.10.2-20241113-154200-d953747 +stdlibUuidVersion=1.8.1-20241113-154400-443c67b -stdlibAuthVersion=2.12.1-20241010-130800-733dbef -stdlibJwtVersion=2.13.1-20241010-123600-5ea6a94 -stdlibOAuth2Version=2.12.1-20241029-084800-d7ba9e5 +stdlibAuthVersion=2.12.1-20241113-162300-ded40eb +stdlibJwtVersion=2.13.1-20241113-162400-b59ccfa +stdlibOAuth2Version=2.12.1-20241113-162400-4c6ddfe -stdlibHttpVersion=2.13.0-20241029-110700-30ed05b +stdlibHttpVersion=2.13.0-20241114-182900-7e9f66a # Ballerinax Observer -observeVersion=1.3.1-20241007-161000-645452d -observeInternalVersion=1.3.1-20241015-172900-cdc3cb3 +observeVersion=1.4.0-20241113-092000-b83ae74 +observeInternalVersion=1.3.1-20241113-101700-265054d diff --git a/protoc-cli/src/main/java/io/ballerina/protoc/GrpcConstants.java b/protoc-cli/src/main/java/io/ballerina/protoc/GrpcConstants.java index 26878bf..f1b099d 100644 --- a/protoc-cli/src/main/java/io/ballerina/protoc/GrpcConstants.java +++ b/protoc-cli/src/main/java/io/ballerina/protoc/GrpcConstants.java @@ -35,7 +35,7 @@ public class GrpcConstants { public static final String DOT = "."; public static final String PROTOCOL_PACKAGE_GRPC = "grpc"; - public static final String PROTOCOL_PACKAGE_VERSION_GRPC = getModule().getVersion(); + public static final String PROTOCOL_PACKAGE_VERSION_GRPC = getModule().getMajorVersion(); public static final String ORG_NAME = "ballerina"; public static final String PROTOCOL_STRUCT_PACKAGE_GRPC = ORG_NAME + ORG_NAME_SEPARATOR + "grpc:" + PROTOCOL_PACKAGE_VERSION_GRPC; From 9c504203f2dc8f2a3d431f7d12eda2cdfd43c602 Mon Sep 17 00:00:00 2001 From: ravinperera00 Date: Wed, 20 Nov 2024 23:54:50 +0530 Subject: [PATCH 3/3] Use main branch for github actions --- .github/workflows/build-timestamped-master.yml | 2 +- .github/workflows/publish-release.yml | 2 +- .github/workflows/pull-request.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-timestamped-master.yml b/.github/workflows/build-timestamped-master.yml index a25507c..9b3d710 100644 --- a/.github/workflows/build-timestamped-master.yml +++ b/.github/workflows/build-timestamped-master.yml @@ -9,5 +9,5 @@ jobs: call_workflow: name: Run Build Workflow if: ${{ github.repository_owner == 'ballerina-platform' }} - uses: ballerina-platform/ballerina-library/.github/workflows/build-timestamp-master-template.yml@java21 + uses: ballerina-platform/ballerina-library/.github/workflows/build-timestamp-master-template.yml@main secrets: inherit diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index e87025f..09ad41b 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -7,7 +7,7 @@ jobs: call_workflow: name: Run Release Workflow if: ${{ github.repository_owner == 'ballerina-platform' }} - uses: ballerina-platform/ballerina-library/.github/workflows/release-package-template.yml@java21 + uses: ballerina-platform/ballerina-library/.github/workflows/release-package-template.yml@main secrets: inherit with: package-name: protoc-tools diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 3f428e7..bf10678 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -10,4 +10,4 @@ jobs: call_workflow: name: Run PR Build Workflow if: ${{ github.repository_owner == 'ballerina-platform' }} - uses: ballerina-platform/ballerina-library/.github/workflows/pull-request-build-template.yml@java21 + uses: ballerina-platform/ballerina-library/.github/workflows/pull-request-build-template.yml@main