diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..d13affe3 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +# Ensure all Java files use LF. +*.java eol=lf diff --git a/.github/workflows/build-dev-branches.yml b/.github/workflows/build-dev-branches.yml index 2beed0b3..8d06c07e 100644 --- a/.github/workflows/build-dev-branches.yml +++ b/.github/workflows/build-dev-branches.yml @@ -13,12 +13,12 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repository - uses: actions/checkout@v2 - - name: Set up JDK 11 - uses: actions/setup-java@v2 + uses: actions/checkout@v3 + - name: Set up JDK 17 + uses: actions/setup-java@v3 with: distribution: adopt - java-version: 11 + java-version: 17.0.7 - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Build with Gradle @@ -38,12 +38,12 @@ jobs: runs-on: windows-latest steps: - name: Checkout Repository - uses: actions/checkout@v2 - - name: Set up JDK 11 - uses: actions/setup-java@v2 + uses: actions/checkout@v3 + - name: Set up JDK 17 + uses: actions/setup-java@v3 with: distribution: adopt - java-version: 11 + java-version: 17.0.7 - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Download Jaeger server executable diff --git a/.github/workflows/build-main.yml b/.github/workflows/build-main.yml index 04521d91..eb17fb64 100644 --- a/.github/workflows/build-main.yml +++ b/.github/workflows/build-main.yml @@ -12,12 +12,12 @@ jobs: if: github.repository_owner == 'ballerina-platform' steps: - name: Checkout Repository - uses: actions/checkout@v2 - - name: Set up JDK 11 - uses: actions/setup-java@v2 + uses: actions/checkout@v3 + - name: Set up JDK 17 + uses: actions/setup-java@v3 with: distribution: adopt - java-version: 11 + java-version: 17.0.7 - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Set Docker Host env variable diff --git a/.github/workflows/central-publish.yml b/.github/workflows/central-publish.yml index 853cb2a1..5afb9c37 100644 --- a/.github/workflows/central-publish.yml +++ b/.github/workflows/central-publish.yml @@ -17,12 +17,12 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'ballerina-platform' steps: - - uses: actions/checkout@v2 - - name: Set up JDK 11 - uses: actions/setup-java@v2 + - uses: actions/checkout@v3 + - name: Set up JDK 17 + uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: 11 + java-version: 17.0.7 - name: Build with Gradle env: packageUser: ${{ github.actor }} diff --git a/.github/workflows/daily-build.yml b/.github/workflows/daily-build.yml index 678f3962..7d8f9396 100644 --- a/.github/workflows/daily-build.yml +++ b/.github/workflows/daily-build.yml @@ -9,13 +9,13 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - - name: Set up JDK 11 - uses: actions/setup-java@v2 + - name: Set up JDK 17 + uses: actions/setup-java@v3 with: distribution: adopt - java-version: 11 + java-version: 17.0.7 # Build the project with Gradle - name: Build with Gradle diff --git a/.github/workflows/graalvm-check.yml b/.github/workflows/graalvm-check.yml index 9829a594..381093e1 100644 --- a/.github/workflows/graalvm-check.yml +++ b/.github/workflows/graalvm-check.yml @@ -16,7 +16,7 @@ jobs: uses: graalvm/setup-graalvm@v1 with: version: 'latest' - java-version: '11' + java-version: '17.0.7' components: 'native-image' github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 1cfb265c..b8fa9166 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -8,12 +8,12 @@ jobs: if: github.repository_owner == 'ballerina-platform' steps: - name: Checkout Repository - uses: actions/checkout@v2 - - name: Set up JDK 11 - uses: actions/setup-java@v2 + uses: actions/checkout@v3 + - name: Set up JDK 17 + uses: actions/setup-java@v3 with: distribution: adopt - java-version: 11 + java-version: 17.0.7 - name: Set version env variable run: echo "VERSION=$((grep -w 'version' | cut -d= -f2) < gradle.properties | rev | cut --complement -d- -f1 | rev)" >> $GITHUB_ENV - name: Pre release depenency version update diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index c40690a3..16661e79 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -7,12 +7,12 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repository - uses: actions/checkout@v2 - - name: Set up JDK 11 - uses: actions/setup-java@v2 + uses: actions/checkout@v3 + - name: Set up JDK 17 + uses: actions/setup-java@v3 with: distribution: adopt - java-version: 11 + java-version: 17.0.7 - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Set Docker Host env variable @@ -34,12 +34,12 @@ jobs: runs-on: windows-latest steps: - name: Checkout Repository - uses: actions/checkout@v2 - - name: Set up JDK 11 - uses: actions/setup-java@v2 + uses: actions/checkout@v3 + - name: Set up JDK 17 + uses: actions/setup-java@v3 with: distribution: adopt - java-version: 11 + java-version: 17.0.7 - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Download Jaeger server executable diff --git a/README.md b/README.md index 387f465a..e343815a 100644 --- a/README.md +++ b/README.md @@ -9,9 +9,9 @@ ### Setting Up the Prerequisites -1. Download and install Java SE Development Kit (JDK) version 11 (from one of the following locations). +1. Download and install Java SE Development Kit (JDK) version 17 (from one of the following locations). - * [Oracle](https://www.oracle.com/java/technologies/javase-jdk11-downloads.html) + * [Oracle](https://www.oracle.com/java/technologies/downloads/) * [OpenJDK](https://adoptopenjdk.net/) diff --git a/build-config/checkstyle/build.gradle b/build-config/checkstyle/build.gradle index 0aa45ba1..480a46d8 100644 --- a/build-config/checkstyle/build.gradle +++ b/build-config/checkstyle/build.gradle @@ -22,8 +22,8 @@ plugins { task downloadFiles(type: Download) { src([ - 'https://raw.githubusercontent.com/wso2/code-quality-tools/v1.3/checkstyle/checkstyle.xml', - 'https://raw.githubusercontent.com/wso2/code-quality-tools/v1.3/checkstyle/suppressions.xml' + 'https://raw.githubusercontent.com/wso2/code-quality-tools/v1.4/checkstyle/jdk-17/checkstyle.xml', + 'https://raw.githubusercontent.com/wso2/code-quality-tools/v1.4/checkstyle/jdk-17/suppressions.xml' ]) overwrite false onlyIfNewer true diff --git a/build.gradle b/build.gradle index 2706bb2b..64bff9c5 100644 --- a/build.gradle +++ b/build.gradle @@ -16,9 +16,9 @@ plugins { id 'checkstyle' - id "com.github.spotbugs" version "4.5.1" + id "com.github.spotbugs" version "5.0.14" id "net.researchgate.release" version "2.8.0" - id "de.undercouch.download" version "4.0.4" + id "de.undercouch.download" version "5.4.0" id "jacoco" } @@ -57,7 +57,7 @@ allprojects { } subprojects { - apply plugin: 'java' + apply plugin: 'java-library' apply plugin: 'checkstyle' apply plugin: 'com.github.spotbugs' @@ -98,7 +98,7 @@ subprojects { } checkstyle { - toolVersion '8.18' + toolVersion '10.12.1' } spotbugsMain { @@ -166,8 +166,8 @@ task codeCoverageReport(type: JacocoReport) { } reports { - xml.enabled = true - html.enabled = true + xml.required = true + html.required = true xml.destination = new File("${buildDir}/reports/jacoco/report.xml") html.destination = new File("${buildDir}/reports/jacoco/report.html") } diff --git a/gradle.properties b/gradle.properties index 6ad6ff25..5052fe42 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,14 +14,14 @@ group=org.ballerinalang version=0.3.1-SNAPSHOT -ballerinaLangVersion=2201.7.0 +ballerinaLangVersion=2201.8.0-20230726-145300-b2bdf796 org.gradle.caching=true org.gradle.parallel=true org.gradle.jvmargs='-Dfile.encoding=UTF-8' org.gradle.workers.max=3 # Native Dependency Versions -jaegerVersion=1.5.0 +jaegerVersion=1.8.1 openTelemetryVersion=1.0.0 openTelemetryAlphaVersion=1.0.0-alpha guavaVersion=30.1-jre @@ -45,7 +45,7 @@ stdlibUrlVersion=2.2.1 stdlibTaskVersion=2.2.1 stdlibFileVersion=1.2.1 stdlibCryptoVersion=2.2.1 -stdlibLogVersion=2.2.1 +stdlibLogVersion=2.8.1-20230718-085900-36c385c stdlibMimeVersion=2.2.1 stdlibCacheVersion=3.2.1 stdlibAuthVersion=2.2.1 @@ -54,7 +54,7 @@ stdlibOAuth2Version=2.2.1 stdlibUuidVersion=1.2.1 # Test Dependency Versions -testngVersion=6.14.3 +testngVersion=7.6.1 slf4jVersion=1.7.26 dockerJavaVersion=3.2.7 gsonVersion=2.8.6 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 5c2d1cf0..033e24c4 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 4c5803d1..9f4197d5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index b0d6d0ab..fcb6fca1 100755 --- a/gradlew +++ b/gradlew @@ -1,13 +1,13 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -17,78 +17,110 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# 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 +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# 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"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -97,92 +129,120 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +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 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=$((i+1)) + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# 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"' -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" +# 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. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" fi +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 15e1ee37..6689b85b 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -5,7 +5,7 @@ @rem you may not use this file except in compliance with the License. @rem You may obtain a copy of the License at @rem -@rem http://www.apache.org/licenses/LICENSE-2.0 +@rem https://www.apache.org/licenses/LICENSE-2.0 @rem @rem Unless required by applicable law or agreed to in writing, software @rem distributed under the License is distributed on an "AS IS" BASIS, @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,10 +25,14 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @@ -37,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -51,7 +55,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -61,38 +65,26 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/jaeger-extension-ballerina/Ballerina.toml b/jaeger-extension-ballerina/Ballerina.toml index ccb8aa9d..c574e646 100644 --- a/jaeger-extension-ballerina/Ballerina.toml +++ b/jaeger-extension-ballerina/Ballerina.toml @@ -20,136 +20,136 @@ name = "jaeger" version = "@toml.version@" distribution = "2201.7.0" -[platform.java11] +[platform.java17] graalvmCompatible = true -[[platform.java11.dependency]] +[[platform.java17.dependency]] path = "../jaeger-extension-native/build/libs/jaeger-extension-native-@project.version@.jar" groupId = "ballerina" artifactId = "jaeger-extension-native" version = "@project.version@" -[[platform.java11.dependency]] +[[platform.java17.dependency]] path = "./lib/jaeger-core-@jaeger.version@.jar" groupId = "io.jaegertracing" artifactId = "jaeger-core" version = "@jaeger.version@" -[[platform.java11.dependency]] +[[platform.java17.dependency]] path = "./lib/opentelemetry-api-metrics-@openTelemetryAlpha.version@.jar" groupId = "io.opentelemetry" artifactId = "opentelemetry-api-metrics" version = "@openTelemetryAlpha.version@" -[[platform.java11.dependency]] +[[platform.java17.dependency]] path = "./lib/opentelemetry-sdk-trace-@opentelemetry.version@.jar" groupId = "io.opentelemetry" artifactId = "opentelemetry-sdk-trace" version = "@opentelemetry.version@" -[[platform.java11.dependency]] +[[platform.java17.dependency]] path = "./lib/opentelemetry-sdk-common-@opentelemetry.version@.jar" groupId = "io.opentelemetry" artifactId = "opentelemetry-sdk-common" version = "@opentelemetry.version@" -[[platform.java11.dependency]] +[[platform.java17.dependency]] path = "./lib/opentelemetry-semconv-@openTelemetryAlpha.version@.jar" groupId = "io.opentelemetry" artifactId = "opentelemetry-semconv" version = "@openTelemetryAlpha.version@" -[[platform.java11.dependency]] +[[platform.java17.dependency]] path = "./lib/opentelemetry-proto-@openTelemetryAlpha.version@.jar" groupId = "io.opentelemetry" artifactId = "opentelemetry-proto" version = "@openTelemetryAlpha.version@" -[[platform.java11.dependency]] +[[platform.java17.dependency]] path = "./lib/opentelemetry-exporter-otlp-trace-@opentelemetry.version@.jar" groupId = "io.opentelemetry" artifactId = "opentelemetry-exporter-otlp-trace" version = "@opentelemetry.version@" -[[platform.java11.dependency]] +[[platform.java17.dependency]] path = "./lib/opentelemetry-exporter-otlp-common-@opentelemetry.version@.jar" groupId = "io.opentelemetry" artifactId = "opentelemetry-exporter-otlp-common" version = "@opentelemetry.version@" -[[platform.java11.dependency]] +[[platform.java17.dependency]] path = "./lib/opentelemetry-extension-trace-propagators-@opentelemetry.version@.jar" groupId = "io.opentelemetry" artifactId = "opentelemetry-extension-trace-propagators" version = "@opentelemetry.version@" -[[platform.java11.dependency]] +[[platform.java17.dependency]] path = "./lib/guava-@guava.version@.jar" groupId = "com.google.guava" artifactId = "guava" version = "@guava.version@" -[[platform.java11.dependency]] +[[platform.java17.dependency]] path = "./lib/failureaccess-@failureAccess.version@.jar" groupId = "com.google.guava" artifactId = "failureaccess" version = "@failureAccess.version@" -[[platform.java11.dependency]] +[[platform.java17.dependency]] path = "./lib/grpc-api-@grpc.version@.jar" groupId = "io.grpc" artifactId = "grpc-api" version = "@grpc.version@" -[[platform.java11.dependency]] +[[platform.java17.dependency]] path = "./lib/grpc-context-@grpc.version@.jar" groupId = "io.grpc" artifactId = "grpc-context" version = "@grpc.version@" -[[platform.java11.dependency]] +[[platform.java17.dependency]] path = "./lib/grpc-core-@grpc.version@.jar" groupId = "io.grpc" artifactId = "grpc-core" version = "@grpc.version@" -[[platform.java11.dependency]] +[[platform.java17.dependency]] path = "./lib/grpc-stub-@grpc.version@.jar" groupId = "io.grpc" artifactId = "grpc-stub" version = "@grpc.version@" -[[platform.java11.dependency]] +[[platform.java17.dependency]] path = "./lib/grpc-protobuf-@grpc.version@.jar" groupId = "io.grpc" artifactId = "grpc-protobuf" version = "@grpc.version@" -[[platform.java11.dependency]] +[[platform.java17.dependency]] path = "./lib/grpc-protobuf-lite-@grpc.version@.jar" groupId = "io.grpc" artifactId = "grpc-protobuf-lite" version = "@grpc.version@" -[[platform.java11.dependency]] +[[platform.java17.dependency]] path = "./lib/grpc-netty-shaded-@grpc.version@.jar" groupId = "io.grpc" artifactId = "grpc-netty-shaded" version = "@grpc.version@" -[[platform.java11.dependency]] +[[platform.java17.dependency]] path = "./lib/protobuf-java-@protobuf.version@.jar" groupId = "com.google.protobuf" artifactId = "protobuf-java" version = "@protobuf.version@" -[[platform.java11.dependency]] +[[platform.java17.dependency]] path = "./lib/netty-handler-@netty.version@.jar" groupId = "io.netty" artifactId = "netty-handler" version = "@netty.version@" -[[platform.java11.dependency]] +[[platform.java17.dependency]] path = "./lib/perfmark-api-@perfmark.version@.jar" groupId = "io.perfmark" artifactId = "perfmark-api" diff --git a/jaeger-extension-ballerina/build.gradle b/jaeger-extension-ballerina/build.gradle index 55ea2298..783f3543 100644 --- a/jaeger-extension-ballerina/build.gradle +++ b/jaeger-extension-ballerina/build.gradle @@ -126,8 +126,8 @@ def tomlVersion = stripBallerinaExtensionVersion("${project.version}") def ballerinaCentralAccessToken = System.getenv('BALLERINA_CENTRAL_ACCESS_TOKEN') def originalConfig = ballerinaConfigFile.text def originalDependencyConfig = ballerinaDependencyFile.text -def artifactJar = file("$project.projectDir/target/cache/${packageOrg}/${packageName}/${tomlVersion}/java11/") -def platform = "java11" +def artifactJar = file("$project.projectDir/target/cache/${packageOrg}/${packageName}/${tomlVersion}/java17/") +def platform = "java17" def distributionBinPath = "${project.buildDir.absolutePath}/extracted-distributions/jballerina-tools-zip/jballerina-tools-${ballerinaLangVersion}/bin" def stripBallerinaExtensionVersion(String extVersion) { @@ -188,6 +188,11 @@ task ballerinaBuild { dependsOn updateTomlVerions dependsOn configurations.nativeJar dependsOn configurations.externalJars + dependsOn compileJava + dependsOn compileTestJava + dependsOn jar + dependsOn checkstyleMain + dependsOn checkstyleTest inputs.dir file(project.projectDir) finalizedBy(revertTomlFile) diff --git a/jaeger-extension-native/build.gradle b/jaeger-extension-native/build.gradle index 400563a8..58e100c5 100644 --- a/jaeger-extension-native/build.gradle +++ b/jaeger-extension-native/build.gradle @@ -15,7 +15,7 @@ */ plugins { - id 'java' + id 'java-library' } description = 'Ballerina - Jaeger Extension - Native Module' @@ -103,6 +103,7 @@ publishing { } task copyJavaClassFiles(type: Copy) { + dependsOn(compileJava) from("${project.buildDir}/classes") { exclude '**/module-info.class' include '**/*.class' diff --git a/jaeger-extension-tests/spotbugs-test-exclude.xml b/jaeger-extension-tests/spotbugs-test-exclude.xml index 19627d6e..2c38628e 100644 --- a/jaeger-extension-tests/spotbugs-test-exclude.xml +++ b/jaeger-extension-tests/spotbugs-test-exclude.xml @@ -31,4 +31,7 @@ + + + diff --git a/jaeger-extension-tests/src/test/java/io/ballerina/observe/trace/jaeger/JaegerTracesTestCase.java b/jaeger-extension-tests/src/test/java/io/ballerina/observe/trace/jaeger/JaegerTracesTestCase.java index ebadfd96..9fb882b3 100644 --- a/jaeger-extension-tests/src/test/java/io/ballerina/observe/trace/jaeger/JaegerTracesTestCase.java +++ b/jaeger-extension-tests/src/test/java/io/ballerina/observe/trace/jaeger/JaegerTracesTestCase.java @@ -38,6 +38,7 @@ import java.io.File; import java.lang.reflect.Type; +import java.net.InetAddress; import java.nio.file.Paths; import java.util.Arrays; import java.util.Calendar; @@ -107,7 +108,7 @@ public void testJaegerMetrics(String host, int jaegerReportAddress, JaegerServer .getAbsolutePath(); int[] requiredPorts = {9091}; serverInstance.startServer(balFile, new String[]{"--observability-included"}, null, env, requiredPorts); - Utils.waitForPortsToOpen(requiredPorts, 1000 * 60, false, "localhost"); + Utils.waitForPortsToOpen(requiredPorts, 1000 * 60, false, InetAddress.getByName("localhost")); jaegerExtLogLeecher.waitForText(10000); // Send requests to generate metrics @@ -256,7 +257,7 @@ public void testJaegerDisabled() throws Exception { .getAbsolutePath(); int[] requiredPorts = {9091}; serverInstance.startServer(balFile, null, null, requiredPorts); - Utils.waitForPortsToOpen(requiredPorts, 1000 * 60, false, "localhost"); + Utils.waitForPortsToOpen(requiredPorts, 1000 * 60, false, InetAddress.getByName("localhost")); String responseData = HttpClientRequest.doGet(TEST_RESOURCE_URL).getData(); Assert.assertEquals(responseData, "Sum: 53"); @@ -284,7 +285,7 @@ public void testInvalidTracingProviderName() throws Exception { .getAbsolutePath(); int[] requiredPorts = {9091}; serverInstance.startServer(balFile, new String[]{"--observability-included"}, null, env, requiredPorts); - Utils.waitForPortsToOpen(requiredPorts, 1000 * 60, false, "localhost"); + Utils.waitForPortsToOpen(requiredPorts, 1000 * 60, false, InetAddress.getByName("localhost")); tracerNotFoundLog.waitForText(10000); String responseData = HttpClientRequest.doGet(TEST_RESOURCE_URL).getData();