Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit ac60852

Browse files
authoredOct 28, 2022
Updating the netflixoss project plugin (Netflix#276)
Upgrading gradle Printing version Printing version Trying something trying something else trying something else Printing all released artifacts Cleaning up trying something else Add PR comment Co-authored-by: Sundaram Ananthanarayanan <sananthanarayanan@netflix.com>
1 parent 1d31a21 commit ac60852

File tree

12 files changed

+266
-178
lines changed

12 files changed

+266
-178
lines changed
 

‎.github/workflows/nebula-snapshot.yml

+15-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
name: "Publish snapshot to NetflixOSS and Maven Central"
22

33
on:
4-
push:
5-
branches:
6-
- '**'
4+
pull_request_target:
75

86
jobs:
97
build:
@@ -25,4 +23,17 @@ jobs:
2523
NETFLIX_OSS_REPO_USERNAME: ${{ secrets.ORG_NETFLIXOSS_USERNAME }}
2624
NETFLIX_OSS_REPO_PASSWORD: ${{ secrets.ORG_NETFLIXOSS_PASSWORD }}
2725
with:
28-
arguments: build snapshot
26+
arguments: --info --stacktrace build -x test snapshot
27+
- name: Create PR Comment String
28+
run: |
29+
MY_STRING=$(cat ${GITHUB_WORKSPACE}/build/versions.txt)
30+
echo "::set-output name=content::$MY_STRING"
31+
id: my_string
32+
- name: Upload
33+
uses: mshick/add-pr-comment@v1
34+
with:
35+
message: |
36+
**Uploaded Artifacts**
37+
"${{ steps.my_string.outputs.content }}"
38+
repo-token: ${{ secrets.GITHUB_TOKEN }}
39+
allow-repeats: false # This is the default

‎build.gradle

+19-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ buildscript {
2323
}
2424
}
2525
dependencies {
26-
classpath 'com.netflix.nebula:gradle-netflixoss-project-plugin:9.4.2'
26+
classpath 'com.netflix.nebula:gradle-netflixoss-project-plugin:10.6.0'
2727
classpath 'com.netflix.nebula:nebula-dependency-recommender:11.+'
2828
classpath 'io.mantisrx:mantis-gradle-plugin:1.2.+'
2929
classpath "io.freefair.gradle:lombok-plugin:5.3.3.3"
@@ -90,6 +90,8 @@ allprojects {
9090
apply plugin: 'nebula.netflixoss'
9191
}
9292

93+
def printAllReleasedArtifacts = project.tasks.create('printAllReleasedArtifacts')
94+
project.snapshot.configure { finalizedBy printAllReleasedArtifacts }
9395
subprojects {
9496
apply plugin: 'java-library'
9597

@@ -142,6 +144,22 @@ subprojects {
142144
tasks.withType(JavaCompile) {
143145
options.compilerArgs << "-Xlint:deprecation"
144146
}
147+
148+
project.plugins.withType(MavenPublishPlugin) {
149+
def printReleasedArtifact = project.tasks.create('printReleasedArtifact')
150+
printReleasedArtifact.doLast {
151+
def file1 = file("${buildDir}/tmp/publishNebulaPublicationToNetflixOSSRepository/maven-metadata.xml")
152+
def file2 = file("${buildDir}/tmp/publishNebulaPublicationToNetflixOSSRepository/snapshot-maven-metadata.xml")
153+
def xmlText = file1.exists() ? file1.text : (file2.exists() ? file2.text : "file not found")
154+
def xml = new XmlParser(false, false).parseText(xmlText)
155+
def snapshotVersion = xml.versioning.snapshotVersions.snapshotVersion[0].'value'.text()
156+
logger.lifecycle("${project.group}:${project.name}:${snapshotVersion}")
157+
file("${project.rootProject.buildDir}/versions.txt").append("${project.group}:${project.name}:${snapshotVersion}\n")
158+
}
159+
160+
printReleasedArtifact.dependsOn(project.rootProject.snapshot)
161+
printAllReleasedArtifacts.dependsOn("${project.path}:printReleasedArtifact")
162+
}
145163
}
146164

147165
apply from: file('baseline.gradle')

‎gradle/wrapper/gradle-wrapper.jar

4.47 KB
Binary file not shown.
+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Thu Mar 26 09:45:11 PDT 2020
2-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip
31
distributionBase=GRADLE_USER_HOME
42
distributionPath=wrapper/dists
5-
zipStorePath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
64
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists

‎gradlew

+177-117
Original file line numberDiff line numberDiff line change
@@ -1,86 +1,129 @@
1-
#!/usr/bin/env sh
1+
#!/bin/sh
2+
3+
#
4+
# Copyright © 2015-2021 the original authors.
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# https://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
#
218

319
##############################################################################
4-
##
5-
## Gradle start up script for UN*X
6-
##
20+
#
21+
# Gradle start up script for POSIX generated by Gradle.
22+
#
23+
# Important for running:
24+
#
25+
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
26+
# noncompliant, but you have some other compliant shell such as ksh or
27+
# bash, then to run this script, type that shell name before the whole
28+
# command line, like:
29+
#
30+
# ksh Gradle
31+
#
32+
# Busybox and similar reduced shells will NOT work, because this script
33+
# requires all of these POSIX shell features:
34+
# * functions;
35+
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
36+
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
37+
# * compound commands having a testable exit status, especially «case»;
38+
# * various built-in commands including «command», «set», and «ulimit».
39+
#
40+
# Important for patching:
41+
#
42+
# (2) This script targets any POSIX shell, so it avoids extensions provided
43+
# by Bash, Ksh, etc; in particular arrays are avoided.
44+
#
45+
# The "traditional" practice of packing multiple parameters into a
46+
# space-separated string is a well documented source of bugs and security
47+
# problems, so this is (mostly) avoided, by progressively accumulating
48+
# options in "$@", and eventually passing that to Java.
49+
#
50+
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
51+
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
52+
# see the in-line comments for details.
53+
#
54+
# There are tweaks for specific operating systems such as AIX, CygWin,
55+
# Darwin, MinGW, and NonStop.
56+
#
57+
# (3) This script is generated from the Groovy template
58+
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
59+
# within the Gradle project.
60+
#
61+
# You can find Gradle at https://github.com/gradle/gradle/.
62+
#
763
##############################################################################
864

965
# Attempt to set APP_HOME
66+
1067
# Resolve links: $0 may be a link
11-
PRG="$0"
12-
# Need this for relative symlinks.
13-
while [ -h "$PRG" ] ; do
14-
ls=`ls -ld "$PRG"`
15-
link=`expr "$ls" : '.*-> \(.*\)$'`
16-
if expr "$link" : '/.*' > /dev/null; then
17-
PRG="$link"
18-
else
19-
PRG=`dirname "$PRG"`"/$link"
20-
fi
68+
app_path=$0
69+
70+
# Need this for daisy-chained symlinks.
71+
while
72+
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
73+
[ -h "$app_path" ]
74+
do
75+
ls=$( ls -ld "$app_path" )
76+
link=${ls#*' -> '}
77+
case $link in #(
78+
/*) app_path=$link ;; #(
79+
*) app_path=$APP_HOME$link ;;
80+
esac
2181
done
22-
SAVED="`pwd`"
23-
cd "`dirname \"$PRG\"`/" >/dev/null
24-
APP_HOME="`pwd -P`"
25-
cd "$SAVED" >/dev/null
2682

27-
APP_NAME="Gradle"
28-
APP_BASE_NAME=`basename "$0"`
29-
30-
# Netflix: Attempt to use $WORKSPACE/.gradle if we're not told otherwise
31-
if [ "x$GRADLE_USER_HOME" = "x" ]; then
32-
if [ "x$WORKSPACE" != "x" ]; then
33-
export GRADLE_USER_HOME="$WORKSPACE/.gradle"
34-
fi
35-
fi
83+
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
3684

85+
APP_NAME="Gradle"
86+
APP_BASE_NAME=${0##*/}
3787

3888
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
39-
DEFAULT_JVM_OPTS=""
89+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
4090

4191
# Use the maximum available, or set MAX_FD != -1 to use that value.
42-
MAX_FD="maximum"
92+
MAX_FD=maximum
4393

4494
warn () {
4595
echo "$*"
46-
}
96+
} >&2
4797

4898
die () {
4999
echo
50100
echo "$*"
51101
echo
52102
exit 1
53-
}
103+
} >&2
54104

