From cc83a10666761c1f9169fa445e0d1020f4d307c2 Mon Sep 17 00:00:00 2001 From: Frank Scholten Date: Tue, 24 May 2016 17:33:41 +0200 Subject: [PATCH] #453 Moved cli code into separate module --- bin/minimesos | 4 +- {minimesos => cli}/Dockerfile | 2 +- cli/build.gradle | 125 ++++++++++++++++++ .../containersol/minimesos/main/Command.java | 0 .../minimesos/main/CommandDestroy.java | 0 .../minimesos/main/CommandHelp.java | 0 .../minimesos/main/CommandInfo.java | 0 .../minimesos/main/CommandInit.java | 0 .../minimesos/main/CommandInstall.java | 0 .../minimesos/main/CommandMain.java | 0 .../minimesos/main/CommandPs.java | 0 .../minimesos/main/CommandState.java | 0 .../minimesos/main/CommandUninstall.java | 0 .../minimesos/main/CommandUp.java | 0 .../com/containersol/minimesos/main/Main.java | 0 .../minimesos/main/CommandInitTest.java | 0 .../minimesos/main/CommandPsTest.java | 0 .../minimesos/main/CommandTest.java | 0 .../minimesos/main/CommandUninstallTest.java | 28 ++-- .../minimesos/main/CommandUpTest.java | 0 .../containersol/minimesos/main/MainTest.java | 0 .../src/test/resources/app.json | 0 .../test/resources/clusterconfig/basic.groovy | 0 .../resources/clusterconfig/two-agents.groovy | 0 .../configFiles/complete-minimesosFile | 0 .../configFiles/invalid-minimesosFile.txt | 0 .../marathonAppConfig-minimesosFile | 0 .../configFiles/minimal-minimesosFile | 8 ++ .../configFiles/withMarathon-minimesosFile | 0 cli/src/test/resources/logback-test.xml | 16 +++ minimesos/build.gradle | 83 ------------ settings.gradle | 1 + 32 files changed, 165 insertions(+), 102 deletions(-) rename {minimesos => cli}/Dockerfile (61%) create mode 100644 cli/build.gradle rename {minimesos => cli}/src/main/java/com/containersol/minimesos/main/Command.java (100%) rename {minimesos => cli}/src/main/java/com/containersol/minimesos/main/CommandDestroy.java (100%) rename {minimesos => cli}/src/main/java/com/containersol/minimesos/main/CommandHelp.java (100%) rename {minimesos => cli}/src/main/java/com/containersol/minimesos/main/CommandInfo.java (100%) rename {minimesos => cli}/src/main/java/com/containersol/minimesos/main/CommandInit.java (100%) rename {minimesos => cli}/src/main/java/com/containersol/minimesos/main/CommandInstall.java (100%) rename {minimesos => cli}/src/main/java/com/containersol/minimesos/main/CommandMain.java (100%) rename {minimesos => cli}/src/main/java/com/containersol/minimesos/main/CommandPs.java (100%) rename {minimesos => cli}/src/main/java/com/containersol/minimesos/main/CommandState.java (100%) rename {minimesos => cli}/src/main/java/com/containersol/minimesos/main/CommandUninstall.java (100%) rename {minimesos => cli}/src/main/java/com/containersol/minimesos/main/CommandUp.java (100%) rename {minimesos => cli}/src/main/java/com/containersol/minimesos/main/Main.java (100%) rename {minimesos => cli}/src/test/java/com/containersol/minimesos/main/CommandInitTest.java (100%) rename {minimesos => cli}/src/test/java/com/containersol/minimesos/main/CommandPsTest.java (100%) rename {minimesos => cli}/src/test/java/com/containersol/minimesos/main/CommandTest.java (100%) rename {minimesos => cli}/src/test/java/com/containersol/minimesos/main/CommandUninstallTest.java (62%) rename {minimesos => cli}/src/test/java/com/containersol/minimesos/main/CommandUpTest.java (100%) rename {minimesos => cli}/src/test/java/com/containersol/minimesos/main/MainTest.java (100%) rename {minimesos => cli}/src/test/resources/app.json (100%) rename {minimesos => cli}/src/test/resources/clusterconfig/basic.groovy (100%) rename {minimesos => cli}/src/test/resources/clusterconfig/two-agents.groovy (100%) rename {minimesos => cli}/src/test/resources/configFiles/complete-minimesosFile (100%) rename {minimesos => cli}/src/test/resources/configFiles/invalid-minimesosFile.txt (100%) rename {minimesos => cli}/src/test/resources/configFiles/marathonAppConfig-minimesosFile (100%) create mode 100644 cli/src/test/resources/configFiles/minimal-minimesosFile rename {minimesos => cli}/src/test/resources/configFiles/withMarathon-minimesosFile (100%) create mode 100644 cli/src/test/resources/logback-test.xml diff --git a/bin/minimesos b/bin/minimesos index d033267d..35e8ecba 100755 --- a/bin/minimesos +++ b/bin/minimesos @@ -64,6 +64,6 @@ docker run --rm -v "${MINIMESOS_HOST_DIR}":"${MINIMESOS_HOST_DIR}" \ -i \ --env DOCKER_HOST_IP=${DOCKER_HOST_IP} \ --entrypoint java \ - containersol/minimesos:${MINIMESOS_TAG} \ + containersol/minimesos-cli:${MINIMESOS_TAG} \ -Dminimesos.host.dir="${MINIMESOS_HOST_DIR}" \ - -jar /usr/local/share/minimesos/minimesos.jar ${PARAMS} + -jar /usr/local/share/minimesos/minimesos-cli.jar ${PARAMS} diff --git a/minimesos/Dockerfile b/cli/Dockerfile similarity index 61% rename from minimesos/Dockerfile rename to cli/Dockerfile index 1a69b457..a8731d25 100644 --- a/minimesos/Dockerfile +++ b/cli/Dockerfile @@ -1,4 +1,4 @@ FROM containersol/alpine3.3-java8-jre:v1 MAINTAINER Container Solutions BV -ADD minimesos.jar /usr/local/share/minimesos/minimesos.jar +ADD minimesos-cli.jar /usr/local/share/minimesos/minimesos-cli.jar diff --git a/cli/build.gradle b/cli/build.gradle new file mode 100644 index 00000000..18173178 --- /dev/null +++ b/cli/build.gradle @@ -0,0 +1,125 @@ +import com.bmuschko.gradle.docker.tasks.image.DockerBuildImage +import com.bmuschko.gradle.docker.tasks.image.DockerPushImage +import com.bmuschko.gradle.docker.tasks.image.DockerTagImage + +apply plugin: 'java' +apply plugin: 'application' +apply plugin: 'com.bmuschko.docker-remote-api' + +repositories { + mavenLocal() + mavenCentral() + maven { + url "https://jitpack.io" + } +} + +group = "com.containersol.minimesos" + +dependencies { + compile 'com.beust:jcommander:1.48' + compile 'org.slf4j:slf4j-api:1.7.12' + + compile project(':minimesos') + + testCompile 'junit:junit:4.11' + testCompile "org.mockito:mockito-core:1.+" + // using guru.nidi as maintenanance of the original project is dropped https://github.com/clarkware/jdepend/pull/9 + testCompile "guru.nidi:jdepend:2.9.5" +} + +mainClassName = "com.containersol.minimesos.main.Main" + +ext { + imageName = imagePrefix + '/minimesos-cli' +} + +test { + testLogging { + showStandardStreams = true + } +} + +task executableJar(type: Jar) { + baseName = "minimesos-cli" + from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } } + with jar + manifest { + attributes( + 'Main-Class': mainClassName, + 'Implementation-Version': project.version + ) + } + exclude 'META-INF/*.RSA', 'META-INF/*.SF', 'META-INF/*.DSA' +} + +artifacts { + archives executableJar +} + +task copyFilesForDocker(type: Copy) { + dependsOn 'executableJar' + from "build/libs/minimesos-cli-${project.version}.jar" + into 'build/docker' + rename { String fileName -> + fileName.replace("-${project.version}", "") + } +} + +task copyDockerfile(type: Copy) { + dependsOn 'copyFilesForDocker' + from "Dockerfile" + into 'build/docker' +} + +afterEvaluate { project -> + if (new File(project.projectDir, 'Dockerfile').exists()) { + if (!project.hasProperty('imageName')) { + throw new GradleException('Root directory of ' + project.name + + ' contains Dockerfile, but it does not define project.ext.imageName value') + } + docker.url = 'unix:///var/run/docker.sock' + if (!System.properties['os.name'].equals('Mac OS X')) { + docker.certPath = null + } + if (System.env.DOCKER_HOST) { + docker.url = "$System.env.DOCKER_HOST".replace("tcp", "https") + if (System.env.DOCKER_CERT_PATH) { + docker.certPath = new File(System.env.DOCKER_CERT_PATH) + } + } + task buildDockerImage(type: DockerBuildImage, dependsOn: [copyDockerfile], description: 'build Docker image') { + inputDir = new File("${buildDir}/docker") + tag = project.imageName + } + project.build.dependsOn buildDockerImage + ['snapshot', 'version'].each { aTag -> + String uppercasedName = aTag.capitalize() + task "tagDockerImageWith$uppercasedName"(type: DockerTagImage, description: 'tag Docker image') { + imageId = project.imageName + tag = ('version'.equals(aTag)) ? project.version : aTag + repository = project.imageName + force = true + } + task "publishDockerImageWith$uppercasedName"(type: DockerPushImage, dependsOn: ["tagDockerImageWith$uppercasedName"], + description: 'publish Docker image') { + imageName = project.imageName + tag = ('version'.equals(aTag)) ? project.version : aTag + doFirst { + ['dockerHubUsername', 'dockerHubPassword', 'dockerHubEmail'].each { + assert project.hasProperty(it): 'Undefined "' + it + '" property' + } + docker { + registryCredentials { + username = project.property('dockerHubUsername') + password = project.property('dockerHubPassword') + email = project.property('dockerHubEmail') + } + } + } + } + } + } +} + +assemble.dependsOn executableJar diff --git a/minimesos/src/main/java/com/containersol/minimesos/main/Command.java b/cli/src/main/java/com/containersol/minimesos/main/Command.java similarity index 100% rename from minimesos/src/main/java/com/containersol/minimesos/main/Command.java rename to cli/src/main/java/com/containersol/minimesos/main/Command.java diff --git a/minimesos/src/main/java/com/containersol/minimesos/main/CommandDestroy.java b/cli/src/main/java/com/containersol/minimesos/main/CommandDestroy.java similarity index 100% rename from minimesos/src/main/java/com/containersol/minimesos/main/CommandDestroy.java rename to cli/src/main/java/com/containersol/minimesos/main/CommandDestroy.java diff --git a/minimesos/src/main/java/com/containersol/minimesos/main/CommandHelp.java b/cli/src/main/java/com/containersol/minimesos/main/CommandHelp.java similarity index 100% rename from minimesos/src/main/java/com/containersol/minimesos/main/CommandHelp.java rename to cli/src/main/java/com/containersol/minimesos/main/CommandHelp.java diff --git a/minimesos/src/main/java/com/containersol/minimesos/main/CommandInfo.java b/cli/src/main/java/com/containersol/minimesos/main/CommandInfo.java similarity index 100% rename from minimesos/src/main/java/com/containersol/minimesos/main/CommandInfo.java rename to cli/src/main/java/com/containersol/minimesos/main/CommandInfo.java diff --git a/minimesos/src/main/java/com/containersol/minimesos/main/CommandInit.java b/cli/src/main/java/com/containersol/minimesos/main/CommandInit.java similarity index 100% rename from minimesos/src/main/java/com/containersol/minimesos/main/CommandInit.java rename to cli/src/main/java/com/containersol/minimesos/main/CommandInit.java diff --git a/minimesos/src/main/java/com/containersol/minimesos/main/CommandInstall.java b/cli/src/main/java/com/containersol/minimesos/main/CommandInstall.java similarity index 100% rename from minimesos/src/main/java/com/containersol/minimesos/main/CommandInstall.java rename to cli/src/main/java/com/containersol/minimesos/main/CommandInstall.java diff --git a/minimesos/src/main/java/com/containersol/minimesos/main/CommandMain.java b/cli/src/main/java/com/containersol/minimesos/main/CommandMain.java similarity index 100% rename from minimesos/src/main/java/com/containersol/minimesos/main/CommandMain.java rename to cli/src/main/java/com/containersol/minimesos/main/CommandMain.java diff --git a/minimesos/src/main/java/com/containersol/minimesos/main/CommandPs.java b/cli/src/main/java/com/containersol/minimesos/main/CommandPs.java similarity index 100% rename from minimesos/src/main/java/com/containersol/minimesos/main/CommandPs.java rename to cli/src/main/java/com/containersol/minimesos/main/CommandPs.java diff --git a/minimesos/src/main/java/com/containersol/minimesos/main/CommandState.java b/cli/src/main/java/com/containersol/minimesos/main/CommandState.java similarity index 100% rename from minimesos/src/main/java/com/containersol/minimesos/main/CommandState.java rename to cli/src/main/java/com/containersol/minimesos/main/CommandState.java diff --git a/minimesos/src/main/java/com/containersol/minimesos/main/CommandUninstall.java b/cli/src/main/java/com/containersol/minimesos/main/CommandUninstall.java similarity index 100% rename from minimesos/src/main/java/com/containersol/minimesos/main/CommandUninstall.java rename to cli/src/main/java/com/containersol/minimesos/main/CommandUninstall.java diff --git a/minimesos/src/main/java/com/containersol/minimesos/main/CommandUp.java b/cli/src/main/java/com/containersol/minimesos/main/CommandUp.java similarity index 100% rename from minimesos/src/main/java/com/containersol/minimesos/main/CommandUp.java rename to cli/src/main/java/com/containersol/minimesos/main/CommandUp.java diff --git a/minimesos/src/main/java/com/containersol/minimesos/main/Main.java b/cli/src/main/java/com/containersol/minimesos/main/Main.java similarity index 100% rename from minimesos/src/main/java/com/containersol/minimesos/main/Main.java rename to cli/src/main/java/com/containersol/minimesos/main/Main.java diff --git a/minimesos/src/test/java/com/containersol/minimesos/main/CommandInitTest.java b/cli/src/test/java/com/containersol/minimesos/main/CommandInitTest.java similarity index 100% rename from minimesos/src/test/java/com/containersol/minimesos/main/CommandInitTest.java rename to cli/src/test/java/com/containersol/minimesos/main/CommandInitTest.java diff --git a/minimesos/src/test/java/com/containersol/minimesos/main/CommandPsTest.java b/cli/src/test/java/com/containersol/minimesos/main/CommandPsTest.java similarity index 100% rename from minimesos/src/test/java/com/containersol/minimesos/main/CommandPsTest.java rename to cli/src/test/java/com/containersol/minimesos/main/CommandPsTest.java diff --git a/minimesos/src/test/java/com/containersol/minimesos/main/CommandTest.java b/cli/src/test/java/com/containersol/minimesos/main/CommandTest.java similarity index 100% rename from minimesos/src/test/java/com/containersol/minimesos/main/CommandTest.java rename to cli/src/test/java/com/containersol/minimesos/main/CommandTest.java diff --git a/minimesos/src/test/java/com/containersol/minimesos/main/CommandUninstallTest.java b/cli/src/test/java/com/containersol/minimesos/main/CommandUninstallTest.java similarity index 62% rename from minimesos/src/test/java/com/containersol/minimesos/main/CommandUninstallTest.java rename to cli/src/test/java/com/containersol/minimesos/main/CommandUninstallTest.java index d732d5a7..d0933ab2 100644 --- a/minimesos/src/test/java/com/containersol/minimesos/main/CommandUninstallTest.java +++ b/cli/src/test/java/com/containersol/minimesos/main/CommandUninstallTest.java @@ -6,18 +6,14 @@ import com.containersol.minimesos.cluster.MesosCluster; import com.containersol.minimesos.cluster.MesosClusterFactory; import org.apache.commons.io.output.ByteArrayOutputStream; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.mockito.Matchers; +import org.mockito.Mockito; import java.io.PrintStream; -import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.any; -import static org.mockito.Mockito.doNothing; -import static org.mockito.Mockito.doThrow; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - public class CommandUninstallTest { private ByteArrayOutputStream outputStream; @@ -33,13 +29,13 @@ public void initTest() { outputStream = new ByteArrayOutputStream(); ps = new PrintStream(outputStream, true); - marathon = mock(Marathon.class); + marathon = Mockito.mock(Marathon.class); - mesosCluster = mock(MesosCluster.class); - when(mesosCluster.getMarathon()).thenReturn(marathon); + mesosCluster = Mockito.mock(MesosCluster.class); + Mockito.when(mesosCluster.getMarathon()).thenReturn(marathon); - repository = mock(ClusterRepository.class); - when(repository.loadCluster(any(MesosClusterFactory.class))).thenReturn(mesosCluster); + repository = Mockito.mock(ClusterRepository.class); + Mockito.when(repository.loadCluster(Matchers.any(MesosClusterFactory.class))).thenReturn(mesosCluster); commandUninstall = new CommandUninstall(ps); commandUninstall.setRepository(repository); @@ -48,21 +44,21 @@ public void initTest() { @Test public void execute() { - doNothing().when(marathon).deleteApp("app"); + Mockito.doNothing().when(marathon).deleteApp("app"); commandUninstall.execute(); String result = outputStream.toString(); - assertEquals("Deleted app 'app'\n", result); + Assert.assertEquals("Deleted app 'app'\n", result); } @Test public void execute_appDoesNotExist() { - doThrow(new MinimesosException("App does not exist")).when(marathon).deleteApp("app"); + Mockito.doThrow(new MinimesosException("App does not exist")).when(marathon).deleteApp("app"); commandUninstall.execute(); String result = outputStream.toString(); - assertEquals("", result); + Assert.assertEquals("", result); } } diff --git a/minimesos/src/test/java/com/containersol/minimesos/main/CommandUpTest.java b/cli/src/test/java/com/containersol/minimesos/main/CommandUpTest.java similarity index 100% rename from minimesos/src/test/java/com/containersol/minimesos/main/CommandUpTest.java rename to cli/src/test/java/com/containersol/minimesos/main/CommandUpTest.java diff --git a/minimesos/src/test/java/com/containersol/minimesos/main/MainTest.java b/cli/src/test/java/com/containersol/minimesos/main/MainTest.java similarity index 100% rename from minimesos/src/test/java/com/containersol/minimesos/main/MainTest.java rename to cli/src/test/java/com/containersol/minimesos/main/MainTest.java diff --git a/minimesos/src/test/resources/app.json b/cli/src/test/resources/app.json similarity index 100% rename from minimesos/src/test/resources/app.json rename to cli/src/test/resources/app.json diff --git a/minimesos/src/test/resources/clusterconfig/basic.groovy b/cli/src/test/resources/clusterconfig/basic.groovy similarity index 100% rename from minimesos/src/test/resources/clusterconfig/basic.groovy rename to cli/src/test/resources/clusterconfig/basic.groovy diff --git a/minimesos/src/test/resources/clusterconfig/two-agents.groovy b/cli/src/test/resources/clusterconfig/two-agents.groovy similarity index 100% rename from minimesos/src/test/resources/clusterconfig/two-agents.groovy rename to cli/src/test/resources/clusterconfig/two-agents.groovy diff --git a/minimesos/src/test/resources/configFiles/complete-minimesosFile b/cli/src/test/resources/configFiles/complete-minimesosFile similarity index 100% rename from minimesos/src/test/resources/configFiles/complete-minimesosFile rename to cli/src/test/resources/configFiles/complete-minimesosFile diff --git a/minimesos/src/test/resources/configFiles/invalid-minimesosFile.txt b/cli/src/test/resources/configFiles/invalid-minimesosFile.txt similarity index 100% rename from minimesos/src/test/resources/configFiles/invalid-minimesosFile.txt rename to cli/src/test/resources/configFiles/invalid-minimesosFile.txt diff --git a/minimesos/src/test/resources/configFiles/marathonAppConfig-minimesosFile b/cli/src/test/resources/configFiles/marathonAppConfig-minimesosFile similarity index 100% rename from minimesos/src/test/resources/configFiles/marathonAppConfig-minimesosFile rename to cli/src/test/resources/configFiles/marathonAppConfig-minimesosFile diff --git a/cli/src/test/resources/configFiles/minimal-minimesosFile b/cli/src/test/resources/configFiles/minimal-minimesosFile new file mode 100644 index 00000000..cc9953e8 --- /dev/null +++ b/cli/src/test/resources/configFiles/minimal-minimesosFile @@ -0,0 +1,8 @@ +minimesos { + clusterName = "minimesos-test" + mapPortsToHost = false + loggingLevel = "INFO" + mapAgentSandboxVolume = false + mesosVersion = "0.25" + timeout = 60 +} diff --git a/minimesos/src/test/resources/configFiles/withMarathon-minimesosFile b/cli/src/test/resources/configFiles/withMarathon-minimesosFile similarity index 100% rename from minimesos/src/test/resources/configFiles/withMarathon-minimesosFile rename to cli/src/test/resources/configFiles/withMarathon-minimesosFile diff --git a/cli/src/test/resources/logback-test.xml b/cli/src/test/resources/logback-test.xml new file mode 100644 index 00000000..9ca08a9b --- /dev/null +++ b/cli/src/test/resources/logback-test.xml @@ -0,0 +1,16 @@ + + + + System.out + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36}: %msg%n + + + + + + + + + + diff --git a/minimesos/build.gradle b/minimesos/build.gradle index 1036b4e0..abbcef2e 100644 --- a/minimesos/build.gradle +++ b/minimesos/build.gradle @@ -1,11 +1,3 @@ -import com.bmuschko.gradle.docker.tasks.image.DockerBuildImage -import com.bmuschko.gradle.docker.tasks.image.DockerPushImage -import com.bmuschko.gradle.docker.tasks.image.DockerTagImage - -ext { - imageName = imagePrefix + '/minimesos' -} - tasks.withType(JavaCompile) { options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation" } @@ -104,29 +96,6 @@ task installMinimesosScript(type: Copy) { into "/usr/local/bin" } -task copyExecutableJar(type: Copy) { - dependsOn 'executableJar' - rename { String fileName -> - fileName.replace("-${project.version}-all", "") - } - from "build/libs/minimesos-${project.version}-all.jar" - into 'build/libs' -} - -task copyFilesForDocker(type: Copy) { - dependsOn 'copyExecutableJar' - from "build/libs/minimesos.jar" - into 'build/docker' - rename { String fileName -> - fileName.replace("-${project.version}", "") - } -} - -task copyDockerfile(type: Copy) { - dependsOn 'copyFilesForDocker' - from "Dockerfile" - into 'build/docker' -} artifacts { archives executableJar @@ -138,55 +107,3 @@ test { } } -afterEvaluate { project -> - if (new File(project.projectDir, 'Dockerfile').exists()) { - if (!project.hasProperty('imageName')) { - throw new GradleException('Root directory of ' + project.name - + ' contains Dockerfile, but it does not define project.ext.imageName value') - } - docker.url = 'unix:///var/run/docker.sock' - if (!System.properties['os.name'].equals('Mac OS X')) { - docker.certPath = null - } - if (System.env.DOCKER_HOST) { - docker.url = "$System.env.DOCKER_HOST".replace("tcp", "https") - if (System.env.DOCKER_CERT_PATH) { - docker.certPath = new File(System.env.DOCKER_CERT_PATH) - } - } - task buildDockerImage(type: DockerBuildImage, dependsOn: [copyDockerfile], description: 'build Docker image') { - inputDir = new File("${buildDir}/docker") - tag = project.imageName - } - project.build.dependsOn buildDockerImage - ['snapshot', 'version'].each { aTag -> - String uppercasedName = aTag.capitalize() - task "tagDockerImageWith$uppercasedName"(type: DockerTagImage, description: 'tag Docker image') { - imageId = project.imageName - tag = ('version'.equals(aTag)) ? project.version : aTag - repository = project.imageName - force = true - } - task "publishDockerImageWith$uppercasedName"(type: DockerPushImage, dependsOn: ["tagDockerImageWith$uppercasedName"], - description: 'publish Docker image') { - imageName = project.imageName - tag = ('version'.equals(aTag)) ? project.version : aTag - doFirst { - ['dockerHubUsername', 'dockerHubPassword', 'dockerHubEmail'].each { - assert project.hasProperty(it): 'Undefined "' + it + '" property' - } - docker { - registryCredentials { - username = project.property('dockerHubUsername') - password = project.property('dockerHubPassword') - email = project.property('dockerHubEmail') - } - } - } - } - } - } -} - -assemble.dependsOn copyExecutableJar -// install.dependsOn installMinimesosScript diff --git a/settings.gradle b/settings.gradle index f555000e..ea472a58 100644 --- a/settings.gradle +++ b/settings.gradle @@ -3,3 +3,4 @@ include "minimesos" include "test-framework-docker:scheduler" include "test-framework-docker:executor" include "test-framework-docker:system-test" +include "cli"