From a95a60376e6f4727cb789b313953708426711a45 Mon Sep 17 00:00:00 2001 From: Greg Schueler Date: Tue, 4 Jun 2019 08:38:19 -0700 Subject: [PATCH 1/5] Restructure rd base tool into submodule --- build.gradle | 150 +-------------- gradle.properties | 15 ++ gradle/bintray.gradle | 12 +- rd-api-client/build.gradle | 50 ++++- rd-tool/build.gradle | 178 ++++++++++++++++++ .../java/org/rundeck/client/tool/Main.java | 0 .../java/org/rundeck/client/tool/RdApp.java | 0 .../rundeck/client/tool/commands/Adhoc.java | 0 .../client/tool/commands/AppCommand.java | 0 .../client/tool/commands/Executions.java | 0 .../rundeck/client/tool/commands/Jobs.java | 0 .../rundeck/client/tool/commands/Keys.java | 0 .../rundeck/client/tool/commands/Metrics.java | 0 .../rundeck/client/tool/commands/Nodes.java | 0 .../client/tool/commands/Projects.java | 0 .../client/tool/commands/RDSystem.java | 0 .../rundeck/client/tool/commands/Retry.java | 0 .../org/rundeck/client/tool/commands/Run.java | 0 .../client/tool/commands/Scheduler.java | 0 .../rundeck/client/tool/commands/Tokens.java | 0 .../rundeck/client/tool/commands/Users.java | 0 .../client/tool/commands/jobs/Files.java | 0 .../commands/projects/ACLFileOptions.java | 0 .../commands/projects/ACLNameOptions.java | 0 .../client/tool/commands/projects/ACLs.java | 0 .../tool/commands/projects/Archives.java | 0 .../tool/commands/projects/Configure.java | 0 .../client/tool/commands/projects/Readme.java | 0 .../client/tool/commands/projects/SCM.java | 0 .../commands/repository/InstallPlugin.java | 0 .../tool/commands/repository/Plugins.java | 0 .../repository/RepositoryResponseHandler.java | 0 .../commands/repository/UninstallPlugin.java | 0 .../commands/repository/UploadPlugin.java | 0 .../client/tool/commands/system/ACLs.java | 0 .../client/tool/commands/system/Mode.java | 0 .../tool/options/ACLOutputFormatOption.java | 0 .../client/tool/options/ACLOutputOptions.java | 0 .../client/tool/options/AdhocBaseOptions.java | 0 .../client/tool/options/BaseOptions.java | 0 .../tool/options/BulkJobActionOptions.java | 0 .../tool/options/ConfigFileOptions.java | 0 .../tool/options/ConfigInputOptions.java | 0 .../tool/options/ExecutionIdOption.java | 0 .../tool/options/ExecutionListOptions.java | 0 .../options/ExecutionOutputFormatOption.java | 0 .../tool/options/ExecutionResultOptions.java | 0 .../tool/options/ExecutionsFollowOptions.java | 0 .../client/tool/options/FollowOptions.java | 0 .../client/tool/options/JobFileOptions.java | 0 .../client/tool/options/JobIdentOptions.java | 0 .../client/tool/options/JobListOptions.java | 0 .../client/tool/options/JobLoadOptions.java | 0 .../tool/options/JobOutputFormatOption.java | 0 .../client/tool/options/JobPurgeOptions.java | 0 .../client/tool/options/LoginNameOption.java | 0 .../tool/options/NodeFilterOptions.java | 0 .../tool/options/NodeOutputFormatOption.java | 0 .../client/tool/options/OptionUtil.java | 0 .../tool/options/OptionalIdOptions.java | 0 .../tool/options/OptionalProjectOptions.java | 0 .../tool/options/PagingResultOptions.java | 0 .../tool/options/ProjectCreateOptions.java | 0 .../options/ProjectListFormatOptions.java | 0 .../tool/options/ProjectNameOptions.java | 0 .../options/ProjectRequiredNameOptions.java | 0 .../client/tool/options/QueryOptions.java | 0 .../client/tool/options/QuietOption.java | 0 .../client/tool/options/RetryBaseOptions.java | 0 .../tool/options/RetryExecutionOption.java | 0 .../client/tool/options/RunBaseOptions.java | 0 .../client/tool/options/RunOptions.java | 0 .../tool/options/TokenFormatOption.java | 0 .../tool/options/UnparsedConfigOptions.java | 0 .../client/tool/options/UserFormatOption.java | 0 .../client/tool/options/VerboseOption.java | 0 .../org/rundeck/client/tool/util/Colorz.java | 0 .../src}/main/resources/rd-banner.txt | 0 .../rundeck/client/RundeckClientSpec.groovy | 0 .../client/api/model/DateInfoSpec.groovy | 0 .../client/api/model/ErrorResponseSpec.groovy | 0 .../client/api/model/ExecLogSpec.groovy | 0 .../client/api/model/ExecOutputSpec.groovy | 0 .../client/api/model/PagingSpec.groovy | 0 .../tool/commands/AppCommandSpec.groovy | 0 .../tool/commands/ExecutionsSpec.groovy | 0 .../client/tool/commands/JobsSpec.groovy | 0 .../client/tool/commands/KeysSpec.groovy | 0 .../client/tool/commands/MetricsSpec.groovy | 0 .../client/tool/commands/ProjectsSpec.groovy | 0 .../client/tool/commands/RetrySpec.groovy | 0 .../client/tool/commands/RunSpec.groovy | 0 .../client/tool/commands/SchedulerSpec.groovy | 0 .../client/tool/commands/TokensSpec.groovy | 0 .../client/tool/commands/UsersSpec.groovy | 0 .../tool/commands/projects/ACLsSpec.groovy | 0 .../tool/commands/projects/SCMSpec.groovy | 0 .../repository/InstallPluginTest.groovy | 0 .../commands/repository/PluginsTest.groovy | 0 .../repository/UninstallPluginTest.groovy | 0 .../repository/UploadPluginTest.groovy | 0 .../util/FormAuthInterceptorSpec.groovy | 0 .../org/rundeck/client/util/FormatSpec.groovy | 0 .../rundeck/client/util/QuotingSpec.groovy | 0 .../util/RedirectBypassInterceptorSpec.groovy | 0 settings.gradle | 2 +- 106 files changed, 252 insertions(+), 155 deletions(-) create mode 100644 gradle.properties create mode 100644 rd-tool/build.gradle rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/Main.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/RdApp.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/commands/Adhoc.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/commands/AppCommand.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/commands/Executions.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/commands/Jobs.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/commands/Keys.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/commands/Metrics.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/commands/Nodes.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/commands/Projects.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/commands/RDSystem.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/commands/Retry.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/commands/Run.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/commands/Scheduler.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/commands/Tokens.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/commands/Users.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/commands/jobs/Files.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/commands/projects/ACLFileOptions.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/commands/projects/ACLNameOptions.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/commands/projects/ACLs.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/commands/projects/Archives.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/commands/projects/Configure.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/commands/projects/Readme.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/commands/projects/SCM.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/commands/repository/InstallPlugin.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/commands/repository/Plugins.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/commands/repository/RepositoryResponseHandler.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/commands/repository/UninstallPlugin.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/commands/repository/UploadPlugin.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/commands/system/ACLs.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/commands/system/Mode.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/options/ACLOutputFormatOption.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/options/ACLOutputOptions.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/options/AdhocBaseOptions.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/options/BaseOptions.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/options/BulkJobActionOptions.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/options/ConfigFileOptions.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/options/ConfigInputOptions.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/options/ExecutionIdOption.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/options/ExecutionListOptions.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/options/ExecutionOutputFormatOption.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/options/ExecutionResultOptions.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/options/ExecutionsFollowOptions.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/options/FollowOptions.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/options/JobFileOptions.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/options/JobIdentOptions.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/options/JobListOptions.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/options/JobLoadOptions.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/options/JobOutputFormatOption.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/options/JobPurgeOptions.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/options/LoginNameOption.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/options/NodeFilterOptions.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/options/NodeOutputFormatOption.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/options/OptionUtil.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/options/OptionalIdOptions.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/options/OptionalProjectOptions.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/options/PagingResultOptions.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/options/ProjectCreateOptions.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/options/ProjectListFormatOptions.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/options/ProjectNameOptions.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/options/ProjectRequiredNameOptions.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/options/QueryOptions.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/options/QuietOption.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/options/RetryBaseOptions.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/options/RetryExecutionOption.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/options/RunBaseOptions.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/options/RunOptions.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/options/TokenFormatOption.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/options/UnparsedConfigOptions.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/options/UserFormatOption.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/options/VerboseOption.java (100%) rename {src => rd-tool/src}/main/java/org/rundeck/client/tool/util/Colorz.java (100%) rename {src => rd-tool/src}/main/resources/rd-banner.txt (100%) rename {src => rd-tool/src}/test/groovy/org/rundeck/client/RundeckClientSpec.groovy (100%) rename {src => rd-tool/src}/test/groovy/org/rundeck/client/api/model/DateInfoSpec.groovy (100%) rename {src => rd-tool/src}/test/groovy/org/rundeck/client/api/model/ErrorResponseSpec.groovy (100%) rename {src => rd-tool/src}/test/groovy/org/rundeck/client/api/model/ExecLogSpec.groovy (100%) rename {src => rd-tool/src}/test/groovy/org/rundeck/client/api/model/ExecOutputSpec.groovy (100%) rename {src => rd-tool/src}/test/groovy/org/rundeck/client/api/model/PagingSpec.groovy (100%) rename {src => rd-tool/src}/test/groovy/org/rundeck/client/tool/commands/AppCommandSpec.groovy (100%) rename {src => rd-tool/src}/test/groovy/org/rundeck/client/tool/commands/ExecutionsSpec.groovy (100%) rename {src => rd-tool/src}/test/groovy/org/rundeck/client/tool/commands/JobsSpec.groovy (100%) rename {src => rd-tool/src}/test/groovy/org/rundeck/client/tool/commands/KeysSpec.groovy (100%) rename {src => rd-tool/src}/test/groovy/org/rundeck/client/tool/commands/MetricsSpec.groovy (100%) rename {src => rd-tool/src}/test/groovy/org/rundeck/client/tool/commands/ProjectsSpec.groovy (100%) rename {src => rd-tool/src}/test/groovy/org/rundeck/client/tool/commands/RetrySpec.groovy (100%) rename {src => rd-tool/src}/test/groovy/org/rundeck/client/tool/commands/RunSpec.groovy (100%) rename {src => rd-tool/src}/test/groovy/org/rundeck/client/tool/commands/SchedulerSpec.groovy (100%) rename {src => rd-tool/src}/test/groovy/org/rundeck/client/tool/commands/TokensSpec.groovy (100%) rename {src => rd-tool/src}/test/groovy/org/rundeck/client/tool/commands/UsersSpec.groovy (100%) rename {src => rd-tool/src}/test/groovy/org/rundeck/client/tool/commands/projects/ACLsSpec.groovy (100%) rename {src => rd-tool/src}/test/groovy/org/rundeck/client/tool/commands/projects/SCMSpec.groovy (100%) rename {src => rd-tool/src}/test/groovy/org/rundeck/client/tool/commands/repository/InstallPluginTest.groovy (100%) rename {src => rd-tool/src}/test/groovy/org/rundeck/client/tool/commands/repository/PluginsTest.groovy (100%) rename {src => rd-tool/src}/test/groovy/org/rundeck/client/tool/commands/repository/UninstallPluginTest.groovy (100%) rename {src => rd-tool/src}/test/groovy/org/rundeck/client/tool/commands/repository/UploadPluginTest.groovy (100%) rename {src => rd-tool/src}/test/groovy/org/rundeck/client/util/FormAuthInterceptorSpec.groovy (100%) rename {src => rd-tool/src}/test/groovy/org/rundeck/client/util/FormatSpec.groovy (100%) rename {src => rd-tool/src}/test/groovy/org/rundeck/client/util/QuotingSpec.groovy (100%) rename {src => rd-tool/src}/test/groovy/org/rundeck/client/util/RedirectBypassInterceptorSpec.groovy (100%) diff --git a/build.gradle b/build.gradle index 4ead1b66..7124c330 100644 --- a/build.gradle +++ b/build.gradle @@ -27,9 +27,8 @@ buildscript { } plugins { id 'pl.allegro.tech.build.axion-release' version '1.4.1' - id 'groovy' - id 'com.github.johnrengelman.shadow' version '2.0.3' - id "nebula.ospackage" version "4.8.0" + + id 'maven' } ext.githubUrl = "https://github.com/rundeck/rundeck-cli" ext.changelogFile = file("CHANGELOG.md") @@ -157,151 +156,6 @@ task changeLog(){ } -apply plugin: 'idea' -apply plugin: 'groovy' -apply plugin: 'application' -apply plugin: 'com.github.johnrengelman.shadow' -apply plugin: 'nebula.ospackage' - -mainClassName = 'org.rundeck.client.tool.Main' -applicationName = 'rd' -//install path in rpm/deb -ext.distInstallPath = '/var/lib/rundeck-cli' -defaultTasks 'clean', 'build' - -repositories { - mavenLocal() - mavenCentral() - maven { url "https://jitpack.io" } -} - -ext.toolbeltVersion = "0.2.2" -ext.toolbeltGroup = "${toolbeltVersion.contains('SNAPSHOT')?'org':'com.github'}.rundeck.cli-toolbelt" - -dependencies { - compileOnly "org.projectlombok:lombok:1.16.16" - annotationProcessor "org.projectlombok:lombok:1.16.16" - - compile project(":rd-api-client") - - compile "$toolbeltGroup:toolbelt:$toolbeltVersion" - compile "$toolbeltGroup:toolbelt-snakeyaml:$toolbeltVersion" - compile "$toolbeltGroup:toolbelt-json-jackson:$toolbeltVersion" - compile "$toolbeltGroup:toolbelt-jewelcli:$toolbeltVersion" - - testCompile project(":rd-api-client") - testCompile group: 'junit', name: 'junit', version: '4.12' - testCompile 'com.squareup.retrofit2:retrofit-mock:2.1.0' - testCompile 'com.squareup.okhttp3:mockwebserver:3.5.0' - testCompile group: 'org.mockito', name: 'mockito-core', version: '1.10.19' - testCompile "org.codehaus.groovy:groovy-all:2.3.7" - testCompile "org.spockframework:spock-core:0.7-groovy-2.0" -} -shadowJar { - -} - -//force distZip/distTar artifacts to be overwritten by shadow versions -shadowDistZip.mustRunAfter distZip -shadowDistTar.mustRunAfter distTar - -def scriptsClos = { - - def prependConfigData = { regexTest, additionalText, line -> - // Looking for the line that starts with regexTest closure argument, - //prepend the additionalText - line = line.replaceAll(~/${regexTest}/) { original -> - additionalText + "\n" + original - } - } - def appendConfigData = { regexTest, additionalText, line -> - line = line.replaceAll(~/${regexTest}/) { original -> - original + "\n" + additionalText - } - } - - def addUnixConfigSource = prependConfigData.curry( - '^# Determine the Java command to use to start the JVM.*', - ''' -# Source user's config file -RD_CONF=${RD_CONF:-$HOME/.$APP_NAME/$APP_NAME.conf} -test -f $RD_CONF && . $RD_CONF -''' - ) - def setE = appendConfigData.curry( - '^#!/usr/bin/env sh', - ''' -set -e -''' - ) - - // The default script content is generated and - // with the doLast method we can still alter - // the contents before the complete task ends. - doLast { - // Alter the start script for Unix systems. - unixScript.text = - unixScript - .readLines() - .collect(addUnixConfigSource) - .collect(setE) - .join('\n') - - //TODO: modify windows start script to load config - } - -} -startScripts scriptsClos -startShadowScripts scriptsClos - -task verifyScripts { - group = "Verification" - description = 'Verify the start scripts (normal and shadow) contain the modifications for the RD_CONF' - doFirst { - [startScripts.outputDir, startShadowScripts.outputDir].each { dir -> - def f = new File(dir, applicationName) - assert f.exists() - assert f.text ==~ /(?s)^.*RD_CONF.*$/ - } - } -} -check.dependsOn verifyScripts - -/** - * Define rpm/deb details - */ -ospackage { - version = rpmVersion - release = 1 - summary = "A commandline tool for Rundeck." - packageDescription = "The rd program provides an all-in-one commandline tool to interact with Rundeck" - url = 'https://github.com/rundeck/rundeck-cli' - vendor = 'Rundeck, Inc.' - license = 'APL' - os = 'LINUX' - packageGroup = 'System' - user = 'root' - prefix(distInstallPath) - - //packaging includes the shadowDistZip contents, exclude *.bat - from(zipTree(shadowDistZip.outputs.files.singleFile)) { - exclude '**/*.bat' - into distInstallPath - } - - def archivedir=shadowDistZip.archiveName - ".${shadowDistZip.extension}" - - //symlink /usr/bin/rd to the rd script - postInstall(""" -/bin/ln -s \${RPM_INSTALL_PREFIX:-${distInstallPath}}/${archivedir}/bin/${applicationName} /usr/bin/${applicationName} -""") -} - -//depend on the shadow artifact -buildDeb.dependsOn shadowDistZip -buildRpm.dependsOn shadowDistZip -assemble.dependsOn buildRpm, buildDeb - apply from: 'gradle/bintray.gradle' task wrapper(type: Wrapper) { diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 00000000..76837905 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,15 @@ +# +# Copyright 2019 Rundeck, Inc. (http://rundeck.com) +# +# 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. +# diff --git a/gradle/bintray.gradle b/gradle/bintray.gradle index a86347ef..0d48e0dd 100644 --- a/gradle/bintray.gradle +++ b/gradle/bintray.gradle @@ -16,9 +16,9 @@ def components = [ - rpm: [pattern: '*.rpm', dir: "$buildDir/distributions", name: 'rundeck-cli', desc: 'Rundeck CLI Tools'], - deb: [pattern: '*.deb', dir: "$buildDir/distributions", name: 'rundeck-cli', desc: 'Rundeck CLI Tools'], - api: [pattern: '*.jar', dir: "rd-api-client/build/libs", name: 'rd-api-client', desc: 'Rundeck API Lib'], + rpm: [patterns: ['*.rpm'], dir: "$buildDir/distributions", name: 'rundeck-cli', desc: 'Rundeck CLI Tools'], + deb: [patterns: ['*.deb'], dir: "$buildDir/distributions", name: 'rundeck-cli', desc: 'Rundeck CLI Tools'], + api: [patterns: ['*.jar','pom.xml'], dir: "rd-api-client/build/libs", name: 'rd-api-client', desc: 'Rundeck API Lib'], ] def bintrayUser = project.hasProperty('bintrayUser') ? project.property('bintrayUser') : System.getenv('BINTRAY_USER') @@ -45,14 +45,16 @@ if (bintrayUser && bintrayKey && bintrayRepo) { "Valid values: ${components.keySet()}" ) } - def includePat = components[component].pattern + apply plugin: 'com.jfrog.bintray' bintray { user = bintrayUser key = bintrayKey filesSpec { from(components[component].dir) { - include includePat + components[component].patterns.each { + include it + } } into "." } diff --git a/rd-api-client/build.gradle b/rd-api-client/build.gradle index b826d33d..91f081e5 100644 --- a/rd-api-client/build.gradle +++ b/rd-api-client/build.gradle @@ -20,6 +20,8 @@ apply plugin: 'idea' apply plugin: 'groovy' apply plugin: 'de.fuerstenau.buildconfig' +group = 'org.rundeck.api' + /** * Generates java source with embedded version info */ @@ -78,4 +80,50 @@ artifacts { archives testJar archives sourceJar archives javadocJar -} \ No newline at end of file +} +ext.pomClosure = { + project { + artifactId project.name + groupId project.group + inceptionYear '2017' + packaging 'jar' + version version + name "Rundeck API Library ${project.version}" + description project.description ?: 'Rundeck API Library' + url 'http://rundeck.org' + licenses { + license { + name 'The Apache Software License, Version 2.0' + url 'http://www.apache.org/licenses/LICENSE-2.0.txt' + distribution 'repo' + } + } + scm { + url 'https://github.com/rundeck/rundeck-cli' + connection 'scm:git:git@github.com/rundeck/rundeck-cli.git' + developerConnection 'scm:git:git@github.com:rundeck/rundeck-cli.git' + } + developers { + developer { + id('gschueler') + name('Greg Schueler') + email('greg@rundeck.com') + } + } + parent { + groupId('org.sonatype.oss') + artifactId('oss-parent') + version('7') + } + } +} +// +//install{ +// repositories.mavenInstaller { +// pom(pomClosure) +// } +//} + +task('createPom').doLast { + pom(pomClosure).writeTo("${buildDir}/poms/${project.name}-${project.version}.pom") +} diff --git a/rd-tool/build.gradle b/rd-tool/build.gradle new file mode 100644 index 00000000..dd166107 --- /dev/null +++ b/rd-tool/build.gradle @@ -0,0 +1,178 @@ +/* + * Copyright 2019 Rundeck, Inc. (http://rundeck.com) + * + * 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 { + jcenter() + } + +} +plugins { + id 'groovy' + id 'com.github.johnrengelman.shadow' version '2.0.3' + id "nebula.ospackage" version "4.8.0" + id 'maven' +} + +apply plugin: 'idea' +apply plugin: 'groovy' +apply plugin: 'application' +apply plugin: 'com.github.johnrengelman.shadow' +apply plugin: 'nebula.ospackage' + +mainClassName = 'org.rundeck.client.tool.Main' +applicationName = 'rd' +archivesBaseName = 'rundeck-cli' +//install path in rpm/deb +ext.distInstallPath = '/var/lib/rundeck-cli' +defaultTasks 'clean', 'build' + +repositories { + mavenLocal() + mavenCentral() + maven { url "https://jitpack.io" } +} + +ext.toolbeltVersion = "0.2.2" +ext.toolbeltGroup = "${toolbeltVersion.contains('SNAPSHOT') ? 'org' : 'com.github'}.rundeck.cli-toolbelt" + +dependencies { + compileOnly "org.projectlombok:lombok:1.16.16" + annotationProcessor "org.projectlombok:lombok:1.16.16" + + compile project(":rd-api-client") + + compile "$toolbeltGroup:toolbelt:$toolbeltVersion" + compile "$toolbeltGroup:toolbelt-snakeyaml:$toolbeltVersion" + compile "$toolbeltGroup:toolbelt-json-jackson:$toolbeltVersion" + compile "$toolbeltGroup:toolbelt-jewelcli:$toolbeltVersion" + + testCompile project(":rd-api-client") + testCompile group: 'junit', name: 'junit', version: '4.12' + testCompile 'com.squareup.retrofit2:retrofit-mock:2.1.0' + testCompile 'com.squareup.okhttp3:mockwebserver:3.5.0' + testCompile group: 'org.mockito', name: 'mockito-core', version: '1.10.19' + testCompile "org.codehaus.groovy:groovy-all:2.3.7" + testCompile "org.spockframework:spock-core:0.7-groovy-2.0" +} +shadowJar { + +} + +//force distZip/distTar artifacts to be overwritten by shadow versions +shadowDistZip.mustRunAfter distZip +shadowDistTar.mustRunAfter distTar + +def scriptsClos = { + + def prependConfigData = { regexTest, additionalText, line -> + // Looking for the line that starts with regexTest closure argument, + //prepend the additionalText + line = line.replaceAll(~/${regexTest}/) { original -> + additionalText + "\n" + original + } + } + def appendConfigData = { regexTest, additionalText, line -> + line = line.replaceAll(~/${regexTest}/) { original -> + original + "\n" + additionalText + } + } + + def addUnixConfigSource = prependConfigData.curry( + '^# Determine the Java command to use to start the JVM.*', + ''' +# Source user's config file +RD_CONF=${RD_CONF:-$HOME/.$APP_NAME/$APP_NAME.conf} +test -f $RD_CONF && . $RD_CONF +''' + ) + def setE = appendConfigData.curry( + '^#!/usr/bin/env sh', + ''' +set -e +''' + ) + + // The default script content is generated and + // with the doLast method we can still alter + // the contents before the complete task ends. + doLast { + // Alter the start script for Unix systems. + unixScript.text = + unixScript + .readLines() + .collect(addUnixConfigSource) + .collect(setE) + .join('\n') + + //TODO: modify windows start script to load config + } + +} +startScripts scriptsClos +startShadowScripts scriptsClos + +task verifyScripts { + group = "Verification" + description = 'Verify the start scripts (normal and shadow) contain the modifications for the RD_CONF' + doFirst { + [startScripts.outputDir, startShadowScripts.outputDir].each { dir -> + def f = new File(dir, applicationName) + assert f.exists() + assert f.text ==~ /(?s)^.*RD_CONF.*$/ + } + } +} +check.dependsOn verifyScripts + +/** + * Define rpm/deb details + */ +ospackage { + version = rpmVersion + release = 1 + summary = "A commandline tool for Rundeck." + packageDescription = "The rd program provides an all-in-one commandline tool to interact with Rundeck" + url = 'https://github.com/rundeck/rundeck-cli' + vendor = 'Rundeck, Inc.' + license = 'APL' + os = 'LINUX' + packageGroup = 'System' + user = 'root' + prefix(distInstallPath) + + //packaging includes the shadowDistZip contents, exclude *.bat + from(zipTree(shadowDistZip.outputs.files.singleFile)) { + exclude '**/*.bat' + into distInstallPath + } + + def archivedir = shadowDistZip.archiveName - ".${shadowDistZip.extension}" + + //symlink /usr/bin/rd to the rd script + postInstall( + """ +/bin/ln -s \${RPM_INSTALL_PREFIX:-${distInstallPath}}/${archivedir}/bin/${applicationName} /usr/bin/${applicationName} +""" + ) +} + +//depend on the shadow artifact +buildDeb.dependsOn shadowDistZip +buildRpm.dependsOn shadowDistZip +assemble.dependsOn buildRpm, buildDeb diff --git a/src/main/java/org/rundeck/client/tool/Main.java b/rd-tool/src/main/java/org/rundeck/client/tool/Main.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/Main.java rename to rd-tool/src/main/java/org/rundeck/client/tool/Main.java diff --git a/src/main/java/org/rundeck/client/tool/RdApp.java b/rd-tool/src/main/java/org/rundeck/client/tool/RdApp.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/RdApp.java rename to rd-tool/src/main/java/org/rundeck/client/tool/RdApp.java diff --git a/src/main/java/org/rundeck/client/tool/commands/Adhoc.java b/rd-tool/src/main/java/org/rundeck/client/tool/commands/Adhoc.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/commands/Adhoc.java rename to rd-tool/src/main/java/org/rundeck/client/tool/commands/Adhoc.java diff --git a/src/main/java/org/rundeck/client/tool/commands/AppCommand.java b/rd-tool/src/main/java/org/rundeck/client/tool/commands/AppCommand.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/commands/AppCommand.java rename to rd-tool/src/main/java/org/rundeck/client/tool/commands/AppCommand.java diff --git a/src/main/java/org/rundeck/client/tool/commands/Executions.java b/rd-tool/src/main/java/org/rundeck/client/tool/commands/Executions.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/commands/Executions.java rename to rd-tool/src/main/java/org/rundeck/client/tool/commands/Executions.java diff --git a/src/main/java/org/rundeck/client/tool/commands/Jobs.java b/rd-tool/src/main/java/org/rundeck/client/tool/commands/Jobs.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/commands/Jobs.java rename to rd-tool/src/main/java/org/rundeck/client/tool/commands/Jobs.java diff --git a/src/main/java/org/rundeck/client/tool/commands/Keys.java b/rd-tool/src/main/java/org/rundeck/client/tool/commands/Keys.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/commands/Keys.java rename to rd-tool/src/main/java/org/rundeck/client/tool/commands/Keys.java diff --git a/src/main/java/org/rundeck/client/tool/commands/Metrics.java b/rd-tool/src/main/java/org/rundeck/client/tool/commands/Metrics.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/commands/Metrics.java rename to rd-tool/src/main/java/org/rundeck/client/tool/commands/Metrics.java diff --git a/src/main/java/org/rundeck/client/tool/commands/Nodes.java b/rd-tool/src/main/java/org/rundeck/client/tool/commands/Nodes.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/commands/Nodes.java rename to rd-tool/src/main/java/org/rundeck/client/tool/commands/Nodes.java diff --git a/src/main/java/org/rundeck/client/tool/commands/Projects.java b/rd-tool/src/main/java/org/rundeck/client/tool/commands/Projects.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/commands/Projects.java rename to rd-tool/src/main/java/org/rundeck/client/tool/commands/Projects.java diff --git a/src/main/java/org/rundeck/client/tool/commands/RDSystem.java b/rd-tool/src/main/java/org/rundeck/client/tool/commands/RDSystem.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/commands/RDSystem.java rename to rd-tool/src/main/java/org/rundeck/client/tool/commands/RDSystem.java diff --git a/src/main/java/org/rundeck/client/tool/commands/Retry.java b/rd-tool/src/main/java/org/rundeck/client/tool/commands/Retry.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/commands/Retry.java rename to rd-tool/src/main/java/org/rundeck/client/tool/commands/Retry.java diff --git a/src/main/java/org/rundeck/client/tool/commands/Run.java b/rd-tool/src/main/java/org/rundeck/client/tool/commands/Run.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/commands/Run.java rename to rd-tool/src/main/java/org/rundeck/client/tool/commands/Run.java diff --git a/src/main/java/org/rundeck/client/tool/commands/Scheduler.java b/rd-tool/src/main/java/org/rundeck/client/tool/commands/Scheduler.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/commands/Scheduler.java rename to rd-tool/src/main/java/org/rundeck/client/tool/commands/Scheduler.java diff --git a/src/main/java/org/rundeck/client/tool/commands/Tokens.java b/rd-tool/src/main/java/org/rundeck/client/tool/commands/Tokens.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/commands/Tokens.java rename to rd-tool/src/main/java/org/rundeck/client/tool/commands/Tokens.java diff --git a/src/main/java/org/rundeck/client/tool/commands/Users.java b/rd-tool/src/main/java/org/rundeck/client/tool/commands/Users.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/commands/Users.java rename to rd-tool/src/main/java/org/rundeck/client/tool/commands/Users.java diff --git a/src/main/java/org/rundeck/client/tool/commands/jobs/Files.java b/rd-tool/src/main/java/org/rundeck/client/tool/commands/jobs/Files.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/commands/jobs/Files.java rename to rd-tool/src/main/java/org/rundeck/client/tool/commands/jobs/Files.java diff --git a/src/main/java/org/rundeck/client/tool/commands/projects/ACLFileOptions.java b/rd-tool/src/main/java/org/rundeck/client/tool/commands/projects/ACLFileOptions.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/commands/projects/ACLFileOptions.java rename to rd-tool/src/main/java/org/rundeck/client/tool/commands/projects/ACLFileOptions.java diff --git a/src/main/java/org/rundeck/client/tool/commands/projects/ACLNameOptions.java b/rd-tool/src/main/java/org/rundeck/client/tool/commands/projects/ACLNameOptions.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/commands/projects/ACLNameOptions.java rename to rd-tool/src/main/java/org/rundeck/client/tool/commands/projects/ACLNameOptions.java diff --git a/src/main/java/org/rundeck/client/tool/commands/projects/ACLs.java b/rd-tool/src/main/java/org/rundeck/client/tool/commands/projects/ACLs.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/commands/projects/ACLs.java rename to rd-tool/src/main/java/org/rundeck/client/tool/commands/projects/ACLs.java diff --git a/src/main/java/org/rundeck/client/tool/commands/projects/Archives.java b/rd-tool/src/main/java/org/rundeck/client/tool/commands/projects/Archives.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/commands/projects/Archives.java rename to rd-tool/src/main/java/org/rundeck/client/tool/commands/projects/Archives.java diff --git a/src/main/java/org/rundeck/client/tool/commands/projects/Configure.java b/rd-tool/src/main/java/org/rundeck/client/tool/commands/projects/Configure.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/commands/projects/Configure.java rename to rd-tool/src/main/java/org/rundeck/client/tool/commands/projects/Configure.java diff --git a/src/main/java/org/rundeck/client/tool/commands/projects/Readme.java b/rd-tool/src/main/java/org/rundeck/client/tool/commands/projects/Readme.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/commands/projects/Readme.java rename to rd-tool/src/main/java/org/rundeck/client/tool/commands/projects/Readme.java diff --git a/src/main/java/org/rundeck/client/tool/commands/projects/SCM.java b/rd-tool/src/main/java/org/rundeck/client/tool/commands/projects/SCM.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/commands/projects/SCM.java rename to rd-tool/src/main/java/org/rundeck/client/tool/commands/projects/SCM.java diff --git a/src/main/java/org/rundeck/client/tool/commands/repository/InstallPlugin.java b/rd-tool/src/main/java/org/rundeck/client/tool/commands/repository/InstallPlugin.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/commands/repository/InstallPlugin.java rename to rd-tool/src/main/java/org/rundeck/client/tool/commands/repository/InstallPlugin.java diff --git a/src/main/java/org/rundeck/client/tool/commands/repository/Plugins.java b/rd-tool/src/main/java/org/rundeck/client/tool/commands/repository/Plugins.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/commands/repository/Plugins.java rename to rd-tool/src/main/java/org/rundeck/client/tool/commands/repository/Plugins.java diff --git a/src/main/java/org/rundeck/client/tool/commands/repository/RepositoryResponseHandler.java b/rd-tool/src/main/java/org/rundeck/client/tool/commands/repository/RepositoryResponseHandler.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/commands/repository/RepositoryResponseHandler.java rename to rd-tool/src/main/java/org/rundeck/client/tool/commands/repository/RepositoryResponseHandler.java diff --git a/src/main/java/org/rundeck/client/tool/commands/repository/UninstallPlugin.java b/rd-tool/src/main/java/org/rundeck/client/tool/commands/repository/UninstallPlugin.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/commands/repository/UninstallPlugin.java rename to rd-tool/src/main/java/org/rundeck/client/tool/commands/repository/UninstallPlugin.java diff --git a/src/main/java/org/rundeck/client/tool/commands/repository/UploadPlugin.java b/rd-tool/src/main/java/org/rundeck/client/tool/commands/repository/UploadPlugin.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/commands/repository/UploadPlugin.java rename to rd-tool/src/main/java/org/rundeck/client/tool/commands/repository/UploadPlugin.java diff --git a/src/main/java/org/rundeck/client/tool/commands/system/ACLs.java b/rd-tool/src/main/java/org/rundeck/client/tool/commands/system/ACLs.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/commands/system/ACLs.java rename to rd-tool/src/main/java/org/rundeck/client/tool/commands/system/ACLs.java diff --git a/src/main/java/org/rundeck/client/tool/commands/system/Mode.java b/rd-tool/src/main/java/org/rundeck/client/tool/commands/system/Mode.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/commands/system/Mode.java rename to rd-tool/src/main/java/org/rundeck/client/tool/commands/system/Mode.java diff --git a/src/main/java/org/rundeck/client/tool/options/ACLOutputFormatOption.java b/rd-tool/src/main/java/org/rundeck/client/tool/options/ACLOutputFormatOption.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/options/ACLOutputFormatOption.java rename to rd-tool/src/main/java/org/rundeck/client/tool/options/ACLOutputFormatOption.java diff --git a/src/main/java/org/rundeck/client/tool/options/ACLOutputOptions.java b/rd-tool/src/main/java/org/rundeck/client/tool/options/ACLOutputOptions.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/options/ACLOutputOptions.java rename to rd-tool/src/main/java/org/rundeck/client/tool/options/ACLOutputOptions.java diff --git a/src/main/java/org/rundeck/client/tool/options/AdhocBaseOptions.java b/rd-tool/src/main/java/org/rundeck/client/tool/options/AdhocBaseOptions.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/options/AdhocBaseOptions.java rename to rd-tool/src/main/java/org/rundeck/client/tool/options/AdhocBaseOptions.java diff --git a/src/main/java/org/rundeck/client/tool/options/BaseOptions.java b/rd-tool/src/main/java/org/rundeck/client/tool/options/BaseOptions.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/options/BaseOptions.java rename to rd-tool/src/main/java/org/rundeck/client/tool/options/BaseOptions.java diff --git a/src/main/java/org/rundeck/client/tool/options/BulkJobActionOptions.java b/rd-tool/src/main/java/org/rundeck/client/tool/options/BulkJobActionOptions.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/options/BulkJobActionOptions.java rename to rd-tool/src/main/java/org/rundeck/client/tool/options/BulkJobActionOptions.java diff --git a/src/main/java/org/rundeck/client/tool/options/ConfigFileOptions.java b/rd-tool/src/main/java/org/rundeck/client/tool/options/ConfigFileOptions.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/options/ConfigFileOptions.java rename to rd-tool/src/main/java/org/rundeck/client/tool/options/ConfigFileOptions.java diff --git a/src/main/java/org/rundeck/client/tool/options/ConfigInputOptions.java b/rd-tool/src/main/java/org/rundeck/client/tool/options/ConfigInputOptions.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/options/ConfigInputOptions.java rename to rd-tool/src/main/java/org/rundeck/client/tool/options/ConfigInputOptions.java diff --git a/src/main/java/org/rundeck/client/tool/options/ExecutionIdOption.java b/rd-tool/src/main/java/org/rundeck/client/tool/options/ExecutionIdOption.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/options/ExecutionIdOption.java rename to rd-tool/src/main/java/org/rundeck/client/tool/options/ExecutionIdOption.java diff --git a/src/main/java/org/rundeck/client/tool/options/ExecutionListOptions.java b/rd-tool/src/main/java/org/rundeck/client/tool/options/ExecutionListOptions.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/options/ExecutionListOptions.java rename to rd-tool/src/main/java/org/rundeck/client/tool/options/ExecutionListOptions.java diff --git a/src/main/java/org/rundeck/client/tool/options/ExecutionOutputFormatOption.java b/rd-tool/src/main/java/org/rundeck/client/tool/options/ExecutionOutputFormatOption.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/options/ExecutionOutputFormatOption.java rename to rd-tool/src/main/java/org/rundeck/client/tool/options/ExecutionOutputFormatOption.java diff --git a/src/main/java/org/rundeck/client/tool/options/ExecutionResultOptions.java b/rd-tool/src/main/java/org/rundeck/client/tool/options/ExecutionResultOptions.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/options/ExecutionResultOptions.java rename to rd-tool/src/main/java/org/rundeck/client/tool/options/ExecutionResultOptions.java diff --git a/src/main/java/org/rundeck/client/tool/options/ExecutionsFollowOptions.java b/rd-tool/src/main/java/org/rundeck/client/tool/options/ExecutionsFollowOptions.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/options/ExecutionsFollowOptions.java rename to rd-tool/src/main/java/org/rundeck/client/tool/options/ExecutionsFollowOptions.java diff --git a/src/main/java/org/rundeck/client/tool/options/FollowOptions.java b/rd-tool/src/main/java/org/rundeck/client/tool/options/FollowOptions.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/options/FollowOptions.java rename to rd-tool/src/main/java/org/rundeck/client/tool/options/FollowOptions.java diff --git a/src/main/java/org/rundeck/client/tool/options/JobFileOptions.java b/rd-tool/src/main/java/org/rundeck/client/tool/options/JobFileOptions.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/options/JobFileOptions.java rename to rd-tool/src/main/java/org/rundeck/client/tool/options/JobFileOptions.java diff --git a/src/main/java/org/rundeck/client/tool/options/JobIdentOptions.java b/rd-tool/src/main/java/org/rundeck/client/tool/options/JobIdentOptions.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/options/JobIdentOptions.java rename to rd-tool/src/main/java/org/rundeck/client/tool/options/JobIdentOptions.java diff --git a/src/main/java/org/rundeck/client/tool/options/JobListOptions.java b/rd-tool/src/main/java/org/rundeck/client/tool/options/JobListOptions.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/options/JobListOptions.java rename to rd-tool/src/main/java/org/rundeck/client/tool/options/JobListOptions.java diff --git a/src/main/java/org/rundeck/client/tool/options/JobLoadOptions.java b/rd-tool/src/main/java/org/rundeck/client/tool/options/JobLoadOptions.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/options/JobLoadOptions.java rename to rd-tool/src/main/java/org/rundeck/client/tool/options/JobLoadOptions.java diff --git a/src/main/java/org/rundeck/client/tool/options/JobOutputFormatOption.java b/rd-tool/src/main/java/org/rundeck/client/tool/options/JobOutputFormatOption.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/options/JobOutputFormatOption.java rename to rd-tool/src/main/java/org/rundeck/client/tool/options/JobOutputFormatOption.java diff --git a/src/main/java/org/rundeck/client/tool/options/JobPurgeOptions.java b/rd-tool/src/main/java/org/rundeck/client/tool/options/JobPurgeOptions.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/options/JobPurgeOptions.java rename to rd-tool/src/main/java/org/rundeck/client/tool/options/JobPurgeOptions.java diff --git a/src/main/java/org/rundeck/client/tool/options/LoginNameOption.java b/rd-tool/src/main/java/org/rundeck/client/tool/options/LoginNameOption.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/options/LoginNameOption.java rename to rd-tool/src/main/java/org/rundeck/client/tool/options/LoginNameOption.java diff --git a/src/main/java/org/rundeck/client/tool/options/NodeFilterOptions.java b/rd-tool/src/main/java/org/rundeck/client/tool/options/NodeFilterOptions.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/options/NodeFilterOptions.java rename to rd-tool/src/main/java/org/rundeck/client/tool/options/NodeFilterOptions.java diff --git a/src/main/java/org/rundeck/client/tool/options/NodeOutputFormatOption.java b/rd-tool/src/main/java/org/rundeck/client/tool/options/NodeOutputFormatOption.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/options/NodeOutputFormatOption.java rename to rd-tool/src/main/java/org/rundeck/client/tool/options/NodeOutputFormatOption.java diff --git a/src/main/java/org/rundeck/client/tool/options/OptionUtil.java b/rd-tool/src/main/java/org/rundeck/client/tool/options/OptionUtil.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/options/OptionUtil.java rename to rd-tool/src/main/java/org/rundeck/client/tool/options/OptionUtil.java diff --git a/src/main/java/org/rundeck/client/tool/options/OptionalIdOptions.java b/rd-tool/src/main/java/org/rundeck/client/tool/options/OptionalIdOptions.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/options/OptionalIdOptions.java rename to rd-tool/src/main/java/org/rundeck/client/tool/options/OptionalIdOptions.java diff --git a/src/main/java/org/rundeck/client/tool/options/OptionalProjectOptions.java b/rd-tool/src/main/java/org/rundeck/client/tool/options/OptionalProjectOptions.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/options/OptionalProjectOptions.java rename to rd-tool/src/main/java/org/rundeck/client/tool/options/OptionalProjectOptions.java diff --git a/src/main/java/org/rundeck/client/tool/options/PagingResultOptions.java b/rd-tool/src/main/java/org/rundeck/client/tool/options/PagingResultOptions.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/options/PagingResultOptions.java rename to rd-tool/src/main/java/org/rundeck/client/tool/options/PagingResultOptions.java diff --git a/src/main/java/org/rundeck/client/tool/options/ProjectCreateOptions.java b/rd-tool/src/main/java/org/rundeck/client/tool/options/ProjectCreateOptions.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/options/ProjectCreateOptions.java rename to rd-tool/src/main/java/org/rundeck/client/tool/options/ProjectCreateOptions.java diff --git a/src/main/java/org/rundeck/client/tool/options/ProjectListFormatOptions.java b/rd-tool/src/main/java/org/rundeck/client/tool/options/ProjectListFormatOptions.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/options/ProjectListFormatOptions.java rename to rd-tool/src/main/java/org/rundeck/client/tool/options/ProjectListFormatOptions.java diff --git a/src/main/java/org/rundeck/client/tool/options/ProjectNameOptions.java b/rd-tool/src/main/java/org/rundeck/client/tool/options/ProjectNameOptions.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/options/ProjectNameOptions.java rename to rd-tool/src/main/java/org/rundeck/client/tool/options/ProjectNameOptions.java diff --git a/src/main/java/org/rundeck/client/tool/options/ProjectRequiredNameOptions.java b/rd-tool/src/main/java/org/rundeck/client/tool/options/ProjectRequiredNameOptions.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/options/ProjectRequiredNameOptions.java rename to rd-tool/src/main/java/org/rundeck/client/tool/options/ProjectRequiredNameOptions.java diff --git a/src/main/java/org/rundeck/client/tool/options/QueryOptions.java b/rd-tool/src/main/java/org/rundeck/client/tool/options/QueryOptions.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/options/QueryOptions.java rename to rd-tool/src/main/java/org/rundeck/client/tool/options/QueryOptions.java diff --git a/src/main/java/org/rundeck/client/tool/options/QuietOption.java b/rd-tool/src/main/java/org/rundeck/client/tool/options/QuietOption.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/options/QuietOption.java rename to rd-tool/src/main/java/org/rundeck/client/tool/options/QuietOption.java diff --git a/src/main/java/org/rundeck/client/tool/options/RetryBaseOptions.java b/rd-tool/src/main/java/org/rundeck/client/tool/options/RetryBaseOptions.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/options/RetryBaseOptions.java rename to rd-tool/src/main/java/org/rundeck/client/tool/options/RetryBaseOptions.java diff --git a/src/main/java/org/rundeck/client/tool/options/RetryExecutionOption.java b/rd-tool/src/main/java/org/rundeck/client/tool/options/RetryExecutionOption.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/options/RetryExecutionOption.java rename to rd-tool/src/main/java/org/rundeck/client/tool/options/RetryExecutionOption.java diff --git a/src/main/java/org/rundeck/client/tool/options/RunBaseOptions.java b/rd-tool/src/main/java/org/rundeck/client/tool/options/RunBaseOptions.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/options/RunBaseOptions.java rename to rd-tool/src/main/java/org/rundeck/client/tool/options/RunBaseOptions.java diff --git a/src/main/java/org/rundeck/client/tool/options/RunOptions.java b/rd-tool/src/main/java/org/rundeck/client/tool/options/RunOptions.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/options/RunOptions.java rename to rd-tool/src/main/java/org/rundeck/client/tool/options/RunOptions.java diff --git a/src/main/java/org/rundeck/client/tool/options/TokenFormatOption.java b/rd-tool/src/main/java/org/rundeck/client/tool/options/TokenFormatOption.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/options/TokenFormatOption.java rename to rd-tool/src/main/java/org/rundeck/client/tool/options/TokenFormatOption.java diff --git a/src/main/java/org/rundeck/client/tool/options/UnparsedConfigOptions.java b/rd-tool/src/main/java/org/rundeck/client/tool/options/UnparsedConfigOptions.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/options/UnparsedConfigOptions.java rename to rd-tool/src/main/java/org/rundeck/client/tool/options/UnparsedConfigOptions.java diff --git a/src/main/java/org/rundeck/client/tool/options/UserFormatOption.java b/rd-tool/src/main/java/org/rundeck/client/tool/options/UserFormatOption.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/options/UserFormatOption.java rename to rd-tool/src/main/java/org/rundeck/client/tool/options/UserFormatOption.java diff --git a/src/main/java/org/rundeck/client/tool/options/VerboseOption.java b/rd-tool/src/main/java/org/rundeck/client/tool/options/VerboseOption.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/options/VerboseOption.java rename to rd-tool/src/main/java/org/rundeck/client/tool/options/VerboseOption.java diff --git a/src/main/java/org/rundeck/client/tool/util/Colorz.java b/rd-tool/src/main/java/org/rundeck/client/tool/util/Colorz.java similarity index 100% rename from src/main/java/org/rundeck/client/tool/util/Colorz.java rename to rd-tool/src/main/java/org/rundeck/client/tool/util/Colorz.java diff --git a/src/main/resources/rd-banner.txt b/rd-tool/src/main/resources/rd-banner.txt similarity index 100% rename from src/main/resources/rd-banner.txt rename to rd-tool/src/main/resources/rd-banner.txt diff --git a/src/test/groovy/org/rundeck/client/RundeckClientSpec.groovy b/rd-tool/src/test/groovy/org/rundeck/client/RundeckClientSpec.groovy similarity index 100% rename from src/test/groovy/org/rundeck/client/RundeckClientSpec.groovy rename to rd-tool/src/test/groovy/org/rundeck/client/RundeckClientSpec.groovy diff --git a/src/test/groovy/org/rundeck/client/api/model/DateInfoSpec.groovy b/rd-tool/src/test/groovy/org/rundeck/client/api/model/DateInfoSpec.groovy similarity index 100% rename from src/test/groovy/org/rundeck/client/api/model/DateInfoSpec.groovy rename to rd-tool/src/test/groovy/org/rundeck/client/api/model/DateInfoSpec.groovy diff --git a/src/test/groovy/org/rundeck/client/api/model/ErrorResponseSpec.groovy b/rd-tool/src/test/groovy/org/rundeck/client/api/model/ErrorResponseSpec.groovy similarity index 100% rename from src/test/groovy/org/rundeck/client/api/model/ErrorResponseSpec.groovy rename to rd-tool/src/test/groovy/org/rundeck/client/api/model/ErrorResponseSpec.groovy diff --git a/src/test/groovy/org/rundeck/client/api/model/ExecLogSpec.groovy b/rd-tool/src/test/groovy/org/rundeck/client/api/model/ExecLogSpec.groovy similarity index 100% rename from src/test/groovy/org/rundeck/client/api/model/ExecLogSpec.groovy rename to rd-tool/src/test/groovy/org/rundeck/client/api/model/ExecLogSpec.groovy diff --git a/src/test/groovy/org/rundeck/client/api/model/ExecOutputSpec.groovy b/rd-tool/src/test/groovy/org/rundeck/client/api/model/ExecOutputSpec.groovy similarity index 100% rename from src/test/groovy/org/rundeck/client/api/model/ExecOutputSpec.groovy rename to rd-tool/src/test/groovy/org/rundeck/client/api/model/ExecOutputSpec.groovy diff --git a/src/test/groovy/org/rundeck/client/api/model/PagingSpec.groovy b/rd-tool/src/test/groovy/org/rundeck/client/api/model/PagingSpec.groovy similarity index 100% rename from src/test/groovy/org/rundeck/client/api/model/PagingSpec.groovy rename to rd-tool/src/test/groovy/org/rundeck/client/api/model/PagingSpec.groovy diff --git a/src/test/groovy/org/rundeck/client/tool/commands/AppCommandSpec.groovy b/rd-tool/src/test/groovy/org/rundeck/client/tool/commands/AppCommandSpec.groovy similarity index 100% rename from src/test/groovy/org/rundeck/client/tool/commands/AppCommandSpec.groovy rename to rd-tool/src/test/groovy/org/rundeck/client/tool/commands/AppCommandSpec.groovy diff --git a/src/test/groovy/org/rundeck/client/tool/commands/ExecutionsSpec.groovy b/rd-tool/src/test/groovy/org/rundeck/client/tool/commands/ExecutionsSpec.groovy similarity index 100% rename from src/test/groovy/org/rundeck/client/tool/commands/ExecutionsSpec.groovy rename to rd-tool/src/test/groovy/org/rundeck/client/tool/commands/ExecutionsSpec.groovy diff --git a/src/test/groovy/org/rundeck/client/tool/commands/JobsSpec.groovy b/rd-tool/src/test/groovy/org/rundeck/client/tool/commands/JobsSpec.groovy similarity index 100% rename from src/test/groovy/org/rundeck/client/tool/commands/JobsSpec.groovy rename to rd-tool/src/test/groovy/org/rundeck/client/tool/commands/JobsSpec.groovy diff --git a/src/test/groovy/org/rundeck/client/tool/commands/KeysSpec.groovy b/rd-tool/src/test/groovy/org/rundeck/client/tool/commands/KeysSpec.groovy similarity index 100% rename from src/test/groovy/org/rundeck/client/tool/commands/KeysSpec.groovy rename to rd-tool/src/test/groovy/org/rundeck/client/tool/commands/KeysSpec.groovy diff --git a/src/test/groovy/org/rundeck/client/tool/commands/MetricsSpec.groovy b/rd-tool/src/test/groovy/org/rundeck/client/tool/commands/MetricsSpec.groovy similarity index 100% rename from src/test/groovy/org/rundeck/client/tool/commands/MetricsSpec.groovy rename to rd-tool/src/test/groovy/org/rundeck/client/tool/commands/MetricsSpec.groovy diff --git a/src/test/groovy/org/rundeck/client/tool/commands/ProjectsSpec.groovy b/rd-tool/src/test/groovy/org/rundeck/client/tool/commands/ProjectsSpec.groovy similarity index 100% rename from src/test/groovy/org/rundeck/client/tool/commands/ProjectsSpec.groovy rename to rd-tool/src/test/groovy/org/rundeck/client/tool/commands/ProjectsSpec.groovy diff --git a/src/test/groovy/org/rundeck/client/tool/commands/RetrySpec.groovy b/rd-tool/src/test/groovy/org/rundeck/client/tool/commands/RetrySpec.groovy similarity index 100% rename from src/test/groovy/org/rundeck/client/tool/commands/RetrySpec.groovy rename to rd-tool/src/test/groovy/org/rundeck/client/tool/commands/RetrySpec.groovy diff --git a/src/test/groovy/org/rundeck/client/tool/commands/RunSpec.groovy b/rd-tool/src/test/groovy/org/rundeck/client/tool/commands/RunSpec.groovy similarity index 100% rename from src/test/groovy/org/rundeck/client/tool/commands/RunSpec.groovy rename to rd-tool/src/test/groovy/org/rundeck/client/tool/commands/RunSpec.groovy diff --git a/src/test/groovy/org/rundeck/client/tool/commands/SchedulerSpec.groovy b/rd-tool/src/test/groovy/org/rundeck/client/tool/commands/SchedulerSpec.groovy similarity index 100% rename from src/test/groovy/org/rundeck/client/tool/commands/SchedulerSpec.groovy rename to rd-tool/src/test/groovy/org/rundeck/client/tool/commands/SchedulerSpec.groovy diff --git a/src/test/groovy/org/rundeck/client/tool/commands/TokensSpec.groovy b/rd-tool/src/test/groovy/org/rundeck/client/tool/commands/TokensSpec.groovy similarity index 100% rename from src/test/groovy/org/rundeck/client/tool/commands/TokensSpec.groovy rename to rd-tool/src/test/groovy/org/rundeck/client/tool/commands/TokensSpec.groovy diff --git a/src/test/groovy/org/rundeck/client/tool/commands/UsersSpec.groovy b/rd-tool/src/test/groovy/org/rundeck/client/tool/commands/UsersSpec.groovy similarity index 100% rename from src/test/groovy/org/rundeck/client/tool/commands/UsersSpec.groovy rename to rd-tool/src/test/groovy/org/rundeck/client/tool/commands/UsersSpec.groovy diff --git a/src/test/groovy/org/rundeck/client/tool/commands/projects/ACLsSpec.groovy b/rd-tool/src/test/groovy/org/rundeck/client/tool/commands/projects/ACLsSpec.groovy similarity index 100% rename from src/test/groovy/org/rundeck/client/tool/commands/projects/ACLsSpec.groovy rename to rd-tool/src/test/groovy/org/rundeck/client/tool/commands/projects/ACLsSpec.groovy diff --git a/src/test/groovy/org/rundeck/client/tool/commands/projects/SCMSpec.groovy b/rd-tool/src/test/groovy/org/rundeck/client/tool/commands/projects/SCMSpec.groovy similarity index 100% rename from src/test/groovy/org/rundeck/client/tool/commands/projects/SCMSpec.groovy rename to rd-tool/src/test/groovy/org/rundeck/client/tool/commands/projects/SCMSpec.groovy diff --git a/src/test/groovy/org/rundeck/client/tool/commands/repository/InstallPluginTest.groovy b/rd-tool/src/test/groovy/org/rundeck/client/tool/commands/repository/InstallPluginTest.groovy similarity index 100% rename from src/test/groovy/org/rundeck/client/tool/commands/repository/InstallPluginTest.groovy rename to rd-tool/src/test/groovy/org/rundeck/client/tool/commands/repository/InstallPluginTest.groovy diff --git a/src/test/groovy/org/rundeck/client/tool/commands/repository/PluginsTest.groovy b/rd-tool/src/test/groovy/org/rundeck/client/tool/commands/repository/PluginsTest.groovy similarity index 100% rename from src/test/groovy/org/rundeck/client/tool/commands/repository/PluginsTest.groovy rename to rd-tool/src/test/groovy/org/rundeck/client/tool/commands/repository/PluginsTest.groovy diff --git a/src/test/groovy/org/rundeck/client/tool/commands/repository/UninstallPluginTest.groovy b/rd-tool/src/test/groovy/org/rundeck/client/tool/commands/repository/UninstallPluginTest.groovy similarity index 100% rename from src/test/groovy/org/rundeck/client/tool/commands/repository/UninstallPluginTest.groovy rename to rd-tool/src/test/groovy/org/rundeck/client/tool/commands/repository/UninstallPluginTest.groovy diff --git a/src/test/groovy/org/rundeck/client/tool/commands/repository/UploadPluginTest.groovy b/rd-tool/src/test/groovy/org/rundeck/client/tool/commands/repository/UploadPluginTest.groovy similarity index 100% rename from src/test/groovy/org/rundeck/client/tool/commands/repository/UploadPluginTest.groovy rename to rd-tool/src/test/groovy/org/rundeck/client/tool/commands/repository/UploadPluginTest.groovy diff --git a/src/test/groovy/org/rundeck/client/util/FormAuthInterceptorSpec.groovy b/rd-tool/src/test/groovy/org/rundeck/client/util/FormAuthInterceptorSpec.groovy similarity index 100% rename from src/test/groovy/org/rundeck/client/util/FormAuthInterceptorSpec.groovy rename to rd-tool/src/test/groovy/org/rundeck/client/util/FormAuthInterceptorSpec.groovy diff --git a/src/test/groovy/org/rundeck/client/util/FormatSpec.groovy b/rd-tool/src/test/groovy/org/rundeck/client/util/FormatSpec.groovy similarity index 100% rename from src/test/groovy/org/rundeck/client/util/FormatSpec.groovy rename to rd-tool/src/test/groovy/org/rundeck/client/util/FormatSpec.groovy diff --git a/src/test/groovy/org/rundeck/client/util/QuotingSpec.groovy b/rd-tool/src/test/groovy/org/rundeck/client/util/QuotingSpec.groovy similarity index 100% rename from src/test/groovy/org/rundeck/client/util/QuotingSpec.groovy rename to rd-tool/src/test/groovy/org/rundeck/client/util/QuotingSpec.groovy diff --git a/src/test/groovy/org/rundeck/client/util/RedirectBypassInterceptorSpec.groovy b/rd-tool/src/test/groovy/org/rundeck/client/util/RedirectBypassInterceptorSpec.groovy similarity index 100% rename from src/test/groovy/org/rundeck/client/util/RedirectBypassInterceptorSpec.groovy rename to rd-tool/src/test/groovy/org/rundeck/client/util/RedirectBypassInterceptorSpec.groovy diff --git a/settings.gradle b/settings.gradle index 0ab28480..c41b635e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -14,4 +14,4 @@ * limitations under the License. */ -include 'rd-api-client' +include 'rd-api-client', 'rd-tool' From 454fa9c8be85557b46984ba0088bbb5db934470c Mon Sep 17 00:00:00 2001 From: Greg Schueler Date: Wed, 5 Jun 2019 09:40:42 -0700 Subject: [PATCH 2/5] Rename dir --- {rd-tool => rd-cli-tool}/build.gradle | 11 ++++++----- .../src/main/java/org/rundeck/client/tool/Main.java | 0 .../src/main/java/org/rundeck/client/tool/RdApp.java | 0 .../java/org/rundeck/client/tool/commands/Adhoc.java | 0 .../org/rundeck/client/tool/commands/AppCommand.java | 0 .../org/rundeck/client/tool/commands/Executions.java | 0 .../java/org/rundeck/client/tool/commands/Jobs.java | 0 .../java/org/rundeck/client/tool/commands/Keys.java | 0 .../org/rundeck/client/tool/commands/Metrics.java | 0 .../java/org/rundeck/client/tool/commands/Nodes.java | 0 .../org/rundeck/client/tool/commands/Projects.java | 0 .../org/rundeck/client/tool/commands/RDSystem.java | 0 .../java/org/rundeck/client/tool/commands/Retry.java | 0 .../java/org/rundeck/client/tool/commands/Run.java | 0 .../org/rundeck/client/tool/commands/Scheduler.java | 0 .../java/org/rundeck/client/tool/commands/Tokens.java | 0 .../java/org/rundeck/client/tool/commands/Users.java | 0 .../org/rundeck/client/tool/commands/jobs/Files.java | 0 .../client/tool/commands/projects/ACLFileOptions.java | 0 .../client/tool/commands/projects/ACLNameOptions.java | 0 .../rundeck/client/tool/commands/projects/ACLs.java | 0 .../client/tool/commands/projects/Archives.java | 0 .../client/tool/commands/projects/Configure.java | 0 .../rundeck/client/tool/commands/projects/Readme.java | 0 .../rundeck/client/tool/commands/projects/SCM.java | 0 .../tool/commands/repository/InstallPlugin.java | 0 .../client/tool/commands/repository/Plugins.java | 0 .../repository/RepositoryResponseHandler.java | 0 .../tool/commands/repository/UninstallPlugin.java | 0 .../client/tool/commands/repository/UploadPlugin.java | 0 .../org/rundeck/client/tool/commands/system/ACLs.java | 0 .../org/rundeck/client/tool/commands/system/Mode.java | 0 .../client/tool/options/ACLOutputFormatOption.java | 0 .../rundeck/client/tool/options/ACLOutputOptions.java | 0 .../rundeck/client/tool/options/AdhocBaseOptions.java | 0 .../org/rundeck/client/tool/options/BaseOptions.java | 0 .../client/tool/options/BulkJobActionOptions.java | 0 .../client/tool/options/ConfigFileOptions.java | 0 .../client/tool/options/ConfigInputOptions.java | 0 .../client/tool/options/ExecutionIdOption.java | 0 .../client/tool/options/ExecutionListOptions.java | 0 .../tool/options/ExecutionOutputFormatOption.java | 0 .../client/tool/options/ExecutionResultOptions.java | 0 .../client/tool/options/ExecutionsFollowOptions.java | 0 .../rundeck/client/tool/options/FollowOptions.java | 0 .../rundeck/client/tool/options/JobFileOptions.java | 0 .../rundeck/client/tool/options/JobIdentOptions.java | 0 .../rundeck/client/tool/options/JobListOptions.java | 0 .../rundeck/client/tool/options/JobLoadOptions.java | 0 .../client/tool/options/JobOutputFormatOption.java | 0 .../rundeck/client/tool/options/JobPurgeOptions.java | 0 .../rundeck/client/tool/options/LoginNameOption.java | 0 .../client/tool/options/NodeFilterOptions.java | 0 .../client/tool/options/NodeOutputFormatOption.java | 0 .../org/rundeck/client/tool/options/OptionUtil.java | 0 .../client/tool/options/OptionalIdOptions.java | 0 .../client/tool/options/OptionalProjectOptions.java | 0 .../client/tool/options/PagingResultOptions.java | 0 .../client/tool/options/ProjectCreateOptions.java | 0 .../client/tool/options/ProjectListFormatOptions.java | 0 .../client/tool/options/ProjectNameOptions.java | 0 .../tool/options/ProjectRequiredNameOptions.java | 0 .../org/rundeck/client/tool/options/QueryOptions.java | 0 .../org/rundeck/client/tool/options/QuietOption.java | 0 .../rundeck/client/tool/options/RetryBaseOptions.java | 0 .../client/tool/options/RetryExecutionOption.java | 0 .../rundeck/client/tool/options/RunBaseOptions.java | 0 .../org/rundeck/client/tool/options/RunOptions.java | 0 .../client/tool/options/TokenFormatOption.java | 0 .../client/tool/options/UnparsedConfigOptions.java | 0 .../rundeck/client/tool/options/UserFormatOption.java | 0 .../rundeck/client/tool/options/VerboseOption.java | 0 .../java/org/rundeck/client/tool/util/Colorz.java | 0 .../src/main/resources/rd-banner.txt | 0 .../org/rundeck/client/RundeckClientSpec.groovy | 0 .../org/rundeck/client/api/model/DateInfoSpec.groovy | 0 .../rundeck/client/api/model/ErrorResponseSpec.groovy | 0 .../org/rundeck/client/api/model/ExecLogSpec.groovy | 0 .../rundeck/client/api/model/ExecOutputSpec.groovy | 0 .../org/rundeck/client/api/model/PagingSpec.groovy | 0 .../client/tool/commands/AppCommandSpec.groovy | 0 .../client/tool/commands/ExecutionsSpec.groovy | 0 .../org/rundeck/client/tool/commands/JobsSpec.groovy | 0 .../org/rundeck/client/tool/commands/KeysSpec.groovy | 0 .../rundeck/client/tool/commands/MetricsSpec.groovy | 0 .../rundeck/client/tool/commands/ProjectsSpec.groovy | 0 .../org/rundeck/client/tool/commands/RetrySpec.groovy | 0 .../org/rundeck/client/tool/commands/RunSpec.groovy | 0 .../rundeck/client/tool/commands/SchedulerSpec.groovy | 0 .../rundeck/client/tool/commands/TokensSpec.groovy | 0 .../org/rundeck/client/tool/commands/UsersSpec.groovy | 0 .../client/tool/commands/projects/ACLsSpec.groovy | 0 .../client/tool/commands/projects/SCMSpec.groovy | 0 .../tool/commands/repository/InstallPluginTest.groovy | 0 .../tool/commands/repository/PluginsTest.groovy | 0 .../commands/repository/UninstallPluginTest.groovy | 0 .../tool/commands/repository/UploadPluginTest.groovy | 0 .../client/util/FormAuthInterceptorSpec.groovy | 0 .../groovy/org/rundeck/client/util/FormatSpec.groovy | 0 .../groovy/org/rundeck/client/util/QuotingSpec.groovy | 0 .../client/util/RedirectBypassInterceptorSpec.groovy | 0 settings.gradle | 2 +- 102 files changed, 7 insertions(+), 6 deletions(-) rename {rd-tool => rd-cli-tool}/build.gradle (96%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/Main.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/RdApp.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/commands/Adhoc.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/commands/AppCommand.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/commands/Executions.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/commands/Jobs.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/commands/Keys.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/commands/Metrics.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/commands/Nodes.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/commands/Projects.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/commands/RDSystem.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/commands/Retry.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/commands/Run.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/commands/Scheduler.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/commands/Tokens.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/commands/Users.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/commands/jobs/Files.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/commands/projects/ACLFileOptions.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/commands/projects/ACLNameOptions.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/commands/projects/ACLs.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/commands/projects/Archives.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/commands/projects/Configure.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/commands/projects/Readme.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/commands/projects/SCM.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/commands/repository/InstallPlugin.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/commands/repository/Plugins.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/commands/repository/RepositoryResponseHandler.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/commands/repository/UninstallPlugin.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/commands/repository/UploadPlugin.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/commands/system/ACLs.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/commands/system/Mode.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/options/ACLOutputFormatOption.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/options/ACLOutputOptions.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/options/AdhocBaseOptions.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/options/BaseOptions.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/options/BulkJobActionOptions.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/options/ConfigFileOptions.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/options/ConfigInputOptions.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/options/ExecutionIdOption.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/options/ExecutionListOptions.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/options/ExecutionOutputFormatOption.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/options/ExecutionResultOptions.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/options/ExecutionsFollowOptions.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/options/FollowOptions.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/options/JobFileOptions.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/options/JobIdentOptions.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/options/JobListOptions.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/options/JobLoadOptions.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/options/JobOutputFormatOption.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/options/JobPurgeOptions.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/options/LoginNameOption.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/options/NodeFilterOptions.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/options/NodeOutputFormatOption.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/options/OptionUtil.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/options/OptionalIdOptions.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/options/OptionalProjectOptions.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/options/PagingResultOptions.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/options/ProjectCreateOptions.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/options/ProjectListFormatOptions.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/options/ProjectNameOptions.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/options/ProjectRequiredNameOptions.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/options/QueryOptions.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/options/QuietOption.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/options/RetryBaseOptions.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/options/RetryExecutionOption.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/options/RunBaseOptions.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/options/RunOptions.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/options/TokenFormatOption.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/options/UnparsedConfigOptions.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/options/UserFormatOption.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/options/VerboseOption.java (100%) rename {rd-tool => rd-cli-tool}/src/main/java/org/rundeck/client/tool/util/Colorz.java (100%) rename {rd-tool => rd-cli-tool}/src/main/resources/rd-banner.txt (100%) rename {rd-tool => rd-cli-tool}/src/test/groovy/org/rundeck/client/RundeckClientSpec.groovy (100%) rename {rd-tool => rd-cli-tool}/src/test/groovy/org/rundeck/client/api/model/DateInfoSpec.groovy (100%) rename {rd-tool => rd-cli-tool}/src/test/groovy/org/rundeck/client/api/model/ErrorResponseSpec.groovy (100%) rename {rd-tool => rd-cli-tool}/src/test/groovy/org/rundeck/client/api/model/ExecLogSpec.groovy (100%) rename {rd-tool => rd-cli-tool}/src/test/groovy/org/rundeck/client/api/model/ExecOutputSpec.groovy (100%) rename {rd-tool => rd-cli-tool}/src/test/groovy/org/rundeck/client/api/model/PagingSpec.groovy (100%) rename {rd-tool => rd-cli-tool}/src/test/groovy/org/rundeck/client/tool/commands/AppCommandSpec.groovy (100%) rename {rd-tool => rd-cli-tool}/src/test/groovy/org/rundeck/client/tool/commands/ExecutionsSpec.groovy (100%) rename {rd-tool => rd-cli-tool}/src/test/groovy/org/rundeck/client/tool/commands/JobsSpec.groovy (100%) rename {rd-tool => rd-cli-tool}/src/test/groovy/org/rundeck/client/tool/commands/KeysSpec.groovy (100%) rename {rd-tool => rd-cli-tool}/src/test/groovy/org/rundeck/client/tool/commands/MetricsSpec.groovy (100%) rename {rd-tool => rd-cli-tool}/src/test/groovy/org/rundeck/client/tool/commands/ProjectsSpec.groovy (100%) rename {rd-tool => rd-cli-tool}/src/test/groovy/org/rundeck/client/tool/commands/RetrySpec.groovy (100%) rename {rd-tool => rd-cli-tool}/src/test/groovy/org/rundeck/client/tool/commands/RunSpec.groovy (100%) rename {rd-tool => rd-cli-tool}/src/test/groovy/org/rundeck/client/tool/commands/SchedulerSpec.groovy (100%) rename {rd-tool => rd-cli-tool}/src/test/groovy/org/rundeck/client/tool/commands/TokensSpec.groovy (100%) rename {rd-tool => rd-cli-tool}/src/test/groovy/org/rundeck/client/tool/commands/UsersSpec.groovy (100%) rename {rd-tool => rd-cli-tool}/src/test/groovy/org/rundeck/client/tool/commands/projects/ACLsSpec.groovy (100%) rename {rd-tool => rd-cli-tool}/src/test/groovy/org/rundeck/client/tool/commands/projects/SCMSpec.groovy (100%) rename {rd-tool => rd-cli-tool}/src/test/groovy/org/rundeck/client/tool/commands/repository/InstallPluginTest.groovy (100%) rename {rd-tool => rd-cli-tool}/src/test/groovy/org/rundeck/client/tool/commands/repository/PluginsTest.groovy (100%) rename {rd-tool => rd-cli-tool}/src/test/groovy/org/rundeck/client/tool/commands/repository/UninstallPluginTest.groovy (100%) rename {rd-tool => rd-cli-tool}/src/test/groovy/org/rundeck/client/tool/commands/repository/UploadPluginTest.groovy (100%) rename {rd-tool => rd-cli-tool}/src/test/groovy/org/rundeck/client/util/FormAuthInterceptorSpec.groovy (100%) rename {rd-tool => rd-cli-tool}/src/test/groovy/org/rundeck/client/util/FormatSpec.groovy (100%) rename {rd-tool => rd-cli-tool}/src/test/groovy/org/rundeck/client/util/QuotingSpec.groovy (100%) rename {rd-tool => rd-cli-tool}/src/test/groovy/org/rundeck/client/util/RedirectBypassInterceptorSpec.groovy (100%) diff --git a/rd-tool/build.gradle b/rd-cli-tool/build.gradle similarity index 96% rename from rd-tool/build.gradle rename to rd-cli-tool/build.gradle index dd166107..96b0c9f8 100644 --- a/rd-tool/build.gradle +++ b/rd-cli-tool/build.gradle @@ -24,16 +24,17 @@ buildscript { } plugins { id 'groovy' - id 'com.github.johnrengelman.shadow' version '2.0.3' + id 'application' + id 'com.github.johnrengelman.shadow' version '4.0.4' id "nebula.ospackage" version "4.8.0" - id 'maven' +// id 'maven' } apply plugin: 'idea' -apply plugin: 'groovy' -apply plugin: 'application' +//apply plugin: 'groovy' +//apply plugin: 'application' apply plugin: 'com.github.johnrengelman.shadow' -apply plugin: 'nebula.ospackage' +//apply plugin: 'nebula.ospackage' mainClassName = 'org.rundeck.client.tool.Main' applicationName = 'rd' diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/Main.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/Main.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/Main.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/Main.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/RdApp.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/RdApp.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/RdApp.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/RdApp.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/commands/Adhoc.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/Adhoc.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/commands/Adhoc.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/Adhoc.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/commands/AppCommand.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/AppCommand.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/commands/AppCommand.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/AppCommand.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/commands/Executions.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/Executions.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/commands/Executions.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/Executions.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/commands/Jobs.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/Jobs.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/commands/Jobs.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/Jobs.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/commands/Keys.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/Keys.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/commands/Keys.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/Keys.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/commands/Metrics.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/Metrics.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/commands/Metrics.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/Metrics.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/commands/Nodes.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/Nodes.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/commands/Nodes.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/Nodes.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/commands/Projects.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/Projects.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/commands/Projects.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/Projects.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/commands/RDSystem.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/RDSystem.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/commands/RDSystem.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/RDSystem.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/commands/Retry.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/Retry.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/commands/Retry.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/Retry.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/commands/Run.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/Run.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/commands/Run.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/Run.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/commands/Scheduler.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/Scheduler.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/commands/Scheduler.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/Scheduler.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/commands/Tokens.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/Tokens.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/commands/Tokens.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/Tokens.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/commands/Users.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/Users.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/commands/Users.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/Users.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/commands/jobs/Files.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/jobs/Files.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/commands/jobs/Files.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/jobs/Files.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/commands/projects/ACLFileOptions.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/projects/ACLFileOptions.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/commands/projects/ACLFileOptions.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/projects/ACLFileOptions.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/commands/projects/ACLNameOptions.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/projects/ACLNameOptions.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/commands/projects/ACLNameOptions.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/projects/ACLNameOptions.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/commands/projects/ACLs.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/projects/ACLs.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/commands/projects/ACLs.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/projects/ACLs.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/commands/projects/Archives.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/projects/Archives.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/commands/projects/Archives.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/projects/Archives.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/commands/projects/Configure.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/projects/Configure.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/commands/projects/Configure.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/projects/Configure.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/commands/projects/Readme.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/projects/Readme.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/commands/projects/Readme.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/projects/Readme.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/commands/projects/SCM.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/projects/SCM.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/commands/projects/SCM.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/projects/SCM.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/commands/repository/InstallPlugin.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/repository/InstallPlugin.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/commands/repository/InstallPlugin.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/repository/InstallPlugin.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/commands/repository/Plugins.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/repository/Plugins.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/commands/repository/Plugins.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/repository/Plugins.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/commands/repository/RepositoryResponseHandler.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/repository/RepositoryResponseHandler.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/commands/repository/RepositoryResponseHandler.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/repository/RepositoryResponseHandler.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/commands/repository/UninstallPlugin.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/repository/UninstallPlugin.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/commands/repository/UninstallPlugin.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/repository/UninstallPlugin.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/commands/repository/UploadPlugin.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/repository/UploadPlugin.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/commands/repository/UploadPlugin.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/repository/UploadPlugin.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/commands/system/ACLs.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/system/ACLs.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/commands/system/ACLs.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/system/ACLs.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/commands/system/Mode.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/system/Mode.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/commands/system/Mode.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/system/Mode.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/options/ACLOutputFormatOption.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/options/ACLOutputFormatOption.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/options/ACLOutputFormatOption.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/options/ACLOutputFormatOption.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/options/ACLOutputOptions.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/options/ACLOutputOptions.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/options/ACLOutputOptions.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/options/ACLOutputOptions.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/options/AdhocBaseOptions.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/options/AdhocBaseOptions.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/options/AdhocBaseOptions.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/options/AdhocBaseOptions.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/options/BaseOptions.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/options/BaseOptions.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/options/BaseOptions.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/options/BaseOptions.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/options/BulkJobActionOptions.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/options/BulkJobActionOptions.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/options/BulkJobActionOptions.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/options/BulkJobActionOptions.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/options/ConfigFileOptions.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/options/ConfigFileOptions.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/options/ConfigFileOptions.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/options/ConfigFileOptions.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/options/ConfigInputOptions.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/options/ConfigInputOptions.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/options/ConfigInputOptions.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/options/ConfigInputOptions.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/options/ExecutionIdOption.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/options/ExecutionIdOption.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/options/ExecutionIdOption.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/options/ExecutionIdOption.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/options/ExecutionListOptions.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/options/ExecutionListOptions.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/options/ExecutionListOptions.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/options/ExecutionListOptions.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/options/ExecutionOutputFormatOption.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/options/ExecutionOutputFormatOption.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/options/ExecutionOutputFormatOption.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/options/ExecutionOutputFormatOption.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/options/ExecutionResultOptions.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/options/ExecutionResultOptions.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/options/ExecutionResultOptions.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/options/ExecutionResultOptions.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/options/ExecutionsFollowOptions.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/options/ExecutionsFollowOptions.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/options/ExecutionsFollowOptions.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/options/ExecutionsFollowOptions.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/options/FollowOptions.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/options/FollowOptions.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/options/FollowOptions.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/options/FollowOptions.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/options/JobFileOptions.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/options/JobFileOptions.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/options/JobFileOptions.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/options/JobFileOptions.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/options/JobIdentOptions.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/options/JobIdentOptions.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/options/JobIdentOptions.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/options/JobIdentOptions.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/options/JobListOptions.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/options/JobListOptions.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/options/JobListOptions.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/options/JobListOptions.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/options/JobLoadOptions.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/options/JobLoadOptions.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/options/JobLoadOptions.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/options/JobLoadOptions.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/options/JobOutputFormatOption.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/options/JobOutputFormatOption.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/options/JobOutputFormatOption.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/options/JobOutputFormatOption.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/options/JobPurgeOptions.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/options/JobPurgeOptions.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/options/JobPurgeOptions.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/options/JobPurgeOptions.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/options/LoginNameOption.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/options/LoginNameOption.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/options/LoginNameOption.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/options/LoginNameOption.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/options/NodeFilterOptions.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/options/NodeFilterOptions.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/options/NodeFilterOptions.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/options/NodeFilterOptions.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/options/NodeOutputFormatOption.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/options/NodeOutputFormatOption.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/options/NodeOutputFormatOption.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/options/NodeOutputFormatOption.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/options/OptionUtil.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/options/OptionUtil.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/options/OptionUtil.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/options/OptionUtil.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/options/OptionalIdOptions.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/options/OptionalIdOptions.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/options/OptionalIdOptions.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/options/OptionalIdOptions.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/options/OptionalProjectOptions.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/options/OptionalProjectOptions.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/options/OptionalProjectOptions.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/options/OptionalProjectOptions.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/options/PagingResultOptions.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/options/PagingResultOptions.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/options/PagingResultOptions.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/options/PagingResultOptions.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/options/ProjectCreateOptions.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/options/ProjectCreateOptions.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/options/ProjectCreateOptions.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/options/ProjectCreateOptions.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/options/ProjectListFormatOptions.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/options/ProjectListFormatOptions.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/options/ProjectListFormatOptions.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/options/ProjectListFormatOptions.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/options/ProjectNameOptions.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/options/ProjectNameOptions.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/options/ProjectNameOptions.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/options/ProjectNameOptions.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/options/ProjectRequiredNameOptions.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/options/ProjectRequiredNameOptions.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/options/ProjectRequiredNameOptions.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/options/ProjectRequiredNameOptions.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/options/QueryOptions.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/options/QueryOptions.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/options/QueryOptions.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/options/QueryOptions.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/options/QuietOption.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/options/QuietOption.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/options/QuietOption.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/options/QuietOption.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/options/RetryBaseOptions.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/options/RetryBaseOptions.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/options/RetryBaseOptions.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/options/RetryBaseOptions.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/options/RetryExecutionOption.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/options/RetryExecutionOption.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/options/RetryExecutionOption.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/options/RetryExecutionOption.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/options/RunBaseOptions.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/options/RunBaseOptions.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/options/RunBaseOptions.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/options/RunBaseOptions.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/options/RunOptions.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/options/RunOptions.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/options/RunOptions.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/options/RunOptions.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/options/TokenFormatOption.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/options/TokenFormatOption.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/options/TokenFormatOption.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/options/TokenFormatOption.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/options/UnparsedConfigOptions.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/options/UnparsedConfigOptions.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/options/UnparsedConfigOptions.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/options/UnparsedConfigOptions.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/options/UserFormatOption.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/options/UserFormatOption.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/options/UserFormatOption.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/options/UserFormatOption.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/options/VerboseOption.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/options/VerboseOption.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/options/VerboseOption.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/options/VerboseOption.java diff --git a/rd-tool/src/main/java/org/rundeck/client/tool/util/Colorz.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/util/Colorz.java similarity index 100% rename from rd-tool/src/main/java/org/rundeck/client/tool/util/Colorz.java rename to rd-cli-tool/src/main/java/org/rundeck/client/tool/util/Colorz.java diff --git a/rd-tool/src/main/resources/rd-banner.txt b/rd-cli-tool/src/main/resources/rd-banner.txt similarity index 100% rename from rd-tool/src/main/resources/rd-banner.txt rename to rd-cli-tool/src/main/resources/rd-banner.txt diff --git a/rd-tool/src/test/groovy/org/rundeck/client/RundeckClientSpec.groovy b/rd-cli-tool/src/test/groovy/org/rundeck/client/RundeckClientSpec.groovy similarity index 100% rename from rd-tool/src/test/groovy/org/rundeck/client/RundeckClientSpec.groovy rename to rd-cli-tool/src/test/groovy/org/rundeck/client/RundeckClientSpec.groovy diff --git a/rd-tool/src/test/groovy/org/rundeck/client/api/model/DateInfoSpec.groovy b/rd-cli-tool/src/test/groovy/org/rundeck/client/api/model/DateInfoSpec.groovy similarity index 100% rename from rd-tool/src/test/groovy/org/rundeck/client/api/model/DateInfoSpec.groovy rename to rd-cli-tool/src/test/groovy/org/rundeck/client/api/model/DateInfoSpec.groovy diff --git a/rd-tool/src/test/groovy/org/rundeck/client/api/model/ErrorResponseSpec.groovy b/rd-cli-tool/src/test/groovy/org/rundeck/client/api/model/ErrorResponseSpec.groovy similarity index 100% rename from rd-tool/src/test/groovy/org/rundeck/client/api/model/ErrorResponseSpec.groovy rename to rd-cli-tool/src/test/groovy/org/rundeck/client/api/model/ErrorResponseSpec.groovy diff --git a/rd-tool/src/test/groovy/org/rundeck/client/api/model/ExecLogSpec.groovy b/rd-cli-tool/src/test/groovy/org/rundeck/client/api/model/ExecLogSpec.groovy similarity index 100% rename from rd-tool/src/test/groovy/org/rundeck/client/api/model/ExecLogSpec.groovy rename to rd-cli-tool/src/test/groovy/org/rundeck/client/api/model/ExecLogSpec.groovy diff --git a/rd-tool/src/test/groovy/org/rundeck/client/api/model/ExecOutputSpec.groovy b/rd-cli-tool/src/test/groovy/org/rundeck/client/api/model/ExecOutputSpec.groovy similarity index 100% rename from rd-tool/src/test/groovy/org/rundeck/client/api/model/ExecOutputSpec.groovy rename to rd-cli-tool/src/test/groovy/org/rundeck/client/api/model/ExecOutputSpec.groovy diff --git a/rd-tool/src/test/groovy/org/rundeck/client/api/model/PagingSpec.groovy b/rd-cli-tool/src/test/groovy/org/rundeck/client/api/model/PagingSpec.groovy similarity index 100% rename from rd-tool/src/test/groovy/org/rundeck/client/api/model/PagingSpec.groovy rename to rd-cli-tool/src/test/groovy/org/rundeck/client/api/model/PagingSpec.groovy diff --git a/rd-tool/src/test/groovy/org/rundeck/client/tool/commands/AppCommandSpec.groovy b/rd-cli-tool/src/test/groovy/org/rundeck/client/tool/commands/AppCommandSpec.groovy similarity index 100% rename from rd-tool/src/test/groovy/org/rundeck/client/tool/commands/AppCommandSpec.groovy rename to rd-cli-tool/src/test/groovy/org/rundeck/client/tool/commands/AppCommandSpec.groovy diff --git a/rd-tool/src/test/groovy/org/rundeck/client/tool/commands/ExecutionsSpec.groovy b/rd-cli-tool/src/test/groovy/org/rundeck/client/tool/commands/ExecutionsSpec.groovy similarity index 100% rename from rd-tool/src/test/groovy/org/rundeck/client/tool/commands/ExecutionsSpec.groovy rename to rd-cli-tool/src/test/groovy/org/rundeck/client/tool/commands/ExecutionsSpec.groovy diff --git a/rd-tool/src/test/groovy/org/rundeck/client/tool/commands/JobsSpec.groovy b/rd-cli-tool/src/test/groovy/org/rundeck/client/tool/commands/JobsSpec.groovy similarity index 100% rename from rd-tool/src/test/groovy/org/rundeck/client/tool/commands/JobsSpec.groovy rename to rd-cli-tool/src/test/groovy/org/rundeck/client/tool/commands/JobsSpec.groovy diff --git a/rd-tool/src/test/groovy/org/rundeck/client/tool/commands/KeysSpec.groovy b/rd-cli-tool/src/test/groovy/org/rundeck/client/tool/commands/KeysSpec.groovy similarity index 100% rename from rd-tool/src/test/groovy/org/rundeck/client/tool/commands/KeysSpec.groovy rename to rd-cli-tool/src/test/groovy/org/rundeck/client/tool/commands/KeysSpec.groovy diff --git a/rd-tool/src/test/groovy/org/rundeck/client/tool/commands/MetricsSpec.groovy b/rd-cli-tool/src/test/groovy/org/rundeck/client/tool/commands/MetricsSpec.groovy similarity index 100% rename from rd-tool/src/test/groovy/org/rundeck/client/tool/commands/MetricsSpec.groovy rename to rd-cli-tool/src/test/groovy/org/rundeck/client/tool/commands/MetricsSpec.groovy diff --git a/rd-tool/src/test/groovy/org/rundeck/client/tool/commands/ProjectsSpec.groovy b/rd-cli-tool/src/test/groovy/org/rundeck/client/tool/commands/ProjectsSpec.groovy similarity index 100% rename from rd-tool/src/test/groovy/org/rundeck/client/tool/commands/ProjectsSpec.groovy rename to rd-cli-tool/src/test/groovy/org/rundeck/client/tool/commands/ProjectsSpec.groovy diff --git a/rd-tool/src/test/groovy/org/rundeck/client/tool/commands/RetrySpec.groovy b/rd-cli-tool/src/test/groovy/org/rundeck/client/tool/commands/RetrySpec.groovy similarity index 100% rename from rd-tool/src/test/groovy/org/rundeck/client/tool/commands/RetrySpec.groovy rename to rd-cli-tool/src/test/groovy/org/rundeck/client/tool/commands/RetrySpec.groovy diff --git a/rd-tool/src/test/groovy/org/rundeck/client/tool/commands/RunSpec.groovy b/rd-cli-tool/src/test/groovy/org/rundeck/client/tool/commands/RunSpec.groovy similarity index 100% rename from rd-tool/src/test/groovy/org/rundeck/client/tool/commands/RunSpec.groovy rename to rd-cli-tool/src/test/groovy/org/rundeck/client/tool/commands/RunSpec.groovy diff --git a/rd-tool/src/test/groovy/org/rundeck/client/tool/commands/SchedulerSpec.groovy b/rd-cli-tool/src/test/groovy/org/rundeck/client/tool/commands/SchedulerSpec.groovy similarity index 100% rename from rd-tool/src/test/groovy/org/rundeck/client/tool/commands/SchedulerSpec.groovy rename to rd-cli-tool/src/test/groovy/org/rundeck/client/tool/commands/SchedulerSpec.groovy diff --git a/rd-tool/src/test/groovy/org/rundeck/client/tool/commands/TokensSpec.groovy b/rd-cli-tool/src/test/groovy/org/rundeck/client/tool/commands/TokensSpec.groovy similarity index 100% rename from rd-tool/src/test/groovy/org/rundeck/client/tool/commands/TokensSpec.groovy rename to rd-cli-tool/src/test/groovy/org/rundeck/client/tool/commands/TokensSpec.groovy diff --git a/rd-tool/src/test/groovy/org/rundeck/client/tool/commands/UsersSpec.groovy b/rd-cli-tool/src/test/groovy/org/rundeck/client/tool/commands/UsersSpec.groovy similarity index 100% rename from rd-tool/src/test/groovy/org/rundeck/client/tool/commands/UsersSpec.groovy rename to rd-cli-tool/src/test/groovy/org/rundeck/client/tool/commands/UsersSpec.groovy diff --git a/rd-tool/src/test/groovy/org/rundeck/client/tool/commands/projects/ACLsSpec.groovy b/rd-cli-tool/src/test/groovy/org/rundeck/client/tool/commands/projects/ACLsSpec.groovy similarity index 100% rename from rd-tool/src/test/groovy/org/rundeck/client/tool/commands/projects/ACLsSpec.groovy rename to rd-cli-tool/src/test/groovy/org/rundeck/client/tool/commands/projects/ACLsSpec.groovy diff --git a/rd-tool/src/test/groovy/org/rundeck/client/tool/commands/projects/SCMSpec.groovy b/rd-cli-tool/src/test/groovy/org/rundeck/client/tool/commands/projects/SCMSpec.groovy similarity index 100% rename from rd-tool/src/test/groovy/org/rundeck/client/tool/commands/projects/SCMSpec.groovy rename to rd-cli-tool/src/test/groovy/org/rundeck/client/tool/commands/projects/SCMSpec.groovy diff --git a/rd-tool/src/test/groovy/org/rundeck/client/tool/commands/repository/InstallPluginTest.groovy b/rd-cli-tool/src/test/groovy/org/rundeck/client/tool/commands/repository/InstallPluginTest.groovy similarity index 100% rename from rd-tool/src/test/groovy/org/rundeck/client/tool/commands/repository/InstallPluginTest.groovy rename to rd-cli-tool/src/test/groovy/org/rundeck/client/tool/commands/repository/InstallPluginTest.groovy diff --git a/rd-tool/src/test/groovy/org/rundeck/client/tool/commands/repository/PluginsTest.groovy b/rd-cli-tool/src/test/groovy/org/rundeck/client/tool/commands/repository/PluginsTest.groovy similarity index 100% rename from rd-tool/src/test/groovy/org/rundeck/client/tool/commands/repository/PluginsTest.groovy rename to rd-cli-tool/src/test/groovy/org/rundeck/client/tool/commands/repository/PluginsTest.groovy diff --git a/rd-tool/src/test/groovy/org/rundeck/client/tool/commands/repository/UninstallPluginTest.groovy b/rd-cli-tool/src/test/groovy/org/rundeck/client/tool/commands/repository/UninstallPluginTest.groovy similarity index 100% rename from rd-tool/src/test/groovy/org/rundeck/client/tool/commands/repository/UninstallPluginTest.groovy rename to rd-cli-tool/src/test/groovy/org/rundeck/client/tool/commands/repository/UninstallPluginTest.groovy diff --git a/rd-tool/src/test/groovy/org/rundeck/client/tool/commands/repository/UploadPluginTest.groovy b/rd-cli-tool/src/test/groovy/org/rundeck/client/tool/commands/repository/UploadPluginTest.groovy similarity index 100% rename from rd-tool/src/test/groovy/org/rundeck/client/tool/commands/repository/UploadPluginTest.groovy rename to rd-cli-tool/src/test/groovy/org/rundeck/client/tool/commands/repository/UploadPluginTest.groovy diff --git a/rd-tool/src/test/groovy/org/rundeck/client/util/FormAuthInterceptorSpec.groovy b/rd-cli-tool/src/test/groovy/org/rundeck/client/util/FormAuthInterceptorSpec.groovy similarity index 100% rename from rd-tool/src/test/groovy/org/rundeck/client/util/FormAuthInterceptorSpec.groovy rename to rd-cli-tool/src/test/groovy/org/rundeck/client/util/FormAuthInterceptorSpec.groovy diff --git a/rd-tool/src/test/groovy/org/rundeck/client/util/FormatSpec.groovy b/rd-cli-tool/src/test/groovy/org/rundeck/client/util/FormatSpec.groovy similarity index 100% rename from rd-tool/src/test/groovy/org/rundeck/client/util/FormatSpec.groovy rename to rd-cli-tool/src/test/groovy/org/rundeck/client/util/FormatSpec.groovy diff --git a/rd-tool/src/test/groovy/org/rundeck/client/util/QuotingSpec.groovy b/rd-cli-tool/src/test/groovy/org/rundeck/client/util/QuotingSpec.groovy similarity index 100% rename from rd-tool/src/test/groovy/org/rundeck/client/util/QuotingSpec.groovy rename to rd-cli-tool/src/test/groovy/org/rundeck/client/util/QuotingSpec.groovy diff --git a/rd-tool/src/test/groovy/org/rundeck/client/util/RedirectBypassInterceptorSpec.groovy b/rd-cli-tool/src/test/groovy/org/rundeck/client/util/RedirectBypassInterceptorSpec.groovy similarity index 100% rename from rd-tool/src/test/groovy/org/rundeck/client/util/RedirectBypassInterceptorSpec.groovy rename to rd-cli-tool/src/test/groovy/org/rundeck/client/util/RedirectBypassInterceptorSpec.groovy diff --git a/settings.gradle b/settings.gradle index c41b635e..279156d3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -14,4 +14,4 @@ * limitations under the License. */ -include 'rd-api-client', 'rd-tool' +include 'rd-api-client', 'rd-cli-tool' From 14573a8bd13df1a7fc44a4b9c7ed0528c27908ff Mon Sep 17 00:00:00 2001 From: Greg Schueler Date: Wed, 5 Jun 2019 09:41:00 -0700 Subject: [PATCH 3/5] Update travis --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7a4a0c1d..2e3e2290 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,10 +35,10 @@ deploy: api_key: secure: E5dKfiXBUTFpIJFWSk2+jBcS6FdO++DHqqGp8XDtrrCpKJfynYqPR+/23oYKYVz+H21CnEiUTqtVKvlftccWbErcRAD3R0G1bw6efj3TNiBb0Z0dRa8qgP+3NVTWhRZ4hwSn/0mClY96kz3cEjiJlBs6lYgneKlmg2As++LDjGIWZEfPUBXK6gtG69ZtMj2NBibKg1KQWZV6nZApBvYtkGJJqhu82jlDMbi5ltaOayVl4ISy0NlfcyW9ZNeLsCgjq9NVl5UV7ti6wB25fosz3fc7OZVF0SlU7Txg5Gi0bsnvRAijZRpZQwuo0Dza3Tqv6YDTXmfZT8qaqF6+SGNBH1BLSVApk2pBddJATzM5o0SZkuywUK4tMq6qCJjdPgMXnR4b/t3jK5f5w/ahWgYsqU7z7dBpxDDWafDFibkylJEQaUexktYdxq7JQZ5F6CNcT+qkPhj6LELR9eYh22xnuorwh6sfBfQqWJ0zveD9IcAv4Fl0ogXniftaLxRJ+G9vSQtzruWCTQRT3Ys2eIjc67wI47uMFcU5naM/YDt9BAQZzBoP9vKGiiyRwoa5kqpEy++qtod8oQTN1mw0B3BubrtlDAKirp8S+Zoix7EAvBt0abIO+zOvblUAjzb4zf2DxXkakvWZ4hxq8LnOItxItyBBRbDxiNYigYd8lRW0los= file: - - build/distributions/rd-*.zip - - build/distributions/rundeck-cli*.rpm - - build/distributions/rundeck-cli*.deb - - build/libs/rundeck-cli-*-all.jar + - rd-cli-tool/build/distributions/rd-*.zip + - rd-cli-tool/build/distributions/rundeck-cli*.rpm + - rd-cli-tool/build/distributions/rundeck-cli*.deb + - rd-cli-tool/build/libs/rundeck-cli-*-all.jar - rd-api-client/build/libs/rd-api-client-*.jar on: repo: rundeck/rundeck-cli From 15ebde5047574561e54cf1af7b75bb20af47db17 Mon Sep 17 00:00:00 2001 From: Greg Schueler Date: Wed, 5 Jun 2019 10:52:25 -0700 Subject: [PATCH 4/5] Fix: deb/rpm install scripts to use correct build path --- scripts/deb-install.sh | 4 ++-- scripts/rpm-install.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/deb-install.sh b/scripts/deb-install.sh index 1252aba1..b0e20df7 100644 --- a/scripts/deb-install.sh +++ b/scripts/deb-install.sh @@ -2,8 +2,8 @@ set -euo pipefail -debfile=$(ls build/distributions/rundeck-cli_*-1_all.deb) +debfile=$(ls rd-cli-tool/build/distributions/rundeck-cli_*-1_all.deb) cp $debfile dockers/install/debian/rundeck-cli_all.deb docker build dockers/install/debian -t rdcli-deb -docker run -it rdcli-deb rd pond \ No newline at end of file +docker run -it rdcli-deb rd pond diff --git a/scripts/rpm-install.sh b/scripts/rpm-install.sh index ac858f87..5412a2e1 100644 --- a/scripts/rpm-install.sh +++ b/scripts/rpm-install.sh @@ -2,7 +2,7 @@ set -euo pipefail -rpmfile=$(ls build/distributions/rundeck-cli-*.noarch.rpm) +rpmfile=$(ls rd-cli-tool/build/distributions/rundeck-cli-*.noarch.rpm) cp $rpmfile dockers/install/rpm/rundeck-cli-noarch.rpm docker build dockers/install/rpm -t rdcli-rpm-install From 25ac4e27efa4411d9579c77161135673b56f8d54 Mon Sep 17 00:00:00 2001 From: Greg Schueler Date: Thu, 20 Jun 2019 15:09:33 -0700 Subject: [PATCH 5/5] Update gradle to use maven publishing for bintray --- .travis.yml | 6 +- build.gradle | 3 - gradle/bintray.gradle | 32 ++++++----- rd-api-client/build.gradle | 115 ++++++++++++++++++++++++------------- rd-cli-tool/build.gradle | 3 + 5 files changed, 101 insertions(+), 58 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2e3e2290..6fe6cfd2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,9 +46,9 @@ deploy: file_glob: true skip_cleanup: true after_deploy: -- ./gradlew -PbintrayUser=gschueler -PbintrayUserOrg=rundeck -PbintrayRepo=rundeck-rpm -Pcomponent=rpm bintrayUpload -- ./gradlew -PbintrayUser=gschueler -PbintrayUserOrg=rundeck -PbintrayRepo=rundeck-deb -Pcomponent=deb bintrayUpload -- ./gradlew -PbintrayUser=gschueler -PbintrayUserOrg=rundeck -PbintrayRepo=rundeck-maven -Pcomponent=api bintrayUpload +- ./gradlew -p rd-cli-tool -PbintrayUser=gschueler -PbintrayUserOrg=rundeck -PbintrayRepo=rundeck-rpm -Pcomponent=rpm bintrayUpload +- ./gradlew -p rd-cli-tool -PbintrayUser=gschueler -PbintrayUserOrg=rundeck -PbintrayRepo=rundeck-deb -Pcomponent=deb bintrayUpload +- ./gradlew -p rd-api-client -PbintrayUser=gschueler -PbintrayUserOrg=rundeck -PbintrayRepo=rundeck-maven bintrayUpload env: global: - secure: 2LDWRCZsuUYNUNHQz4oiaq9VIcdp0ziI7SKBxUxfqT4rehJ0J7kz+UPqwtgxMiUyQaHJQqzkcR+m6H3VZj9BREY+POiyu+yJOqhe3KRpDAfiN/gnwN81Nh9wloVaxyVe6i5yPaaBvE5vIREi7SAUdDtdsQ6WSkQ3JnaSL5Nz6e3DKR6+wgaTmBhh/TTW1YuN1qo5EjBpm0//M+KwY5BvVYOfPYLHCpVqnWFePQBkZY13lvufC5XPipXMf6c5Un/Uy6oVaRgLSPHDyELQvBzMSRPtzNmJSDm75LvclHHgDYEUcrcxRoWgAEISaBeIpGhe/PnsswCtQMfQBIm0W8Cv+HThbdCrrTdz/hWsohVvLFkCl9L8NOTOnATr2I9F0GBmsdhJvvr10JqGGol8Y9wwu5eiO9AWmchjZPicIWj5Dwo9E8AdT20aX4l287StESedS/Wtqh7gdf4d3Y1svWLEmh3gbERqOI9hRDV0DotfumhaW49SbaN/XecODiyPrnLBONSrYk1bWADDAvBZm/Jy0hvFbaVFFI8HfZMVJCO4GJJwna2MEMnsouNl2eDBFtvX5JHQ00JP4QacPFwW3/0NsgdaUGLiPSNezNJ1kBYtVbhQg4oL3yTkFaU6KuGhJcdSCVJUwOeP0YZF0oklofLhEhc4puzAi6EmGvLpMeh/huw= diff --git a/build.gradle b/build.gradle index 7124c330..bddef342 100644 --- a/build.gradle +++ b/build.gradle @@ -155,9 +155,6 @@ task changeLog(){ } } - -apply from: 'gradle/bintray.gradle' - task wrapper(type: Wrapper) { gradleVersion = '4.7' } diff --git a/gradle/bintray.gradle b/gradle/bintray.gradle index 0d48e0dd..3a780c5b 100644 --- a/gradle/bintray.gradle +++ b/gradle/bintray.gradle @@ -15,12 +15,6 @@ */ -def components = [ - rpm: [patterns: ['*.rpm'], dir: "$buildDir/distributions", name: 'rundeck-cli', desc: 'Rundeck CLI Tools'], - deb: [patterns: ['*.deb'], dir: "$buildDir/distributions", name: 'rundeck-cli', desc: 'Rundeck CLI Tools'], - api: [patterns: ['*.jar','pom.xml'], dir: "rd-api-client/build/libs", name: 'rd-api-client', desc: 'Rundeck API Lib'], -] - def bintrayUser = project.hasProperty('bintrayUser') ? project.property('bintrayUser') : System.getenv('BINTRAY_USER') def bintrayKey = project.hasProperty('bintrayApiKey') ? project.property('bintrayApiKey') : System.getenv('BINTRAY_API_KEY') @@ -35,6 +29,11 @@ def bintrayRepo = project.hasProperty('bintrayRepo') ? project.property('bintray if (bintrayUser && bintrayKey && bintrayRepo) { + def components = [ + rpm: [pat: '*.rpm'], + deb: [pat: '*.deb'], + ] + def component = ( project.hasProperty('component') ? project.property('component') : System.getenv('BINTRAY_UPLOAD_COMPONENT') @@ -50,19 +49,20 @@ if (bintrayUser && bintrayKey && bintrayRepo) { bintray { user = bintrayUser key = bintrayKey + filesSpec { - from(components[component].dir) { - components[component].patterns.each { - include it - } + from("$buildDir/distributions") { + include components[component].pat } + into "." } + dryRun = false publish = true override = true pkg { - name = components[component].name + name = 'rundeck-cli' repo = bintrayRepo if(bintrayUserOrg) { userOrg = bintrayUserOrg @@ -73,10 +73,16 @@ if (bintrayUser && bintrayKey && bintrayRepo) { issueTrackerUrl = 'https://github.com/rundeck/rundeck-cli/issues' githubRepo = 'rundeck/rundeck-cli' //Optional Github repository githubReleaseNotesFile = 'README.md' //Optional Github readme file - + if(component=='deb'){ + debian { + distribution = 'any' + component = 'main' + architecture = 'noarch' + } + } version { name = rpmVersion - desc = "${components[component].desc} ${rpmVersion}" + desc = "Rundeck CLI Tools ${rpmVersion}" vcsTag = "v${rpmVersion}" } } diff --git a/rd-api-client/build.gradle b/rd-api-client/build.gradle index 91f081e5..f2662727 100644 --- a/rd-api-client/build.gradle +++ b/rd-api-client/build.gradle @@ -6,6 +6,8 @@ buildscript { } plugins{ id 'de.fuerstenau.buildconfig' version '1.1.8' + id 'maven' + id 'maven-publish' } @@ -81,49 +83,84 @@ artifacts { archives sourceJar archives javadocJar } -ext.pomClosure = { - project { - artifactId project.name - groupId project.group - inceptionYear '2017' - packaging 'jar' - version version - name "Rundeck API Library ${project.version}" - description project.description ?: 'Rundeck API Library' - url 'http://rundeck.org' - licenses { - license { - name 'The Apache Software License, Version 2.0' - url 'http://www.apache.org/licenses/LICENSE-2.0.txt' - distribution 'repo' - } +def pomConfig = { + licenses { + license { + name 'The Apache Software License, Version 2.0' + url 'http://www.apache.org/licenses/LICENSE-2.0.txt' + distribution 'repo' } - scm { - url 'https://github.com/rundeck/rundeck-cli' - connection 'scm:git:git@github.com/rundeck/rundeck-cli.git' - developerConnection 'scm:git:git@github.com:rundeck/rundeck-cli.git' + } + scm { + url 'https://github.com/rundeck/rundeck-cli' + connection 'scm:git:git@github.com/rundeck/rundeck-cli.git' + developerConnection 'scm:git:git@github.com:rundeck/rundeck-cli.git' + } + developers { + developer { + id('gschueler') + name('Greg Schueler') + email('greg@rundeck.com') } - developers { - developer { - id('gschueler') - name('Greg Schueler') - email('greg@rundeck.com') + } +} +publishing { + publications { + rdApiClientPublication(MavenPublication) { + from components.java + artifact sourceJar + artifact javadocJar + artifact testJar + + pom.withXml { + def root = asNode() + root.appendNode('description', project.description ?: 'Rundeck API Library') + root.appendNode('name', "Rundeck API Library ${project.version}") + root.appendNode('url', 'https://github.com/rundeck/rundeck-cli') + root.children().last() + pomConfig } - } - parent { - groupId('org.sonatype.oss') - artifactId('oss-parent') - version('7') + } } } -// -//install{ -// repositories.mavenInstaller { -// pom(pomClosure) -// } -//} - -task('createPom').doLast { - pom(pomClosure).writeTo("${buildDir}/poms/${project.name}-${project.version}.pom") + +def bintrayUser = project.hasProperty('bintrayUser') ? project.property('bintrayUser') : System.getenv('BINTRAY_USER') +def bintrayKey = project.hasProperty('bintrayApiKey') ? project.property('bintrayApiKey') : + System.getenv('BINTRAY_API_KEY') +def bintrayUserOrg = project.hasProperty('bintrayUserOrg') ? project.property('bintrayUserOrg') : + System.getenv('BINTRAY_USER_ORG') +def bintrayRepo = project.hasProperty('bintrayRepo') ? project.property('bintrayRepo') : + System.getenv('BINTRAY_REPO') + +if (bintrayUser && bintrayKey && bintrayRepo) { + + apply plugin: 'com.jfrog.bintray' + bintray { + user = bintrayUser + key = bintrayKey + publications = ['rdApiClientPublication'] + + dryRun = false + publish = true + override = true + pkg { + name = project.name + repo = bintrayRepo + if (bintrayUserOrg) { + userOrg = bintrayUserOrg + } + licenses = ['Apache-2.0'] + vcsUrl = 'https://github.com/rundeck/rundeck-cli.git' + websiteUrl = 'https://github.com/rundeck/rundeck-cli' + issueTrackerUrl = 'https://github.com/rundeck/rundeck-cli/issues' + githubRepo = 'rundeck/rundeck-cli' //Optional Github repository + githubReleaseNotesFile = 'README.md' //Optional Github readme file + + version { + name = rpmVersion + desc = "${description} ${rpmVersion}" + vcsTag = "v${rpmVersion}" + } + } + } } diff --git a/rd-cli-tool/build.gradle b/rd-cli-tool/build.gradle index 96b0c9f8..20ed35a4 100644 --- a/rd-cli-tool/build.gradle +++ b/rd-cli-tool/build.gradle @@ -177,3 +177,6 @@ ospackage { buildDeb.dependsOn shadowDistZip buildRpm.dependsOn shadowDistZip assemble.dependsOn buildRpm, buildDeb + + +apply from: '../gradle/bintray.gradle'