This is an automated email from the ASF dual-hosted git repository. tasanuma pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push: new 66b7240 HADOOP-18131. Upgrade maven enforcer plugin and relevant dependencies (#4000) 66b7240 is described below commit 66b72406bd8bed28ca32c75e07fc2b682500e92b Author: Viraj Jasani <vjas...@apache.org> AuthorDate: Tue Mar 8 13:57:04 2022 +0530 HADOOP-18131. Upgrade maven enforcer plugin and relevant dependencies (#4000) Reviewed-by: Akira Ajisaka <aajis...@apache.org> Reviewed-by: Wei-Chiu Chuang <weic...@apache.org> Signed-off-by: Takanobu Asanuma <tasan...@apache.org> --- .../hadoop-client-check-invariants/pom.xml | 2 +- .../hadoop-client-check-test-invariants/pom.xml | 2 +- .../hadoop-client-integration-tests/pom.xml | 6 +++ .../hadoop-client-minicluster/pom.xml | 22 ++++++++-- .../hadoop-cloud-storage/pom.xml | 4 ++ .../hadoop-huaweicloud/pom.xml | 12 +++-- hadoop-common-project/hadoop-common/pom.xml | 16 +++++++ hadoop-hdfs-project/hadoop-hdfs-client/pom.xml | 4 ++ hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml | 6 +++ .../hadoop-mapreduce-client-app/pom.xml | 6 +++ .../hadoop-mapreduce-client-core/pom.xml | 6 +++ .../hadoop-mapreduce-client-hs/pom.xml | 6 +++ .../hadoop-mapreduce-client-jobclient/pom.xml | 6 +++ .../hadoop-mapreduce-client/pom.xml | 10 +++++ .../hadoop-mapreduce-examples/pom.xml | 6 +++ hadoop-mapreduce-project/pom.xml | 4 ++ hadoop-maven-plugins/pom.xml | 18 ++++++++ hadoop-minicluster/pom.xml | 6 +++ hadoop-project/pom.xml | 12 +++++ hadoop-tools/hadoop-aliyun/pom.xml | 6 +++ hadoop-tools/hadoop-archive-logs/pom.xml | 6 +++ hadoop-tools/hadoop-archives/pom.xml | 6 +++ hadoop-tools/hadoop-aws/pom.xml | 16 +++++++ hadoop-tools/hadoop-datajoin/pom.xml | 6 +++ hadoop-tools/hadoop-distcp/pom.xml | 6 +++ .../hadoop-dynamometer-infra/pom.xml | 6 +++ hadoop-tools/hadoop-extras/pom.xml | 16 +++++++ hadoop-tools/hadoop-federation-balance/pom.xml | 6 +++ hadoop-tools/hadoop-fs2img/pom.xml | 6 +++ hadoop-tools/hadoop-gridmix/pom.xml | 6 +++ hadoop-tools/hadoop-openstack/pom.xml | 6 +++ hadoop-tools/hadoop-rumen/pom.xml | 6 +++ hadoop-tools/hadoop-streaming/pom.xml | 6 +++ hadoop-tools/hadoop-tools-dist/pom.xml | 6 +++ .../pom.xml | 12 +++++ .../hadoop-yarn-services-core/pom.xml | 12 +++++ .../hadoop-yarn/hadoop-yarn-client/pom.xml | 6 +++ .../hadoop-yarn-server-common/pom.xml | 6 +++ .../pom.xml | 12 +++++ .../pom.xml | 6 +++ pom.xml | 51 ++++++++++------------ 41 files changed, 332 insertions(+), 37 deletions(-) diff --git a/hadoop-client-modules/hadoop-client-check-invariants/pom.xml b/hadoop-client-modules/hadoop-client-check-invariants/pom.xml index 9d4bce1..b1c0067 100644 --- a/hadoop-client-modules/hadoop-client-check-invariants/pom.xml +++ b/hadoop-client-modules/hadoop-client-check-invariants/pom.xml @@ -56,7 +56,7 @@ <dependency> <groupId>org.codehaus.mojo</groupId> <artifactId>extra-enforcer-rules</artifactId> - <version>1.0-beta-3</version> + <version>1.5.1</version> </dependency> </dependencies> <executions> diff --git a/hadoop-client-modules/hadoop-client-check-test-invariants/pom.xml b/hadoop-client-modules/hadoop-client-check-test-invariants/pom.xml index 635250e..0e576ac 100644 --- a/hadoop-client-modules/hadoop-client-check-test-invariants/pom.xml +++ b/hadoop-client-modules/hadoop-client-check-test-invariants/pom.xml @@ -60,7 +60,7 @@ <dependency> <groupId>org.codehaus.mojo</groupId> <artifactId>extra-enforcer-rules</artifactId> - <version>1.0-beta-3</version> + <version>1.5.1</version> </dependency> </dependencies> <executions> diff --git a/hadoop-client-modules/hadoop-client-integration-tests/pom.xml b/hadoop-client-modules/hadoop-client-integration-tests/pom.xml index 9677821..ba593eb 100644 --- a/hadoop-client-modules/hadoop-client-integration-tests/pom.xml +++ b/hadoop-client-modules/hadoop-client-integration-tests/pom.xml @@ -184,6 +184,12 @@ <artifactId>hadoop-hdfs</artifactId> <scope>test</scope> <type>test-jar</type> + <exclusions> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-commons</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> diff --git a/hadoop-client-modules/hadoop-client-minicluster/pom.xml b/hadoop-client-modules/hadoop-client-minicluster/pom.xml index 2a0a5c1..d70198a 100644 --- a/hadoop-client-modules/hadoop-client-minicluster/pom.xml +++ b/hadoop-client-modules/hadoop-client-minicluster/pom.xml @@ -332,6 +332,10 @@ <groupId>org.apache.hadoop.thirdparty</groupId> <artifactId>hadoop-shaded-guava</artifactId> </exclusion> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-commons</artifactId> + </exclusion> </exclusions> </dependency> <!-- Add optional runtime dependency on the in-development timeline server module @@ -403,8 +407,8 @@ <!-- Skip commons-logging:commons-logging-api because it looks like nothing actually included it --> <!-- Skip jetty-util because it's in client --> <dependency> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-core</artifactId> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-core</artifactId> <optional>true</optional> <exclusions> <exclusion> @@ -451,9 +455,19 @@ <optional>true</optional> </dependency> <dependency> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-servlet</artifactId> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-servlet</artifactId> <optional>true</optional> + <exclusions> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + </exclusion> + </exclusions> </dependency> <!-- skip org.apache.avro:avro-ipc because it doesn't look like hadoop-common actually uses it --> <dependency> diff --git a/hadoop-cloud-storage-project/hadoop-cloud-storage/pom.xml b/hadoop-cloud-storage-project/hadoop-cloud-storage/pom.xml index a8f45a7..33d3f95 100644 --- a/hadoop-cloud-storage-project/hadoop-cloud-storage/pom.xml +++ b/hadoop-cloud-storage-project/hadoop-cloud-storage/pom.xml @@ -101,6 +101,10 @@ <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> </exclusion> + <exclusion> + <groupId>org.projectlombok</groupId> + <artifactId>lombok</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/hadoop-cloud-storage-project/hadoop-huaweicloud/pom.xml b/hadoop-cloud-storage-project/hadoop-huaweicloud/pom.xml index 3d82759..b96883b 100755 --- a/hadoop-cloud-storage-project/hadoop-huaweicloud/pom.xml +++ b/hadoop-cloud-storage-project/hadoop-huaweicloud/pom.xml @@ -100,10 +100,14 @@ <artifactId>hadoop-common</artifactId> <scope>provided</scope> <exclusions> - <exclusion> - <groupId>jdk.tools</groupId> - <artifactId>jdk.tools</artifactId> - </exclusion> + <exclusion> + <groupId>jdk.tools</groupId> + <artifactId>jdk.tools</artifactId> + </exclusion> + <exclusion> + <groupId>org.javassist</groupId> + <artifactId>javassist</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml index 84da42a..467c271 100644 --- a/hadoop-common-project/hadoop-common/pom.xml +++ b/hadoop-common-project/hadoop-common/pom.xml @@ -141,6 +141,16 @@ <groupId>com.sun.jersey</groupId> <artifactId>jersey-servlet</artifactId> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <!-- Used, even though 'mvn dependency:analyze' doesn't find it --> @@ -205,6 +215,12 @@ <groupId>org.apache.commons</groupId> <artifactId>commons-configuration2</artifactId> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.commons</groupId> diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml index d65e603..c4e65ef 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml @@ -51,6 +51,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> <groupId>log4j</groupId> <artifactId>log4j</artifactId> </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-ext</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml index e17602d..d4d5c1e 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml @@ -63,6 +63,12 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-commons</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml index c55cf8c..e3b3511 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml @@ -87,6 +87,12 @@ <artifactId>hadoop-hdfs</artifactId> <type>test-jar</type> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-commons</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml index 946dbe5..957202a 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml @@ -45,6 +45,12 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs-client</artifactId> + <exclusions> + <exclusion> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/pom.xml index baf38d3..79327a7 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/pom.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/pom.xml @@ -39,6 +39,12 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> + <exclusions> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-commons</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml index e98b574..75f250e 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml @@ -93,6 +93,12 @@ <artifactId>hadoop-hdfs</artifactId> <scope>test</scope> <type>test-jar</type> + <exclusions> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-commons</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml index bf18d3e..d6b453f 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml @@ -68,6 +68,10 @@ <artifactId>paranamer-ant</artifactId> <groupId>com.thoughtworks.paranamer</groupId> </exclusion> + <exclusion> + <groupId>org.xerial.snappy</groupId> + <artifactId>snappy-java</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -107,6 +111,12 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-commons</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml index 48cf27e..11932e0 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml @@ -74,6 +74,12 @@ <artifactId>hadoop-hdfs</artifactId> <scope>test</scope> <type>test-jar</type> + <exclusions> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-commons</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> diff --git a/hadoop-mapreduce-project/pom.xml b/hadoop-mapreduce-project/pom.xml index 09b4d42..3ce66a1 100644 --- a/hadoop-mapreduce-project/pom.xml +++ b/hadoop-mapreduce-project/pom.xml @@ -74,6 +74,10 @@ <artifactId>paranamer-ant</artifactId> <groupId>com.thoughtworks.paranamer</groupId> </exclusion> + <exclusion> + <groupId>org.xerial.snappy</groupId> + <artifactId>snappy-java</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/hadoop-maven-plugins/pom.xml b/hadoop-maven-plugins/pom.xml index a547325..37daeb8 100644 --- a/hadoop-maven-plugins/pom.xml +++ b/hadoop-maven-plugins/pom.xml @@ -39,6 +39,12 @@ <groupId>org.apache.maven</groupId> <artifactId>maven-core</artifactId> <version>${maven.dependency.version}</version> + <exclusions> + <exclusion> + <groupId>org.sonatype.sisu</groupId> + <artifactId>sisu-inject-plexus</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.maven.plugin-tools</groupId> @@ -98,6 +104,18 @@ <groupId>org.sonatype.sisu</groupId> <artifactId>sisu-inject-plexus</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-annotations</artifactId> + </exclusion> + <exclusion> + <groupId>org.sonatype.aether</groupId> + <artifactId>aether-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.sonatype.aether</groupId> + <artifactId>aether-util</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/hadoop-minicluster/pom.xml b/hadoop-minicluster/pom.xml index cf1c941..c0334b3 100644 --- a/hadoop-minicluster/pom.xml +++ b/hadoop-minicluster/pom.xml @@ -41,6 +41,12 @@ <artifactId>hadoop-hdfs</artifactId> <scope>compile</scope> <type>test-jar</type> + <exclusions> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-commons</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 82dc681..193f898 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -858,6 +858,12 @@ <groupId>com.sun.jersey</groupId> <artifactId>jersey-core</artifactId> <version>${jersey.version}</version> + <exclusions> + <exclusion> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>com.sun.jersey</groupId> @@ -1783,6 +1789,12 @@ <groupId>org.xerial.snappy</groupId> <artifactId>snappy-java</artifactId> <version>${snappy-java.version}</version> + <exclusions> + <exclusion> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.lz4</groupId> diff --git a/hadoop-tools/hadoop-aliyun/pom.xml b/hadoop-tools/hadoop-aliyun/pom.xml index c5da3e5..570032f 100644 --- a/hadoop-tools/hadoop-aliyun/pom.xml +++ b/hadoop-tools/hadoop-aliyun/pom.xml @@ -117,6 +117,12 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>org.projectlombok</groupId> + <artifactId>lombok</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> diff --git a/hadoop-tools/hadoop-archive-logs/pom.xml b/hadoop-tools/hadoop-archive-logs/pom.xml index 3caa26c..f615448 100644 --- a/hadoop-tools/hadoop-archive-logs/pom.xml +++ b/hadoop-tools/hadoop-archive-logs/pom.xml @@ -59,6 +59,12 @@ <artifactId>hadoop-hdfs</artifactId> <scope>test</scope> <type>test-jar</type> + <exclusions> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-commons</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> diff --git a/hadoop-tools/hadoop-archives/pom.xml b/hadoop-tools/hadoop-archives/pom.xml index 966fff7..b16b88d 100644 --- a/hadoop-tools/hadoop-archives/pom.xml +++ b/hadoop-tools/hadoop-archives/pom.xml @@ -79,6 +79,12 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-commons</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> diff --git a/hadoop-tools/hadoop-aws/pom.xml b/hadoop-tools/hadoop-aws/pom.xml index 4aa38f6..5583bb7 100644 --- a/hadoop-tools/hadoop-aws/pom.xml +++ b/hadoop-tools/hadoop-aws/pom.xml @@ -413,6 +413,16 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> @@ -472,6 +482,12 @@ <artifactId>hadoop-hdfs</artifactId> <scope>test</scope> <type>test-jar</type> + <exclusions> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-commons</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> diff --git a/hadoop-tools/hadoop-datajoin/pom.xml b/hadoop-tools/hadoop-datajoin/pom.xml index ec77281..890e60a 100644 --- a/hadoop-tools/hadoop-datajoin/pom.xml +++ b/hadoop-tools/hadoop-datajoin/pom.xml @@ -90,6 +90,12 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-commons</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> diff --git a/hadoop-tools/hadoop-distcp/pom.xml b/hadoop-tools/hadoop-distcp/pom.xml index 55738ef..5194e51 100644 --- a/hadoop-tools/hadoop-distcp/pom.xml +++ b/hadoop-tools/hadoop-distcp/pom.xml @@ -85,6 +85,12 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-commons</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/pom.xml b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/pom.xml index 7bd4318..b31f261 100644 --- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/pom.xml +++ b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/pom.xml @@ -60,6 +60,12 @@ <artifactId>hadoop-hdfs</artifactId> <type>test-jar</type> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-commons</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> diff --git a/hadoop-tools/hadoop-extras/pom.xml b/hadoop-tools/hadoop-extras/pom.xml index 160f8b4..d6e0ba0 100644 --- a/hadoop-tools/hadoop-extras/pom.xml +++ b/hadoop-tools/hadoop-extras/pom.xml @@ -74,6 +74,16 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> @@ -90,6 +100,12 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-commons</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> diff --git a/hadoop-tools/hadoop-federation-balance/pom.xml b/hadoop-tools/hadoop-federation-balance/pom.xml index 71f2cb3..63269b3 100644 --- a/hadoop-tools/hadoop-federation-balance/pom.xml +++ b/hadoop-tools/hadoop-federation-balance/pom.xml @@ -85,6 +85,12 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-commons</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> diff --git a/hadoop-tools/hadoop-fs2img/pom.xml b/hadoop-tools/hadoop-fs2img/pom.xml index 9a27362..8c5ed02 100644 --- a/hadoop-tools/hadoop-fs2img/pom.xml +++ b/hadoop-tools/hadoop-fs2img/pom.xml @@ -41,6 +41,12 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-commons</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> diff --git a/hadoop-tools/hadoop-gridmix/pom.xml b/hadoop-tools/hadoop-gridmix/pom.xml index f383eca..21d786c 100644 --- a/hadoop-tools/hadoop-gridmix/pom.xml +++ b/hadoop-tools/hadoop-gridmix/pom.xml @@ -90,6 +90,12 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-commons</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> diff --git a/hadoop-tools/hadoop-openstack/pom.xml b/hadoop-tools/hadoop-openstack/pom.xml index e106588..1577de2 100644 --- a/hadoop-tools/hadoop-openstack/pom.xml +++ b/hadoop-tools/hadoop-openstack/pom.xml @@ -100,6 +100,12 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> diff --git a/hadoop-tools/hadoop-rumen/pom.xml b/hadoop-tools/hadoop-rumen/pom.xml index fd3b5c9..9a966d5 100644 --- a/hadoop-tools/hadoop-rumen/pom.xml +++ b/hadoop-tools/hadoop-rumen/pom.xml @@ -86,6 +86,12 @@ <artifactId>hadoop-hdfs</artifactId> <scope>test</scope> <type>test-jar</type> + <exclusions> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-commons</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> diff --git a/hadoop-tools/hadoop-streaming/pom.xml b/hadoop-tools/hadoop-streaming/pom.xml index f03eb00..33e6ca8 100644 --- a/hadoop-tools/hadoop-streaming/pom.xml +++ b/hadoop-tools/hadoop-streaming/pom.xml @@ -96,6 +96,12 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-commons</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> diff --git a/hadoop-tools/hadoop-tools-dist/pom.xml b/hadoop-tools/hadoop-tools-dist/pom.xml index cc811fc..73b6ae0 100644 --- a/hadoop-tools/hadoop-tools-dist/pom.xml +++ b/hadoop-tools/hadoop-tools-dist/pom.xml @@ -38,6 +38,12 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-streaming</artifactId> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.projectlombok</groupId> + <artifactId>lombok</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml index 7e47389..7e468bc 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml @@ -142,6 +142,12 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-commons</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> @@ -153,6 +159,12 @@ <artifactId>hadoop-hdfs</artifactId> <scope>test</scope> <type>test-jar</type> + <exclusions> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-commons</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>javax.ws.rs</groupId> diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/pom.xml index 5c7a9b7..4daac9f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/pom.xml @@ -185,6 +185,12 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> + <exclusions> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-commons</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -195,6 +201,12 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-configuration2</artifactId> + <exclusions> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/pom.xml index b7ec649..dbe4e90 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/pom.xml @@ -42,6 +42,12 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-commons</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml index 9b61479..3bf70bf 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml @@ -125,6 +125,12 @@ <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jcache_1.0_spec</artifactId> + <exclusions> + <exclusion> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.ehcache</groupId> diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-documentstore/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-documentstore/pom.xml index ccd1b13..1759640 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-documentstore/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-documentstore/pom.xml @@ -44,6 +44,12 @@ <artifactId>hadoop-common</artifactId> <type>test-jar</type> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.javassist</groupId> + <artifactId>javassist</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>junit</groupId> @@ -55,6 +61,12 @@ <artifactId>mockito-core</artifactId> <version>2.8.9</version> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.projectlombok</groupId> + <artifactId>lombok</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.powermock</groupId> diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-common/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-common/pom.xml index 11be84e..3970664 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-common/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-common/pom.xml @@ -46,6 +46,12 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-yarn-api</artifactId> <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> diff --git a/pom.xml b/pom.xml index 6e295b8..d3e95d9 100644 --- a/pom.xml +++ b/pom.xml @@ -100,8 +100,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/x <maven-antrun-plugin.version>1.7</maven-antrun-plugin.version> <maven-assembly-plugin.version>2.4</maven-assembly-plugin.version> <maven-dependency-plugin.version>3.0.2</maven-dependency-plugin.version> - <maven-enforcer-plugin.version>3.0.0-M1</maven-enforcer-plugin.version> - <restrict-imports.enforcer.version>1.1.0</restrict-imports.enforcer.version> + <maven-enforcer-plugin.version>3.0.0</maven-enforcer-plugin.version> + <restrict-imports.enforcer.version>2.0.0</restrict-imports.enforcer.version> <maven-javadoc-plugin.version>3.0.1</maven-javadoc-plugin.version> <maven-gpg-plugin.version>1.5</maven-gpg-plugin.version> <maven-remote-resources-plugin.version>1.5</maven-remote-resources-plugin.version> @@ -178,107 +178,104 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/x </goals> <configuration> <rules> - <restrictImports implementation="de.skuzzle.enforcer.restrictimports.rule.RestrictImports"> + <restrictImports> <includeTestCode>true</includeTestCode> <reason>Use hadoop-thirdparty shaded instead of curator shaded</reason> <bannedImports> <bannedImport>org.apache.curator.shaded.**</bannedImport> - <bannedImport>static org.apache.curator.shaded.**</bannedImport> </bannedImports> </restrictImports> - <restrictImports implementation="de.skuzzle.enforcer.restrictimports.rule.RestrictImports"> + <restrictImports> <includeTestCode>true</includeTestCode> <reason>Use hadoop-common provided Sets rather than Guava provided Sets</reason> <bannedImports> <bannedImport>org.apache.hadoop.thirdparty.com.google.common.collect.Sets</bannedImport> - <bannedImport>static org.apache.hadoop.thirdparty.com.google.common.collect.Sets.**</bannedImport> + <bannedImport>org.apache.hadoop.thirdparty.com.google.common.collect.Sets.**</bannedImport> </bannedImports> </restrictImports> - <restrictImports implementation="de.skuzzle.enforcer.restrictimports.rule.RestrictImports"> + <restrictImports> <includeTestCode>true</includeTestCode> <reason>Use hadoop-common provided Lists rather than Guava provided Lists</reason> <bannedImports> <bannedImport>org.apache.hadoop.thirdparty.com.google.common.collect.Lists</bannedImport> - <bannedImport>static org.apache.hadoop.thirdparty.com.google.common.collect.Lists.**</bannedImport> + <bannedImport>org.apache.hadoop.thirdparty.com.google.common.collect.Lists.**</bannedImport> </bannedImports> </restrictImports> - <restrictImports implementation="de.skuzzle.enforcer.restrictimports.rule.RestrictImports"> + <restrictImports> <includeTestCode>true</includeTestCode> <reason>Use hadoop-annotation provided VisibleForTesting rather than the one provided by Guava</reason> <bannedImports> <bannedImport>org.apache.hadoop.thirdparty.com.google.common.annotations.VisibleForTesting</bannedImport> </bannedImports> </restrictImports> - <restrictImports implementation="de.skuzzle.enforcer.restrictimports.rule.RestrictImports"> + <restrictImports> <includeTestCode>true</includeTestCode> <reason>Use alternatives to Guava common classes</reason> <bannedImports> <bannedImport>com.google.common.**</bannedImport> - <bannedImport>static com.google.common.**</bannedImport> </bannedImports> </restrictImports> - <restrictImports implementation="de.skuzzle.enforcer.restrictimports.rule.RestrictImports"> + <restrictImports> <includeTestCode>true</includeTestCode> <reason>Use alternative to Guava provided BaseEncoding</reason> <bannedImports> <bannedImport>org.apache.hadoop.thirdparty.com.google.common.io.BaseEncoding</bannedImport> - <bannedImport>static org.apache.hadoop.thirdparty.com.google.common.io.BaseEncoding.**</bannedImport> + <bannedImport>org.apache.hadoop.thirdparty.com.google.common.io.BaseEncoding.**</bannedImport> </bannedImports> </restrictImports> - <restrictImports implementation="de.skuzzle.enforcer.restrictimports.rule.RestrictImports"> + <restrictImports> <includeTestCode>true</includeTestCode> <reason>Use alternative to Guava provided Optional</reason> <bannedImports> <bannedImport>org.apache.hadoop.thirdparty.com.google.common.base.Optional</bannedImport> - <bannedImport>static org.apache.hadoop.thirdparty.com.google.common.base.Optional.**</bannedImport> + <bannedImport>org.apache.hadoop.thirdparty.com.google.common.base.Optional.**</bannedImport> </bannedImports> </restrictImports> - <restrictImports implementation="de.skuzzle.enforcer.restrictimports.rule.RestrictImports"> + <restrictImports> <includeTestCode>true</includeTestCode> <reason>Use alternative to Guava provided Function</reason> <bannedImports> <bannedImport>org.apache.hadoop.thirdparty.com.google.common.base.Function</bannedImport> - <bannedImport>static org.apache.hadoop.thirdparty.com.google.common.base.Function.**</bannedImport> + <bannedImport>org.apache.hadoop.thirdparty.com.google.common.base.Function.**</bannedImport> </bannedImports> </restrictImports> - <restrictImports implementation="de.skuzzle.enforcer.restrictimports.rule.RestrictImports"> + <restrictImports> <includeTestCode>true</includeTestCode> <reason>Use alternative to Guava provided Predicate</reason> <bannedImports> <bannedImport>org.apache.hadoop.thirdparty.com.google.common.base.Predicate</bannedImport> - <bannedImport>static org.apache.hadoop.thirdparty.com.google.common.base.Predicate.**</bannedImport> + <bannedImport>org.apache.hadoop.thirdparty.com.google.common.base.Predicate.**</bannedImport> </bannedImports> </restrictImports> - <restrictImports implementation="de.skuzzle.enforcer.restrictimports.rule.RestrictImports"> + <restrictImports> <includeTestCode>true</includeTestCode> <reason>Use alternative to Guava provided Supplier</reason> <bannedImports> <bannedImport>org.apache.hadoop.thirdparty.com.google.common.base.Supplier</bannedImport> - <bannedImport>static org.apache.hadoop.thirdparty.com.google.common.base.Supplier.**</bannedImport> + <bannedImport>org.apache.hadoop.thirdparty.com.google.common.base.Supplier.**</bannedImport> </bannedImports> </restrictImports> - <restrictImports implementation="de.skuzzle.enforcer.restrictimports.rule.RestrictImports"> + <restrictImports> <includeTestCode>true</includeTestCode> <reason>Use alternative to Guava provided ImmutableListMultimap</reason> <bannedImports> <bannedImport>org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableListMultimap</bannedImport> - <bannedImport>static org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableListMultimap.**</bannedImport> + <bannedImport>org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableListMultimap.**</bannedImport> </bannedImports> </restrictImports> - <restrictImports implementation="de.skuzzle.enforcer.restrictimports.rule.RestrictImports"> + <restrictImports> <includeTestCode>true</includeTestCode> <reason>Use hadoop-common provided Preconditions rather than Guava provided</reason> <bannedImports> <bannedImport>org.apache.hadoop.thirdparty.com.google.common.base.Preconditions</bannedImport> - <bannedImport>static org.apache.hadoop.thirdparty.com.google.common.base.Preconditions.**</bannedImport> + <bannedImport>org.apache.hadoop.thirdparty.com.google.common.base.Preconditions.**</bannedImport> </bannedImports> </restrictImports> - <restrictImports implementation="de.skuzzle.enforcer.restrictimports.rule.RestrictImports"> + <restrictImports> <includeTestCode>true</includeTestCode> <reason>Use Fasterxml Jackson 2 dependency in place of org.codehaus Jackson 1</reason> <bannedImports> <bannedImport>org.codehaus.jackson.**</bannedImport> - <bannedImport>static org.codehaus.jackson.**</bannedImport> </bannedImports> </restrictImports> </rules> --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org