55105
# OS specific support (must be 'true' or 'false').
56106
cygwin=false
57107
msys=false
58108
darwin=false
59109
nonstop=false
60-
case "`uname`" in
61-
CYGWIN* )
62-
cygwin=true
63-
;;
64-
Darwin* )
65-
darwin=true
66-
;;
67-
MINGW* )
68-
msys=true
69-
;;
70-
NONSTOP* )
71-
nonstop=true
72-
;;
110+
case "$( uname )" in #(
111+
CYGWIN* ) cygwin=true ;; #(
112+
Darwin* ) darwin=true ;; #(
113+
MSYS* | MINGW* ) msys=true ;; #(
114+
NONSTOP* ) nonstop=true ;;
73115
esac
74116

75117
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
76118

119+
77120
# Determine the Java command to use to start the JVM.
78121
if [ -n "$JAVA_HOME" ] ; then
79122
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
80123
# IBM's JDK on AIX uses strange locations for the executables
81-
JAVACMD="$JAVA_HOME/jre/sh/java"
124+
JAVACMD=$JAVA_HOME/jre/sh/java
82125
else
83-
JAVACMD="$JAVA_HOME/bin/java"
126+
JAVACMD=$JAVA_HOME/bin/java
84127
fi
85128
if [ ! -x "$JAVACMD" ] ; then
86129
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -89,92 +132,109 @@ Please set the JAVA_HOME variable in your environment to match the
89132
location of your Java installation."
90133
fi
91134
else
92-
JAVACMD="java"
135+
JAVACMD=java
93136
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
94137
95138
Please set the JAVA_HOME variable in your environment to match the
96139
location of your Java installation."
97140
fi
98141

