You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by di...@apache.org on 2019/10/28 21:17:20 UTC
[airavata] branch staging updated: Fixing missing libraries in
distribution
This is an automated email from the ASF dual-hosted git repository.
dimuthuupe pushed a commit to branch staging
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/staging by this push:
new 43453fd Fixing missing libraries in distribution
43453fd is described below
commit 43453fd6b4d1e8715eeeb3a75f7b88fc7f8a11ce
Author: Dimuthu Wannipurage <di...@gmail.com>
AuthorDate: Mon Oct 28 17:17:08 2019 -0400
Fixing missing libraries in distribution
---
modules/commons/pom.xml | 1 -
modules/distribution/pom.xml | 6 ++++++
modules/distribution/src/main/assembly/controller-bin-assembly.xml | 1 +
.../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 +
.../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 +
.../src/main/assembly/realtime-monitor-bin-assembly.xml | 2 ++
pom.xml | 6 ++++++
11 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/modules/commons/pom.xml b/modules/commons/pom.xml
index 76a3ce9..220714b 100644
--- a/modules/commons/pom.xml
+++ b/modules/commons/pom.xml
@@ -59,7 +59,6 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
- <version>2.7.0</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index e3ed654..245723a 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -441,6 +441,12 @@
<artifactId>realtime-monitor</artifactId>
<version>${project.version}</version>
</dependency>
+
+ <!-- For thrift client pool -->
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-pool2</artifactId>
+ </dependency>
</dependencies>
<url>http://airavata.apache.org/</url>
diff --git a/modules/distribution/src/main/assembly/controller-bin-assembly.xml b/modules/distribution/src/main/assembly/controller-bin-assembly.xml
index 8d90709..ebda676 100644
--- a/modules/distribution/src/main/assembly/controller-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/controller-bin-assembly.xml
@@ -157,6 +157,7 @@
<include>org.ogce:xpp5:jar</include>
<include>com.101tec:zkclient:jar</include>
<include>org.apache.zookeeper:zookeeper:jar</include>
+ <include>org.apache.commons:commons-pool2: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 9b9ca22..eda1c06 100644
--- a/modules/distribution/src/main/assembly/email-monitor-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/email-monitor-bin-assembly.xml
@@ -118,6 +118,7 @@
<include>org.slf4j:log4j-over-slf4j:jar</include>
<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>
</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 2cb2c64..88acc08 100644
--- a/modules/distribution/src/main/assembly/parser-wm-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/parser-wm-bin-assembly.xml
@@ -158,6 +158,7 @@
<include>com.101tec:zkclient:jar</include>
<include>org.apache.zookeeper:zookeeper:jar</include>
<include>com.github.docker-java:docker-java:jar</include>
+ <include>org.apache.commons:commons-pool2: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 386f809..c541472 100644
--- a/modules/distribution/src/main/assembly/participant-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/participant-bin-assembly.xml
@@ -207,6 +207,7 @@
<include>io.netty:netty-transport-native-unix-common:jar</include>
<include>io.netty:netty-transport-native-kqueue:jar</include>
+ <include>org.apache.commons:commons-pool2: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 4fc0a9d..cb0546c 100644
--- a/modules/distribution/src/main/assembly/platform-monitor-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/platform-monitor-bin-assembly.xml
@@ -157,6 +157,7 @@
<include>org.ogce:xpp5:jar</include>
<include>com.101tec:zkclient:jar</include>
<include>org.apache.zookeeper:zookeeper:jar</include>
+ <include>org.apache.commons:commons-pool2: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 6b9be5e..455dc4e 100644
--- a/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml
@@ -162,6 +162,7 @@
<include>com.101tec:zkclient:jar</include>
<include>org.apache.zookeeper:zookeeper:jar</include>
<include>org.apache.airavata:airavata-security:jar</include>
+ <include>org.apache.commons:commons-pool2: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 082aa0f..b7f6591 100644
--- a/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml
@@ -162,6 +162,7 @@
<include>org.apache.airavata:services-security:jar</include>
<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>
</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 f198106..cf34e15 100644
--- a/modules/distribution/src/main/assembly/realtime-monitor-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/realtime-monitor-bin-assembly.xml
@@ -113,6 +113,8 @@
<include>org.slf4j:log4j-over-slf4j:jar</include>
<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>
</includes>
</dependencySet>
</dependencySets>
diff --git a/pom.xml b/pom.xml
index c5b2f10..9f28735 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,6 +119,7 @@
<google.guava.version>20.0</google.guava.version>
<jacoco.version>0.8.1</jacoco.version>
<openjpa.version>2.4.3</openjpa.version>
+ <org.apache.commons.pool2.version>2.7.0</org.apache.commons.pool2.version>
</properties>
<developers>
@@ -534,6 +535,11 @@
<artifactId>guava</artifactId>
<version>${google.guava.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-pool2</artifactId>
+ <version>${org.apache.commons.pool2.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>