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-timestamped-master.yml b/.github/workflows/build-timestamped-master.yml index 3f2450d3..846b17ab 100644 --- a/.github/workflows/build-timestamped-master.yml +++ b/.github/workflows/build-timestamped-master.yml @@ -16,12 +16,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: Change to Timestamped Version run: | startTime=$(TZ="Asia/Kolkata" date +'%Y%m%d-%H%M00') diff --git a/.github/workflows/central-publish.yml b/.github/workflows/central-publish.yml index ee53a442..d18eb30f 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: Grant execute permission for gradlew run: chmod +x gradlew - name: Build with Gradle diff --git a/.github/workflows/daily-build.yml b/.github/workflows/daily-build.yml index 704ca8d6..6d23b8cd 100644 --- a/.github/workflows/daily-build.yml +++ b/.github/workflows/daily-build.yml @@ -11,13 +11,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: 'temurin' - java-version: 11 + java-version: 17.0.7 - name: Set environment variable if: github.event.action == 'check_connector_for_breaking_changes' diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 2c8e6bbc..8e0031d9 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -10,12 +10,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/pull-request.yml b/.github/workflows/pull-request.yml index dbab4982..d350916f 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -11,12 +11,12 @@ jobs: name: Build on Ubuntu runs-on: ubuntu-latest 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 }} @@ -31,12 +31,12 @@ jobs: name: Build on Windows runs-on: windows-latest 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/trivy-scan.yml b/.github/workflows/trivy-scan.yml index 77be3d94..c8ccb0ef 100644 --- a/.github/workflows/trivy-scan.yml +++ b/.github/workflows/trivy-scan.yml @@ -10,12 +10,12 @@ jobs: name: Build on Ubuntu runs-on: ubuntu-latest 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/README.md b/README.md index 866ce4c1..f3bb5331 100644 --- a/README.md +++ b/README.md @@ -18,13 +18,13 @@ Follow one of the following ways to add the corresponding database JAR in the fi * Download the JAR and update the path ``` - [[platform.java11.dependency]] + [[platform.java17.dependency]] path = "PATH" ``` * Add JAR with a maven dependency params ``` - [[platform.java11.dependency]] + [[platform.java17.dependency]] artifactId = "h2" version = "2.0.206" groupId = "com.h2database" @@ -468,8 +468,8 @@ This repository only contains the source code for the library. ### Set up the prerequisites -1. Download and install Java SE Development Kit (JDK) version 11 (from one of the following locations). - * [Oracle](https://www.oracle.com/java/technologies/javase-jdk11-downloads.html) +1. Download and install Java SE Development Kit (JDK) version 17 (from one of the following locations). + * [Oracle](https://www.oracle.com/java/technologies/downloads/) * [OpenJDK](https://adoptium.net/) 2. Export GitHub personal access token with read package permissions as follows, diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index 3d71234f..18cd23b0 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -9,16 +9,16 @@ icon = "icon.png" license = ["Apache-2.0"] distribution = "2201.7.0" -[platform.java11] +[platform.java17] graalvmCompatible = true -[[platform.java11.dependency]] +[[platform.java17.dependency]] groupId = "io.ballerina.stdlib" artifactId = "java.jdbc-native" version = "1.10.1" path = "../native/build/libs/java.jdbc-native-1.10.1-SNAPSHOT.jar" -[[platform.java11.dependency]] +[[platform.java17.dependency]] groupId = "io.ballerina.stdlib" artifactId = "sql-native" version = "1.10.0" diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml index d902ea8a..92c48d38 100644 --- a/ballerina/Dependencies.toml +++ b/ballerina/Dependencies.toml @@ -5,7 +5,7 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.7.0" +distribution-version = "2201.8.0-20230726-145300-b2bdf796" [[package]] org = "ballerina" @@ -239,7 +239,7 @@ dependencies = [ [[package]] org = "ballerina" name = "log" -version = "2.8.0" +version = "2.8.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "io"}, diff --git a/ballerina/Module.md b/ballerina/Module.md index 5940fbd3..caa8c430 100644 --- a/ballerina/Module.md +++ b/ballerina/Module.md @@ -11,13 +11,13 @@ Follow one of the following ways to add the corresponding database JAR in the fi * Download the JAR and update the path ``` - [[platform.java11.dependency]] + [[platform.java17.dependency]] path = "PATH" ``` * Add JAR with a maven dependency params ``` - [[platform.java11.dependency]] + [[platform.java17.dependency]] artifactId = "h2" version = "2.0.206" groupId = "com.h2database" diff --git a/ballerina/Package.md b/ballerina/Package.md index bf91ac33..0595e5e9 100644 --- a/ballerina/Package.md +++ b/ballerina/Package.md @@ -11,13 +11,13 @@ Follow one of the following ways to add the corresponding database JAR in the fi * Download the JAR and update the path ``` - [[platform.java11.dependency]] + [[platform.java17.dependency]] path = "PATH" ``` * Add JAR with a maven dependency params ``` - [[platform.java11.dependency]] + [[platform.java17.dependency]] artifactId = "h2" version = "2.0.206" groupId = "com.h2database" diff --git a/build-config/checkstyle/build.gradle b/build-config/checkstyle/build.gradle index b89ab41f..1dbe8db0 100644 --- a/build-config/checkstyle/build.gradle +++ b/build-config/checkstyle/build.gradle @@ -23,8 +23,8 @@ apply plugin: 'java' task downloadCheckstyleRuleFiles(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-config/resources/Ballerina.toml b/build-config/resources/Ballerina.toml index e11875d4..1e3edd7a 100644 --- a/build-config/resources/Ballerina.toml +++ b/build-config/resources/Ballerina.toml @@ -9,16 +9,16 @@ icon = "icon.png" license = ["Apache-2.0"] distribution = "2201.7.0" -[platform.java11] +[platform.java17] graalvmCompatible = true -[[platform.java11.dependency]] +[[platform.java17.dependency]] groupId = "io.ballerina.stdlib" artifactId = "java.jdbc-native" version = "@toml.version@" path = "../native/build/libs/java.jdbc-native-@project.version@.jar" -[[platform.java11.dependency]] +[[platform.java17.dependency]] groupId = "io.ballerina.stdlib" artifactId = "sql-native" version = "@sql.version@" diff --git a/compiler-plugin-tests/build.gradle b/compiler-plugin-tests/build.gradle index 786194f4..2176076e 100644 --- a/compiler-plugin-tests/build.gradle +++ b/compiler-plugin-tests/build.gradle @@ -17,7 +17,7 @@ */ plugins { - id 'java' + id 'java-library' id 'checkstyle' id 'com.github.spotbugs' id 'jacoco' @@ -33,7 +33,7 @@ dependencies { checkstyle project(':checkstyle') checkstyle "com.puppycrawl.tools:checkstyle:${puppycrawlCheckstyleVersion}" - jacocoRuntime "org.jacoco:org.jacoco.agent:0.8.6:runtime" + jacocoRuntime "org.jacoco:org.jacoco.agent:0.8.10:runtime" implementation project(':java.jdbc-compiler-plugin') @@ -48,7 +48,7 @@ tasks.withType(JavaCompile) { options.encoding = 'UTF-8' } -sourceCompatibility = JavaVersion.VERSION_11 +sourceCompatibility = JavaVersion.VERSION_17 test { systemProperty "ballerina.offline.flag", "true" @@ -73,7 +73,7 @@ test { jacocoTestReport { dependsOn test reports { - xml.enabled true + xml.required = true } sourceSets project(':java.jdbc-compiler-plugin').sourceSets.main } diff --git a/examples/facebook/posts/Working with Facebook Posts.md b/examples/facebook/posts/Working with Facebook Posts.md index 430a0ec4..adef1e7c 100644 --- a/examples/facebook/posts/Working with Facebook Posts.md +++ b/examples/facebook/posts/Working with Facebook Posts.md @@ -20,7 +20,7 @@ This is an HTTP RESTful service that is used to insert, create, and retrieve dat * Set the driver JAR path in the `Ballerina.toml` file. ``` - [[platform.java11.dependency]] + [[platform.java17.dependency]] path = "PATH" ``` Sample path format for macOS: `/Applications/CData/CData JDBC Driver for Facebook 2021/lib/cdata.jdbc.facebook.jar` diff --git a/examples/facebook/user-info/Retrieving Facebook User Information.md b/examples/facebook/user-info/Retrieving Facebook User Information.md index c13e666c..6fefdc49 100644 --- a/examples/facebook/user-info/Retrieving Facebook User Information.md +++ b/examples/facebook/user-info/Retrieving Facebook User Information.md @@ -20,7 +20,7 @@ It is a simple project, which shows how to get user info by using the username a * Set the driver JAR path in the `Ballerina.toml` file. ``` - [[platform.java11.dependency]] + [[platform.java17.dependency]] path = "PATH" ``` Sample path format for macOS: `/Applications/CData/CData JDBC Driver for Facebook 2021/lib/cdata.jdbc.facebook.jar` diff --git a/examples/snowflake/Working with Snowflake and Ballerina.md b/examples/snowflake/Working with Snowflake and Ballerina.md index eac39b53..843e4c9e 100644 --- a/examples/snowflake/Working with Snowflake and Ballerina.md +++ b/examples/snowflake/Working with Snowflake and Ballerina.md @@ -36,13 +36,13 @@ An example of creating the above and populating the table is shown in the [`setu Follow one of the following ways to add the Snowflake JDBC driver JAR in the `Ballerina.toml` file: * Download the JAR and update the path ``` - [[platform.java11.dependency]] + [[platform.java17.dependency]] path = "PATH" ``` * Replace the above path with a maven dependency parameter ``` - [[platform.java11.dependency]] + [[platform.java17.dependency]] groupId = "net.snowflake" artifactId = "snowflake-jdbc" version = "3.13.5" diff --git a/examples/snowflake/service/Ballerina.toml b/examples/snowflake/service/Ballerina.toml index 9499170d..5c82b47b 100644 --- a/examples/snowflake/service/Ballerina.toml +++ b/examples/snowflake/service/Ballerina.toml @@ -3,7 +3,7 @@ org = "jdbc" name = "snowflake" version = "0.1.0" -[[platform.java11.dependency]] +[[platform.java17.dependency]] groupId = "net.snowflake" artifactId = "snowflake-jdbc" version = "3.13.5" diff --git a/examples/snowflake/setup/Ballerina.toml b/examples/snowflake/setup/Ballerina.toml index 9499170d..5c82b47b 100644 --- a/examples/snowflake/setup/Ballerina.toml +++ b/examples/snowflake/setup/Ballerina.toml @@ -3,7 +3,7 @@ org = "jdbc" name = "snowflake" version = "0.1.0" -[[platform.java11.dependency]] +[[platform.java17.dependency]] groupId = "net.snowflake" artifactId = "snowflake-jdbc" version = "3.13.5" diff --git a/gradle.properties b/gradle.properties index f20187ee..02249761 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,17 +1,17 @@ group=io.ballerina.stdlib version=1.10.1-SNAPSHOT -puppycrawlCheckstyleVersion=8.18 -checkstyleToolVersion=7.8.2 -githubSpotbugsVersion=4.0.5 -githubJohnrengelmanShadowVersion=5.2.0 -underCouchDownloadVersion=4.0.4 +puppycrawlCheckstyleVersion=10.12.1 +checkstyleToolVersion=10.12.1 +githubSpotbugsVersion=5.0.14 +githubJohnrengelmanShadowVersion=8.1.1 +underCouchDownloadVersion=5.4.0 researchgateReleaseVersion=2.8.0 -ballerinaGradlePluginVersion=1.1.0 -testngVersion=7.4.0 +ballerinaGradlePluginVersion=2.0.1 +testngVersion=7.6.1 h2DriverVersion=2.2.220 -ballerinaLangVersion= 2201.7.0 +ballerinaLangVersion=2201.8.0-20230726-145300-b2bdf796 stdlibSqlVersion=1.10.0 @@ -21,7 +21,7 @@ stdlibIoVersion=1.5.0 stdlibTimeVersion=2.3.0 # Level 02 -stdlibLogVersion=2.8.0 +stdlibLogVersion=2.8.1-20230718-085900-36c385c stdlibOsVersion=1.7.0 # Level 03 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c0..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 69a97150..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-7.1-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 4f906e0c..fcb6fca1 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/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. @@ -17,67 +17,98 @@ # ############################################################################## -## -## 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 @@ -87,9 +118,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar 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 @@ -98,88 +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" = "true" -o "$msys" = "true" ] ; 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 +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # 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=`expr $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"' + +# 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 ac1b06f9..6689b85b 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -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,7 +25,8 @@ 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% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :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/load-tests/cache/src/Ballerina.toml b/load-tests/cache/src/Ballerina.toml index 19c9b994..df875acd 100644 --- a/load-tests/cache/src/Ballerina.toml +++ b/load-tests/cache/src/Ballerina.toml @@ -6,7 +6,7 @@ version = "0.0.1" [build-options] cloud = "k8s" -[[platform.java11.dependency]] +[[platform.java17.dependency]] groupId = "org.postgresql" artifactId = "postgresql" version = "42.2.20" diff --git a/load-tests/cache_with_cleanup_task/src/Ballerina.toml b/load-tests/cache_with_cleanup_task/src/Ballerina.toml index 6f3feab5..3cf7701f 100644 --- a/load-tests/cache_with_cleanup_task/src/Ballerina.toml +++ b/load-tests/cache_with_cleanup_task/src/Ballerina.toml @@ -6,7 +6,7 @@ version = "0.0.1" [build-options] cloud = "k8s" -[[platform.java11.dependency]] +[[platform.java17.dependency]] groupId = "org.postgresql" artifactId = "postgresql" version = "42.2.20" diff --git a/load-tests/non_cache/src/Ballerina.toml b/load-tests/non_cache/src/Ballerina.toml index 34ca09ff..117cb79f 100644 --- a/load-tests/non_cache/src/Ballerina.toml +++ b/load-tests/non_cache/src/Ballerina.toml @@ -6,7 +6,7 @@ version = "0.0.1" [build-options] cloud = "k8s" -[[platform.java11.dependency]] +[[platform.java17.dependency]] groupId = "org.postgresql" artifactId = "postgresql" version = "42.2.20" diff --git a/native/build.gradle b/native/build.gradle index ff5045d0..8f591588 100644 --- a/native/build.gradle +++ b/native/build.gradle @@ -42,7 +42,7 @@ tasks.withType(JavaCompile) { options.encoding = 'UTF-8' } -sourceCompatibility = JavaVersion.VERSION_11 +sourceCompatibility = JavaVersion.VERSION_17 jacoco { toolVersion = "0.8.5" diff --git a/settings.gradle b/settings.gradle index 86991542..a2d39421 100644 --- a/settings.gradle +++ b/settings.gradle @@ -8,7 +8,7 @@ */ plugins { - id "com.gradle.enterprise" version "3.2" + id "com.gradle.enterprise" version "3.13.2" } rootProject.name = 'ballerinax-java.jdbc'