From e1d39539fdd07b7c730b1c5106e662e5420dd9e8 Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Wed, 11 Sep 2024 12:40:02 +0200 Subject: [PATCH 1/8] HDDS-11450. Avoid managing versions for transitive-only dependencies --- hadoop-hdds/hadoop-dependency-client/pom.xml | 32 ---------- hadoop-hdds/hadoop-dependency-server/pom.xml | 28 --------- hadoop-ozone/integration-test/pom.xml | 20 +++++++ hadoop-ozone/pom.xml | 19 ++++++ hadoop-ozone/s3gateway/pom.xml | 18 ++++++ hadoop-ozone/tools/pom.xml | 19 ++++++ pom.xml | 63 -------------------- 7 files changed, 76 insertions(+), 123 deletions(-) diff --git a/hadoop-hdds/hadoop-dependency-client/pom.xml b/hadoop-hdds/hadoop-dependency-client/pom.xml index 03b677e3818c..fb1c72b9a024 100644 --- a/hadoop-hdds/hadoop-dependency-client/pom.xml +++ b/hadoop-hdds/hadoop-dependency-client/pom.xml @@ -43,18 +43,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> hadoop-common ${hadoop.version} - - com.nimbusds - nimbus-jose-jwt - - - org.xerial.snappy - snappy-java - - - org.apache.hadoop.thirdparty - hadoop-shaded-guava - org.apache.hadoop hadoop-annotations @@ -191,10 +179,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> dnsjava dnsjava - - com.nimbusds - * - net.minidev * @@ -210,24 +194,12 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - - org.apache.hadoop.thirdparty - hadoop-shaded-guava - - - com.nimbusds - nimbus-jose-jwt - org.apache.hadoop hadoop-hdfs ${hadoop.version} compile - - org.apache.hadoop.thirdparty - hadoop-shaded-guava - com.google.guava guava @@ -314,10 +286,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - - org.xerial.snappy - snappy-java - diff --git a/hadoop-hdds/hadoop-dependency-server/pom.xml b/hadoop-hdds/hadoop-dependency-server/pom.xml index 69daeac4bd7f..1e2444c74d3d 100644 --- a/hadoop-hdds/hadoop-dependency-server/pom.xml +++ b/hadoop-hdds/hadoop-dependency-server/pom.xml @@ -43,18 +43,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> hadoop-common ${hadoop.version} - - com.nimbusds - nimbus-jose-jwt - - - org.xerial.snappy - snappy-java - - - org.apache.hadoop.thirdparty - hadoop-shaded-guava - org.apache.curator * @@ -148,14 +136,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - - org.apache.hadoop.thirdparty - hadoop-shaded-guava - - - com.nimbusds - nimbus-jose-jwt - commons-cli @@ -171,10 +151,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> com.sun.jersey * - - org.apache.hadoop.thirdparty - hadoop-shaded-guava - io.netty * @@ -205,10 +181,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.kerby kerb-util - - org.xerial.snappy - snappy-java - diff --git a/hadoop-ozone/integration-test/pom.xml b/hadoop-ozone/integration-test/pom.xml index f66f64d2874f..e56a55a6cfb0 100644 --- a/hadoop-ozone/integration-test/pom.xml +++ b/hadoop-ozone/integration-test/pom.xml @@ -42,6 +42,26 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.ozone hdds-server-scm + + + + com.fasterxml.woodstox + woodstox-core + + org.apache.ozone diff --git a/hadoop-ozone/pom.xml b/hadoop-ozone/pom.xml index d91d488c4345..8b4f5b0378d8 100644 --- a/hadoop-ozone/pom.xml +++ b/hadoop-ozone/pom.xml @@ -315,6 +315,25 @@ true + + + org.codehaus.woodstox:stax2-api + diff --git a/hadoop-ozone/s3gateway/pom.xml b/hadoop-ozone/s3gateway/pom.xml index c26171d98ac4..6a0272cd67d7 100644 --- a/hadoop-ozone/s3gateway/pom.xml +++ b/hadoop-ozone/s3gateway/pom.xml @@ -226,6 +226,24 @@ org.apache.ozone hdds-hadoop-dependency-server + + + + com.fasterxml.woodstox + woodstox-core + + org.apache.ozone diff --git a/hadoop-ozone/tools/pom.xml b/hadoop-ozone/tools/pom.xml index 04c1c8602cb0..a197b6b94b55 100644 --- a/hadoop-ozone/tools/pom.xml +++ b/hadoop-ozone/tools/pom.xml @@ -196,6 +196,25 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> com.amazonaws aws-java-sdk-core + + + + joda-time + joda-time + + com.amazonaws diff --git a/pom.xml b/pom.xml index c3834286870b..8fdac47051de 100644 --- a/pom.xml +++ b/pom.xml @@ -148,7 +148,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs 2.3.9 0.10.4 3.1.19 - 0.1.55 2.0 3.1.0 2.1 @@ -162,7 +161,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs 1.9.13 1.9.13 2.16.2 - 5.4.0 1.8.1 @@ -187,9 +185,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs 0.16.0 0.10.2 - - 1.7 - 2.5.0 @@ -197,15 +192,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs 1.1.1 3.1.12.2 - 2.1.9 4.12.0 - 4.2.2 2.6.1 2.1.1 2.0.2 2.1.6 1 - 2.12.7 1.0 0.21.0 @@ -215,7 +207,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs 2.10.1 2.7.5 - 3.6.0 4.11.0 2.2 5.10.3 @@ -309,18 +300,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs 1.2.1 3.9.9 - 1.1.10.6 - 1.2.0 - 9.40 - - com.squareup.okio - okio - ${okio.version} - com.squareup.okhttp okhttp @@ -980,11 +963,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs spring-tx ${spring.version} - - com.fasterxml.woodstox - woodstox-core - ${woodstox.version} - com.fasterxml.jackson jackson-bom @@ -1007,11 +985,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs compile-testing ${compile-testing.version} - - com.google.re2j - re2j - ${re2j.version} - com.google.protobuf protobuf-java @@ -1027,11 +1000,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs commons-daemon ${commons-daemon.version} - - com.jcraft - jsch - ${jsch.version} - org.kohsuke.metainf-services @@ -1170,12 +1138,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs ${bouncycastle.version} - - dnsjava - dnsjava - ${dnsjava.version} - - org.yaml snakeyaml @@ -1222,11 +1184,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs okhttp ${okhttp3.version} - - org.codehaus.woodstox - stax2-api - ${stax2.version} - net.java.dev.jna jna @@ -1257,11 +1214,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs jakarta.ws.rs-api ${jakarta.ws.rs-api.version} - - joda-time - joda-time - ${joda.time.version} - org.apache.curator curator-framework @@ -1292,26 +1244,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs mockito-inline ${mockito.version} - - org.xerial.snappy - snappy-java - ${snappy-java.version} - - - org.apache.hadoop.thirdparty - hadoop-shaded-guava - ${hadoop-shaded-guava.version} - com.github.vlsi.mxgraph jgraphx ${jgraphx.version} - - com.nimbusds - nimbus-jose-jwt - ${com.nimbusds.nimbus-jose-jwt.version} - From 1f247ac2d1f70d5fdc02783f995aee1592fd1852 Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Wed, 11 Sep 2024 16:39:02 +0200 Subject: [PATCH 2/8] copy dependencies per project --- hadoop-hdds/pom.xml | 31 -------------- .../dev-support/bin/dist-layout-stitching | 5 +++ hadoop-ozone/pom.xml | 31 -------------- pom.xml | 42 +++++++++++++++++++ 4 files changed, 47 insertions(+), 62 deletions(-) diff --git a/hadoop-hdds/pom.xml b/hadoop-hdds/pom.xml index 87d761583014..ef8159d9076e 100644 --- a/hadoop-hdds/pom.xml +++ b/hadoop-hdds/pom.xml @@ -322,36 +322,5 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> - - add-classpath-descriptor - - - src/main/java - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - add-classpath-descriptor - prepare-package - - build-classpath - - - ${project.build.outputDirectory}/${project.artifactId}.classpath - $HDDS_LIB_JARS_DIR - true - runtime - - - - - - - diff --git a/hadoop-ozone/dist/dev-support/bin/dist-layout-stitching b/hadoop-ozone/dist/dev-support/bin/dist-layout-stitching index 0ec066aca563..c72f540da73c 100755 --- a/hadoop-ozone/dist/dev-support/bin/dist-layout-stitching +++ b/hadoop-ozone/dist/dev-support/bin/dist-layout-stitching @@ -71,6 +71,7 @@ run cp -p "${ROOT}/HISTORY.md" . run cp -p "${ROOT}/SECURITY.md" . run cp -p "${ROOT}/CONTRIBUTING.md" . +run mkdir -p ./share/ozone/lib run mkdir -p ./share/ozone/web run mkdir -p ./bin run mkdir -p ./sbin @@ -129,6 +130,10 @@ run cp -p -r "${ROOT}/hadoop-ozone/dist/target/Dockerfile" . #Copy pre-generated keytabs run cp -p -R "${ROOT}/hadoop-ozone/dist/src/main/keytabs" compose/_keytabs +for file in $(find "${ROOT}" -path '*/share/ozone/lib/*jar' -not -path '*test*/share/ozone/lib/*' | sort); do + cp -n -p -v "$file" share/ozone/lib/ +done + #workaround for https://issues.apache.org/jira/browse/MRESOURCES-236 find ./compose -name "*.sh" -exec chmod 755 {} \; find ./kubernetes -name "*.sh" -exec chmod 755 {} \; diff --git a/hadoop-ozone/pom.xml b/hadoop-ozone/pom.xml index 8b4f5b0378d8..01733251edf5 100644 --- a/hadoop-ozone/pom.xml +++ b/hadoop-ozone/pom.xml @@ -474,36 +474,5 @@ - - add-classpath-descriptor - - - src/main/java - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - add-classpath-descriptor - prepare-package - - build-classpath - - - ${project.build.outputDirectory}/${project.artifactId}.classpath - $HDDS_LIB_JARS_DIR - true - runtime - - - - - - - diff --git a/pom.xml b/pom.xml index 8fdac47051de..70c1492f086b 100644 --- a/pom.xml +++ b/pom.xml @@ -2240,5 +2240,47 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs + + add-classpath-descriptor + + + src/main/java + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + add-classpath-descriptor + prepare-package + + build-classpath + + + ${project.build.outputDirectory}/${project.artifactId}.classpath + $HDDS_LIB_JARS_DIR + true + runtime + + + + copy-jars + prepare-package + + copy-dependencies + + + ${project.build.directory}/share/ozone/lib + runtime + + + + + + + From 699d60b45c9b8ff1ee38783311acefc8436a2211 Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Wed, 11 Sep 2024 17:38:56 +0200 Subject: [PATCH 3/8] fix re2j version in license.exceptions --- hadoop-ozone/dev-support/checks/license.exceptions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-ozone/dev-support/checks/license.exceptions b/hadoop-ozone/dev-support/checks/license.exceptions index 5b22b88c4921..66f17fb670d3 100644 --- a/hadoop-ozone/dev-support/checks/license.exceptions +++ b/hadoop-ozone/dev-support/checks/license.exceptions @@ -16,7 +16,7 @@ # This file lists dependencies with acceptable license that # license-maven-plugin cannot find, or finds with unexpected license. -com.google.re2j:re2j:1.7 BSD 3-Clause +com.google.re2j:re2j:1.1 BSD 3-Clause javax.servlet:servlet-api:2.5 CDDL 1.1 javax.servlet.jsp:jsp-api:2.1 CDDL 1.1 org.codehaus.jettison:jettison:1.1 Apache License 2.0 From 10d03cfef6338a6c52f62754f56f218da071e9ef Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Wed, 11 Sep 2024 17:40:13 +0200 Subject: [PATCH 4/8] fix dependency check --- hadoop-ozone/dev-support/checks/dependency.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hadoop-ozone/dev-support/checks/dependency.sh b/hadoop-ozone/dev-support/checks/dependency.sh index 116664df81b1..dc95a25e47c2 100755 --- a/hadoop-ozone/dev-support/checks/dependency.sh +++ b/hadoop-ozone/dev-support/checks/dependency.sh @@ -32,8 +32,8 @@ cp ${src_dir}/current.txt "$REPORT_DIR"/ #implementation of sort cli is not exactly the same everywhere. It's better to sort with the same command locally (diff -uw \ - <(sort ${src_dir}/jar-report.txt) \ - <(sort ${src_dir}/current.txt) \ + <(sort -u ${src_dir}/jar-report.txt) \ + <(sort -u ${src_dir}/current.txt) \ || true) \ > "$REPORT_FILE" From f9c2649ae2a8afdb027191aad86563383c1c7abe Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Thu, 12 Sep 2024 08:44:19 +0200 Subject: [PATCH 5/8] exclude ozone-filesystem-shaded, which is base for hadoop2/3-specific fat jars --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 70c1492f086b..e06f81abb832 100644 --- a/pom.xml +++ b/pom.xml @@ -2275,6 +2275,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs ${project.build.directory}/share/ozone/lib runtime + ozone-filesystem-shaded From 91e4ad8f9835d15df7184e2103997013d4f55eeb Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Thu, 12 Sep 2024 15:52:46 +0200 Subject: [PATCH 6/8] copy classpath files instead of extracting them; avoid using profile, as it could be disabled manually... --- hadoop-hdds/server-scm/pom.xml | 1 + hadoop-ozone/csi/pom.xml | 1 + hadoop-ozone/datanode/pom.xml | 1 + .../dev-support/bin/dist-layout-stitching | 7 +- hadoop-ozone/dist/pom.xml | 37 +-------- hadoop-ozone/httpfsgateway/pom.xml | 1 + hadoop-ozone/insight/pom.xml | 2 + hadoop-ozone/ozone-manager/pom.xml | 1 + hadoop-ozone/recon/pom.xml | 1 + hadoop-ozone/s3gateway/pom.xml | 1 + hadoop-ozone/tools/pom.xml | 4 + pom.xml | 77 ++++++++----------- 12 files changed, 54 insertions(+), 80 deletions(-) diff --git a/hadoop-hdds/server-scm/pom.xml b/hadoop-hdds/server-scm/pom.xml index 32408e8904b2..a08138b721d1 100644 --- a/hadoop-hdds/server-scm/pom.xml +++ b/hadoop-hdds/server-scm/pom.xml @@ -29,6 +29,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> jar + false diff --git a/hadoop-ozone/csi/pom.xml b/hadoop-ozone/csi/pom.xml index a0565d7e8909..63aa097d766b 100644 --- a/hadoop-ozone/csi/pom.xml +++ b/hadoop-ozone/csi/pom.xml @@ -29,6 +29,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> jar + false true diff --git a/hadoop-ozone/datanode/pom.xml b/hadoop-ozone/datanode/pom.xml index 29c10671d9da..bf41cb64fd70 100644 --- a/hadoop-ozone/datanode/pom.xml +++ b/hadoop-ozone/datanode/pom.xml @@ -27,6 +27,7 @@ 1.5.0-SNAPSHOT + false true true diff --git a/hadoop-ozone/dist/dev-support/bin/dist-layout-stitching b/hadoop-ozone/dist/dev-support/bin/dist-layout-stitching index c72f540da73c..03905fd20abd 100755 --- a/hadoop-ozone/dist/dev-support/bin/dist-layout-stitching +++ b/hadoop-ozone/dist/dev-support/bin/dist-layout-stitching @@ -71,6 +71,7 @@ run cp -p "${ROOT}/HISTORY.md" . run cp -p "${ROOT}/SECURITY.md" . run cp -p "${ROOT}/CONTRIBUTING.md" . +run mkdir -p ./share/ozone/classpath run mkdir -p ./share/ozone/lib run mkdir -p ./share/ozone/web run mkdir -p ./bin @@ -130,7 +131,11 @@ run cp -p -r "${ROOT}/hadoop-ozone/dist/target/Dockerfile" . #Copy pre-generated keytabs run cp -p -R "${ROOT}/hadoop-ozone/dist/src/main/keytabs" compose/_keytabs -for file in $(find "${ROOT}" -path '*/share/ozone/lib/*jar' -not -path '*test*/share/ozone/lib/*' | sort); do +for file in $(find "${ROOT}" -path '*/target/classes/*.classpath' | sort); do + cp -n -p -v "$file" share/ozone/classpath/ +done + +for file in $(find "${ROOT}" -path '*/share/ozone/lib/*jar' | sort); do cp -n -p -v "$file" share/ozone/lib/ done diff --git a/hadoop-ozone/dist/pom.xml b/hadoop-ozone/dist/pom.xml index f2c2ba365c0d..56d59f9a34a6 100644 --- a/hadoop-ozone/dist/pom.xml +++ b/hadoop-ozone/dist/pom.xml @@ -71,24 +71,7 @@ maven-dependency-plugin - copy-classpath-files - prepare-package - - unpack-dependencies - - - - target/ozone-${ozone.version}/share/ozone/classpath - - *.classpath - - hdds-server-scm,ozone-common,ozone-csi,ozone-datanode,ozone-httpfsgateway, - ozone-insight,ozone-manager,ozone-recon,ozone-s3gateway,ozone-tools,hdds-rocks-native,ozone-s3-secret-store - - - - - copy-jars + copy-omitted-jars prepare-package copy-dependencies @@ -98,24 +81,6 @@ runtime - - copy-omitted-jars - prepare-package - - copy - - - target/ozone-${ozone.version}/share/ozone/lib - - - - com.google.protobuf - protobuf-java - ${grpc.protobuf-compile.version} - - - - diff --git a/hadoop-ozone/httpfsgateway/pom.xml b/hadoop-ozone/httpfsgateway/pom.xml index 7664643b153e..4773a02840ac 100644 --- a/hadoop-ozone/httpfsgateway/pom.xml +++ b/hadoop-ozone/httpfsgateway/pom.xml @@ -32,6 +32,7 @@ Apache Ozone HttpFS + false REPO NOT AVAIL REVISION NOT AVAIL yyyy-MM-dd'T'HH:mm:ssZ diff --git a/hadoop-ozone/insight/pom.xml b/hadoop-ozone/insight/pom.xml index bcfb1660244d..1176e1cf62d0 100644 --- a/hadoop-ozone/insight/pom.xml +++ b/hadoop-ozone/insight/pom.xml @@ -27,7 +27,9 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> Apache Ozone Insight Tool Apache Ozone Insight Tool jar + + false diff --git a/hadoop-ozone/ozone-manager/pom.xml b/hadoop-ozone/ozone-manager/pom.xml index ae427727def5..c2fa6d601ec6 100644 --- a/hadoop-ozone/ozone-manager/pom.xml +++ b/hadoop-ozone/ozone-manager/pom.xml @@ -29,6 +29,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> jar + false diff --git a/hadoop-ozone/recon/pom.xml b/hadoop-ozone/recon/pom.xml index a24252c1ed62..b34049f67730 100644 --- a/hadoop-ozone/recon/pom.xml +++ b/hadoop-ozone/recon/pom.xml @@ -24,6 +24,7 @@ 4.0.0 ozone-recon + false 8.15.7 diff --git a/hadoop-ozone/s3gateway/pom.xml b/hadoop-ozone/s3gateway/pom.xml index 6a0272cd67d7..f35e5efc02b7 100644 --- a/hadoop-ozone/s3gateway/pom.xml +++ b/hadoop-ozone/s3gateway/pom.xml @@ -26,6 +26,7 @@ jar 1.5.0-SNAPSHOT + false UTF-8 true diff --git a/hadoop-ozone/tools/pom.xml b/hadoop-ozone/tools/pom.xml index a197b6b94b55..a39060102cb3 100644 --- a/hadoop-ozone/tools/pom.xml +++ b/hadoop-ozone/tools/pom.xml @@ -28,6 +28,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> Apache Ozone Tools jar + + false + + org.apache.ozone diff --git a/pom.xml b/pom.xml index e06f81abb832..693678509ed6 100644 --- a/pom.xml +++ b/pom.xml @@ -95,6 +95,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs UTF-8 UTF-8 + true + 3.2.4 bash @@ -1629,6 +1631,38 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs + + org.apache.maven.plugins + maven-dependency-plugin + + + add-classpath-descriptor + prepare-package + + build-classpath + + + ${project.build.outputDirectory}/${project.artifactId}.classpath + $HDDS_LIB_JARS_DIR + true + runtime + ${classpath.skip} + + + + copy-jars + prepare-package + + copy-dependencies + + + ${project.build.directory}/share/ozone/lib + runtime + ${classpath.skip} + + + + maven-clean-plugin @@ -2240,48 +2274,5 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs - - add-classpath-descriptor - - - src/main/java - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - add-classpath-descriptor - prepare-package - - build-classpath - - - ${project.build.outputDirectory}/${project.artifactId}.classpath - $HDDS_LIB_JARS_DIR - true - runtime - - - - copy-jars - prepare-package - - copy-dependencies - - - ${project.build.directory}/share/ozone/lib - runtime - ozone-filesystem-shaded - - - - - - - From 4fd723db383c8f4533cd89437330035a24f396c9 Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Thu, 12 Sep 2024 16:31:51 +0200 Subject: [PATCH 7/8] restore nimbus-jose-jwt and snappy-java for CVE --- hadoop-hdds/hadoop-dependency-client/pom.xml | 20 ++++++++++++++++++++ hadoop-hdds/hadoop-dependency-server/pom.xml | 16 ++++++++++++++++ pom.xml | 14 ++++++++++++++ 3 files changed, 50 insertions(+) diff --git a/hadoop-hdds/hadoop-dependency-client/pom.xml b/hadoop-hdds/hadoop-dependency-client/pom.xml index fb1c72b9a024..ebe54e61a646 100644 --- a/hadoop-hdds/hadoop-dependency-client/pom.xml +++ b/hadoop-hdds/hadoop-dependency-client/pom.xml @@ -43,6 +43,14 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> hadoop-common ${hadoop.version} + + com.nimbusds + nimbus-jose-jwt + + + org.xerial.snappy + snappy-java + org.apache.hadoop hadoop-annotations @@ -179,6 +187,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> dnsjava dnsjava + + com.nimbusds + * + net.minidev * @@ -194,6 +206,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> + + com.nimbusds + nimbus-jose-jwt + org.apache.hadoop hadoop-hdfs @@ -286,6 +302,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> + + org.xerial.snappy + snappy-java + diff --git a/hadoop-hdds/hadoop-dependency-server/pom.xml b/hadoop-hdds/hadoop-dependency-server/pom.xml index 1e2444c74d3d..bd75526eb5a5 100644 --- a/hadoop-hdds/hadoop-dependency-server/pom.xml +++ b/hadoop-hdds/hadoop-dependency-server/pom.xml @@ -43,6 +43,14 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> hadoop-common ${hadoop.version} + + com.nimbusds + nimbus-jose-jwt + + + org.xerial.snappy + snappy-java + org.apache.curator * @@ -136,6 +144,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> + + com.nimbusds + nimbus-jose-jwt + commons-cli @@ -181,6 +193,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.apache.kerby kerb-util + + org.xerial.snappy + snappy-java + diff --git a/pom.xml b/pom.xml index 693678509ed6..56a35999d1f3 100644 --- a/pom.xml +++ b/pom.xml @@ -302,6 +302,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs 1.2.1 3.9.9 + 1.1.10.6 + 9.40 @@ -1246,11 +1248,23 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs mockito-inline ${mockito.version} + + + org.xerial.snappy + snappy-java + ${snappy-java.version} + com.github.vlsi.mxgraph jgraphx ${jgraphx.version} + + + com.nimbusds + nimbus-jose-jwt + ${com.nimbusds.nimbus-jose-jwt.version} + From a0a7bb8db85da7a59459b01ce94b167fd0fde9a0 Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Sun, 6 Oct 2024 10:35:30 +0200 Subject: [PATCH 8/8] do not override copy-jars from root POM --- hadoop-hdds/rocks-native/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-hdds/rocks-native/pom.xml b/hadoop-hdds/rocks-native/pom.xml index 35a03db730a4..4c751e0b10a5 100644 --- a/hadoop-hdds/rocks-native/pom.xml +++ b/hadoop-hdds/rocks-native/pom.xml @@ -385,7 +385,7 @@ maven-dependency-plugin - copy-jars + copy-dependencies process-sources copy-dependencies