This is an automated email from the ASF dual-hosted git repository.
jackie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pinot.git
The following commit(s) were added to refs/heads/master by this push:
new 1b2c5898e5 Upgrade all Apache commons dependencies (#12692)
1b2c5898e5 is described below
commit 1b2c5898e5ac4e82be44992e7756a83d3bad8553
Author: Xiaotian (Jackie) Jiang <17555551+jackie-ji...@users.noreply.github.com>
AuthorDate: Fri Mar 22 10:20:26 2024 -0700
Upgrade all Apache commons dependencies (#12692)
---
pinot-common/pom.xml | 13 --
pinot-controller/pom.xml | 8 -
pinot-core/pom.xml | 16 --
pinot-integration-test-base/pom.xml | 12 --
pinot-integration-tests/pom.xml | 12 --
pinot-perf/pom.xml | 16 --
.../pinot-batch-ingestion-hadoop/pom.xml | 13 --
.../pinot-batch-ingestion-spark-2.4/pom.xml | 20 --
.../pinot-batch-ingestion-spark-3/pom.xml | 27 ---
pinot-plugins/pinot-file-system/pinot-hdfs/pom.xml | 4 -
pinot-plugins/pinot-input-format/pinot-csv/pom.xml | 4 -
.../pinot-input-format/pinot-json/pom.xml | 7 -
pinot-plugins/pinot-input-format/pinot-orc/pom.xml | 4 -
.../pinot-input-format/pinot-parquet/pom.xml | 4 -
.../pinot-input-format/pinot-protobuf/pom.xml | 4 -
.../pinot-input-format/pinot-thrift/pom.xml | 4 -
pinot-plugins/pinot-input-format/pom.xml | 5 -
.../pinot-stream-ingestion/pinot-pulsar/pom.xml | 18 +-
pinot-server/pom.xml | 13 --
pinot-spi/pom.xml | 48 ++---
pinot-tools/pom.xml | 12 --
pom.xml | 214 +++++++++++----------
22 files changed, 142 insertions(+), 336 deletions(-)
diff --git a/pinot-common/pom.xml b/pinot-common/pom.xml
index 867b5c48a0..65f9778177 100644
--- a/pinot-common/pom.xml
+++ b/pinot-common/pom.xml
@@ -253,10 +253,6 @@
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
</dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
@@ -303,19 +299,10 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-math3</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
diff --git a/pinot-controller/pom.xml b/pinot-controller/pom.xml
index b1af2fbdf3..b2b52171a0 100644
--- a/pinot-controller/pom.xml
+++ b/pinot-controller/pom.xml
@@ -148,10 +148,6 @@
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
<!-- Helix Related Dependency -->
<dependency>
@@ -172,10 +168,6 @@
<groupId>com.jcabi</groupId>
<artifactId>jcabi-log</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-math3</artifactId>
- </dependency>
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
diff --git a/pinot-core/pom.xml b/pinot-core/pom.xml
index 4c3ac8f9b2..d782c39659 100644
--- a/pinot-core/pom.xml
+++ b/pinot-core/pom.xml
@@ -68,22 +68,10 @@
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
</dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
<!--<dependency>
<groupId>org.apache.helix</groupId>
<artifactId>helix-core</artifactId>
@@ -142,10 +130,6 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-math</artifactId>
- </dependency>
<dependency>
<groupId>com.clearspring.analytics</groupId>
<artifactId>stream</artifactId>
diff --git a/pinot-integration-test-base/pom.xml
b/pinot-integration-test-base/pom.xml
index 7947b6ae6c..2c6eb3dd31 100644
--- a/pinot-integration-test-base/pom.xml
+++ b/pinot-integration-test-base/pom.xml
@@ -153,10 +153,6 @@
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
@@ -179,14 +175,6 @@
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-math3</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
diff --git a/pinot-integration-tests/pom.xml b/pinot-integration-tests/pom.xml
index 54bd8f6c82..1db7433c3f 100644
--- a/pinot-integration-tests/pom.xml
+++ b/pinot-integration-tests/pom.xml
@@ -334,10 +334,6 @@
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
@@ -360,14 +356,6 @@
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-math3</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
diff --git a/pinot-perf/pom.xml b/pinot-perf/pom.xml
index 2711711a49..6a4f64c5f6 100644
--- a/pinot-perf/pom.xml
+++ b/pinot-perf/pom.xml
@@ -62,24 +62,12 @@
<artifactId>pinot-integration-test-base</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
- <exclusions>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-math3</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.pinot</groupId>
<artifactId>pinot-integration-tests</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
- <exclusions>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-math3</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.pinot</groupId>
@@ -105,10 +93,6 @@
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-math3</artifactId>
- </dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
diff --git
a/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-hadoop/pom.xml
b/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-hadoop/pom.xml
index eb55e82f54..099292d9da 100644
--- a/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-hadoop/pom.xml
+++ b/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-hadoop/pom.xml
@@ -43,10 +43,6 @@
<artifactId>pinot-batch-ingestion-common</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-configuration2</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
@@ -63,15 +59,6 @@
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-math3</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
diff --git
a/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-spark-2.4/pom.xml
b/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-spark-2.4/pom.xml
index 2f3673da88..07cc979ccf 100644
---
a/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-spark-2.4/pom.xml
+++
b/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-spark-2.4/pom.xml
@@ -47,10 +47,6 @@
<artifactId>pinot-batch-ingestion-common</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-configuration2</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-core_${scala.major.version}</artifactId>
@@ -105,10 +101,6 @@
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
@@ -160,12 +152,6 @@
<artifactId>pinot-common</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
@@ -176,12 +162,6 @@
<artifactId>pinot-spi</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
diff --git
a/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-spark-3/pom.xml
b/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-spark-3/pom.xml
index 648446bd4f..f50b384ee1 100644
--- a/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-spark-3/pom.xml
+++ b/pinot-plugins/pinot-batch-ingestion/pinot-batch-ingestion-spark-3/pom.xml
@@ -37,7 +37,6 @@
<pinot.root>${basedir}/../../..</pinot.root>
<phase.prop>package</phase.prop>
<spark.version>3.5.0</spark.version>
- <commons-lang3.version>3.11</commons-lang3.version>
</properties>
<dependencies>
@@ -88,10 +87,6 @@
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
@@ -108,10 +103,6 @@
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
@@ -144,30 +135,12 @@
<artifactId>pinot-common</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.pinot</groupId>
<artifactId>pinot-spi</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>${commons-lang3.version}</version>
- <scope>test</scope>
</dependency>
</dependencies>
</project>
diff --git a/pinot-plugins/pinot-file-system/pinot-hdfs/pom.xml
b/pinot-plugins/pinot-file-system/pinot-hdfs/pom.xml
index 18f9b8b928..9691e9a3c9 100644
--- a/pinot-plugins/pinot-file-system/pinot-hdfs/pom.xml
+++ b/pinot-plugins/pinot-file-system/pinot-hdfs/pom.xml
@@ -40,10 +40,6 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-configuration2</artifactId>
- </dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>stax2-api</artifactId>
diff --git a/pinot-plugins/pinot-input-format/pinot-csv/pom.xml
b/pinot-plugins/pinot-input-format/pinot-csv/pom.xml
index b1223abbf8..d323171600 100644
--- a/pinot-plugins/pinot-input-format/pinot-csv/pom.xml
+++ b/pinot-plugins/pinot-input-format/pinot-csv/pom.xml
@@ -42,9 +42,5 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-csv</artifactId>
</dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
</dependencies>
</project>
diff --git a/pinot-plugins/pinot-input-format/pinot-json/pom.xml
b/pinot-plugins/pinot-input-format/pinot-json/pom.xml
index a39d8d29da..608cb65787 100644
--- a/pinot-plugins/pinot-input-format/pinot-json/pom.xml
+++ b/pinot-plugins/pinot-input-format/pinot-json/pom.xml
@@ -36,11 +36,4 @@
<pinot.root>${basedir}/../../..</pinot.root>
<phase.prop>package</phase.prop>
</properties>
-
- <dependencies>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
- </dependencies>
</project>
diff --git a/pinot-plugins/pinot-input-format/pinot-orc/pom.xml
b/pinot-plugins/pinot-input-format/pinot-orc/pom.xml
index 4af68a7811..4984c17fd3 100644
--- a/pinot-plugins/pinot-input-format/pinot-orc/pom.xml
+++ b/pinot-plugins/pinot-input-format/pinot-orc/pom.xml
@@ -38,10 +38,6 @@
<phase.prop>package</phase.prop>
</properties>
<dependencies>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-configuration2</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.orc</groupId>
<artifactId>orc-core</artifactId>
diff --git a/pinot-plugins/pinot-input-format/pinot-parquet/pom.xml
b/pinot-plugins/pinot-input-format/pinot-parquet/pom.xml
index 3e7fdef21c..62d70ba5ec 100644
--- a/pinot-plugins/pinot-input-format/pinot-parquet/pom.xml
+++ b/pinot-plugins/pinot-input-format/pinot-parquet/pom.xml
@@ -46,10 +46,6 @@
<groupId>org.apache.parquet</groupId>
<artifactId>parquet-avro</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-configuration2</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
diff --git a/pinot-plugins/pinot-input-format/pinot-protobuf/pom.xml
b/pinot-plugins/pinot-input-format/pinot-protobuf/pom.xml
index c3ec098593..3c4f92097f 100644
--- a/pinot-plugins/pinot-input-format/pinot-protobuf/pom.xml
+++ b/pinot-plugins/pinot-input-format/pinot-protobuf/pom.xml
@@ -46,10 +46,6 @@
</repository>
</repositories>
<dependencies>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
diff --git a/pinot-plugins/pinot-input-format/pinot-thrift/pom.xml
b/pinot-plugins/pinot-input-format/pinot-thrift/pom.xml
index de7f0f6a8f..bb5ed9c94d 100644
--- a/pinot-plugins/pinot-input-format/pinot-thrift/pom.xml
+++ b/pinot-plugins/pinot-input-format/pinot-thrift/pom.xml
@@ -37,10 +37,6 @@
<phase.prop>package</phase.prop>
</properties>
<dependencies>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
diff --git a/pinot-plugins/pinot-input-format/pom.xml
b/pinot-plugins/pinot-input-format/pom.xml
index 945ab08f6f..78513b0a65 100644
--- a/pinot-plugins/pinot-input-format/pom.xml
+++ b/pinot-plugins/pinot-input-format/pom.xml
@@ -58,11 +58,6 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<!-- test -->
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.pinot</groupId>
<artifactId>pinot-spi</artifactId>
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/pom.xml
b/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/pom.xml
index f6979225a2..05f3a1fa04 100644
--- a/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/pom.xml
+++ b/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/pom.xml
@@ -48,7 +48,6 @@
<caffeine.version>2.6.2</caffeine.version>
<codehaus-annotations.version>1.17</codehaus-annotations.version>
<javax.annotation-api.version>1.2</javax.annotation-api.version>
- <commons-collections.version>4.4</commons-collections.version>
<grpc-protobuf-lite.version>1.19.0</grpc-protobuf-lite.version>
</properties>
@@ -69,8 +68,8 @@
<artifactId>javax.ws.rs-api</artifactId>
</exclusion>
<exclusion>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
</exclusion>
<exclusion>
<groupId>org.bouncycastle</groupId>
@@ -134,10 +133,6 @@
<artifactId>grpc-context</artifactId>
<version>${grpc-context.version}</version>
</dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </dependency>
<dependency>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient</artifactId>
@@ -171,11 +166,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-collections4</artifactId>
- <version>${commons-collections.version}</version>
- </dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
@@ -214,10 +204,6 @@
<groupId>org.apache.pinot</groupId>
<artifactId>pinot-spi</artifactId>
<exclusions>
- <exclusion>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
diff --git a/pinot-server/pom.xml b/pinot-server/pom.xml
index 1a7b181f36..39c95e01a2 100644
--- a/pinot-server/pom.xml
+++ b/pinot-server/pom.xml
@@ -69,10 +69,6 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- </dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
@@ -83,10 +79,6 @@
<artifactId>javax.servlet-api</artifactId>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.helix</groupId>
<artifactId>helix-core</artifactId>
@@ -200,11 +192,6 @@
<artifactId>pinot-yammer</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-math3</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
diff --git a/pinot-spi/pom.xml b/pinot-spi/pom.xml
index 06b616bace..99ee192905 100644
--- a/pinot-spi/pom.xml
+++ b/pinot-spi/pom.xml
@@ -47,44 +47,52 @@
</plugin>
</plugins>
</build>
+
<dependencies>
<dependency>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-configuration2</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </exclusion>
- </exclusions>
+ <artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-math3</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-configuration2</artifactId>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </dependency>
+ <!-- Legacy Apache Commons Libraries -->
+ <!-- TODO: Move all usage to commons-lang3 -->
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
+ <!-- TODO: Move all usage to commons-collections4 -->
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
</dependency>
+ <!-- TODO: Move all usage to commons-math3 -->
<dependency>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
+ <artifactId>commons-math</artifactId>
</dependency>
+
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
@@ -130,10 +138,6 @@
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
</dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- </dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
diff --git a/pinot-tools/pom.xml b/pinot-tools/pom.xml
index 761ebd3464..a1414f0208 100644
--- a/pinot-tools/pom.xml
+++ b/pinot-tools/pom.xml
@@ -97,10 +97,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-configuration2</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
@@ -229,10 +225,6 @@
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- </dependency>
<dependency>
<groupId>info.picocli</groupId>
<artifactId>picocli</artifactId>
@@ -267,10 +259,6 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-math3</artifactId>
- </dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
diff --git a/pom.xml b/pom.xml
index 810d438419..2b36857003 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,16 +111,29 @@
<build.profile.id>dev</build.profile.id>
<jdk.version>11</jdk.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <!-- Only unit tests are run by default. -->
- <skip.integration.tests>true</skip.integration.tests>
- <skip.unit.tests>false</skip.unit.tests>
- <!-- Configuration for unit/integration tests section 1 of 3 (properties)
STARTS HERE.
+
+ <!-- Configuration for unit/integration tests
Property for running integration tests with profiles
at the command line, where you do:
mvn integration-test -P integration-test
See also: the surefire plugin section and the profiles section.-->
+ <!-- Only unit tests are run by default. -->
+ <skip.integration.tests>true</skip.integration.tests>
+ <skip.unit.tests>false</skip.unit.tests>
+ <!-- Sets the VM argument line used when unit tests are run. -->
+ <argLine>-Xms4g -Xmx4g</argLine>
<SKIP_INTEGRATION_TESTS>true</SKIP_INTEGRATION_TESTS>
- <!-- Configuration for unit/integration tests section 1 of 3 (properties)
ENDS HERE.-->
+ <surefire.version>3.2.5</surefire.version>
+ <maven-enforcer-plugin.version>3.4.1</maven-enforcer-plugin.version>
+
+ <!-- Checkstyle violation prop.-->
+ <checkstyle.violation.severity>warning</checkstyle.violation.severity>
+ <checkstyle.fail.on.violation>true</checkstyle.fail.on.violation>
+
+ <!-- Configuration for Packaging -->
+ <shade.prefix>org.apache.pinot.shaded</shade.prefix>
+ <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
+
<avro.version>1.11.3</avro.version>
<parquet.version>1.13.1</parquet.version>
<helix.version>1.3.1</helix.version>
@@ -139,10 +152,6 @@
<calcite.version>1.30.0</calcite.version>
<lucene.version>9.8.0</lucene.version>
<reflections.version>0.9.11</reflections.version>
- <!-- commons-configuration, hadoop-common, hadoop-client use commons-lang
-->
- <commons-lang.version>2.6</commons-lang.version>
- <!-- hadoop-common, spark-core use commons-net -->
- <commons-net.version>3.10.0</commons-net.version>
<!-- helix-core, spark-core use libraries from io.dropwizard.metrics -->
<dropwizard-metrics.version>4.2.25</dropwizard-metrics.version>
<snappy-java.version>1.1.10.5</snappy-java.version>
@@ -164,6 +173,23 @@
<woodstox.version>6.4.0</woodstox.version>
<sslcontext.kickstart.version>8.2.0</sslcontext.kickstart.version>
+ <!-- Apache Commons Libraries -->
+ <commons-lang3.version>3.14.0</commons-lang3.version>
+ <commons-collections4.version>4.4</commons-collections4.version>
+ <commons-text.version>1.11.0</commons-text.version>
+ <commons-compress.version>1.26.1</commons-compress.version>
+ <commons-math3.version>3.6.1</commons-math3.version>
+ <commons-csv.version>1.10.0</commons-csv.version>
+ <commons-configuration2.version>2.10.1</commons-configuration2.version>
+ <commons-io.version>2.15.1</commons-io.version>
+ <commons-codec.version>1.16.1</commons-codec.version>
+ <commons-cli.version>1.6.0</commons-cli.version>
+ <commons-net.version>3.10.0</commons-net.version>
+ <!-- Legacy Apache Commons Libraries -->
+ <commons-lang.version>2.6</commons-lang.version>
+ <commons-collections.version>3.2.2</commons-collections.version>
+ <commons-math.version>2.2</commons-math.version>
+
<!-- Google Libraries -->
<google.cloud.libraries.version>26.32.0</google.cloud.libraries.version>
<google.auth.version>1.23.0</google.auth.version>
@@ -175,25 +201,11 @@
<confluent.version>7.6.0</confluent.version>
- <!-- Sets the VM argument line used when unit tests are run. -->
- <argLine>-Xms4g -Xmx4g</argLine>
-
- <!-- Checkstyle violation prop.-->
- <checkstyle.violation.severity>warning</checkstyle.violation.severity>
- <checkstyle.fail.on.violation>true</checkstyle.fail.on.violation>
-
- <!-- Configuration for Packaging -->
- <shade.prefix>org.apache.pinot.shaded</shade.prefix>
- <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
- <maven-enforcer-plugin.version>3.4.1</maven-enforcer-plugin.version>
- <surefire.version>3.2.5</surefire.version>
-
<!-- Configuration for Scala -->
<scala.version>2.12.18</scala.version>
<scala.compat.version>2.12</scala.compat.version>
<flink.version>1.14.6</flink.version>
- <commons-configuration2.version>2.9.0</commons-configuration2.version>
<kotlin.stdlib.version>1.9.22</kotlin.stdlib.version>
<okio.version>3.9.0</okio.version>
@@ -426,38 +438,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>1.6.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.12.0</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-configuration2</artifactId>
- <version>${commons-configuration2.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.11.0</version>
- </dependency>
-
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
@@ -534,11 +514,6 @@
<artifactId>lz4-java</artifactId>
<version>${lz4-java.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-compress</artifactId>
- <version>1.26.0</version>
- </dependency>
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
@@ -672,16 +647,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.9.4</version>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.16.0</version>
- </dependency>
<dependency>
<groupId>com.thoughtworks.paranamer</groupId>
<artifactId>paranamer</artifactId>
@@ -697,6 +662,85 @@
<scope>import</scope>
</dependency>
+ <!-- Apache Commons Libraries -->
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>${commons-lang3.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ <version>${commons-collections4.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ <version>${commons-text.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ <version>${commons-compress.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-math3</artifactId>
+ <version>${commons-math3.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-csv</artifactId>
+ <version>${commons-csv.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-configuration2</artifactId>
+ <version>${commons-configuration2.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons-io.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>${commons-codec.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>${commons-cli.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ <version>${commons-net.version}</version>
+ </dependency>
+ <!-- Legacy Apache Commons Libraries -->
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>${commons-lang.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>${commons-collections.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-math</artifactId>
+ <version>${commons-math.version}</version>
+ </dependency>
+
<!-- Google Libraries -->
<dependency>
<groupId>com.google.cloud</groupId>
@@ -774,10 +818,6 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-text</artifactId>
- </exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
@@ -1258,11 +1298,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-math</artifactId>
- <version>2.1</version>
- </dependency>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-testng</artifactId>
@@ -1274,11 +1309,6 @@
<version>5.11.0</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-csv</artifactId>
- <version>1.10.0</version>
- </dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
@@ -1304,28 +1334,12 @@
<artifactId>tyrus-standalone-client</artifactId>
<version>2.1.4</version>
</dependency>
- <!-- hadoop-common & jmh-core use common-math3 -->
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-math3</artifactId>
- <version>3.2</version>
- </dependency>
<!-- kafka_2.10 & jmh-core use jopt-simple -->
<dependency>
<groupId>net.sf.jopt-simple</groupId>
<artifactId>jopt-simple</artifactId>
<version>4.6</version>
</dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${commons-lang.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-net</groupId>
- <artifactId>commons-net</artifactId>
- <version>${commons-net.version}</version>
- </dependency>
<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org
