Skip to content

Commit

Permalink
[fix][sec] Drop hdfs2 support, Upgrade hadoop3 to 3.4.0 and dnsjava t…
Browse files Browse the repository at this point in the history
…o 3.6.2 to address CVE-2024-25638 (apache#23411)
  • Loading branch information
lhotari authored Oct 11, 2024
1 parent 50dc521 commit d5e3675
Show file tree
Hide file tree
Showing 37 changed files with 94 additions and 2,190 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pulsar-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1498,7 +1498,7 @@ jobs:
- name: trigger dependency check
run: |
mvn -B -ntp verify -PskipDocker,skip-all,owasp-dependency-check -Dcheckstyle.skip=true -DskipTests \
-pl '!distribution/server,!distribution/io,!distribution/offloaders,!tiered-storage/file-system,!pulsar-io/flume,!pulsar-io/hbase,!pulsar-io/hdfs2,!pulsar-io/hdfs3,!pulsar-io/docs,!pulsar-io/jdbc/openmldb'
-pl '!distribution/server,!distribution/io,!distribution/offloaders,!tiered-storage/file-system,!pulsar-io/flume,!pulsar-io/hbase,!pulsar-io/hdfs3,!pulsar-io/docs,!pulsar-io/jdbc/openmldb'
- name: Upload report
uses: actions/upload-artifact@v4
Expand Down
1 change: 0 additions & 1 deletion deployment/terraform-ansible/deploy-pulsar.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,6 @@
# - file
# - flume
# - hbase
# - hdfs2
# - hdfs3
# - influxdb
# - jdbc-clickhouse
Expand Down
1 change: 0 additions & 1 deletion distribution/io/src/assemble/io.xml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@
<file><source>${basedir}/../../pulsar-io/kafka-connect-adaptor-nar/target/pulsar-io-kafka-connect-adaptor-${project.version}.nar</source></file>
<file><source>${basedir}/../../pulsar-io/hbase/target/pulsar-io-hbase-${project.version}.nar</source></file>
<file><source>${basedir}/../../pulsar-io/kinesis/target/pulsar-io-kinesis-${project.version}.nar</source></file>
<file><source>${basedir}/../../pulsar-io/hdfs2/target/pulsar-io-hdfs2-${project.version}.nar</source></file>
<file><source>${basedir}/../../pulsar-io/hdfs3/target/pulsar-io-hdfs3-${project.version}.nar</source></file>
<file><source>${basedir}/../../pulsar-io/file/target/pulsar-io-file-${project.version}.nar</source></file>
<file><source>${basedir}/../../pulsar-io/data-generator/target/pulsar-io-data-generator-${project.version}.nar</source></file>
Expand Down
60 changes: 56 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,6 @@ flexible messaging model and an intuitive client API.</description>
<clickhouse-jdbc.version>0.4.6</clickhouse-jdbc.version>
<mariadb-jdbc.version>2.7.5</mariadb-jdbc.version>
<openmldb-jdbc.version>0.4.4-hotfix1</openmldb-jdbc.version>
<hdfs-offload-version3>3.3.5</hdfs-offload-version3>
<json-smart.version>2.4.10</json-smart.version>
<opensearch.version>2.16.0</opensearch.version>
<elasticsearch-java.version>8.12.1</elasticsearch-java.version>
Expand All @@ -207,9 +206,10 @@ flexible messaging model and an intuitive client API.</description>
<wildfly-elytron.version>1.15.16.Final</wildfly-elytron.version>
<jsonwebtoken.version>0.11.1</jsonwebtoken.version>
<opencensus.version>0.28.0</opencensus.version>
<hadoop2.version>2.10.2</hadoop2.version>
<hadoop3.version>3.3.5</hadoop3.version>
<hbase.version>2.4.16</hbase.version>
<hadoop3.version>3.4.0</hadoop3.version>
<dnsjava3.version>3.6.2</dnsjava3.version>
<hdfs-offload-version3>${hadoop3.version}</hdfs-offload-version3>
<hbase.version>2.6.0-hadoop3</hbase.version>
<guava.version>32.1.2-jre</guava.version>
<jcip.version>1.0</jcip.version>
<prometheus-jmx.version>0.16.1</prometheus-jmx.version>
Expand Down Expand Up @@ -1313,6 +1313,58 @@ flexible messaging model and an intuitive client API.</description>
<version>${commons.collections4.version}</version>
</dependency>

<!-- support only hadoop 3 since hadoop 2 is EOL -->
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<version>${hadoop3.version}</version>
<exclusions>
<exclusion>
<groupId>dnsjava</groupId>
<artifactId>dnsjava</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-auth</artifactId>
<version>${hadoop3.version}</version>
<exclusions>
<exclusion>
<groupId>dnsjava</groupId>
<artifactId>dnsjava</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
<version>${hadoop3.version}</version>
<exclusions>
<exclusion>
<groupId>dnsjava</groupId>
<artifactId>dnsjava</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-client</artifactId>
<version>${hbase.version}</version>
<exclusions>
<exclusion>
<groupId>dnsjava</groupId>
<artifactId>dnsjava</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- dnsjava is pulled in by hadoop-common -->
<dependency>
<groupId>dnsjava</groupId>
<artifactId>dnsjava</artifactId>
<version>${dnsjava3.version}</version>
</dependency>

<!-- test dependencies -->
<dependency>
<groupId>com.lmax</groupId>
Expand Down
5 changes: 0 additions & 5 deletions pulsar-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -495,11 +495,6 @@
<artifactId>pulsar-io-hbase</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-io-hdfs2</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-io-hdfs3</artifactId>
Expand Down
5 changes: 0 additions & 5 deletions pulsar-io/docs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -127,11 +127,6 @@
<artifactId>pulsar-io-hbase</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>pulsar-io-hdfs2</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>pulsar-io-hdfs3</artifactId>
Expand Down
130 changes: 0 additions & 130 deletions pulsar-io/hdfs2/pom.xml

This file was deleted.

This file was deleted.

Loading

0 comments on commit d5e3675

Please sign in to comment.