diff --git a/.github/workflows/nebula-snapshot.yml b/.github/workflows/nebula-snapshot.yml index 50d7df454..9bb239862 100644 --- a/.github/workflows/nebula-snapshot.yml +++ b/.github/workflows/nebula-snapshot.yml @@ -1,9 +1,7 @@ name: "Publish snapshot to NetflixOSS and Maven Central" on: - push: - branches: - - '**' + pull_request_target: jobs: build: @@ -25,4 +23,17 @@ jobs: NETFLIX_OSS_REPO_USERNAME: ${{ secrets.ORG_NETFLIXOSS_USERNAME }} NETFLIX_OSS_REPO_PASSWORD: ${{ secrets.ORG_NETFLIXOSS_PASSWORD }} with: - arguments: build snapshot + arguments: --info --stacktrace build -x test snapshot + - name: Create PR Comment String + run: | + MY_STRING=$(cat ${GITHUB_WORKSPACE}/build/versions.txt) + echo "::set-output name=content::$MY_STRING" + id: my_string + - name: Upload + uses: mshick/add-pr-comment@v1 + with: + message: | + **Uploaded Artifacts** + "${{ steps.my_string.outputs.content }}" + repo-token: ${{ secrets.GITHUB_TOKEN }} + allow-repeats: false # This is the default diff --git a/build.gradle b/build.gradle index dd0ae3263..62997deb1 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ buildscript { } } dependencies { - classpath 'com.netflix.nebula:gradle-netflixoss-project-plugin:9.4.2' + classpath 'com.netflix.nebula:gradle-netflixoss-project-plugin:10.6.0' classpath 'com.netflix.nebula:nebula-dependency-recommender:11.+' classpath 'io.mantisrx:mantis-gradle-plugin:1.2.+' classpath "io.freefair.gradle:lombok-plugin:5.3.3.3" @@ -90,6 +90,8 @@ allprojects { apply plugin: 'nebula.netflixoss' } +def printAllReleasedArtifacts = project.tasks.create('printAllReleasedArtifacts') +project.snapshot.configure { finalizedBy printAllReleasedArtifacts } subprojects { apply plugin: 'java-library' @@ -142,6 +144,22 @@ subprojects { tasks.withType(JavaCompile) { options.compilerArgs << "-Xlint:deprecation" } + + project.plugins.withType(MavenPublishPlugin) { + def printReleasedArtifact = project.tasks.create('printReleasedArtifact') + printReleasedArtifact.doLast { + def file1 = file("${buildDir}/tmp/publishNebulaPublicationToNetflixOSSRepository/maven-metadata.xml") + def file2 = file("${buildDir}/tmp/publishNebulaPublicationToNetflixOSSRepository/snapshot-maven-metadata.xml") + def xmlText = file1.exists() ? file1.text : (file2.exists() ? file2.text : "file not found") + def xml = new XmlParser(false, false).parseText(xmlText) + def snapshotVersion = xml.versioning.snapshotVersions.snapshotVersion[0].'value'.text() + logger.lifecycle("${project.group}:${project.name}:${snapshotVersion}") + file("${project.rootProject.buildDir}/versions.txt").append("${project.group}:${project.name}:${snapshotVersion}\n") + } + + printReleasedArtifact.dependsOn(project.rootProject.snapshot) + printAllReleasedArtifacts.dependsOn("${project.path}:printReleasedArtifact") + } } apply from: file('baseline.gradle') diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 94336fcae..249e5832f 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 57263fd26..8049c684f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Thu Mar 26 09:45:11 PDT 2020 -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 9bceee909..a69d9cb6c 100755 --- a/gradlew +++ b/gradlew @@ -1,86 +1,129 @@ -#!/usr/bin/env sh +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# 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. +# ############################################################################## -## -## 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_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Netflix: Attempt to use $WORKSPACE/.gradle if we're not told otherwise -if [ "x$GRADLE_USER_HOME" = "x" ]; then - if [ "x$WORKSPACE" != "x" ]; then - export GRADLE_USER_HOME="$WORKSPACE/.gradle" - fi -fi +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit +APP_NAME="Gradle" +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="" +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 + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -89,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 @@ -97,84 +140,101 @@ 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" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=$((i+1)) + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" fi +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 1e4be7eb6..53a6b238d 100755 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,4 +1,20 @@ -@if "%DEBUG%" == "" @echo off +@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 @@ -9,26 +25,22 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% -@rem Netflix: Attempt to use $WORKSPACE/.gradle if we're not told otherwise -if "%GRADLE_USER_HOME%"=="" ( - if NOT "%WORKSPACE%"=="" ( - set GRADLE_USER_HOME=%WORKSPACE%\.gradle - ) -) +@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= +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 init +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -42,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -52,38 +64,26 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/mantis-control-plane/mantis-control-plane-core/build.gradle b/mantis-control-plane/mantis-control-plane-core/build.gradle index db012a2cf..c1f404738 100644 --- a/mantis-control-plane/mantis-control-plane-core/build.gradle +++ b/mantis-control-plane/mantis-control-plane-core/build.gradle @@ -42,6 +42,6 @@ dependencies { api "joda-time:joda-time:$jodaTimeVersion" - testCompile libraries.junit4 - testCompile libraries.mockitoAll + testImplementation libraries.junit4 + testImplementation libraries.mockitoAll } diff --git a/mantis-control-plane/mantis-control-plane-server/build.gradle b/mantis-control-plane/mantis-control-plane-server/build.gradle index d1f8da1f5..23a547271 100644 --- a/mantis-control-plane/mantis-control-plane-server/build.gradle +++ b/mantis-control-plane/mantis-control-plane-server/build.gradle @@ -29,7 +29,7 @@ ext { } dependencies { - compile project(':mantis-control-plane:mantis-control-plane-core') + api project(':mantis-control-plane:mantis-control-plane-core') api "com.typesafe.akka:akka-http_$scalaBinaryVersion:$akkaHttpVersion" api "com.typesafe.akka:akka-http-jackson_$scalaBinaryVersion:$akkaHttpVersion" @@ -44,11 +44,11 @@ dependencies { api "com.github.spullara.cli-parser:cli-parser:$cliParserVersion" api "org.skife.config:config-magic:$configMagicVersion" - testCompile "com.typesafe.akka:akka-testkit_$scalaBinaryVersion:$akkaVersion" - testCompile "com.typesafe.akka:akka-http-testkit_$scalaBinaryVersion:$akkaHttpVersion" - testCompile libraries.junit4 - testCompile libraries.mockitoCore3 - testCompile "org.testng:testng:$testngVersion" + testImplementation "com.typesafe.akka:akka-testkit_$scalaBinaryVersion:$akkaVersion" + testImplementation "com.typesafe.akka:akka-http-testkit_$scalaBinaryVersion:$akkaHttpVersion" + testImplementation libraries.junit4 + testImplementation libraries.mockitoCore3 + testImplementation "org.testng:testng:$testngVersion" testImplementation testFixtures(project(":mantis-common")) testImplementation testFixtures(project(":mantis-control-plane:mantis-control-plane-core")) testImplementation libraries.commonsIo diff --git a/mantis-examples/mantis-examples-mantis-publish-sample/build.gradle b/mantis-examples/mantis-examples-mantis-publish-sample/build.gradle index c461abe93..e14f736c9 100644 --- a/mantis-examples/mantis-examples-mantis-publish-sample/build.gradle +++ b/mantis-examples/mantis-examples-mantis-publish-sample/build.gradle @@ -54,7 +54,7 @@ ext { dependencies { - compile project(":mantis-publish:mantis-publish-netty-guice") + implementation project(":mantis-publish:mantis-publish-netty-guice") implementation libraries.rxJava implementation "com.netflix.spectator:spectator-ext-ipc:$spectatorVersion" diff --git a/mantis-server/mantis-server-agent/build.gradle b/mantis-server/mantis-server-agent/build.gradle index 4fa517ab4..2774deebd 100644 --- a/mantis-server/mantis-server-agent/build.gradle +++ b/mantis-server/mantis-server-agent/build.gradle @@ -15,7 +15,7 @@ */ dependencies { - compile project(":mantis-control-plane:mantis-control-plane-core") + api project(":mantis-control-plane:mantis-control-plane-core") implementation libraries.slf4jApi implementation libraries.slf4jLog4j12 diff --git a/mantis-server/mantis-server-worker-client/build.gradle b/mantis-server/mantis-server-worker-client/build.gradle index a469f0793..99ce3f59b 100644 --- a/mantis-server/mantis-server-worker-client/build.gradle +++ b/mantis-server/mantis-server-worker-client/build.gradle @@ -21,5 +21,5 @@ dependencies { testImplementation libraries.junit4 testImplementation libraries.mockitoAll - testCompile 'org.hamcrest:hamcrest-all:1.3' + testImplementation 'org.hamcrest:hamcrest-all:1.3' } diff --git a/mantis-server/mantis-server-worker/build.gradle b/mantis-server/mantis-server-worker/build.gradle index e19431823..4046bd365 100644 --- a/mantis-server/mantis-server-worker/build.gradle +++ b/mantis-server/mantis-server-worker/build.gradle @@ -24,10 +24,10 @@ ext { } dependencies { - compile project(":mantis-runtime") - compile project(":mantis-control-plane:mantis-control-plane-client") - compile project(":mantis-control-plane:mantis-control-plane-core") - compile project(":mantis-server:mantis-server-worker-client") + api project(":mantis-runtime") + api project(":mantis-control-plane:mantis-control-plane-client") + api project(":mantis-control-plane:mantis-control-plane-core") + api project(":mantis-server:mantis-server-worker-client") api libraries.flinkRpcApi implementation libraries.commonsIo @@ -37,17 +37,17 @@ dependencies { implementation libraries.spotifyFutures implementation libraries.flinkRpcImpl - compile "org.apache.mesos:mesos:$mesosVersion" - compile libraries.slf4jApi - compile libraries.slf4jLog4j12 - compile libraries.vavr - compile('nz.ac.waikato.cms.moa:moa:2017.06') { + implementation "org.apache.mesos:mesos:$mesosVersion" + implementation libraries.slf4jApi + implementation libraries.slf4jLog4j12 + implementation libraries.vavr + implementation('nz.ac.waikato.cms.moa:moa:2017.06') { exclude group: 'com.github.spullara.cli-parser', module: 'cli-parser' exclude group: 'org.pentaho.pentaho-commons', module: 'pentaho-package-manager' } - compile "org.apache.httpcomponents:httpclient:$httpComponentsVersion" - compile "io.mantisrx:mantis-rxcontrol:$mantisRxControlVersion" - compile "com.yahoo.datasketches:sketches-core:0.9.1" + implementation "org.apache.httpcomponents:httpclient:$httpComponentsVersion" + implementation "io.mantisrx:mantis-rxcontrol:$mantisRxControlVersion" + implementation "com.yahoo.datasketches:sketches-core:0.9.1" testImplementation libraries.junit4 testImplementation libraries.mockitoAll