99142
# Increase the maximum file descriptors if we can.
100-
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
101-
MAX_FD_LIMIT=`ulimit -H -n`
102-
if [ $? -eq 0 ] ; then
103-
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
104-
MAX_FD="$MAX_FD_LIMIT"
105-
fi
106-
ulimit -n $MAX_FD
107-
if [ $? -ne 0 ] ; then
108-
warn "Could not set maximum file descriptor limit: $MAX_FD"
109-
fi
110-
else
111-
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
112-
fi
143+
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
144+
case $MAX_FD in #(
145+
max*)
146+
MAX_FD=$( ulimit -H -n ) ||
147+
warn "Could not query maximum file descriptor limit"
148+
esac
149+
case $MAX_FD in #(
150+
'' | soft) :;; #(
151+
*)
152+
ulimit -n "$MAX_FD" ||
153+
warn "Could not set maximum file descriptor limit to $MAX_FD"
154+
esac
113155
fi
114156

115-
# For Darwin, add options to specify how the application appears in the dock
116-
if $darwin; then
117-
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
118-
fi
157+
# Collect all arguments for the java command, stacking in reverse order:
158+
# * args from the command line
159+
# * the main class name
160+
# * -classpath
161+
# * -D...appname settings
162+
# * --module-path (only if needed)
163+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
164+
165+
# For Cygwin or MSYS, switch paths to Windows format before running java
166+
if "$cygwin" || "$msys" ; then
167+
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
168+
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
169+
170+
JAVACMD=$( cygpath --unix "$JAVACMD" )
119171

