diff --git a/.github/workflows/gke-kube-test-command.yml b/.github/workflows/gke-kube-test-command.yml index 30b99b3db1f..05eedfc5240 100644 --- a/.github/workflows/gke-kube-test-command.yml +++ b/.github/workflows/gke-kube-test-command.yml @@ -46,11 +46,11 @@ jobs: - uses: actions/setup-java@v1 with: - java-version: '14' + java-version: '17' - uses: actions/setup-node@v1 with: - node-version: '14.7' + node-version: '16.13.0' - name: Fix EC-2 Runner run: | diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 33f5bf6e017..c275b2d5777 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -79,7 +79,7 @@ jobs: - uses: actions/setup-java@v1 with: - java-version: "14" + java-version: "17" - uses: actions/setup-node@v1 with: @@ -96,7 +96,11 @@ jobs: run: | mkdir -p ~/.gradle/ cat > ~/.gradle/gradle.properties < ~/.gradle/gradle.properties < ~/.gradle/gradle.properties < ~/.gradle/gradle.properties < { V0_30_22_001__Store_last_sync_state.copyData(ctx, STD_CONNECTION_STATES, timestamp); diff --git a/airbyte-integrations/bases/base-java/Dockerfile b/airbyte-integrations/bases/base-java/Dockerfile index 84741b499f9..b504b464760 100644 --- a/airbyte-integrations/bases/base-java/Dockerfile +++ b/airbyte-integrations/bases/base-java/Dockerfile @@ -1,4 +1,4 @@ -ARG JDK_VERSION=14.0.2 +ARG JDK_VERSION=17.0.1 FROM openjdk:${JDK_VERSION}-slim COPY --from=airbyte/integration-base:dev /airbyte /airbyte diff --git a/airbyte-integrations/bases/base-standard-source-test-file/Dockerfile b/airbyte-integrations/bases/base-standard-source-test-file/Dockerfile index dd009c49fb2..4a10b77ce6a 100644 --- a/airbyte-integrations/bases/base-standard-source-test-file/Dockerfile +++ b/airbyte-integrations/bases/base-standard-source-test-file/Dockerfile @@ -1,4 +1,4 @@ -ARG JDK_VERSION=14.0.2 +ARG JDK_VERSION=17.0.1 FROM openjdk:${JDK_VERSION}-slim # Install Docker to launch worker images. Eventually should be replaced with Docker-java. diff --git a/airbyte-integrations/bases/standard-source-test/Dockerfile b/airbyte-integrations/bases/standard-source-test/Dockerfile index ce7318a83a1..e2dbe3dd47e 100644 --- a/airbyte-integrations/bases/standard-source-test/Dockerfile +++ b/airbyte-integrations/bases/standard-source-test/Dockerfile @@ -1,4 +1,4 @@ -ARG JDK_VERSION=14.0.2 +ARG JDK_VERSION=17.0.1 FROM openjdk:${JDK_VERSION}-slim # Install Docker to launch worker images. Eventually should be replaced with Docker-java. diff --git a/airbyte-integrations/connectors/source-jdbc/build.gradle b/airbyte-integrations/connectors/source-jdbc/build.gradle index b4fa1e33ca1..da8d05827fd 100644 --- a/airbyte-integrations/connectors/source-jdbc/build.gradle +++ b/airbyte-integrations/connectors/source-jdbc/build.gradle @@ -47,7 +47,7 @@ dependencies { testFixturesRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.4.2' testFixturesImplementation 'org.junit.jupiter:junit-jupiter-api:5.4.2' testFixturesImplementation 'org.junit.jupiter:junit-jupiter-params:5.4.2' - testFixturesImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '3.4.6' + testFixturesImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '4.0.0' implementation files(project(':airbyte-integrations:bases:base-java').airbyteDocker.outputs) } \ No newline at end of file diff --git a/airbyte-integrations/infrastructure/ssh_tunnel/module/sql/postgresql-01-dbcreate.sql b/airbyte-integrations/infrastructure/ssh_tunnel/module/sql/postgresql-01-dbcreate.sql index b3baf0145fd..ced5848f85a 100644 --- a/airbyte-integrations/infrastructure/ssh_tunnel/module/sql/postgresql-01-dbcreate.sql +++ b/airbyte-integrations/infrastructure/ssh_tunnel/module/sql/postgresql-01-dbcreate.sql @@ -1,5 +1,5 @@ -- generic setup for a brand new empty postgresql RDS - CREATE +CREATE ROLE integrationtest_rw; GRANT integrationtest_rw TO airbyte; diff --git a/airbyte-integrations/infrastructure/ssh_tunnel/module/sql/postgresql-02-user-create.sql b/airbyte-integrations/infrastructure/ssh_tunnel/module/sql/postgresql-02-user-create.sql index cbc7759aca9..83cd4e05abf 100644 --- a/airbyte-integrations/infrastructure/ssh_tunnel/module/sql/postgresql-02-user-create.sql +++ b/airbyte-integrations/infrastructure/ssh_tunnel/module/sql/postgresql-02-user-create.sql @@ -1,5 +1,5 @@ -- create the specific user we want to use from airbyte - CREATE +CREATE USER testcaseuser WITH password 'ThisIsNotTheRealPassword.PleaseSetThisByHand'; GRANT integrationtest_rw TO testcaseuser; diff --git a/airbyte-scheduler/app/Dockerfile b/airbyte-scheduler/app/Dockerfile index 1fa306ee626..f58381ae5a3 100644 --- a/airbyte-scheduler/app/Dockerfile +++ b/airbyte-scheduler/app/Dockerfile @@ -1,4 +1,4 @@ -ARG JDK_VERSION=14.0.2 +ARG JDK_VERSION=17.0.1 FROM openjdk:${JDK_VERSION}-slim AS scheduler ENV APPLICATION airbyte-scheduler diff --git a/airbyte-scheduler/persistence/src/main/resources/job_history_purge.sql b/airbyte-scheduler/persistence/src/main/resources/job_history_purge.sql index 931634f0c4b..449039a0f03 100644 --- a/airbyte-scheduler/persistence/src/main/resources/job_history_purge.sql +++ b/airbyte-scheduler/persistence/src/main/resources/job_history_purge.sql @@ -18,8 +18,8 @@ WHERE ) counts ON jobs.scope = counts.scope WHERE - -- job must be at least MINIMUM_AGE_IN_DAYS old or connection has more than EXCESSIVE_NUMBER_OF_JOBS -( + /* job must be at least MINIMUM_AGE_IN_DAYS old or connection has more than EXCESSIVE_NUMBER_OF_JOBS */ + ( jobs.created_at <( TO_TIMESTAMP( ?, @@ -29,8 +29,8 @@ WHERE OR counts.jobCount >? ) AND jobs.id NOT IN( - -- cannot be the most recent job with saved state - SELECT + /* cannot be the most recent job with saved state */ + SELECT job_id AS latest_job_id_with_state FROM ( @@ -69,8 +69,8 @@ WHERE stateRecency = 1 ) AND jobs.id NOT IN( - -- cannot be one of the last MINIMUM_RECENCY jobs for that connection/scope - SELECT + /* cannot be one of the last MINIMUM_RECENCY jobs for that connection/scope */ + SELECT id FROM ( diff --git a/airbyte-server/Dockerfile b/airbyte-server/Dockerfile index 71276fdfdc7..f4587ece24d 100644 --- a/airbyte-server/Dockerfile +++ b/airbyte-server/Dockerfile @@ -1,4 +1,4 @@ -ARG JDK_VERSION=14.0.2 +ARG JDK_VERSION=17.0.1 FROM openjdk:${JDK_VERSION}-slim AS server EXPOSE 8000 diff --git a/airbyte-server/src/test/resources/migration/schema.sql b/airbyte-server/src/test/resources/migration/schema.sql index 2b1047db493..dd2b7c50730 100644 --- a/airbyte-server/src/test/resources/migration/schema.sql +++ b/airbyte-server/src/test/resources/migration/schema.sql @@ -1,9 +1,9 @@ -- extensions - CREATE +CREATE EXTENSION IF NOT EXISTS "uuid-ossp"; -- types - CREATE +CREATE TYPE JOB_STATUS AS ENUM( 'pending', 'running', @@ -31,7 +31,7 @@ CREATE ); -- tables - CREATE +CREATE TABLE AIRBYTE_METADATA( KEY VARCHAR(255) PRIMARY KEY, @@ -73,7 +73,7 @@ CREATE ); -- entries - INSERT +INSERT INTO AIRBYTE_METADATA VALUES( diff --git a/airbyte-workers/Dockerfile b/airbyte-workers/Dockerfile index 2f0badfd9ff..c482a852287 100644 --- a/airbyte-workers/Dockerfile +++ b/airbyte-workers/Dockerfile @@ -1,4 +1,4 @@ -ARG JDK_VERSION=14.0.2 +ARG JDK_VERSION=17.0.1 FROM openjdk:${JDK_VERSION}-slim AS worker ARG DOCKER_BUILD_ARCH=amd64 diff --git a/airbyte-workers/build.gradle b/airbyte-workers/build.gradle index c9dfb8cc51e..3d8b9005129 100644 --- a/airbyte-workers/build.gradle +++ b/airbyte-workers/build.gradle @@ -31,7 +31,7 @@ dependencies { implementation project(':airbyte-protocol:models') implementation project(':airbyte-scheduler:persistence') - testImplementation 'org.mockito:mockito-inline:2.13.0' + testImplementation 'org.mockito:mockito-inline:4.0.0' testImplementation 'org.postgresql:postgresql:42.2.18' testImplementation "org.flywaydb:flyway-core:7.14.0" testImplementation 'io.temporal:temporal-testing:1.6.0' diff --git a/build.gradle b/build.gradle index 0981902c7ff..a84c6176f60 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ buildscript { plugins { id 'base' id 'pmd' - id 'com.diffplug.spotless' version '5.7.0' + id 'com.diffplug.spotless' version '6.0.0' id 'com.github.hierynomus.license' version '0.16.1' } @@ -103,7 +103,7 @@ spotless { importOrder() - eclipse('4.16.0').configFile(rootProject.file('tools/gradle/codestyle/java-google-style.xml')) + eclipse('4.21.0').configFile(rootProject.file('tools/gradle/codestyle/java-google-style.xml')) licenseHeaderFile createJavaLicenseWith(rootProject.file('LICENSE_SHORT')) removeUnusedImports() @@ -132,7 +132,7 @@ def Task getDockerBuildTask(String artifactName, String projectDir) { def buildPlatform = System.getenv('DOCKER_BUILD_PLATFORM') ?: 'linux/amd64' def alpineImage = System.getenv('ALPINE_IMAGE') ?: 'alpine:3.4' def postgresImage = System.getenv('POSTGRES_IMAGE') ?: 'postgres:13-alpine' - def jdkVersion = System.getenv('JDK_VERSION') ?: '14.0.2' + def jdkVersion = System.getenv('JDK_VERSION') ?: '17.0.1' def buildArch = System.getenv('DOCKER_BUILD_ARCH') ?: 'amd64' inputDir = file("$projectDir/build/docker") @@ -178,8 +178,8 @@ subprojects { apply plugin: 'java' apply plugin: 'jacoco' - sourceCompatibility = JavaVersion.VERSION_14 - targetCompatibility = JavaVersion.VERSION_14 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 repositories { mavenCentral() @@ -300,7 +300,7 @@ subprojects { testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.2' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.2' testImplementation 'org.junit.jupiter:junit-jupiter-params:5.7.2' - testImplementation 'org.mockito:mockito-junit-jupiter:3.12.4' + testImplementation 'org.mockito:mockito-junit-jupiter:4.0.0' testImplementation 'org.assertj:assertj-core:3.21.0' } diff --git a/docs/connector-development/testing-connectors/standard-source-tests.md b/docs/connector-development/testing-connectors/standard-source-tests.md index 52ddb5c716e..4f9d1b53075 100644 --- a/docs/connector-development/testing-connectors/standard-source-tests.md +++ b/docs/connector-development/testing-connectors/standard-source-tests.md @@ -2,35 +2,3 @@ Test methods start with `test`. Other methods are internal helpers in the java class implementing the test suite. -## testGetSpec - -Verify that a spec operation issued to the connector returns a valid spec. - -## testCheckConnection - -Verify that a check operation issued to the connector with the input config file returns a success response. - -## testDiscover - -Verifies when a discover operation is run on the connector using the given config file, a valid catalog is output by the connector. - -## testFullRefreshRead - -Configuring all streams in the input catalog to full refresh mode, verifies that a read operation produces some RECORD messages. - -## testIdenticalFullRefreshes - -Configuring all streams in the input catalog to full refresh mode, performs two read operations on all streams which support full refresh syncs. It then verifies that the RECORD messages output from both were identical. - -## testIncrementalSyncWithState - -This test verifies that all streams in the input catalog which support incremental sync can do so correctly. It does this by running two read operations on the connector's Docker image: the first takes the configured catalog and config provided to this test as input. It then verifies that the sync produced a non-zero number of RECORD and STATE messages. The second read takes the same catalog and config used in the first test, plus the last STATE message output by the first read operation as the input state file. It verifies that no records are produced \(since we read all records in the first sync\). This test is performed only for streams which support incremental. Streams which do not support incremental sync are ignored. If no streams in the input catalog support incremental sync, this test is skipped. - -## testEmptyStateIncrementalIdenticalToFullRefresh - -If the source does not support incremental sync, this test is skipped. Otherwise, this test runs two syncs: one where all streams provided in the input catalog sync in full refresh mode, and another where all the streams which in the input catalog which support incremental, sync in incremental mode \(streams which don't support incremental sync in full refresh mode\). Then, the test asserts that the two syncs produced the same RECORD messages. Any other type of message is disregarded. - -## testEntrypointEnvVar - -In order to launch a source on Kubernetes in a pod, we need to be able to wrap the entrypoint. The source connector must specify its entrypoint in the AIRBYTE_ENTRYPOINT variable. This test ensures that the entrypoint environment variable is set. - diff --git a/docs/contributing-to-airbyte/developing-locally.md b/docs/contributing-to-airbyte/developing-locally.md index 1d7afd3a236..34e5371fe24 100644 --- a/docs/contributing-to-airbyte/developing-locally.md +++ b/docs/contributing-to-airbyte/developing-locally.md @@ -2,7 +2,7 @@ The following technologies are required to build Airbyte locally. -1. [`Java 14`](https://jdk.java.net/archive/) +1. [`Java 17`](https://jdk.java.net/archive/) 2. `Node 16` 3. `Python 3.7` 4. `Docker` diff --git a/docs/understanding-airbyte/tech-stack.md b/docs/understanding-airbyte/tech-stack.md index 88c7f5f7823..59a6cc4b9fe 100644 --- a/docs/understanding-airbyte/tech-stack.md +++ b/docs/understanding-airbyte/tech-stack.md @@ -2,7 +2,7 @@ ## Airbyte Core Backend -* [Java 14](https://jdk.java.net/archive/) +* [Java 17](https://jdk.java.net/archive/) * Framework: [Jersey](https://eclipse-ee4j.github.io/jersey/) * API: [OAS3](https://www.openapis.org/) * Databases: [PostgreSQL](https://www.postgresql.org/) @@ -14,7 +14,7 @@ Connectors can be written in any language. However the most common languages are: * Python 3.7.0 -* [Java 14](https://jdk.java.net/archive/) +* [Java 17](https://jdk.java.net/archive/) ## **Frontend** diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c023e..7454180f2ae 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 ffed3a254e9..84d1f85fd65 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0c811..1b6c787337f 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,101 @@ # ############################################################################## -## -## 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/master/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_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${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"' # 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 +121,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,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + 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. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,95 @@ location of your Java installation." 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*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + 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; +# * $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 \ + "$@" + +# 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. +# -# 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" +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/tools/bin/build_image.sh b/tools/bin/build_image.sh index bb6264eb2d5..6bf078efa94 100755 --- a/tools/bin/build_image.sh +++ b/tools/bin/build_image.sh @@ -39,7 +39,7 @@ if [ "$FOLLOW_SYMLINKS" == "true" ]; then # to use as the build context tar cL "${exclusions[@]}" . | docker build - "${args[@]}" else - JDK_VERSION="${JDK_VERSION:-14.0.2}" + JDK_VERSION="${JDK_VERSION:-17.0.1}" if [[ -z "${DOCKER_BUILD_PLATFORM}" ]]; then docker build --build-arg JDK_VERSION="$JDK_VERSION" . "${args[@]}" else