This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git
The following commit(s) were added to refs/heads/master by this push:
new c304f2b HOP-2675 : Remove LGPL dependency from Cassandra plugins
new 3783245 Merge pull request #709 from mattcasters/master
c304f2b is described below
commit c304f2b055759c277415d8581d2f86cf53918366
Author: Matt Casters <[email protected]>
AuthorDate: Fri Mar 26 16:51:11 2021 +0100
HOP-2675 : Remove LGPL dependency from Cassandra plugins
---
assemblies/plugins/tech/cassandra/pom.xml | 4 ++++
assemblies/plugins/tech/cassandra/src/assembly/assembly.xml | 4 ----
plugins/tech/cassandra/pom.xml | 4 ++++
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/assemblies/plugins/tech/cassandra/pom.xml
b/assemblies/plugins/tech/cassandra/pom.xml
index 64858d3..8d3c628 100644
--- a/assemblies/plugins/tech/cassandra/pom.xml
+++ b/assemblies/plugins/tech/cassandra/pom.xml
@@ -76,6 +76,10 @@
<groupId>ch.qos.logback</groupId>
<artifactId>*</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.addthis.metrics</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
</exclusions>
</dependency>
diff --git a/assemblies/plugins/tech/cassandra/src/assembly/assembly.xml
b/assemblies/plugins/tech/cassandra/src/assembly/assembly.xml
index 9def2c8..3e00d2e 100644
--- a/assemblies/plugins/tech/cassandra/src/assembly/assembly.xml
+++ b/assemblies/plugins/tech/cassandra/src/assembly/assembly.xml
@@ -52,8 +52,6 @@
<useProjectArtifact>false</useProjectArtifact>
<scope>runtime</scope>
<includes>
- <include>com.addthis.metrics:reporter-config3:jar</include>
- <include>com.addthis.metrics:reporter-config-base:jar</include>
<include>com.boundary:high-scale-lib:jar</include>
<include>com.carrotsearch:hppc:jar</include>
<include>com.datastax.cassandra:cassandra-driver-core:jar</include>
@@ -102,8 +100,6 @@
<include>org.caffinitas.ohc:ohc-core:jar</include>
<include>org.eclipse.jdt.core.compiler:ecj:jar</include>
<include>org.fusesource:sigar:jar</include>
- <include>org.hibernate:hibernate-validator:jar</include>
- <include>org.jboss.logging:jboss-logging:jar</include>
<include>org.jctools:jctools-core:jar</include>
<include>org.mindrot:jbcrypt:jar</include>
<include>org.ow2.asm:asm-analysis:jar</include>
diff --git a/plugins/tech/cassandra/pom.xml b/plugins/tech/cassandra/pom.xml
index 42e08df..a91ee78 100644
--- a/plugins/tech/cassandra/pom.xml
+++ b/plugins/tech/cassandra/pom.xml
@@ -82,6 +82,10 @@
<groupId>ch.qos.logback</groupId>
<artifactId>*</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.addthis.metrics</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
</exclusions>
</dependency>
