diff --git a/ballerina-tests/Dependencies.toml b/ballerina-tests/Dependencies.toml index c8db4849..13f9a06d 100644 --- a/ballerina-tests/Dependencies.toml +++ b/ballerina-tests/Dependencies.toml @@ -5,12 +5,12 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.11.0-20241117-133400-a3054b77" +distribution-version = "2201.11.0" [[package]] org = "ballerina" name = "crypto" -version = "2.7.3" +version = "2.8.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"}, @@ -20,7 +20,7 @@ dependencies = [ [[package]] org = "ballerina" name = "io" -version = "1.6.2" +version = "1.7.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"}, @@ -114,7 +114,7 @@ dependencies = [ [[package]] org = "ballerina" name = "log" -version = "2.10.1" +version = "2.11.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "io"}, diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index 02a10700..4ed307c5 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -7,7 +7,7 @@ keywords = ["service", "client", "messaging", "network", "pubsub"] repository = "https://github.com/ballerina-platform/module-ballerinax-nats" icon = "icon.png" license = ["Apache-2.0"] -distribution = "2201.11.0-20241117-133400-a3054b77" +distribution = "2201.11.0" [platform.java21] graalvmCompatible = true @@ -25,7 +25,7 @@ path = "../native/build/libs/nats-native-3.2.0-SNAPSHOT.jar" groupId = "io.ballerina.stdlib" artifactId = "constraint-native" version = "1.6.0" -path = "./lib/constraint-native-1.6.0-20241113-090900-d276ad5.jar" +path = "./lib/constraint-native-1.6.0.jar" [build-options] observabilityIncluded=true diff --git a/ballerina/CompilerPlugin.toml b/ballerina/CompilerPlugin.toml index 2d359a39..43a0d5ef 100644 --- a/ballerina/CompilerPlugin.toml +++ b/ballerina/CompilerPlugin.toml @@ -3,4 +3,4 @@ id = "nats-compiler-plugin" class = "io.ballerina.stdlib.nats.plugin.NatsCompilerPlugin" [[dependency]] -path = "../compiler-plugin/build/libs/nats-compiler-plugin-3.1.1-SNAPSHOT.jar" +path = "../compiler-plugin/build/libs/nats-compiler-plugin-3.2.0-SNAPSHOT.jar" diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml index 9feaebbe..534f4f0b 100644 --- a/ballerina/Dependencies.toml +++ b/ballerina/Dependencies.toml @@ -5,7 +5,7 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.11.0-20241117-133400-a3054b77" +distribution-version = "2201.11.0" [[package]] org = "ballerina" @@ -22,7 +22,7 @@ modules = [ [[package]] org = "ballerina" name = "crypto" -version = "2.7.3" +version = "2.8.0" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} @@ -34,7 +34,7 @@ modules = [ [[package]] org = "ballerina" name = "io" -version = "1.6.2" +version = "1.7.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"}, @@ -130,7 +130,7 @@ dependencies = [ [[package]] org = "ballerina" name = "log" -version = "2.10.1" +version = "2.11.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "io"}, diff --git a/build-config/resources/Ballerina.toml b/build-config/resources/Ballerina.toml index 5aac4962..8d354c81 100644 --- a/build-config/resources/Ballerina.toml +++ b/build-config/resources/Ballerina.toml @@ -7,7 +7,7 @@ keywords = ["service", "client", "messaging", "network", "pubsub"] repository = "https://github.com/ballerina-platform/module-ballerinax-nats" icon = "icon.png" license = ["Apache-2.0"] -distribution = "2201.11.0-20241117-133400-a3054b77" +distribution = "2201.11.0" [platform.java21] graalvmCompatible = true diff --git a/compiler-plugin-tests/build.gradle b/compiler-plugin-tests/build.gradle index e4dede91..8eac9117 100644 --- a/compiler-plugin-tests/build.gradle +++ b/compiler-plugin-tests/build.gradle @@ -27,7 +27,7 @@ description = 'Ballerina - NATS Compiler Plugin Tests' dependencies { checkstyle project(':checkstyle') - checkstyle "com.puppycrawl.tools:checkstyle:${puppycrawlCheckstyleVersion}" + checkstyle "com.puppycrawl.tools:checkstyle:${checkstylePluginVersion}" testImplementation project(":nats-compiler-plugin") testImplementation group: 'org.ballerinalang', name: 'ballerina-lang', version: "${ballerinaLangVersion}" @@ -42,7 +42,7 @@ tasks.withType(Checkstyle) { } checkstyle { - toolVersion "${project.puppycrawlCheckstyleVersion}" + toolVersion "${project.checkstylePluginVersion}" configFile rootProject.file("build-config/checkstyle/build/checkstyle.xml") configProperties = ["suppressionFile" : file("${rootDir}/build-config/checkstyle/build/suppressions.xml")] } diff --git a/compiler-plugin/build.gradle b/compiler-plugin/build.gradle index 7a397ead..ac5510ed 100644 --- a/compiler-plugin/build.gradle +++ b/compiler-plugin/build.gradle @@ -25,7 +25,7 @@ description = 'Ballerina - NATS Compiler Plugin' dependencies { checkstyle project(':checkstyle') - checkstyle "com.puppycrawl.tools:checkstyle:${puppycrawlCheckstyleVersion}" + checkstyle "com.puppycrawl.tools:checkstyle:${checkstylePluginVersion}" implementation group: 'org.ballerinalang', name: 'ballerina-lang', version: "${ballerinaLangVersion}" implementation group: 'org.ballerinalang', name: 'ballerina-parser', version: "${ballerinaLangVersion}" implementation group: 'org.ballerinalang', name: 'ballerina-tools-api', version: "${ballerinaLangVersion}" diff --git a/gradle.properties b/gradle.properties index 93b8e9b4..a185960c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,28 +1,27 @@ org.gradle.caching=true group=io.ballerina.stdlib - version=3.2.0-SNAPSHOT -ballerinaLangVersion=2201.11.0-20241117-133400-a3054b77 -ballerinaGradlePluginVersion=2.0.1 +ballerinaLangVersion=2201.11.0 + +ballerinaGradlePluginVersion=2.3.0 +checkstylePluginVersion=10.12.1 spotbugsPluginVersion=6.0.18 shadowJarPluginVersion=8.1.1 downloadPluginVersion=5.4.0 releasePluginVersion=2.8.0 natsVersion=2.20.4 -puppycrawlCheckstyleVersion=10.12.1 testngVersion=7.6.1 gsonVersion=2.8.8 slf4jVersion=1.7.30 +jacocoVersion=0.8.10 -stdlibIoVersion=1.6.2-20241112-233100-995cf5f -stdlibTimeVersion=2.6.0-20241113-073800-201b904 - -stdlibConstraintVersion=1.6.0-20241113-090900-d276ad5 -stdlibLogVersion=2.10.1-20241113-120000-4577868 -stdlibCryptoVersion=2.7.3-20241113-081400-d015a39 +stdlibIoVersion=1.7.0 +stdlibTimeVersion=2.6.0 -observeVersion=1.4.0-20241113-092000-b83ae74 -observeInternalVersion=1.3.1-20241113-101700-265054d +stdlibConstraintVersion=1.6.0 +stdlibLogVersion=2.11.0 +stdlibCryptoVersion=2.8.0 -jacocoVersion=0.8.10 +observeVersion=1.4.0 +observeInternalVersion=1.4.0 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 033e24c4..a4b76b95 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9f4197d5..e2847c82 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index fcb6fca1..f5feea6d 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -83,7 +85,9 @@ done # This is normally unused # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -144,7 +148,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -152,7 +156,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -201,11 +205,11 @@ fi # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ diff --git a/gradlew.bat b/gradlew.bat index 6689b85b..9b42019c 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## @@ -43,11 +45,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/native/build.gradle b/native/build.gradle index 5a59ae19..1f3e4db8 100644 --- a/native/build.gradle +++ b/native/build.gradle @@ -25,7 +25,7 @@ description = 'Ballerina - NATS Java Utils' dependencies { checkstyle project(':checkstyle') - checkstyle "com.puppycrawl.tools:checkstyle:${puppycrawlCheckstyleVersion}" + checkstyle "com.puppycrawl.tools:checkstyle:${checkstylePluginVersion}" implementation group: 'io.nats', name: 'jnats', version: "${natsVersion}" implementation group: 'org.ballerinalang', name: 'ballerina-lang', version: "${ballerinaLangVersion}" implementation group: 'org.ballerinalang', name: 'ballerina-runtime', version: "${ballerinaLangVersion}"