From 3098e8ed36b9aba871f0e072e3ffe5a2801b231f Mon Sep 17 00:00:00 2001 From: doleyzi Date: Thu, 17 Aug 2023 16:18:33 +0800 Subject: [PATCH 1/2] Separate commons-text from org.apache.flume --- inlong-audit/pom.xml | 5 +++++ pom.xml | 1 + 2 files changed, 6 insertions(+) diff --git a/inlong-audit/pom.xml b/inlong-audit/pom.xml index a0e6311f709..fae9e364297 100644 --- a/inlong-audit/pom.xml +++ b/inlong-audit/pom.xml @@ -63,6 +63,11 @@ + + org.apache.commons + commons-text + ${commons.text.version} + org.apache.flume flume-ng-sdk diff --git a/pom.xml b/pom.xml index da81741fa20..4a7cb0de19c 100644 --- a/pom.xml +++ b/pom.xml @@ -125,6 +125,7 @@ 3.11 3.2.2 4.3 + 1.10.0 32.1.2-jre 1.18.22 From e60703e070d9c08be4331d43f6dd9088bde77e44 Mon Sep 17 00:00:00 2001 From: doleyzi Date: Thu, 17 Aug 2023 17:12:33 +0800 Subject: [PATCH 2/2] update commons-text version --- inlong-dataproxy/pom.xml | 9 +++++++++ inlong-sdk/pom.xml | 11 +++++++++++ inlong-sort-standalone/pom.xml | 9 +++++++++ licenses/inlong-agent/LICENSE | 1 + licenses/inlong-audit/LICENSE | 1 + licenses/inlong-dataproxy/LICENSE | 1 + licenses/inlong-manager/LICENSE | 2 +- licenses/inlong-sort-standalone/LICENSE | 1 + 8 files changed, 34 insertions(+), 1 deletion(-) diff --git a/inlong-dataproxy/pom.xml b/inlong-dataproxy/pom.xml index cd5c5fe17f8..ed039d4c888 100644 --- a/inlong-dataproxy/pom.xml +++ b/inlong-dataproxy/pom.xml @@ -74,8 +74,17 @@ log4j log4j + + org.apache.commons + commons-text + + + org.apache.commons + commons-text + ${commons.text.version} + org.apache.flume flume-ng-sdk diff --git a/inlong-sdk/pom.xml b/inlong-sdk/pom.xml index d17574a3d64..73d18d5d81b 100644 --- a/inlong-sdk/pom.xml +++ b/inlong-sdk/pom.xml @@ -47,6 +47,17 @@ org.apache.flume flume-ng-node + + + org.apache.commons + commons-text + + + + + org.apache.commons + commons-text + ${commons.text.version} org.apache.flume diff --git a/inlong-sort-standalone/pom.xml b/inlong-sort-standalone/pom.xml index 723c83cb3f2..7512e2cf878 100644 --- a/inlong-sort-standalone/pom.xml +++ b/inlong-sort-standalone/pom.xml @@ -62,8 +62,17 @@ com.google.protobuf protobuf-java + + org.apache.commons + commons-text + + + org.apache.commons + commons-text + ${commons.text.version} + org.apache.flume flume-ng-sdk diff --git a/licenses/inlong-agent/LICENSE b/licenses/inlong-agent/LICENSE index 79399423328..1beaad19395 100644 --- a/licenses/inlong-agent/LICENSE +++ b/licenses/inlong-agent/LICENSE @@ -387,6 +387,7 @@ The text of each license is the standard Apache 2.0 license. org.apache.flume:flume-ng-node:1.9.0 - Flume NG Node (https://github.com/apache/flume/tree/flume-1.9/flume-ng-node), (The Apache Software License, Version 2.0) org.apache.flume:flume-ng-sdk:1.9.0 - Flume NG SDK (https://github.com/apache/flume/tree/flume-1.9/flume-ng-sdk), (The Apache Software License, Version 2.0) org.apache.flume.flume-ng-channels:flume-spillable-memory-channel:1.9.0 - Flume NG Spillable Memory channel (https://github.com/apache/flume/tree/flume-1.9/flume-ng-channels/flume-spillable-memory-channel), (The Apache Software License, Version 2.0) + org.apache.commons:commons-text:1.10.0 - Apache Commons Text (https://commons.apache.org/proper/commons-text), (Apache License, Version 2.0) com.google.code.gson:gson:2.8.6 - Gson (https://github.com/google/gson/gson), (Apache 2.0) com.google.guava:guava:32.1.2-jre - Guava: Google Core Libraries for Java (https://github.com/google/guava), (Apache License, Version 2.0) org.apache.httpcomponents:httpclient:4.5.13 - Apache HttpClient (http://hc.apache.org/httpcomponents-client), (Apache License, Version 2.0) diff --git a/licenses/inlong-audit/LICENSE b/licenses/inlong-audit/LICENSE index 5f0dcb7cc60..2676a4cd315 100644 --- a/licenses/inlong-audit/LICENSE +++ b/licenses/inlong-audit/LICENSE @@ -382,6 +382,7 @@ The text of each license is the standard Apache 2.0 license. org.apache.flume:flume-ng-node:1.9.0 - Flume NG Node (https://github.com/apache/flume/tree/flume-1.9/flume-ng-node), (The Apache Software License, Version 2.0) org.apache.flume:flume-ng-sdk:1.9.0 - Flume NG SDK (https://github.com/apache/flume/tree/flume-1.9/flume-ng-sdk), (The Apache Software License, Version 2.0) org.apache.flume.flume-ng-channels:flume-spillable-memory-channel:1.9.0 - Flume NG Spillable Memory channel (https://github.com/apache/flume/tree/flume-1.9/flume-ng-channels/flume-spillable-memory-channel), (The Apache Software License, Version 2.0) + org.apache.commons:commons-text:1.10.0 - Apache Commons Text (https://commons.apache.org/proper/commons-text), (Apache License, Version 2.0) com.google.code.gson:gson:2.8.6 - Gson (https://github.com/google/gson/gson), (Apache 2.0) com.google.guava:guava:32.1.2-jre - Guava: Google Core Libraries for Java (https://github.com/google/guava), (Apache License, Version 2.0) com.zaxxer:HikariCP:4.0.3 - HikariCP (https://github.com/brettwooldridge/HikariCP/tree/HikariCP-4.0.3), (The Apache Software License, Version 2.0) diff --git a/licenses/inlong-dataproxy/LICENSE b/licenses/inlong-dataproxy/LICENSE index b5987f3a3f1..fbeb484e3a2 100644 --- a/licenses/inlong-dataproxy/LICENSE +++ b/licenses/inlong-dataproxy/LICENSE @@ -373,6 +373,7 @@ The text of each license is the standard Apache 2.0 license. org.apache.flume:flume-ng-node:1.10.0 - Flume NG Node (https://github.com/apache/flume/tree/flume-1.10.0/flume-ng-node), (The Apache Software License, Version 2.0) org.apache.flume:flume-ng-sdk:1.10.0 - Flume NG SDK (https://github.com/apache/flume/tree/flume-1.10.0/flume-ng-sdk), (The Apache Software License, Version 2.0) org.apache.flume.flume-ng-channels:flume-spillable-memory-channel:1.10.0 - Flume NG Spillable Memory channel (https://github.com/apache/flume/tree/flume-1.10.0/flume-ng-channels/flume-spillable-memory-channel), (The Apache Software License, Version 2.0) + org.apache.commons:commons-text:1.10.0 - Apache Commons Text (https://commons.apache.org/proper/commons-text), (Apache License, Version 2.0) com.google.code.gson:gson:2.8.6 - Gson (https://github.com/google/gson/gson), (Apache 2.0) com.google.guava:guava:-jre - Guava: Google Core Libraries for Java (https://github.com/google/guava), (Apache License, Version 2.0) org.apache.httpcomponents:httpclient:4.5.13 - Apache HttpClient (https://hc.apache.org/httpcomponents-client-4.5.x), (Apache License, Version 2.0) diff --git a/licenses/inlong-manager/LICENSE b/licenses/inlong-manager/LICENSE index 75dd8c39178..4cec449372d 100644 --- a/licenses/inlong-manager/LICENSE +++ b/licenses/inlong-manager/LICENSE @@ -377,7 +377,7 @@ The text of each license is the standard Apache 2.0 license. commons-logging:commons-logging:1.2 - Commons Logging (https://commons.apache.org/proper/commons-logging/), (The Apache Software License, Version 2.0) commons-net:commons-net:3.1 - Commons Net (https://commons.apache.org/proper/commons-net/), (The Apache Software License, Version 2.0) commons-pool:commons-pool:1.5.4 - Commons Pool (https://commons.apache.org/proper/commons-pool/), (The Apache Software License, Version 2.0) - org.apache.commons:commons-text:1.9 - Apache Commons Text (https://commons.apache.org/proper/commons-text), (Apache License, Version 2.0) + org.apache.commons:commons-text:1.10.0 - Apache Commons Text (https://commons.apache.org/proper/commons-text), (Apache License, Version 2.0) com.typesafe:config:1.3.3 - config (https://github.com/lightbend/config/tree/v1.3.3), (Apache License, Version 2.0) com.squareup.retrofit2:converter-jackson:2.9.0 - Retrofit (https://github.com/square/retrofit) (Apache License, Version 2.0) org.apache.curator:curator-client:2.13.0 - Curator Client (https://curator.apache.org/curator-client), (The Apache Software License, Version 2.0) diff --git a/licenses/inlong-sort-standalone/LICENSE b/licenses/inlong-sort-standalone/LICENSE index 7c6c96caa09..77d38d474ac 100644 --- a/licenses/inlong-sort-standalone/LICENSE +++ b/licenses/inlong-sort-standalone/LICENSE @@ -397,6 +397,7 @@ The text of each license is the standard Apache 2.0 license. org.apache.flume:flume-ng-node:1.9.0 - Flume NG Node (https://github.com/apache/flume/tree/flume-1.9/flume-ng-node), (The Apache Software License, Version 2.0) org.apache.flume:flume-ng-sdk:1.9.0 - Flume NG SDK (https://github.com/apache/flume/tree/flume-1.9/flume-ng-sdk), (The Apache Software License, Version 2.0) org.apache.flume.flume-ng-channels:flume-spillable-memory-channel:1.9.0 - Flume NG Spillable Memory channel (https://github.com/apache/flume/tree/flume-1.9/flume-ng-channels/flume-spillable-memory-channel), (The Apache Software License, Version 2.0) + org.apache.commons:commons-text:1.10.0 - Apache Commons Text (https://commons.apache.org/proper/commons-text), (Apache License, Version 2.0) de.ruedigermoeller:fst:2.50 - fst (https://github.com/RuedigerMoeller/fast-serialization/tree/v2.50), (Apache License 2.0) org.apache.geronimo.specs:geronimo-jcache_1.0_spec:1.0-alpha-1 - Apache Geronimo JCache Spec 1.0 (http://geronimo.apache.org/maven/specs/geronimo-jcache_1.0_spec/1.0-alpha-1), (The Apache Software License, Version 2.0) com.google.code.gson:gson:2.8.6 - Gson (https://github.com/google/gson/gson), (Apache 2.0)