You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2016/09/01 21:59:29 UTC
[1/3] hbase git commit: HBASE-16340 exclude Xerces iplementation jars
from coming in transitively.
Repository: hbase
Updated Branches:
refs/heads/0.98 c8da39429 -> a7e6860f2
refs/heads/branch-1.1 bd61885ba -> 69a64d2e3
refs/heads/branch-1.2 81655cab9 -> 0f7bfe832
HBASE-16340 exclude Xerces iplementation jars from coming in transitively.
Signed-off-by: Esteban Gutierrez <es...@apache.org>
Signed-off-by: stack <st...@apache.org>
Conflicts:
hbase-spark/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/0f7bfe83
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/0f7bfe83
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/0f7bfe83
Branch: refs/heads/branch-1.2
Commit: 0f7bfe8321481df378cee64b9949566824ff6421
Parents: 81655ca
Author: Sean Busbey <bu...@apache.org>
Authored: Tue Aug 2 11:36:51 2016 -0500
Committer: Andrew Purtell <ap...@apache.org>
Committed: Thu Sep 1 14:43:05 2016 -0700
----------------------------------------------------------------------
pom.xml | 24 +++++++++++++++++++++++-
1 file changed, 23 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/0f7bfe83/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 44a13c1..a4be2ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -835,7 +835,7 @@
<!-- version set by parent -->
<executions>
<execution>
- <id>min-maven-and-java</id>
+ <id>min-maven-min-java-banned-xerces</id>
<goals>
<goal>enforce</goal>
</goals>
@@ -861,6 +861,12 @@
See the reference guide on building for more information: http://hbase.apache.org/book.html#build
</message>
</requireJavaVersion>
+ <bannedDependencies>
+ <excludes>
+ <exclude>xerces:xercesImpl</exclude>
+ </excludes>
+ <message>We avoid adding our own Xerces jars to the classpath, see HBASE-16340.</message>
+ </bannedDependencies>
</rules>
</configuration>
</execution>
@@ -2031,6 +2037,10 @@
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
</exclusions>
<version>${hadoop-two.version}</version>
</dependency>
@@ -2057,6 +2067,10 @@
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -2209,6 +2223,10 @@
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
</exclusions>
<version>${hadoop-three.version}</version>
</dependency>
@@ -2231,6 +2249,10 @@
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
[2/3] hbase git commit: HBASE-16340 exclude Xerces iplementation jars
from coming in transitively.
Posted by ap...@apache.org.
HBASE-16340 exclude Xerces iplementation jars from coming in transitively.
Signed-off-by: Esteban Gutierrez <es...@apache.org>
Signed-off-by: stack <st...@apache.org>
Conflicts:
hbase-spark/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/69a64d2e
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/69a64d2e
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/69a64d2e
Branch: refs/heads/branch-1.1
Commit: 69a64d2e347746fbf37e2b7e16cb8573fab7175f
Parents: bd61885
Author: Sean Busbey <bu...@apache.org>
Authored: Tue Aug 2 11:36:51 2016 -0500
Committer: Andrew Purtell <ap...@apache.org>
Committed: Thu Sep 1 14:43:10 2016 -0700
----------------------------------------------------------------------
pom.xml | 24 +++++++++++++++++++++++-
1 file changed, 23 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/69a64d2e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6deab26..2d760ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -827,7 +827,7 @@
<!-- version set by parent -->
<executions>
<execution>
- <id>min-maven-and-java</id>
+ <id>min-maven-min-java-banned-xerces</id>
<goals>
<goal>enforce</goal>
</goals>
@@ -853,6 +853,12 @@
See the reference guide on building for more information: http://hbase.apache.org/book.html#build
</message>
</requireJavaVersion>
+ <bannedDependencies>
+ <excludes>
+ <exclude>xerces:xercesImpl</exclude>
+ </excludes>
+ <message>We avoid adding our own Xerces jars to the classpath, see HBASE-16340.</message>
+ </bannedDependencies>
</rules>
</configuration>
</execution>
@@ -2011,6 +2017,10 @@
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
</exclusions>
<version>${hadoop-two.version}</version>
</dependency>
@@ -2033,6 +2043,10 @@
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -2185,6 +2199,10 @@
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
</exclusions>
<version>${hadoop-three.version}</version>
</dependency>
@@ -2207,6 +2225,10 @@
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
[3/3] hbase git commit: HBASE-16340 exclude Xerces iplementation jars
from coming in transitively.
Posted by ap...@apache.org.
HBASE-16340 exclude Xerces iplementation jars from coming in transitively.
Signed-off-by: Esteban Gutierrez <es...@apache.org>
Signed-off-by: stack <st...@apache.org>
Conflicts:
hbase-spark/pom.xml
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/a7e6860f
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a7e6860f
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a7e6860f
Branch: refs/heads/0.98
Commit: a7e6860f217ac3fcda396332957d7420ad93050c
Parents: c8da394
Author: Sean Busbey <bu...@apache.org>
Authored: Tue Aug 2 11:36:51 2016 -0500
Committer: Andrew Purtell <ap...@apache.org>
Committed: Thu Sep 1 14:47:19 2016 -0700
----------------------------------------------------------------------
pom.xml | 36 +++++++++++++++++++++++++++++++++---
1 file changed, 33 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/a7e6860f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9f4a332..9c2ae06 100644
--- a/pom.xml
+++ b/pom.xml
@@ -813,7 +813,7 @@
<!-- version set by parent -->
<executions>
<execution>
- <id>min-maven-and-java</id>
+ <id>min-maven-min-java-banned-xerces</id>
<goals>
<goal>enforce</goal>
</goals>
@@ -839,6 +839,12 @@
See the reference guide on building for more information: http://hbase.apache.org/book.html#build
</message>
</requireJavaVersion>
+ <bannedDependencies>
+ <excludes>
+ <exclude>xerces:xercesImpl</exclude>
+ </excludes>
+ <message>We avoid adding our own Xerces jars to the classpath, see HBASE-16340.</message>
+ </bannedDependencies>
</rules>
</configuration>
</execution>
@@ -1927,7 +1933,11 @@
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
- </exclusions>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ </exclusions>
<version>${hadoop-two.version}</version>
</dependency>
<dependency>
@@ -1948,7 +1958,11 @@
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
- </exclusions>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
@@ -2006,11 +2020,16 @@
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>
</dependencyManagement>
</profile>
+
<!--
profile for building against Hadoop 3.0.0. Activate using:
mvn -Dhadoop.profile=3.0
@@ -2039,9 +2058,20 @@
<artifactId>hadoop-minicluster</artifactId>
<version>${hadoop.version}</version>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
</profile>
+
<!-- profiles for the tests
See as well the properties of the project for the values
when no profile is active. -->