You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by pi...@apache.org on 2022/10/20 07:36:28 UTC
[atlas] branch branch-2.0 updated: ATLAS-4677 : Upgrade commons-configuration to 2.8.0
This is an automated email from the ASF dual-hosted git repository.
pinal pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new fe930d701 ATLAS-4677 : Upgrade commons-configuration to 2.8.0
fe930d701 is described below
commit fe930d70130f3ac4cbdcdfd2fcbad575d33e818b
Author: prasad.pawar <pr...@cloudera.com>
AuthorDate: Tue Oct 18 18:23:14 2022 +0530
ATLAS-4677 : Upgrade commons-configuration to 2.8.0
Signed-off-by: Pinal Shah <pi...@freestoneinfotech.com>
(cherry picked from commit e98c398e622fa0d3bc57cb48ef77295d04b120b4)
---
addons/hbase-bridge-shim/pom.xml | 4 ++++
addons/hbase-bridge/pom.xml | 22 ++++++++++++++++++++++
addons/hbase-testing-util/pom.xml | 22 ++++++++++++++++++++++
addons/hdfs-model/pom.xml | 6 ++++++
addons/hive-bridge-shim/pom.xml | 6 ++++++
addons/hive-bridge/pom.xml | 4 ++++
addons/impala-bridge/pom.xml | 4 ++++
addons/kafka-bridge/pom.xml | 16 ++++++++++++++++
addons/sqoop-bridge/pom.xml | 4 ++++
addons/storm-bridge/pom.xml | 4 ++++
atlas-examples/sample-app/pom.xml | 6 ++++++
client/client-v1/pom.xml | 6 ++++++
common/pom.xml | 14 ++++++++++++++
distro/pom.xml | 6 ++++++
graphdb/api/pom.xml | 6 ++++++
graphdb/janus-hbase2/pom.xml | 14 ++++++++++++++
graphdb/janus/pom.xml | 6 ++++++
intg/pom.xml | 8 ++++++++
pom.xml | 8 ++++++++
repository/pom.xml | 6 ++++++
server-api/pom.xml | 8 ++++++++
test-tools/pom.xml | 8 ++++++++
webapp/pom.xml | 8 ++++++++
23 files changed, 196 insertions(+)
diff --git a/addons/hbase-bridge-shim/pom.xml b/addons/hbase-bridge-shim/pom.xml
index 5fcb97453..ef3c1bad9 100644
--- a/addons/hbase-bridge-shim/pom.xml
+++ b/addons/hbase-bridge-shim/pom.xml
@@ -54,6 +54,10 @@
<groupId>javax.ws.rs</groupId>
<artifactId>*</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>
diff --git a/addons/hbase-bridge/pom.xml b/addons/hbase-bridge/pom.xml
index 5f475c29c..e5728281c 100644
--- a/addons/hbase-bridge/pom.xml
+++ b/addons/hbase-bridge/pom.xml
@@ -111,9 +111,23 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-configuration2</artifactId>
+ </exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-configuration2</artifactId>
+ <version>${commons-conf2.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
@@ -212,6 +226,14 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-configuration2</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/addons/hbase-testing-util/pom.xml b/addons/hbase-testing-util/pom.xml
index e6c858aa2..dffb34291 100644
--- a/addons/hbase-testing-util/pom.xml
+++ b/addons/hbase-testing-util/pom.xml
@@ -97,6 +97,14 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-configuration2</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -116,8 +124,22 @@
<groupId>org.apache.htrace</groupId>
<artifactId>htrace-core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-configuration2</artifactId>
+ </exclusion>
</exclusions>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-configuration2</artifactId>
+ <version>${commons-conf2.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minikdc</artifactId>
diff --git a/addons/hdfs-model/pom.xml b/addons/hdfs-model/pom.xml
index 2c665b0bb..226b0d49b 100644
--- a/addons/hdfs-model/pom.xml
+++ b/addons/hdfs-model/pom.xml
@@ -46,6 +46,12 @@
<dependency>
<groupId>org.apache.atlas</groupId>
<artifactId>atlas-client-v1</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
diff --git a/addons/hive-bridge-shim/pom.xml b/addons/hive-bridge-shim/pom.xml
index 44ad3d233..cb4dbb3ae 100755
--- a/addons/hive-bridge-shim/pom.xml
+++ b/addons/hive-bridge-shim/pom.xml
@@ -42,6 +42,12 @@
<artifactId>hive-exec</artifactId>
<version>${hive.version}</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
</project>
diff --git a/addons/hive-bridge/pom.xml b/addons/hive-bridge/pom.xml
index 39104958a..856e5d95d 100755
--- a/addons/hive-bridge/pom.xml
+++ b/addons/hive-bridge/pom.xml
@@ -152,6 +152,10 @@
<groupId>org.eclipse.jetty</groupId>
<artifactId>*</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ </exclusion>
</exclusions>
</dependency>
diff --git a/addons/impala-bridge/pom.xml b/addons/impala-bridge/pom.xml
index ab977da0d..cacdf4a98 100644
--- a/addons/impala-bridge/pom.xml
+++ b/addons/impala-bridge/pom.xml
@@ -110,6 +110,10 @@
<groupId>org.eclipse.jetty</groupId>
<artifactId>*</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ </exclusion>
</exclusions>
</dependency>
diff --git a/addons/kafka-bridge/pom.xml b/addons/kafka-bridge/pom.xml
index 1c896577c..9ce22a757 100644
--- a/addons/kafka-bridge/pom.xml
+++ b/addons/kafka-bridge/pom.xml
@@ -83,6 +83,14 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-configuration2</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -129,6 +137,14 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-configuration2</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/addons/sqoop-bridge/pom.xml b/addons/sqoop-bridge/pom.xml
index 0a2cbfbd5..62e2eee00 100644
--- a/addons/sqoop-bridge/pom.xml
+++ b/addons/sqoop-bridge/pom.xml
@@ -137,6 +137,10 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ </exclusion>
</exclusions>
</dependency>
diff --git a/addons/storm-bridge/pom.xml b/addons/storm-bridge/pom.xml
index 7d205b3c0..a5017e0b2 100644
--- a/addons/storm-bridge/pom.xml
+++ b/addons/storm-bridge/pom.xml
@@ -77,6 +77,10 @@
<groupId>org.eclipse.jetty</groupId>
<artifactId>*</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ </exclusion>
</exclusions>
</dependency>
diff --git a/atlas-examples/sample-app/pom.xml b/atlas-examples/sample-app/pom.xml
index db5cc597e..e2eb42f54 100644
--- a/atlas-examples/sample-app/pom.xml
+++ b/atlas-examples/sample-app/pom.xml
@@ -38,6 +38,12 @@
<groupId>org.apache.atlas</groupId>
<artifactId>atlas-common</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
diff --git a/client/client-v1/pom.xml b/client/client-v1/pom.xml
index 5533352df..fc80a4294 100644
--- a/client/client-v1/pom.xml
+++ b/client/client-v1/pom.xml
@@ -38,6 +38,12 @@
<groupId>org.apache.atlas</groupId>
<artifactId>atlas-common</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
</project>
diff --git a/common/pom.xml b/common/pom.xml
index 3252d579a..c67fa94b2 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -57,9 +57,23 @@
<groupId>org.eclipse.jetty</groupId>
<artifactId>*</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-configuration2</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ </exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-configuration2</artifactId>
+ <version>${commons-conf2.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs-client</artifactId>
diff --git a/distro/pom.xml b/distro/pom.xml
index eec737a58..a892736de 100644
--- a/distro/pom.xml
+++ b/distro/pom.xml
@@ -605,6 +605,12 @@ atlas.graph.storage.conf-file=${sys:atlas.home}/conf/cassandra.yml
<dependency>
<groupId>org.apache.atlas</groupId>
<artifactId>storm-bridge</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
</project>
diff --git a/graphdb/api/pom.xml b/graphdb/api/pom.xml
index bdfb4cd28..5fc40acf2 100644
--- a/graphdb/api/pom.xml
+++ b/graphdb/api/pom.xml
@@ -50,6 +50,12 @@
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-core</artifactId>
<version>${tinkerpop.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-configuration2</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
diff --git a/graphdb/janus-hbase2/pom.xml b/graphdb/janus-hbase2/pom.xml
index 83e77e6be..caad816b5 100644
--- a/graphdb/janus-hbase2/pom.xml
+++ b/graphdb/janus-hbase2/pom.xml
@@ -68,6 +68,10 @@
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkergraph-gremlin</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-configuration2</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -76,6 +80,16 @@
<artifactId>hadoop-common</artifactId>
<version>${hadoop.version}</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-configuration2</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
diff --git a/graphdb/janus/pom.xml b/graphdb/janus/pom.xml
index e136a891d..66766dd8f 100644
--- a/graphdb/janus/pom.xml
+++ b/graphdb/janus/pom.xml
@@ -243,6 +243,12 @@
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-core</artifactId>
<version>${tinkerpop.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-configuration2</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
diff --git a/intg/pom.xml b/intg/pom.xml
index ffccbcaa5..0be6bde99 100644
--- a/intg/pom.xml
+++ b/intg/pom.xml
@@ -55,6 +55,14 @@
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-configuration2</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ </exclusion>
</exclusions>
</dependency>
diff --git a/pom.xml b/pom.xml
index 0c24a5111..f5ec9fc4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -997,6 +997,14 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-configuration2</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ </exclusion>
</exclusions>
</dependency>
diff --git a/repository/pom.xml b/repository/pom.xml
index 0c19ad6dc..eeb7af9de 100644
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -256,6 +256,12 @@
<groupId>com.opencsv</groupId>
<artifactId>opencsv</artifactId>
<version>${opencsv.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
diff --git a/server-api/pom.xml b/server-api/pom.xml
index f3485192b..0c5e66ec2 100644
--- a/server-api/pom.xml
+++ b/server-api/pom.xml
@@ -48,6 +48,14 @@
<groupId>org.eclipse.jetty</groupId>
<artifactId>*</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-configuration2</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ </exclusion>
</exclusions>
</dependency>
diff --git a/test-tools/pom.xml b/test-tools/pom.xml
index 24bb50431..6622512fe 100644
--- a/test-tools/pom.xml
+++ b/test-tools/pom.xml
@@ -60,6 +60,14 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-configuration2</artifactId>
+ </exclusion>
</exclusions>
</dependency>
diff --git a/webapp/pom.xml b/webapp/pom.xml
index 32c04d7fa..30c7b416b 100755
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -171,6 +171,14 @@
<groupId>org.eclipse.jetty</groupId>
<artifactId>*</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-configuration2</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ </exclusion>
</exclusions>
</dependency>