120-
# For Cygwin, switch paths to Windows format before running java
121-
if $cygwin ; then
122-
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
123-
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
124-
JAVACMD=`cygpath --unix "$JAVACMD"`
125-
126-
# We build the pattern for arguments to be converted via cygpath
127-
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
128-
SEP=""
129-
for dir in $ROOTDIRSRAW ; do
130-
ROOTDIRS="$ROOTDIRS$SEP$dir"
131-
SEP="|"
132-
done
133-
OURCYGPATTERN="(^($ROOTDIRS))"
134-
# Add a user-defined pattern to the cygpath arguments
135-
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
136-
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
137-
fi
138172
# Now convert the arguments - kludge to limit ourselves to /bin/sh
139-
i=0
140-
for arg in "$@" ; do
141-
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
142-
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
143-
144-
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
145-
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
146-
else
147-
eval `echo args$i`="\"$arg\""
173+
for arg do
174+
if
175+
case $arg in #(
176+
-*) false ;; # don't mess with options #(
177+
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
178+
[ -e "$t" ] ;; #(
179+
*) false ;;
180+
esac
181+
then
182+
arg=$( cygpath --path --ignore --mixed "$arg" )
148183
fi
149-
i=$((i+1))
184+
# Roll the args list around exactly as many times as the number of
185+
# args, so each arg winds up back in the position where it started, but
186+
# possibly modified.
187+
#
188+
# NB: a `for` loop captures its iteration list before it begins, so
189+
# changing the positional parameters here affects neither the number of
190+
# iterations, nor the values presented in `arg`.
191+
shift # remove old arg
192+
set -- "$@" "$arg" # push replacement arg
150193
done
151-
case $i in
152-
(0) set -- ;;
153-
(1) set -- "$args0" ;;
154-
(2) set -- "$args0" "$args1" ;;
155-
(3) set -- "$args0" "$args1" "$args2" ;;
156-
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
157-
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
158-
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
159-
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
160-
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
161-
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
162-
esac
163194
fi
164195

165-
# Escape application args
166-
save () {
167-
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
168-
echo " "
169-
}
170-
APP_ARGS=$(save "$@")
171-
172-
# Collect all arguments for the java command, following the shell quoting and substitution rules
173-
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
174-
175-
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
176-
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
177-
cd "$(dirname "$0")"
196+
# Collect all arguments for the java command;
197+
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
198+
# shell script including quotes and variable substitutions, so put them in
199+
# double quotes to make sure that they get re-expanded; and
200+
# * put everything else in single quotes, so that it's not re-expanded.
201+
202+
set -- \
203+
"-Dorg.gradle.appname=$APP_BASE_NAME" \
204+
-classpath "$CLASSPATH" \
205+
org.gradle.wrapper.GradleWrapperMain \
206+
"$@"
207+
208+
# Stop when "xargs" is not available.
209+
if ! command -v xargs >/dev/null 2>&1
210+
then
211+
die "xargs is not available"
178212
fi
179213

214+
# Use "xargs" to parse quoted args.
215+
#
216+
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
217+
#
218+
# In Bash we could simply go:
219+
#
220+
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
221+
# set -- "${ARGS[@]}" "$@"
222+
#
223+
# but POSIX shell has neither arrays nor command substitution, so instead we
224+
# post-process each arg (as a line of input to sed) to backslash-escape any
225+
# character that might be a shell metacharacter, then use eval to reverse
226+
# that process (while maintaining the separation between arguments), and wrap
227+
# the whole thing up as a single "set" statement.
228+
#
229+
# This will of course break if any of these variables contains a newline or
230+
# an unmatched quote.
231+
#
232+
233+
eval "set -- $(
234+
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
235+
xargs -n1 |
236+
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
237+
tr '\n' ' '
238+
)" '"$@"'
239+
180240
exec "$JAVACMD" "$@"

‎gradlew.bat

+30-30
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,20 @@
1-
@if "%DEBUG%" == "" @echo off
1+
@rem
2+
@rem Copyright 2015 the original author or authors.
3+
@rem
4+
@rem Licensed under the Apache License, Version 2.0 (the "License");
5+
@rem you may not use this file except in compliance with the License.
6+
@rem You may obtain a copy of the License at
7+
@rem
8+
@rem https://www.apache.org/licenses/LICENSE-2.0
9+
@rem
10+
@rem Unless required by applicable law or agreed to in writing, software
11+
@rem distributed under the License is distributed on an "AS IS" BASIS,
12+
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
@rem See the License for the specific language governing permissions and
14+
@rem limitations under the License.
15+
@rem
16+
17+
@if "%DEBUG%"=="" @echo off
218
@rem ##########################################################################
319
@rem
420
@rem Gradle startup script for Windows
@@ -9,26 +25,22 @@
925
if "%OS%"=="Windows_NT" setlocal
1026

