This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch
dependabot/maven/sql/storm-sql-runtime/org.apache.avro-avro-1.11.3
in repository https://gitbox.apache.org/repos/asf/storm.git
The following commit(s) were added to
refs/heads/dependabot/maven/sql/storm-sql-runtime/org.apache.avro-avro-1.11.3
by this push:
new e0a31fc46 Fix avro licenses. Remove duplicate / multiple avro versions
in classpath
e0a31fc46 is described below
commit e0a31fc466497f15ea2c9c89009d5fac0aa651ca
Author: Richard Zowalla <[email protected]>
AuthorDate: Thu Oct 19 11:30:58 2023 +0200
Fix avro licenses. Remove duplicate / multiple avro versions in classpath
---
DEPENDENCY-LICENSES | 6 +-----
LICENSE-binary | 3 +--
external/storm-blobstore-migration/pom.xml | 8 ++++++++
external/storm-hdfs-blobstore/pom.xml | 8 ++++++++
external/storm-hdfs-oci/pom.xml | 8 ++++++++
external/storm-hdfs/pom.xml | 8 ++++++++
pom.xml | 5 +++++
7 files changed, 39 insertions(+), 7 deletions(-)
diff --git a/DEPENDENCY-LICENSES b/DEPENDENCY-LICENSES
index 5e0632ce6..f21700a4a 100644
--- a/DEPENDENCY-LICENSES
+++ b/DEPENDENCY-LICENSES
@@ -16,6 +16,7 @@ List of third-party dependencies grouped by their license
type.
* ActiveMQ :: KahaDB Store
(org.apache.activemq:activemq-kahadb-store:5.18.2 -
http://activemq.apache.org/activemq-kahadb-store)
* ActiveMQ :: MQTT Protocol (org.apache.activemq:activemq-mqtt:5.18.2
- http://activemq.apache.org/activemq-mqtt)
* ActiveMQ :: Openwire Legacy Support
(org.apache.activemq:activemq-openwire-legacy:5.18.2 -
http://activemq.apache.org/activemq-openwire-legacy)
+ * Apache Avro (org.apache.avro:avro:1.11.3 - https://avro.apache.org)
* Apache Commons FileUpload (commons-fileupload:commons-fileupload:1.5
- https://commons.apache.org/proper/commons-fileupload/)
* Apache Commons Lang (org.apache.commons:commons-lang3:3.13.0 -
https://commons.apache.org/proper/commons-lang/)
* Gson (com.google.code.gson:gson:2.8.9 -
https://github.com/google/gson/gson)
@@ -42,8 +43,6 @@ List of third-party dependencies grouped by their license
type.
* ant (ant:ant:1.6.5 - http://www.apache.org/ant/)
* Apache Ant Core (org.apache.ant:ant:1.9.1 - http://ant.apache.org/)
* Apache Ant Launcher (org.apache.ant:ant-launcher:1.9.1 -
http://ant.apache.org/)
- * Apache Avro (org.apache.avro:avro:1.7.7 - http://avro.apache.org)
- * Apache Avro (org.apache.avro:avro:1.8.2 - http://avro.apache.org)
* Apache Calcite Avatica
(org.apache.calcite.avatica:avatica-core:1.11.0 -
https://calcite.apache.org/avatica/avatica-core)
* Apache Calcite Avatica Metrics
(org.apache.calcite.avatica:avatica-metrics:1.11.0 -
https://calcite.apache.org/avatica/avatica-metrics)
* Apache Commons BeanUtils (commons-beanutils:commons-beanutils:1.9.4
- https://commons.apache.org/proper/commons-beanutils/)
@@ -616,8 +615,6 @@ List of third-party dependencies grouped by their license
type.
* ASM Util (org.ow2.asm:asm-util:6.0_BETA -
http://asm.objectweb.org/asm-util/)
* Javolution (javolution:javolution:5.5.1 - http://javolution.org)
* JLine (jline:jline:0.9.94 - http://jline.sourceforge.net)
- * ParaNamer Core (com.thoughtworks.paranamer:paranamer:2.3 -
http://paranamer.codehaus.org/paranamer)
- * ParaNamer Core (com.thoughtworks.paranamer:paranamer:2.7 -
http://paranamer.codehaus.org/paranamer)
* Stax2 API (org.codehaus.woodstox:stax2-api:3.1.4 -
http://wiki.fasterxml.com/WoodstoxStax2)
* xmlenc Library (xmlenc:xmlenc:0.52 - http://xmlenc.sourceforge.net)
@@ -743,7 +740,6 @@ List of third-party dependencies grouped by their license
type.
Public Domain
* AOP alliance (aopalliance:aopalliance:1.0 -
http://aopalliance.sourceforge.net)
- * XZ for Java (org.tukaani:xz:1.5 - http://tukaani.org/xz/java.html)
Revised BSD
diff --git a/LICENSE-binary b/LICENSE-binary
index 49130c053..d2095772c 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -707,7 +707,7 @@ The license texts of these dependencies can be found in the
licenses directory.
* ant (ant:ant:1.6.5 - http://www.apache.org/ant/)
* Apache Ant Core (org.apache.ant:ant:1.9.1 - http://ant.apache.org/)
* Apache Ant Launcher (org.apache.ant:ant-launcher:1.9.1 -
http://ant.apache.org/)
- * Apache Avro (org.apache.avro:avro:1.7.7 - http://avro.apache.org)
+ * Apache Avro (org.apache.avro:avro:1.11.3 - https://avro.apache.org)
* Apache Calcite Avatica
(org.apache.calcite.avatica:avatica-core:1.11.0 -
https://calcite.apache.org/avatica/avatica-core)
* Apache Commons CLI (commons-cli:commons-cli:1.4 -
http://commons.apache.org/proper/commons-cli/)
* Apache Commons Codec (commons-codec:commons-codec:1.11 -
http://commons.apache.org/proper/commons-codec/)
@@ -981,7 +981,6 @@ The license texts of these dependencies can be found in the
licenses directory.
* leveldbjni-all (org.fusesource.leveldbjni:leveldbjni-all:1.8 -
http://leveldbjni.fusesource.org/leveldbjni-all)
* ANTLR 3 Runtime (org.antlr:antlr-runtime:3.5.2 -
http://www.antlr.org)
* ANTLR ST4 4.0.4 (org.antlr:ST4:4.0.4 - http://www.stringtemplate.org)
- * ParaNamer Core (com.thoughtworks.paranamer:paranamer:2.3 -
http://paranamer.codehaus.org/paranamer)
* Stax2 API (org.codehaus.woodstox:stax2-api:3.1.4 -
http://wiki.fasterxml.com/WoodstoxStax2)
* xmlenc Library (xmlenc:xmlenc:0.52 - http://xmlenc.sourceforge.net)
* Commons Compiler (org.codehaus.janino:commons-compiler:2.7.6 -
http://docs.codehaus.org/display/JANINO/Home/commons-compiler)
diff --git a/external/storm-blobstore-migration/pom.xml
b/external/storm-blobstore-migration/pom.xml
index 0ec323b6e..cee417388 100644
--- a/external/storm-blobstore-migration/pom.xml
+++ b/external/storm-blobstore-migration/pom.xml
@@ -94,8 +94,16 @@ limitations under the License.
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ </exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
diff --git a/external/storm-hdfs-blobstore/pom.xml
b/external/storm-hdfs-blobstore/pom.xml
index 04d93923b..49e15733e 100644
--- a/external/storm-hdfs-blobstore/pom.xml
+++ b/external/storm-hdfs-blobstore/pom.xml
@@ -176,8 +176,16 @@
<groupId>jdk.tools</groupId>
<artifactId>jdk.tools</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ </exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minicluster</artifactId>
diff --git a/external/storm-hdfs-oci/pom.xml b/external/storm-hdfs-oci/pom.xml
index 175119fc2..96c94ffcc 100644
--- a/external/storm-hdfs-oci/pom.xml
+++ b/external/storm-hdfs-oci/pom.xml
@@ -84,8 +84,16 @@
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ </exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git a/external/storm-hdfs/pom.xml b/external/storm-hdfs/pom.xml
index ef0b27b35..a2353e5c9 100644
--- a/external/storm-hdfs/pom.xml
+++ b/external/storm-hdfs/pom.xml
@@ -130,8 +130,16 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ </exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-auth</artifactId>
diff --git a/pom.xml b/pom.xml
index 28c88884b..58f5d7869 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1022,6 +1022,11 @@
<artifactId>httpcore</artifactId>
<version>${httpclient.core.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ <version>1.11.3</version>
+ </dependency>
</dependencies>
</dependencyManagement>
