You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2020/01/06 18:25:41 UTC

[airavata] branch airavata-3281 updated: AIRAVATA-3281 Add missing jars to distribution

This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch airavata-3281
in repository https://gitbox.apache.org/repos/asf/airavata.git


The following commit(s) were added to refs/heads/airavata-3281 by this push:
     new 0f7b264  AIRAVATA-3281 Add missing jars to distribution
0f7b264 is described below

commit 0f7b264d65d5062d2e642133c3d12b0af59fdaa1
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Mon Jan 6 13:25:06 2020 -0500

    AIRAVATA-3281 Add missing jars to distribution
---
 modules/distribution/src/main/assembly/controller-bin-assembly.xml       | 1 +
 modules/distribution/src/main/assembly/email-monitor-bin-assembly.xml    | 1 +
 modules/distribution/src/main/assembly/parser-wm-bin-assembly.xml        | 1 +
 modules/distribution/src/main/assembly/participant-bin-assembly.xml      | 1 +
 modules/distribution/src/main/assembly/platform-monitor-bin-assembly.xml | 1 +
 modules/distribution/src/main/assembly/post-wm-bin-assembly.xml          | 1 +
 modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml           | 1 +
 modules/distribution/src/main/assembly/realtime-monitor-bin-assembly.xml | 1 +
 8 files changed, 8 insertions(+)

diff --git a/modules/distribution/src/main/assembly/controller-bin-assembly.xml b/modules/distribution/src/main/assembly/controller-bin-assembly.xml
index ebda676..1c325a1 100644
--- a/modules/distribution/src/main/assembly/controller-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/controller-bin-assembly.xml
@@ -158,6 +158,7 @@
                 <include>com.101tec:zkclient:jar</include>
                 <include>org.apache.zookeeper:zookeeper:jar</include>
                 <include>org.apache.commons:commons-pool2:jar</include>
+                <include>org.json:json:jar</include>
             </includes>
             <excludes>
                 <exclude>mysql:mysql-connector-java:jar</exclude>
diff --git a/modules/distribution/src/main/assembly/email-monitor-bin-assembly.xml b/modules/distribution/src/main/assembly/email-monitor-bin-assembly.xml
index eda1c06..ae976f2 100644
--- a/modules/distribution/src/main/assembly/email-monitor-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/email-monitor-bin-assembly.xml
@@ -119,6 +119,7 @@
                 <include>com.github.danielwegener:logback-kafka-appender:jar</include>
                 <include>net.logstash.logback:logstash-logback-encoder:jar</include>
                 <include>org.apache.commons:commons-pool2:jar</include>
+                <include>org.json:json:jar</include>
             </includes>
         </dependencySet>
     </dependencySets>
diff --git a/modules/distribution/src/main/assembly/parser-wm-bin-assembly.xml b/modules/distribution/src/main/assembly/parser-wm-bin-assembly.xml
index 88acc08..511c998 100644
--- a/modules/distribution/src/main/assembly/parser-wm-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/parser-wm-bin-assembly.xml
@@ -159,6 +159,7 @@
                 <include>org.apache.zookeeper:zookeeper:jar</include>
                 <include>com.github.docker-java:docker-java:jar</include>
                 <include>org.apache.commons:commons-pool2:jar</include>
+                <include>org.json:json:jar</include>
             </includes>
             <excludes>
                 <exclude>mysql:mysql-connector-java:jar</exclude>
diff --git a/modules/distribution/src/main/assembly/participant-bin-assembly.xml b/modules/distribution/src/main/assembly/participant-bin-assembly.xml
index c541472..811bb2d 100644
--- a/modules/distribution/src/main/assembly/participant-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/participant-bin-assembly.xml
@@ -208,6 +208,7 @@
                 <include>io.netty:netty-transport-native-kqueue:jar</include>
 
                 <include>org.apache.commons:commons-pool2:jar</include>
+                <include>org.json:json:jar</include>
             </includes>
             <excludes>
                 <exclude>mysql:mysql-connector-java:jar</exclude>
diff --git a/modules/distribution/src/main/assembly/platform-monitor-bin-assembly.xml b/modules/distribution/src/main/assembly/platform-monitor-bin-assembly.xml
index cb0546c..a898c13 100644
--- a/modules/distribution/src/main/assembly/platform-monitor-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/platform-monitor-bin-assembly.xml
@@ -158,6 +158,7 @@
                 <include>com.101tec:zkclient:jar</include>
                 <include>org.apache.zookeeper:zookeeper:jar</include>
                 <include>org.apache.commons:commons-pool2:jar</include>
+                <include>org.json:json:jar</include>
             </includes>
             <excludes>
                 <exclude>mysql:mysql-connector-java:jar</exclude>
diff --git a/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml b/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml
index 455dc4e..3d46ec6 100644
--- a/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml
@@ -163,6 +163,7 @@
                 <include>org.apache.zookeeper:zookeeper:jar</include>
                 <include>org.apache.airavata:airavata-security:jar</include>
                 <include>org.apache.commons:commons-pool2:jar</include>
+                <include>org.json:json:jar</include>
             </includes>
             <excludes>
                 <exclude>mysql:mysql-connector-java:jar</exclude>
diff --git a/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml b/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml
index b7f6591..2b26851 100644
--- a/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml
@@ -163,6 +163,7 @@
                 <include>org.apache.airavata:airavata-sharing-registry-stubs:jar</include>
                 <include>org.apache.airavata:airavata-security:jar</include>
                 <include>org.apache.commons:commons-pool2:jar</include>
+                <include>org.json:json:jar</include>
             </includes>
             <excludes>
                 <exclude>mysql:mysql-connector-java:jar</exclude>
diff --git a/modules/distribution/src/main/assembly/realtime-monitor-bin-assembly.xml b/modules/distribution/src/main/assembly/realtime-monitor-bin-assembly.xml
index cf34e15..e1caef9 100644
--- a/modules/distribution/src/main/assembly/realtime-monitor-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/realtime-monitor-bin-assembly.xml
@@ -115,6 +115,7 @@
                 <include>net.logstash.logback:logstash-logback-encoder:jar</include>
 
                 <include>org.apache.commons:commons-pool2:jar</include>
+                <include>org.json:json:jar</include>
             </includes>
         </dependencySet>
     </dependencySets>