1127
set DIRNAME=%~dp0
12-
if "%DIRNAME%" == "" set DIRNAME=.
28+
if "%DIRNAME%"=="" set DIRNAME=.
1329
set APP_BASE_NAME=%~n0
1430
set APP_HOME=%DIRNAME%
1531

16-
@rem Netflix: Attempt to use $WORKSPACE/.gradle if we're not told otherwise
17-
if "%GRADLE_USER_HOME%"=="" (
18-
if NOT "%WORKSPACE%"=="" (
19-
set GRADLE_USER_HOME=%WORKSPACE%\.gradle
20-
)
21-
)
32+
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
33+
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
2234

2335
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
24-
set DEFAULT_JVM_OPTS=
36+
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
2537

2638
@rem Find java.exe
2739
if defined JAVA_HOME goto findJavaFromJavaHome
2840

2941
set JAVA_EXE=java.exe
3042
%JAVA_EXE% -version >NUL 2>&1
31-
if "%ERRORLEVEL%" == "0" goto init
43+
if %ERRORLEVEL% equ 0 goto execute
3244

3345
echo.
3446
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -42,7 +54,7 @@ goto fail
4254
set JAVA_HOME=%JAVA_HOME:"=%
4355
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
4456

45-
if exist "%JAVA_EXE%" goto init
57+
if exist "%JAVA_EXE%" goto execute
4658

4759
echo.
4860
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -52,38 +64,26 @@ echo location of your Java installation.
5264

5365
goto fail
5466

55-
:init
56-
@rem Get command-line arguments, handling Windows variants
57-
58-
if not "%OS%" == "Windows_NT" goto win9xME_args
59-
60-
:win9xME_args
61-
@rem Slurp the command line arguments.
62-
set CMD_LINE_ARGS=
63-
set _SKIP=2
64-
65-
:win9xME_args_slurp
66-
if "x%~1" == "x" goto execute
67-
68-
set CMD_LINE_ARGS=%*
69-
7067
:execute
7168
@rem Setup the command line
7269

7370
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
7471

72+
7573
@rem Execute Gradle
76-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
74+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
7775

7876
:end
7977
@rem End local scope for the variables with windows NT shell
80-
if "%ERRORLEVEL%"=="0" goto mainEnd
78+
if %ERRORLEVEL% equ 0 goto mainEnd
8179

8280
:fail
8381
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
8482
rem the _cmd.exe /c_ return code!
85-
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
86-
exit /b 1
83+
set EXIT_CODE=%ERRORLEVEL%
84+
if %EXIT_CODE% equ 0 set EXIT_CODE=1
85+
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
86+
exit /b %EXIT_CODE%
8787

8888
:mainEnd
8989
if "%OS%"=="Windows_NT" endlocal

‎mantis-control-plane/mantis-control-plane-core/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@ dependencies {
4242
api "joda-time:joda-time:$jodaTimeVersion"
4343

4444

45-
testCompile libraries.junit4
46-
testCompile libraries.mockitoAll
45+
testImplementation libraries.junit4
46+
testImplementation libraries.mockitoAll
4747
}

‎mantis-control-plane/mantis-control-plane-server/build.gradle

+6-6
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ ext {
2929
}
3030

