These are the API classes
- diff --git a/src/test/resources/integration/gradle-example-ci-publications/api/src/main/java/org/gradle/apiImpl/Impl.java b/src/test/resources/integration/gradle-example-ci-publications/api/src/main/java/org/gradle/apiImpl/Impl.java deleted file mode 100644 index 76cf0cc22..000000000 --- a/src/test/resources/integration/gradle-example-ci-publications/api/src/main/java/org/gradle/apiImpl/Impl.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (C) 2011 JFrog Ltd. - * - * 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 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.gradle.apiImpl; - - -public class Impl { - - public void implMethod() { - double a = 4.0 * 4; - } - -} diff --git a/src/test/resources/integration/gradle-example-ci-publications/build.gradle b/src/test/resources/integration/gradle-example-ci-publications/build.gradle deleted file mode 100644 index f6157b64a..000000000 --- a/src/test/resources/integration/gradle-example-ci-publications/build.gradle +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2013 JFrog Ltd. - * - * 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 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -buildscript { - repositories { - mavenLocal() - mavenCentral() - } -} - -allprojects { - apply plugin: 'java' - apply plugin: 'maven-publish' - - group = 'org.jfrog.example.gradle' - version = '1.0' - status = 'integration' - - publishing { - publications { - nonDefaultPublication(MavenPublication) { - from components.java - } - } - } -} - -// Setting this property to true will make the artifactoryPublish task -// skip this module (in our case, the root module): -artifactoryPublish.skip = true diff --git a/src/test/resources/integration/gradle-example-ci-publications/gradle.properties b/src/test/resources/integration/gradle-example-ci-publications/gradle.properties deleted file mode 100644 index 740496fb4..000000000 --- a/src/test/resources/integration/gradle-example-ci-publications/gradle.properties +++ /dev/null @@ -1,3 +0,0 @@ -currentVersion=2.3-SNAPSHOT -artifactory_password=password -artifactory_user=admin diff --git a/src/test/resources/integration/gradle-example-ci-publications/services/webservice/build.gradle b/src/test/resources/integration/gradle-example-ci-publications/services/webservice/build.gradle deleted file mode 100644 index 3a0247bfc..000000000 --- a/src/test/resources/integration/gradle-example-ci-publications/services/webservice/build.gradle +++ /dev/null @@ -1,8 +0,0 @@ -apply plugin: 'war' - -dependencies { - implementation project(':shared'), 'commons-collections:commons-collections:3.2@jar', 'commons-io:commons-io:1.2', 'org.apache.commons:commons-lang3:3.12.0@jar' - implementation group: 'org.apache.wicket', name: 'wicket', version: '1.3.7' - implementation group: 'junit', name: 'junit', version: '4.11' - implementation project(':api') -} diff --git a/src/test/resources/integration/gradle-example-ci-publications/services/webservice/src/main/java/org/gradle/webservice/TestTest.java b/src/test/resources/integration/gradle-example-ci-publications/services/webservice/src/main/java/org/gradle/webservice/TestTest.java deleted file mode 100644 index 33a1c7fe6..000000000 --- a/src/test/resources/integration/gradle-example-ci-publications/services/webservice/src/main/java/org/gradle/webservice/TestTest.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (C) 2011 JFrog Ltd. - * - * 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 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.gradle.webservice; - -import org.apache.commons.collections.list.GrowthList; -import org.apache.commons.io.FilenameUtils; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.gradle.api.PersonList; -import org.gradle.shared.Person; - -public class TestTest { - private String name; - - public void method() { - FilenameUtils.separatorsToUnix("my/unix/filename"); - ToStringBuilder.reflectionToString(new Person("name")); - new GrowthList(); - new PersonList().doSomethingWithImpl(); // compile with api-spi, runtime with api - } - -} diff --git a/src/test/resources/integration/gradle-example-ci-publications/services/webservice/src/test/java/org/gradle/webservice/TestTestTest.java b/src/test/resources/integration/gradle-example-ci-publications/services/webservice/src/test/java/org/gradle/webservice/TestTestTest.java deleted file mode 100644 index b8e22a4ad..000000000 --- a/src/test/resources/integration/gradle-example-ci-publications/services/webservice/src/test/java/org/gradle/webservice/TestTestTest.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2007 the original author or 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 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.gradle.webservice; - -import junit.framework.TestCase; - -/** - * @author Hans Dockter - */ -public class TestTestTest extends TestCase { - public void testClasspath() { - new TestTest().method(); - } - - public void testApiCompileClasspath() { - new org.gradle.api.PersonList(); - } -} diff --git a/src/test/resources/integration/gradle-example-ci-publications/settings.gradle b/src/test/resources/integration/gradle-example-ci-publications/settings.gradle deleted file mode 100644 index 397a3021a..000000000 --- a/src/test/resources/integration/gradle-example-ci-publications/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -include "shared", "api", "services:webservice" diff --git a/src/test/resources/integration/gradle-example-ci-publications/shared/src/main/java/org/gradle/shared/Person.java b/src/test/resources/integration/gradle-example-ci-publications/shared/src/main/java/org/gradle/shared/Person.java deleted file mode 100644 index d9ed11ee8..000000000 --- a/src/test/resources/integration/gradle-example-ci-publications/shared/src/main/java/org/gradle/shared/Person.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2011 JFrog Ltd. - * - * 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 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.gradle.shared; - -import java.io.IOException; -import java.util.Properties; - -public class Person { - private String name; - - public Person(String name) { - this.name = name; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String readProperty() throws IOException { - Properties properties = new Properties(); - properties.load(getClass().getClassLoader().getResourceAsStream("org/gradle/shared/main.properties")); - return properties.getProperty("main"); - } -} diff --git a/src/test/resources/integration/gradle-example-ci-publications/shared/src/main/java/org/gradle/shared/package-info.java b/src/test/resources/integration/gradle-example-ci-publications/shared/src/main/java/org/gradle/shared/package-info.java deleted file mode 100644 index 7c5f65caf..000000000 --- a/src/test/resources/integration/gradle-example-ci-publications/shared/src/main/java/org/gradle/shared/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (C) 2011 JFrog Ltd. - * - * 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 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * These are the shared classes. - */ -package org.gradle.shared; diff --git a/src/test/resources/integration/gradle-example-ci-publications/shared/src/main/resources/org/gradle/shared/main.properties b/src/test/resources/integration/gradle-example-ci-publications/shared/src/main/resources/org/gradle/shared/main.properties deleted file mode 100644 index 68fed4627..000000000 --- a/src/test/resources/integration/gradle-example-ci-publications/shared/src/main/resources/org/gradle/shared/main.properties +++ /dev/null @@ -1,17 +0,0 @@ -# -# Copyright (C) 2011 JFrog Ltd. -# -# 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 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -main=mainValue diff --git a/src/test/resources/integration/gradle-example-ci/api/build.gradle b/src/test/resources/integration/gradle-example-ci/api/build.gradle index 052b24da9..482312f09 100644 --- a/src/test/resources/integration/gradle-example-ci/api/build.gradle +++ b/src/test/resources/integration/gradle-example-ci/api/build.gradle @@ -3,11 +3,11 @@ configurations { } dependencies { - compile project(':shared') - compile module("org.apache.commons:commons-lang3:3.12.0") { + implementation project(':shared') + implementation module("org.apache.commons:commons-lang3:3.12.0") { dependency("commons-io:commons-io:1.2") } - compile group: 'org.apache.wicket', name: 'wicket', version: '1.3.7' + implementation group: 'org.apache.wicket', name: 'wicket', version: '1.3.7' } diff --git a/src/test/resources/integration/gradle-example-ci/build.gradle b/src/test/resources/integration/gradle-example-ci/build.gradle index 1268a1e37..f6157b64a 100644 --- a/src/test/resources/integration/gradle-example-ci/build.gradle +++ b/src/test/resources/integration/gradle-example-ci/build.gradle @@ -23,11 +23,19 @@ buildscript { allprojects { apply plugin: 'java' - apply plugin: 'maven' + apply plugin: 'maven-publish' group = 'org.jfrog.example.gradle' version = '1.0' status = 'integration' + + publishing { + publications { + nonDefaultPublication(MavenPublication) { + from components.java + } + } + } } // Setting this property to true will make the artifactoryPublish task diff --git a/src/test/resources/integration/gradle-example-ci/gradle/wrapper/gradle-wrapper.jar b/src/test/resources/integration/gradle-example-ci/gradle/wrapper/gradle-wrapper.jar index e708b1c02..7f93135c4 100644 Binary files a/src/test/resources/integration/gradle-example-ci/gradle/wrapper/gradle-wrapper.jar and b/src/test/resources/integration/gradle-example-ci/gradle/wrapper/gradle-wrapper.jar differ diff --git a/src/test/resources/integration/gradle-example-ci/gradle/wrapper/gradle-wrapper.properties b/src/test/resources/integration/gradle-example-ci/gradle/wrapper/gradle-wrapper.properties index 0ebb3108e..a826913af 100644 --- a/src/test/resources/integration/gradle-example-ci/gradle/wrapper/gradle-wrapper.properties +++ b/src/test/resources/integration/gradle-example-ci/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.3-all.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/test/resources/integration/gradle-example-ci/gradlew b/src/test/resources/integration/gradle-example-ci/gradlew index 4f906e0c8..0adc8e1a5 100755 --- a/src/test/resources/integration/gradle-example-ci/gradlew +++ b/src/test/resources/integration/gradle-example-ci/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,99 @@ # ############################################################################## -## -## 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##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && 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 +119,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 +130,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/src/test/resources/integration/gradle-example-ci/gradlew.bat b/src/test/resources/integration/gradle-example-ci/gradlew.bat index ac1b06f93..93e3f59f1 100644 --- a/src/test/resources/integration/gradle-example-ci/gradlew.bat +++ b/src/test/resources/integration/gradle-example-ci/gradlew.bat @@ -1,89 +1,92 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@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 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, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -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" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "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. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -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. - -goto fail - -: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 %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="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 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@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 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, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +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" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +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. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +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. + +goto fail + +: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 %* + +:end +@rem End local scope for the variables with windows NT shell +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! +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 + +:omega diff --git a/src/test/resources/integration/gradle-example-ci/services/webservice/build.gradle b/src/test/resources/integration/gradle-example-ci/services/webservice/build.gradle index 88d22672d..3a0247bfc 100644 --- a/src/test/resources/integration/gradle-example-ci/services/webservice/build.gradle +++ b/src/test/resources/integration/gradle-example-ci/services/webservice/build.gradle @@ -1,8 +1,8 @@ apply plugin: 'war' dependencies { - compile project(':shared'), 'commons-collections:commons-collections:3.2@jar', 'commons-io:commons-io:1.2', 'org.apache.commons:commons-lang3:3.12.0@jar' - compile group: 'org.apache.wicket', name: 'wicket', version: '1.3.7' - compile group: 'junit', name: 'junit', version: '4.11' - compile project(':api') + implementation project(':shared'), 'commons-collections:commons-collections:3.2@jar', 'commons-io:commons-io:1.2', 'org.apache.commons:commons-lang3:3.12.0@jar' + implementation group: 'org.apache.wicket', name: 'wicket', version: '1.3.7' + implementation group: 'junit', name: 'junit', version: '4.11' + implementation project(':api') } diff --git a/src/test/resources/integration/pipelines/declarative/gradle.pipeline b/src/test/resources/integration/pipelines/declarative/gradle.pipeline index 8eaabc0ec..ca0031acc 100644 --- a/src/test/resources/integration/pipelines/declarative/gradle.pipeline +++ b/src/test/resources/integration/pipelines/declarative/gradle.pipeline @@ -49,7 +49,6 @@ node("TestSlave") { buildNumber: buildNumber, usesPlugin: true, rootDir: 'declarative-gradle-example', - buildFile: 'build.gradle', tasks: 'clean artifactoryPublish', deployerId: "GRADLE_DEPLOYER", resolverId: "GRADLE_RESOLVER", diff --git a/src/test/resources/integration/pipelines/declarative/gradleCiServer.pipeline b/src/test/resources/integration/pipelines/declarative/gradleCiServer.pipeline index 51e1ac67a..499586432 100644 --- a/src/test/resources/integration/pipelines/declarative/gradleCiServer.pipeline +++ b/src/test/resources/integration/pipelines/declarative/gradleCiServer.pipeline @@ -23,6 +23,7 @@ node("TestSlave") { serverId: serverId, releaseRepo: "${LOCAL_REPO1}", snapshotRepo: "${LOCAL_REPO1}", + publications: ["nonDefaultPublication"] ) rtGradleResolver( @@ -39,11 +40,9 @@ node("TestSlave") { buildName: buildName, buildNumber: buildNumber, rootDir: 'declarative-gradle-example-ci-server', - buildFile: 'build.gradle', tasks: 'clean artifactoryPublish', deployerId: "GRADLE_DEPLOYER", - resolverId: "GRADLE_RESOLVER", - useWrapper: true + resolverId: "GRADLE_RESOLVER" ) stage "Publish build info" diff --git a/src/test/resources/integration/pipelines/declarative/gradleCiServerPublication.pipeline b/src/test/resources/integration/pipelines/declarative/gradleCiServerPublication.pipeline deleted file mode 100644 index f11c97237..000000000 --- a/src/test/resources/integration/pipelines/declarative/gradleCiServerPublication.pipeline +++ /dev/null @@ -1,55 +0,0 @@ -package integration.pipelines.declarative - -import org.apache.commons.io.FileUtils - -import java.nio.file.Paths - -node("TestSlave") { - def serverId = "Artifactory-1" - def buildName = "declarative:gradle-ci-publication test" - def buildNumber = "${BUILD_NUMBER}" - - stage "Configure Artifactory" - rtServer( - id: serverId, - url: "${env.JENKINS_PLATFORM_URL}".replaceFirst('/*$', '')+'/artifactory', - username: "${env.JENKINS_PLATFORM_USERNAME}", - password: "${env.JENKINS_PLATFORM_ADMIN_TOKEN}" - ) - - stage "Configure Gradle build" - rtGradleDeployer( - id: "GRADLE_DEPLOYER", - serverId: serverId, - releaseRepo: "${LOCAL_REPO1}", - snapshotRepo: "${LOCAL_REPO1}", - publications: ["nonDefaultPublication"] - ) - - rtGradleResolver( - id: "GRADLE_RESOLVER", - serverId: serverId, - repo: "${MAVEN_REMOTE_REPO}", - ) - - stage "Copy project example" - FileUtils.copyDirectory(Paths.get("${GRADLE_CI_PUBLICATION_PROJECT_PATH}").toFile(), Paths.get(pwd(), "declarative-gradle-example-ci-server-publication").toFile()) - - stage "Run Gradle" - rtGradleRun( - buildName: buildName, - buildNumber: buildNumber, - rootDir: 'declarative-gradle-example-ci-server-publication', - buildFile: 'build.gradle', - tasks: 'clean artifactoryPublish', - deployerId: "GRADLE_DEPLOYER", - resolverId: "GRADLE_RESOLVER" - ) - - stage "Publish build info" - rtPublishBuildInfo( - serverId: serverId, - buildName: buildName, - buildNumber: buildNumber - ) -} diff --git a/src/test/resources/integration/pipelines/scripted/gradleCiServerPublication.pipeline b/src/test/resources/integration/pipelines/scripted/gradleCiServerPublication.pipeline index a764a25ce..078dfc81f 100644 --- a/src/test/resources/integration/pipelines/scripted/gradleCiServerPublication.pipeline +++ b/src/test/resources/integration/pipelines/scripted/gradleCiServerPublication.pipeline @@ -8,7 +8,7 @@ node("TestSlave") { stage "Configure Artifactory" def rtServer = Artifactory.newServer url: "${env.JENKINS_PLATFORM_URL}".replaceFirst('/*$', '')+'/artifactory', username: "${env.JENKINS_PLATFORM_USERNAME}", password: "${env.JENKINS_PLATFORM_ADMIN_TOKEN}" def buildInfo = Artifactory.newBuildInfo() - buildInfo.name = "scripted:gradle-ci-publication test" + buildInfo.name = "scripted:gradle-ci test" buildInfo.number = ${BUILD_NUMBER} stage "Configure Gradle build" @@ -18,10 +18,10 @@ node("TestSlave") { rtGradle.resolver repo: "${MAVEN_REMOTE_REPO}", server: rtServer stage "Copy project example" - FileUtils.copyDirectory(Paths.get("${GRADLE_CI_PUBLICATION_PROJECT_PATH}").toFile(), Paths.get(pwd(), "scripted-gradle-example-ci-server-publication").toFile()) + FileUtils.copyDirectory(Paths.get("${GRADLE_CI_PROJECT_PATH}").toFile(), Paths.get(pwd(), "scripted-gradle-example-ci-server").toFile()) stage "Run Gradle" - rtGradle.run rootDir: "scripted-gradle-example-ci-server-publication", buildFile: "build.gradle", tasks: "clean artifactoryPublish", buildInfo: buildInfo + rtGradle.run rootDir: "scripted-gradle-example-ci-server", buildFile: "build.gradle", tasks: "clean artifactoryPublish", buildInfo: buildInfo stage "Publish build info" rtServer.publishBuildInfo buildInfo