From commits-return-18611-apmail-airavata-commits-archive=airavata.apache.org@airavata.apache.org Wed Dec 6 03:14:00 2017 Return-Path: X-Original-To: apmail-airavata-commits-archive@www.apache.org Delivered-To: apmail-airavata-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9A3B417B41 for ; Wed, 6 Dec 2017 03:13:59 +0000 (UTC) Received: (qmail 20321 invoked by uid 500); 6 Dec 2017 03:13:55 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 20094 invoked by uid 500); 6 Dec 2017 03:13:50 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 19586 invoked by uid 99); 6 Dec 2017 03:13:48 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Dec 2017 03:13:48 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 8115682080; Wed, 6 Dec 2017 03:13:46 +0000 (UTC) Date: Wed, 06 Dec 2017 03:13:52 +0000 To: "commits@airavata.apache.org" Subject: [airavata-sandbox] 08/19: Optimizing maven imports and adding docker build plugins to tasks MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: smarru@apache.org In-Reply-To: <151253002492.6961.4711355333669269177@gitbox.apache.org> References: <151253002492.6961.4711355333669269177@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: airavata-sandbox X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Rev: e83184a0a26e7a00144b0c078b7bc4508233bc80 X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20171206031346.8115682080@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. smarru pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/airavata-sandbox.git commit e83184a0a26e7a00144b0c078b7bc4508233bc80 Author: dimuthu.upeksha2@gmail.com AuthorDate: Mon Nov 20 20:40:02 2017 +0530 Optimizing maven imports and adding docker build plugins to tasks --- airavata-kubernetes/modules/helix-task-api/pom.xml | 2 - .../apache/airavata/helix/api/AbstractTask.java | 1 - .../modules/microservices/helix-controller/pom.xml | 41 +------------- .../microservices/tasks/command-task/pom.xml | 63 +++++++++++++++++++++- .../src/main/resources/log4j.properties | 9 ++++ .../microservices/tasks/data-in-task/pom.xml | 62 ++++++++++++++++++++- .../src/main/resources/log4j.properties | 9 ++++ .../microservices/tasks/data-out-task/pom.xml | 62 ++++++++++++++++++++- .../src/main/resources/log4j.properties | 9 ++++ airavata-kubernetes/pom.xml | 25 +++++++++ 10 files changed, 237 insertions(+), 46 deletions(-) diff --git a/airavata-kubernetes/modules/helix-task-api/pom.xml b/airavata-kubernetes/modules/helix-task-api/pom.xml index e2363e6..6116e4f 100644 --- a/airavata-kubernetes/modules/helix-task-api/pom.xml +++ b/airavata-kubernetes/modules/helix-task-api/pom.xml @@ -30,7 +30,6 @@ org.apache.helix helix-core - 0.6.7 org.springframework @@ -50,7 +49,6 @@ org.apache.kafka kafka-clients - 0.10.1.1 diff --git a/airavata-kubernetes/modules/helix-task-api/src/main/java/org/apache/airavata/helix/api/AbstractTask.java b/airavata-kubernetes/modules/helix-task-api/src/main/java/org/apache/airavata/helix/api/AbstractTask.java index e7290c2..03589e7 100644 --- a/airavata-kubernetes/modules/helix-task-api/src/main/java/org/apache/airavata/helix/api/AbstractTask.java +++ b/airavata-kubernetes/modules/helix-task-api/src/main/java/org/apache/airavata/helix/api/AbstractTask.java @@ -1,7 +1,6 @@ package org.apache.airavata.helix.api; import org.apache.airavata.k8s.api.resources.compute.ComputeResource; -import org.apache.airavata.k8s.api.resources.task.type.TaskTypeResource; import org.apache.airavata.k8s.compute.api.ComputeOperations; import org.apache.airavata.k8s.compute.impl.MockComputeOperation; import org.apache.airavata.k8s.compute.impl.SSHComputeOperations; diff --git a/airavata-kubernetes/modules/microservices/helix-controller/pom.xml b/airavata-kubernetes/modules/microservices/helix-controller/pom.xml index 9fe9f06..1613030 100644 --- a/airavata-kubernetes/modules/microservices/helix-controller/pom.xml +++ b/airavata-kubernetes/modules/microservices/helix-controller/pom.xml @@ -13,62 +13,23 @@ helix-controller - - org.springframework - spring-web - 3.0.2.RELEASE - - - org.apache.airavata - api-resource - 1.0-SNAPSHOT - - - org.apache.airavata - compute-resource-api - 1.0-SNAPSHOT - - - org.apache.kafka - kafka-clients - 0.10.1.1 - - - commons-io - commons-io - 2.5 - + org.apache.helix helix-core - 0.6.7 org.slf4j slf4j-api - 1.7.5 compile - org.slf4j slf4j-log4j12 - 1.7.5 - - - org.testng - testng - 6.0.1 - - - com.jcraft - jsch - 0.1.53 org.apache.curator curator-framework - 2.8.0 diff --git a/airavata-kubernetes/modules/microservices/tasks/command-task/pom.xml b/airavata-kubernetes/modules/microservices/tasks/command-task/pom.xml index a08c014..a67fefc 100644 --- a/airavata-kubernetes/modules/microservices/tasks/command-task/pom.xml +++ b/airavata-kubernetes/modules/microservices/tasks/command-task/pom.xml @@ -23,6 +23,58 @@ ${java.version} + + + maven-assembly-plugin + + + + org.apache.airavata.helix.task.command.Participant + + + + jar-with-dependencies + + + + + make-assembly + package + + single + + + + + + + + com.spotify + docker-maven-plugin + 1.0.0 + + ${docker.image.prefix}/command-task + java:openjdk-8-jdk-alpine + + 8080 + + ["java","-jar","/${project.build.finalName}-jar-with-dependencies.jar"] + + + / + ${project.build.directory} + ${project.build.finalName}-jar-with-dependencies.jar + + + + + + + build + + + + @@ -32,10 +84,19 @@ helix-task-api 1.0-SNAPSHOT + org.apache.helix helix-core - 0.6.7 + + + org.slf4j + slf4j-api + compile + + + org.slf4j + slf4j-log4j12 diff --git a/airavata-kubernetes/modules/microservices/tasks/command-task/src/main/resources/log4j.properties b/airavata-kubernetes/modules/microservices/tasks/command-task/src/main/resources/log4j.properties new file mode 100644 index 0000000..5e31e3c --- /dev/null +++ b/airavata-kubernetes/modules/microservices/tasks/command-task/src/main/resources/log4j.properties @@ -0,0 +1,9 @@ +# Set root logger level to DEBUG and its only appender to A1. +log4j.rootLogger=INFO, A1 + +# A1 is set to be a ConsoleAppender. +log4j.appender.A1=org.apache.log4j.ConsoleAppender + +# A1 uses PatternLayout. +log4j.appender.A1.layout=org.apache.log4j.PatternLayout +log4j.appender.A1.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n \ No newline at end of file diff --git a/airavata-kubernetes/modules/microservices/tasks/data-in-task/pom.xml b/airavata-kubernetes/modules/microservices/tasks/data-in-task/pom.xml index 866ef14..d6c2fe6 100644 --- a/airavata-kubernetes/modules/microservices/tasks/data-in-task/pom.xml +++ b/airavata-kubernetes/modules/microservices/tasks/data-in-task/pom.xml @@ -23,6 +23,58 @@ ${java.version} + + + maven-assembly-plugin + + + + org.apache.airavata.helix.task.command.Participant + + + + jar-with-dependencies + + + + + make-assembly + package + + single + + + + + + + + com.spotify + docker-maven-plugin + 1.0.0 + + ${docker.image.prefix}/data-in-task + java:openjdk-8-jdk-alpine + + 8080 + + ["java","-jar","/${project.build.finalName}-jar-with-dependencies.jar"] + + + / + ${project.build.directory} + ${project.build.finalName}-jar-with-dependencies.jar + + + + + + + build + + + + @@ -35,7 +87,15 @@ org.apache.helix helix-core - 0.6.7 + + + org.slf4j + slf4j-api + compile + + + org.slf4j + slf4j-log4j12 \ No newline at end of file diff --git a/airavata-kubernetes/modules/microservices/tasks/data-in-task/src/main/resources/log4j.properties b/airavata-kubernetes/modules/microservices/tasks/data-in-task/src/main/resources/log4j.properties new file mode 100644 index 0000000..5e31e3c --- /dev/null +++ b/airavata-kubernetes/modules/microservices/tasks/data-in-task/src/main/resources/log4j.properties @@ -0,0 +1,9 @@ +# Set root logger level to DEBUG and its only appender to A1. +log4j.rootLogger=INFO, A1 + +# A1 is set to be a ConsoleAppender. +log4j.appender.A1=org.apache.log4j.ConsoleAppender + +# A1 uses PatternLayout. +log4j.appender.A1.layout=org.apache.log4j.PatternLayout +log4j.appender.A1.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n \ No newline at end of file diff --git a/airavata-kubernetes/modules/microservices/tasks/data-out-task/pom.xml b/airavata-kubernetes/modules/microservices/tasks/data-out-task/pom.xml index e88a3a0..80c9e87 100644 --- a/airavata-kubernetes/modules/microservices/tasks/data-out-task/pom.xml +++ b/airavata-kubernetes/modules/microservices/tasks/data-out-task/pom.xml @@ -23,6 +23,58 @@ ${java.version} + + + maven-assembly-plugin + + + + org.apache.airavata.helix.task.command.Participant + + + + jar-with-dependencies + + + + + make-assembly + package + + single + + + + + + + + com.spotify + docker-maven-plugin + 1.0.0 + + ${docker.image.prefix}/data-out-task + java:openjdk-8-jdk-alpine + + 8080 + + ["java","-jar","/${project.build.finalName}-jar-with-dependencies.jar"] + + + / + ${project.build.directory} + ${project.build.finalName}-jar-with-dependencies.jar + + + + + + + build + + + + @@ -35,7 +87,15 @@ org.apache.helix helix-core - 0.6.7 + + + org.slf4j + slf4j-api + compile + + + org.slf4j + slf4j-log4j12 diff --git a/airavata-kubernetes/modules/microservices/tasks/data-out-task/src/main/resources/log4j.properties b/airavata-kubernetes/modules/microservices/tasks/data-out-task/src/main/resources/log4j.properties new file mode 100644 index 0000000..5e31e3c --- /dev/null +++ b/airavata-kubernetes/modules/microservices/tasks/data-out-task/src/main/resources/log4j.properties @@ -0,0 +1,9 @@ +# Set root logger level to DEBUG and its only appender to A1. +log4j.rootLogger=INFO, A1 + +# A1 is set to be a ConsoleAppender. +log4j.appender.A1=org.apache.log4j.ConsoleAppender + +# A1 uses PatternLayout. +log4j.appender.A1.layout=org.apache.log4j.PatternLayout +log4j.appender.A1.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n \ No newline at end of file diff --git a/airavata-kubernetes/pom.xml b/airavata-kubernetes/pom.xml index 30439d3..30b9226 100644 --- a/airavata-kubernetes/pom.xml +++ b/airavata-kubernetes/pom.xml @@ -75,6 +75,31 @@ jsch 0.1.53 + + org.apache.helix + helix-core + 0.6.7 + + + org.apache.kafka + kafka-clients + 0.10.1.1 + + + org.slf4j + slf4j-api + 1.7.5 + + + org.slf4j + slf4j-log4j12 + 1.7.5 + + + org.apache.curator + curator-framework + 2.8.0 + -- To stop receiving notification emails like this one, please contact "commits@airavata.apache.org" .