3131
dependencies {
32-
compile project(':mantis-control-plane:mantis-control-plane-core')
32+
api project(':mantis-control-plane:mantis-control-plane-core')
3333

3434
api "com.typesafe.akka:akka-http_$scalaBinaryVersion:$akkaHttpVersion"
3535
api "com.typesafe.akka:akka-http-jackson_$scalaBinaryVersion:$akkaHttpVersion"
@@ -44,11 +44,11 @@ dependencies {
4444
api "com.github.spullara.cli-parser:cli-parser:$cliParserVersion"
4545
api "org.skife.config:config-magic:$configMagicVersion"
4646

47-
testCompile "com.typesafe.akka:akka-testkit_$scalaBinaryVersion:$akkaVersion"
48-
testCompile "com.typesafe.akka:akka-http-testkit_$scalaBinaryVersion:$akkaHttpVersion"
49-
testCompile libraries.junit4
50-
testCompile libraries.mockitoCore3
51-
testCompile "org.testng:testng:$testngVersion"
47+
testImplementation "com.typesafe.akka:akka-testkit_$scalaBinaryVersion:$akkaVersion"
48+
testImplementation "com.typesafe.akka:akka-http-testkit_$scalaBinaryVersion:$akkaHttpVersion"
49+
testImplementation libraries.junit4
50+
testImplementation libraries.mockitoCore3
51+
testImplementation "org.testng:testng:$testngVersion"
5252
testImplementation testFixtures(project(":mantis-common"))
5353
testImplementation testFixtures(project(":mantis-control-plane:mantis-control-plane-core"))
5454
testImplementation libraries.commonsIo

‎mantis-examples/mantis-examples-mantis-publish-sample/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ ext {
5454

5555

5656
dependencies {
57-
compile project(":mantis-publish:mantis-publish-netty-guice")
57+
implementation project(":mantis-publish:mantis-publish-netty-guice")
5858

5959
implementation libraries.rxJava
6060
implementation "com.netflix.spectator:spectator-ext-ipc:$spectatorVersion"

‎mantis-server/mantis-server-agent/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
dependencies {
18-
compile project(":mantis-control-plane:mantis-control-plane-core")
18+
api project(":mantis-control-plane:mantis-control-plane-core")
1919

2020
implementation libraries.slf4jApi
2121
implementation libraries.slf4jLog4j12

‎mantis-server/mantis-server-worker-client/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ dependencies {
2121

2222
testImplementation libraries.junit4
2323
testImplementation libraries.mockitoAll
24-
testCompile 'org.hamcrest:hamcrest-all:1.3'
24+
testImplementation 'org.hamcrest:hamcrest-all:1.3'
2525
}

‎mantis-server/mantis-server-worker/build.gradle

+12-12
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ ext {
2424
}
2525

2626
dependencies {
27-
compile project(":mantis-runtime")
28-
compile project(":mantis-control-plane:mantis-control-plane-client")
29-
compile project(":mantis-control-plane:mantis-control-plane-core")
30-
compile project(":mantis-server:mantis-server-worker-client")
27+
api project(":mantis-runtime")
28+
api project(":mantis-control-plane:mantis-control-plane-client")
29+
api project(":mantis-control-plane:mantis-control-plane-core")
30+
api project(":mantis-server:mantis-server-worker-client")
3131

3232
api libraries.flinkRpcApi
3333
implementation libraries.commonsIo
@@ -37,17 +37,17 @@ dependencies {
3737
implementation libraries.spotifyFutures
3838
implementation libraries.flinkRpcImpl
3939

40-
compile "org.apache.mesos:mesos:$mesosVersion"
41-
compile libraries.slf4jApi
42-
compile libraries.slf4jLog4j12
43-
compile libraries.vavr
44-
compile('nz.ac.waikato.cms.moa:moa:2017.06') {
40+
implementation "org.apache.mesos:mesos:$mesosVersion"
41+
implementation libraries.slf4jApi
42+
implementation libraries.slf4jLog4j12
43+
implementation libraries.vavr
44+
implementation('nz.ac.waikato.cms.moa:moa:2017.06') {
4545
exclude group: 'com.github.spullara.cli-parser', module: 'cli-parser'
4646
exclude group: 'org.pentaho.pentaho-commons', module: 'pentaho-package-manager'
4747
}
48-
compile "org.apache.httpcomponents:httpclient:$httpComponentsVersion"
49-
compile "io.mantisrx:mantis-rxcontrol:$mantisRxControlVersion"
50-
compile "com.yahoo.datasketches:sketches-core:0.9.1"
48+
implementation "org.apache.httpcomponents:httpclient:$httpComponentsVersion"
49+
implementation "io.mantisrx:mantis-rxcontrol:$mantisRxControlVersion"
50+
implementation "com.yahoo.datasketches:sketches-core:0.9.1"
5151

5252
testImplementation libraries.junit4
5353
testImplementation libraries.mockitoAll

0 commit comments

Comments
 (0)
Please sign in to comment.