You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@orc.apache.org by do...@apache.org on 2021/08/05 01:52:28 UTC
[orc] branch branch-1.7 updated: ORC-910: Enforce
maven-dependency-plugin (#816)
This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch branch-1.7
in repository https://gitbox.apache.org/repos/asf/orc.git
The following commit(s) were added to refs/heads/branch-1.7 by this push:
new f1d5f01 ORC-910: Enforce maven-dependency-plugin (#816)
f1d5f01 is described below
commit f1d5f01b02fa9691ad30e2843f82457b3c31c3dc
Author: William Hyun <wi...@apache.org>
AuthorDate: Wed Aug 4 18:44:31 2021 -0700
ORC-910: Enforce maven-dependency-plugin (#816)
### What changes were proposed in this pull request?
This PR aims to enforce maven-dependency-plugin.
### Why are the changes needed?
This will prevent unintended dependency changes.
### How was this patch tested?
Pass the CIs and check the CI log.
(cherry picked from commit b1066a72467c1cbb2b25ace4da8e349d4228b93a)
Signed-off-by: Dongjoon Hyun <do...@apache.org>
---
java/bench/pom.xml | 9 +++++++++
java/core/pom.xml | 12 ++++++++++++
java/examples/pom.xml | 10 ++++++++++
java/pom.xml | 20 ++++++++++++++++++++
java/tools/pom.xml | 15 ++++++++++++++-
5 files changed, 65 insertions(+), 1 deletion(-)
diff --git a/java/bench/pom.xml b/java/bench/pom.xml
index c2119e0..8f5cfbe 100644
--- a/java/bench/pom.xml
+++ b/java/bench/pom.xml
@@ -468,6 +468,15 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <configuration>
+ <ignoredDependencies>
+ <ignoredDependency>*:*</ignoredDependency>
+ </ignoredDependencies>
+ </configuration>
+ </plugin>
</plugins>
<pluginManagement>
<plugins>
diff --git a/java/core/pom.xml b/java/core/pom.xml
index 644f2c7..72e0719 100644
--- a/java/core/pom.xml
+++ b/java/core/pom.xml
@@ -148,6 +148,18 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <configuration>
+ <ignoredUnusedDeclaredDependencies>
+ <ignoredUnusedDeclaredDependency>org.apache.hadoop:hadoop-hdfs</ignoredUnusedDeclaredDependency>
+ </ignoredUnusedDeclaredDependencies>
+ <ignoredDependencies>
+ <ignoredDependency>org.apache.hive:hive-storage-api</ignoredDependency>
+ </ignoredDependencies>
+ </configuration>
+ </plugin>
</plugins>
</build>
diff --git a/java/examples/pom.xml b/java/examples/pom.xml
index 91cadb3..7905fe4 100644
--- a/java/examples/pom.xml
+++ b/java/examples/pom.xml
@@ -103,6 +103,16 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <configuration>
+ <ignoredUnusedDeclaredDependencies>
+ <ignoredUnusedDeclaredDependency>com.google.guava:guava</ignoredUnusedDeclaredDependency>
+ <ignoredUnusedDeclaredDependency>org.apache.hadoop:hadoop-hdfs</ignoredUnusedDeclaredDependency>
+ </ignoredUnusedDeclaredDependencies>
+ </configuration>
+ </plugin>
</plugins>
</build>
diff --git a/java/pom.xml b/java/pom.xml
index c8c872d..31488d8 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -295,6 +295,22 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>3.1.2</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>analyze-only</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <failOnWarning>true</failOnWarning>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.2.0</version>
@@ -418,6 +434,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
</plugins>
</build>
</profile>
diff --git a/java/tools/pom.xml b/java/tools/pom.xml
index 4ab83eb..e249a14 100644
--- a/java/tools/pom.xml
+++ b/java/tools/pom.xml
@@ -34,6 +34,10 @@
<!-- intra-project -->
<dependency>
<groupId>org.apache.orc</groupId>
+ <artifactId>orc-shims</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.orc</groupId>
<artifactId>orc-core</artifactId>
</dependency>
@@ -62,7 +66,7 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs</artifactId>
+ <artifactId>hadoop-hdfs-client</artifactId>
<version>${tools.hadoop.version}</version>
<scope>compile</scope>
</dependency>
@@ -140,6 +144,15 @@
<destDir>${project.artifactId}</destDir>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <configuration>
+ <ignoredUnusedDeclaredDependencies>
+ <ignoredUnusedDeclaredDependency>com.google.guava:guava</ignoredUnusedDeclaredDependency>
+ </ignoredUnusedDeclaredDependencies>
+ </configuration>
+ </plugin>
</plugins>
</build>