You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2019/03/06 04:29:34 UTC
[hbase] branch branch-2.1 updated: HBASE-21998 Move branch-2.1
version from 2.1.4 to 2.1.5-SNAPSHOT
This is an automated email from the ASF dual-hosted git repository.
stack pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new 11badde HBASE-21998 Move branch-2.1 version from 2.1.4 to 2.1.5-SNAPSHOT
11badde is described below
commit 11badde24820a8cef9af891d8ce69422cf54b658
Author: stack <st...@apache.org>
AuthorDate: Tue Mar 5 20:29:22 2019 -0800
HBASE-21998 Move branch-2.1 version from 2.1.4 to 2.1.5-SNAPSHOT
---
.../hbase-2.0.5-bin/hbase-annotations}/pom.xml | 2 +-
.../hbase-archetype-builder/pom.xml | 2 +-
.../hbase-archetypes}/hbase-client-project/pom.xml | 2 +-
.../hbase-shaded-client-project/pom.xml | 2 +-
.../hbase-2.0.5-bin/hbase-archetypes}/pom.xml | 2 +-
.../hbase-2.0.5-bin/hbase-assembly}/pom.xml | 42 ++---
.../hbase-build-configuration}/pom.xml | 4 +-
.../hbase-build-support}/hbase-error-prone/pom.xml | 6 +-
.../hbase-2.0.5-bin/hbase-build-support}/pom.xml | 2 +-
.../hbase-2.0.5-bin/hbase-checkstyle}/pom.xml | 4 +-
.../hbase-2.0.5-bin/hbase-client}/pom.xml | 6 +-
.../hbase-2.0.5-bin/hbase-common}/pom.xml | 14 +-
.../hbase-2.0.5-bin/hbase-endpoint}/pom.xml | 16 +-
.../hbase-2.0.5-bin/hbase-examples}/pom.xml | 14 +-
.../hbase-external-blockcache}/pom.xml | 6 +-
.../hbase-2.0.5-bin/hbase-hadoop-compat}/pom.xml | 2 +-
.../hbase-2.0.5-bin/hbase-hadoop2-compat}/pom.xml | 8 +-
.../hbase-2.0.5-bin/hbase-http}/pom.xml | 2 +-
.../hbase-2.0.5-bin/hbase-it}/pom.xml | 8 +-
.../hbase-2.0.5-bin/hbase-mapreduce}/pom.xml | 32 ++--
.../hbase-2.0.5-bin/hbase-metrics-api}/pom.xml | 2 +-
.../hbase-2.0.5-bin/hbase-metrics}/pom.xml | 2 +-
.../hbase-2.0.5-bin/hbase-procedure}/pom.xml | 6 +-
.../hbase-2.0.5-bin/hbase-protocol-shaded}/pom.xml | 7 +-
.../hbase-2.0.5-bin/hbase-protocol}/pom.xml | 2 +-
.../hbase-2.0.5-bin/hbase-replication}/pom.xml | 18 +-
.../hbase-2.0.5-bin/hbase-resource-bundle}/pom.xml | 2 +-
.../hbase-2.0.5-bin/hbase-rest}/pom.xml | 27 +--
.../hbase-2.0.5-bin/hbase-rsgroup}/pom.xml | 6 +-
.../hbase-2.0.5-bin/hbase-server}/pom.xml | 105 ++++++-----
.../hbase-shaded-check-invariants}/pom.xml | 55 ++----
.../hbase-shaded/hbase-shaded-client}/pom.xml | 21 ++-
.../hbase-shaded}/hbase-shaded-mapreduce/pom.xml | 173 ++-----------------
.../hbase-2.0.5-bin/hbase-shaded}/pom.xml | 21 +--
.../hbase-2.0.5-bin/hbase-shell}/pom.xml | 16 +-
.../hbase-2.0.5-bin/hbase-testing-util}/pom.xml | 18 +-
.../hbase-2.0.5-bin/hbase-thrift}/pom.xml | 23 ++-
.../hbase-2.0.5-bin/hbase-zookeeper}/pom.xml | 9 +-
.../create-release/hbase-2.0.5-bin/pom.xml | 192 ++++++++++++++-------
.../hbase/hbase-annotations}/pom.xml | 2 +-
.../hbase-archetype-builder/pom.xml | 2 +-
.../hbase-archetypes}/hbase-client-project/pom.xml | 2 +-
.../hbase-shaded-client-project/pom.xml | 2 +-
.../create-release/hbase/hbase-archetypes}/pom.xml | 2 +-
.../create-release/hbase/hbase-assembly}/pom.xml | 42 ++---
.../hbase/hbase-build-configuration}/pom.xml | 4 +-
.../hbase-build-support}/hbase-error-prone/pom.xml | 6 +-
.../hbase/hbase-build-support}/pom.xml | 2 +-
.../create-release/hbase/hbase-checkstyle}/pom.xml | 4 +-
.../create-release/hbase/hbase-client}/pom.xml | 6 +-
.../create-release/hbase/hbase-common}/pom.xml | 14 +-
.../create-release/hbase/hbase-endpoint}/pom.xml | 16 +-
.../create-release/hbase/hbase-examples}/pom.xml | 14 +-
.../hbase/hbase-external-blockcache}/pom.xml | 6 +-
.../hbase/hbase-hadoop-compat}/pom.xml | 2 +-
.../hbase/hbase-hadoop2-compat}/pom.xml | 8 +-
.../create-release/hbase/hbase-http}/pom.xml | 2 +-
.../create-release/hbase/hbase-it}/pom.xml | 8 +-
.../create-release/hbase/hbase-mapreduce}/pom.xml | 32 ++--
.../hbase/hbase-metrics-api}/pom.xml | 2 +-
.../create-release/hbase/hbase-metrics}/pom.xml | 2 +-
.../create-release/hbase/hbase-procedure}/pom.xml | 6 +-
.../hbase/hbase-protocol-shaded}/pom.xml | 7 +-
.../create-release/hbase/hbase-protocol}/pom.xml | 2 +-
.../hbase/hbase-replication}/pom.xml | 18 +-
.../hbase/hbase-resource-bundle}/pom.xml | 2 +-
.../create-release/hbase/hbase-rest}/pom.xml | 27 +--
.../create-release/hbase/hbase-rsgroup}/pom.xml | 6 +-
.../create-release/hbase/hbase-server}/pom.xml | 105 ++++++-----
.../hbase-shaded-check-invariants}/pom.xml | 55 ++----
.../hbase-shaded/hbase-shaded-client}/pom.xml | 21 ++-
.../hbase-shaded}/hbase-shaded-mapreduce/pom.xml | 173 ++-----------------
.../create-release/hbase/hbase-shaded}/pom.xml | 21 +--
.../create-release/hbase/hbase-shell}/pom.xml | 16 +-
.../hbase/hbase-testing-util}/pom.xml | 18 +-
.../create-release/hbase/hbase-thrift}/pom.xml | 23 ++-
.../create-release/hbase/hbase-zookeeper}/pom.xml | 9 +-
.../create-release/hbase/pom.xml | 192 ++++++++++++++-------
hbase-annotations/pom.xml | 2 +-
hbase-archetypes/hbase-archetype-builder/pom.xml | 2 +-
hbase-archetypes/hbase-client-project/pom.xml | 2 +-
.../hbase-shaded-client-project/pom.xml | 2 +-
hbase-archetypes/pom.xml | 2 +-
hbase-assembly/pom.xml | 2 +-
hbase-build-configuration/pom.xml | 2 +-
hbase-build-support/hbase-error-prone/pom.xml | 4 +-
hbase-build-support/pom.xml | 2 +-
hbase-checkstyle/pom.xml | 4 +-
hbase-client/pom.xml | 2 +-
hbase-common/pom.xml | 2 +-
hbase-endpoint/pom.xml | 2 +-
hbase-examples/pom.xml | 2 +-
hbase-external-blockcache/pom.xml | 2 +-
hbase-hadoop-compat/pom.xml | 2 +-
hbase-hadoop2-compat/pom.xml | 2 +-
hbase-http/pom.xml | 2 +-
hbase-it/pom.xml | 2 +-
hbase-mapreduce/pom.xml | 2 +-
hbase-metrics-api/pom.xml | 2 +-
hbase-metrics/pom.xml | 2 +-
hbase-procedure/pom.xml | 2 +-
hbase-protocol-shaded/pom.xml | 2 +-
hbase-protocol/pom.xml | 2 +-
hbase-replication/pom.xml | 2 +-
hbase-resource-bundle/pom.xml | 2 +-
hbase-rest/pom.xml | 2 +-
hbase-rsgroup/pom.xml | 2 +-
hbase-server/pom.xml | 2 +-
hbase-shaded/hbase-shaded-check-invariants/pom.xml | 2 +-
.../hbase-shaded-client-byo-hadoop/pom.xml | 2 +-
hbase-shaded/hbase-shaded-client/pom.xml | 2 +-
hbase-shaded/hbase-shaded-mapreduce/pom.xml | 2 +-
.../pom.xml | 2 +-
hbase-shaded/pom.xml | 2 +-
hbase-shell/pom.xml | 2 +-
hbase-testing-util/pom.xml | 2 +-
hbase-thrift/pom.xml | 2 +-
hbase-zookeeper/pom.xml | 2 +-
pom.xml | 2 +-
119 files changed, 859 insertions(+), 989 deletions(-)
diff --git a/hbase-annotations/pom.xml b/dev-support/create-release/hbase-2.0.5-bin/hbase-annotations/pom.xml
similarity index 98%
copy from hbase-annotations/pom.xml
copy to dev-support/create-release/hbase-2.0.5-bin/hbase-annotations/pom.xml
index c38fcb5..a00258c 100644
--- a/hbase-annotations/pom.xml
+++ b/dev-support/create-release/hbase-2.0.5-bin/hbase-annotations/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>..</relativePath>
</parent>
diff --git a/hbase-archetypes/hbase-archetype-builder/pom.xml b/dev-support/create-release/hbase-2.0.5-bin/hbase-archetypes/hbase-archetype-builder/pom.xml
similarity index 99%
copy from hbase-archetypes/hbase-archetype-builder/pom.xml
copy to dev-support/create-release/hbase-2.0.5-bin/hbase-archetypes/hbase-archetype-builder/pom.xml
index 26a880d..3ed683c 100644
--- a/hbase-archetypes/hbase-archetype-builder/pom.xml
+++ b/dev-support/create-release/hbase-2.0.5-bin/hbase-archetypes/hbase-archetype-builder/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>hbase-archetypes</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>..</relativePath>
</parent>
diff --git a/hbase-archetypes/hbase-client-project/pom.xml b/dev-support/create-release/hbase-2.0.5-bin/hbase-archetypes/hbase-client-project/pom.xml
similarity index 99%
copy from hbase-archetypes/hbase-client-project/pom.xml
copy to dev-support/create-release/hbase-2.0.5-bin/hbase-archetypes/hbase-client-project/pom.xml
index 2378d07..b44f5e0 100644
--- a/hbase-archetypes/hbase-client-project/pom.xml
+++ b/dev-support/create-release/hbase-2.0.5-bin/hbase-archetypes/hbase-client-project/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>hbase-archetypes</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>..</relativePath>
</parent>
<artifactId>hbase-client-project</artifactId>
diff --git a/hbase-archetypes/hbase-shaded-client-project/pom.xml b/dev-support/create-release/hbase-2.0.5-bin/hbase-archetypes/hbase-shaded-client-project/pom.xml
similarity index 98%
copy from hbase-archetypes/hbase-shaded-client-project/pom.xml
copy to dev-support/create-release/hbase-2.0.5-bin/hbase-archetypes/hbase-shaded-client-project/pom.xml
index a6b4b99..1408d1b 100644
--- a/hbase-archetypes/hbase-shaded-client-project/pom.xml
+++ b/dev-support/create-release/hbase-2.0.5-bin/hbase-archetypes/hbase-shaded-client-project/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>hbase-archetypes</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>..</relativePath>
</parent>
<artifactId>hbase-shaded-client-project</artifactId>
diff --git a/hbase-archetypes/pom.xml b/dev-support/create-release/hbase-2.0.5-bin/hbase-archetypes/pom.xml
similarity index 99%
copy from hbase-archetypes/pom.xml
copy to dev-support/create-release/hbase-2.0.5-bin/hbase-archetypes/pom.xml
index 290093f..df83ce7 100644
--- a/hbase-archetypes/pom.xml
+++ b/dev-support/create-release/hbase-2.0.5-bin/hbase-archetypes/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
diff --git a/hbase-assembly/pom.xml b/dev-support/create-release/hbase-2.0.5-bin/hbase-assembly/pom.xml
similarity index 90%
copy from hbase-assembly/pom.xml
copy to dev-support/create-release/hbase-2.0.5-bin/hbase-assembly/pom.xml
index 40bdc04..f44a2f3 100644
--- a/hbase-assembly/pom.xml
+++ b/dev-support/create-release/hbase-2.0.5-bin/hbase-assembly/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
<artifactId>hbase-assembly</artifactId>
@@ -79,7 +79,6 @@
<tarLongFileMode>gnu</tarLongFileMode>
<descriptors>
<descriptor>${assembly.file}</descriptor>
- <descriptor>src/main/assembly/client.xml</descriptor>
</descriptors>
</configuration>
</plugin>
@@ -95,7 +94,7 @@
</goals>
<configuration>
<outputFile>${project.parent.basedir}/target/cached_classpath.txt</outputFile>
- <excludeArtifactIds>jline,jruby-complete,hbase-shaded-client,hbase-shaded-client-byo-hadoop,hbase-shaded-mapreduce</excludeArtifactIds>
+ <excludeArtifactIds>jline,jruby-complete</excludeArtifactIds>
</configuration>
</execution>
@@ -174,19 +173,6 @@
</plugins>
</build>
<dependencies>
- <!-- client artifacts for downstream use -->
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-shaded-client</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-shaded-client-byo-hadoop</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-shaded-mapreduce</artifactId>
- </dependency>
<!-- Intra-project dependencies -->
<dependency>
<groupId>org.apache.hbase</groupId>
@@ -226,22 +212,22 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-hadoop-compat</artifactId>
- <exclusions>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-hadoop-compat</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>${compat.module}</artifactId>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>${compat.module}</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-shell</artifactId>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-shell</artifactId>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
diff --git a/hbase-build-configuration/pom.xml b/dev-support/create-release/hbase-2.0.5-bin/hbase-build-configuration/pom.xml
similarity index 98%
copy from hbase-build-configuration/pom.xml
copy to dev-support/create-release/hbase-2.0.5-bin/hbase-build-configuration/pom.xml
index fd43d72..32e1ac0 100644
--- a/hbase-build-configuration/pom.xml
+++ b/dev-support/create-release/hbase-2.0.5-bin/hbase-build-configuration/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>..</relativePath>
</parent>
@@ -75,6 +75,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>${maven.compiler.version}</version>
<configuration>
<compilerId>javac-with-errorprone</compilerId>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
@@ -83,7 +84,6 @@
<arg>-XepDisableWarningsInGeneratedCode</arg>
<arg>-Xep:FallThrough:OFF</arg> <!-- already in findbugs -->
<arg>-Xep:ClassNewInstance:ERROR</arg>
- <arg>-Xep:MissingDefault:ERROR</arg>
</compilerArgs>
<annotationProcessorPaths>
<path>
diff --git a/hbase-build-support/hbase-error-prone/pom.xml b/dev-support/create-release/hbase-2.0.5-bin/hbase-build-support/hbase-error-prone/pom.xml
similarity index 97%
copy from hbase-build-support/hbase-error-prone/pom.xml
copy to dev-support/create-release/hbase-2.0.5-bin/hbase-build-support/hbase-error-prone/pom.xml
index 21c251f..88d7b0c 100644
--- a/hbase-build-support/hbase-error-prone/pom.xml
+++ b/dev-support/create-release/hbase-2.0.5-bin/hbase-build-support/hbase-error-prone/pom.xml
@@ -23,11 +23,11 @@
<parent>
<artifactId>hbase-build-support</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>..</relativePath>
</parent>
<artifactId>hbase-error-prone</artifactId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<name>Apache HBase - Error Prone Rules</name>
<description>Module to hold error prone custom rules for HBase.</description>
@@ -83,4 +83,4 @@
</plugin>
</plugins>
</build>
-</project>
+</project>
\ No newline at end of file
diff --git a/hbase-build-support/pom.xml b/dev-support/create-release/hbase-2.0.5-bin/hbase-build-support/pom.xml
similarity index 99%
copy from hbase-build-support/pom.xml
copy to dev-support/create-release/hbase-2.0.5-bin/hbase-build-support/pom.xml
index 49bb7c5..68d786f 100644
--- a/hbase-build-support/pom.xml
+++ b/dev-support/create-release/hbase-2.0.5-bin/hbase-build-support/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>..</relativePath>
</parent>
diff --git a/hbase-checkstyle/pom.xml b/dev-support/create-release/hbase-2.0.5-bin/hbase-checkstyle/pom.xml
similarity index 97%
copy from hbase-checkstyle/pom.xml
copy to dev-support/create-release/hbase-2.0.5-bin/hbase-checkstyle/pom.xml
index adc8d67..a270eea 100644
--- a/hbase-checkstyle/pom.xml
+++ b/dev-support/create-release/hbase-2.0.5-bin/hbase-checkstyle/pom.xml
@@ -24,7 +24,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-checkstyle</artifactId>
-<version>2.1.4</version>
+<version>2.0.5</version>
<name>Apache HBase - Checkstyle</name>
<description>Module to hold Checkstyle properties for HBase.</description>
<!--REMOVE-->
@@ -32,7 +32,7 @@
<parent>
<artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>..</relativePath>
</parent>
diff --git a/hbase-client/pom.xml b/dev-support/create-release/hbase-2.0.5-bin/hbase-client/pom.xml
similarity index 98%
copy from hbase-client/pom.xml
copy to dev-support/create-release/hbase-2.0.5-bin/hbase-client/pom.xml
index dbae3a3..016b364 100644
--- a/hbase-client/pom.xml
+++ b/dev-support/create-release/hbase-2.0.5-bin/hbase-client/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
@@ -235,6 +235,10 @@
<artifactId>hadoop-common</artifactId>
<exclusions>
<exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>net.java.dev.jets3t</groupId>
<artifactId>jets3t</artifactId>
</exclusion>
diff --git a/hbase-common/pom.xml b/dev-support/create-release/hbase-2.0.5-bin/hbase-common/pom.xml
similarity index 96%
copy from hbase-common/pom.xml
copy to dev-support/create-release/hbase-2.0.5-bin/hbase-common/pom.xml
index f026bc2..ed76e56 100644
--- a/hbase-common/pom.xml
+++ b/dev-support/create-release/hbase-2.0.5-bin/hbase-common/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
@@ -314,6 +314,12 @@
<artifactId>hadoop-common</artifactId>
<!--FYI This pulls in hadoop's guava. Its needed for Configuration
at least-->
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
<build>
@@ -360,6 +366,12 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
<build>
diff --git a/hbase-endpoint/pom.xml b/dev-support/create-release/hbase-2.0.5-bin/hbase-endpoint/pom.xml
similarity index 95%
copy from hbase-endpoint/pom.xml
copy to dev-support/create-release/hbase-2.0.5-bin/hbase-endpoint/pom.xml
index 11bf47f..eab8148 100644
--- a/hbase-endpoint/pom.xml
+++ b/dev-support/create-release/hbase-2.0.5-bin/hbase-endpoint/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
<artifactId>hbase-endpoint</artifactId>
@@ -266,6 +266,12 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
@@ -297,6 +303,10 @@
<scope>test</scope>
<exclusions>
<exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
@@ -340,6 +350,10 @@
<artifactId>hadoop-minicluster</artifactId>
<exclusions>
<exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
diff --git a/hbase-examples/pom.xml b/dev-support/create-release/hbase-2.0.5-bin/hbase-examples/pom.xml
similarity index 96%
copy from hbase-examples/pom.xml
copy to dev-support/create-release/hbase-2.0.5-bin/hbase-examples/pom.xml
index 8d8080c..1843c61 100644
--- a/hbase-examples/pom.xml
+++ b/dev-support/create-release/hbase-2.0.5-bin/hbase-examples/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
<artifactId>hbase-examples</artifactId>
@@ -232,6 +232,12 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
<build>
@@ -281,6 +287,12 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minicluster</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
<build>
diff --git a/hbase-external-blockcache/pom.xml b/dev-support/create-release/hbase-2.0.5-bin/hbase-external-blockcache/pom.xml
similarity index 98%
copy from hbase-external-blockcache/pom.xml
copy to dev-support/create-release/hbase-2.0.5-bin/hbase-external-blockcache/pom.xml
index 673fbae..5023395 100644
--- a/hbase-external-blockcache/pom.xml
+++ b/dev-support/create-release/hbase-2.0.5-bin/hbase-external-blockcache/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
<artifactId>hbase-external-blockcache</artifactId>
@@ -225,6 +225,10 @@
<artifactId>hadoop-common</artifactId>
<exclusions>
<exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
diff --git a/hbase-hadoop-compat/pom.xml b/dev-support/create-release/hbase-2.0.5-bin/hbase-hadoop-compat/pom.xml
similarity index 99%
copy from hbase-hadoop-compat/pom.xml
copy to dev-support/create-release/hbase-2.0.5-bin/hbase-hadoop-compat/pom.xml
index 41e14fd..b341d0b 100644
--- a/hbase-hadoop-compat/pom.xml
+++ b/dev-support/create-release/hbase-2.0.5-bin/hbase-hadoop-compat/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
diff --git a/hbase-hadoop2-compat/pom.xml b/dev-support/create-release/hbase-2.0.5-bin/hbase-hadoop2-compat/pom.xml
similarity index 97%
copy from hbase-hadoop2-compat/pom.xml
copy to dev-support/create-release/hbase-2.0.5-bin/hbase-hadoop2-compat/pom.xml
index db90a4e..666d906 100644
--- a/hbase-hadoop2-compat/pom.xml
+++ b/dev-support/create-release/hbase-2.0.5-bin/hbase-hadoop2-compat/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
@@ -167,6 +167,12 @@ limitations under the License.
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<version>${hadoop.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
diff --git a/hbase-http/pom.xml b/dev-support/create-release/hbase-2.0.5-bin/hbase-http/pom.xml
similarity index 99%
copy from hbase-http/pom.xml
copy to dev-support/create-release/hbase-2.0.5-bin/hbase-http/pom.xml
index 65acb05..dce7d7b 100644
--- a/hbase-http/pom.xml
+++ b/dev-support/create-release/hbase-2.0.5-bin/hbase-http/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
<artifactId>hbase-http</artifactId>
diff --git a/hbase-it/pom.xml b/dev-support/create-release/hbase-2.0.5-bin/hbase-it/pom.xml
similarity index 98%
copy from hbase-it/pom.xml
copy to dev-support/create-release/hbase-2.0.5-bin/hbase-it/pom.xml
index 8684b85..da4804f 100644
--- a/hbase-it/pom.xml
+++ b/dev-support/create-release/hbase-2.0.5-bin/hbase-it/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
@@ -330,6 +330,12 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
diff --git a/hbase-mapreduce/pom.xml b/dev-support/create-release/hbase-2.0.5-bin/hbase-mapreduce/pom.xml
similarity index 95%
copy from hbase-mapreduce/pom.xml
copy to dev-support/create-release/hbase-2.0.5-bin/hbase-mapreduce/pom.xml
index c99012e..58b5a49 100644
--- a/hbase-mapreduce/pom.xml
+++ b/dev-support/create-release/hbase-2.0.5-bin/hbase-mapreduce/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
<artifactId>hbase-mapreduce</artifactId>
@@ -196,15 +196,6 @@
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-server</artifactId>
- <exclusions>
- <!-- commons-logging is only used by hbase-http's HttpRequestLog and hbase-server's
- HBaseTestingUtil. We don't need either of those here, so execlude it.
- -->
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
@@ -255,19 +246,10 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <!-- jackson(s) used by PerformanceEvaluation and it looks like TableMapReduceUtil -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- </dependency>
</dependencies>
<profiles>
<!-- Skip the tests in this module -->
@@ -303,6 +285,10 @@
<artifactId>hadoop-common</artifactId>
<exclusions>
<exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>net.java.dev.jets3t</groupId>
<artifactId>jets3t</artifactId>
</exclusion>
@@ -349,6 +335,10 @@
<artifactId>hadoop-hdfs</artifactId>
<exclusions>
<exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
</exclusion>
@@ -388,6 +378,10 @@
<scope>test</scope>
<exclusions>
<exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
</exclusion>
diff --git a/hbase-metrics-api/pom.xml b/dev-support/create-release/hbase-2.0.5-bin/hbase-metrics-api/pom.xml
similarity index 99%
copy from hbase-metrics-api/pom.xml
copy to dev-support/create-release/hbase-2.0.5-bin/hbase-metrics-api/pom.xml
index 76076db..9092b2a 100644
--- a/hbase-metrics-api/pom.xml
+++ b/dev-support/create-release/hbase-2.0.5-bin/hbase-metrics-api/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
diff --git a/hbase-metrics/pom.xml b/dev-support/create-release/hbase-2.0.5-bin/hbase-metrics/pom.xml
similarity index 99%
copy from hbase-metrics/pom.xml
copy to dev-support/create-release/hbase-2.0.5-bin/hbase-metrics/pom.xml
index 8bf5859..1c98cac 100644
--- a/hbase-metrics/pom.xml
+++ b/dev-support/create-release/hbase-2.0.5-bin/hbase-metrics/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
diff --git a/hbase-procedure/pom.xml b/dev-support/create-release/hbase-2.0.5-bin/hbase-procedure/pom.xml
similarity index 97%
copy from hbase-procedure/pom.xml
copy to dev-support/create-release/hbase-2.0.5-bin/hbase-procedure/pom.xml
index 966ee8c..c4810f6 100644
--- a/hbase-procedure/pom.xml
+++ b/dev-support/create-release/hbase-2.0.5-bin/hbase-procedure/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
@@ -57,8 +57,8 @@
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-common</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
+ <version>${project.version}</version>
+ <classifier>tests</classifier>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
diff --git a/hbase-protocol-shaded/pom.xml b/dev-support/create-release/hbase-2.0.5-bin/hbase-protocol-shaded/pom.xml
similarity index 97%
copy from hbase-protocol-shaded/pom.xml
copy to dev-support/create-release/hbase-2.0.5-bin/hbase-protocol-shaded/pom.xml
index aefdc69..336ea22 100644
--- a/hbase-protocol-shaded/pom.xml
+++ b/dev-support/create-release/hbase-2.0.5-bin/hbase-protocol-shaded/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
<artifactId>hbase-protocol-shaded</artifactId>
@@ -108,7 +108,7 @@
<version>1.5.3</version>
<executions>
<execution>
- <phase>process-sources</phase>
+ <phase>generate-sources</phase>
<goals>
<goal>replace</goal>
</goals>
@@ -119,9 +119,6 @@
<includes>
<include>**/*.java</include>
</includes>
- <!-- Ignore errors when missing files, because it means this build
- was run with -Dprotoc.skip and there is no -Dreplacer.skip -->
- <ignoreErrors>true</ignoreErrors>
<replacements>
<replacement>
<token>([^\.])com.google.protobuf</token>
diff --git a/hbase-protocol/pom.xml b/dev-support/create-release/hbase-2.0.5-bin/hbase-protocol/pom.xml
similarity index 99%
copy from hbase-protocol/pom.xml
copy to dev-support/create-release/hbase-2.0.5-bin/hbase-protocol/pom.xml
index 5fc0369..9a1fe79 100644
--- a/hbase-protocol/pom.xml
+++ b/dev-support/create-release/hbase-2.0.5-bin/hbase-protocol/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
<artifactId>hbase-protocol</artifactId>
diff --git a/hbase-replication/pom.xml b/dev-support/create-release/hbase-2.0.5-bin/hbase-replication/pom.xml
similarity index 94%
copy from hbase-replication/pom.xml
copy to dev-support/create-release/hbase-2.0.5-bin/hbase-replication/pom.xml
index f884314..43bc66d 100644
--- a/hbase-replication/pom.xml
+++ b/dev-support/create-release/hbase-2.0.5-bin/hbase-replication/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
<artifactId>hbase-replication</artifactId>
@@ -101,18 +101,6 @@
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-zookeeper</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-common</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-zookeeper</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
<!-- General dependencies -->
<dependency>
<groupId>org.apache.commons</groupId>
@@ -149,6 +137,10 @@
<artifactId>hadoop-common</artifactId>
<exclusions>
<exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>net.java.dev.jets3t</groupId>
<artifactId>jets3t</artifactId>
</exclusion>
diff --git a/hbase-resource-bundle/pom.xml b/dev-support/create-release/hbase-2.0.5-bin/hbase-resource-bundle/pom.xml
similarity index 98%
copy from hbase-resource-bundle/pom.xml
copy to dev-support/create-release/hbase-2.0.5-bin/hbase-resource-bundle/pom.xml
index 4062665..3ee7c24 100644
--- a/hbase-resource-bundle/pom.xml
+++ b/dev-support/create-release/hbase-2.0.5-bin/hbase-resource-bundle/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
diff --git a/hbase-rest/pom.xml b/dev-support/create-release/hbase-2.0.5-bin/hbase-rest/pom.xml
similarity index 96%
copy from hbase-rest/pom.xml
copy to dev-support/create-release/hbase-2.0.5-bin/hbase-rest/pom.xml
index 3368747..8ed67c7 100644
--- a/hbase-rest/pom.xml
+++ b/dev-support/create-release/hbase-2.0.5-bin/hbase-rest/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
<artifactId>hbase-rest</artifactId>
@@ -306,19 +306,6 @@
<artifactId>jackson-jaxrs-json-provider</artifactId>
</dependency>
<dependency>
- <!-- We *might* need this for XMLStreamReader use in RemoteAdmin
- TODO figure out if we can remove it.
- -->
- <groupId>org.codehaus.jettison</groupId>
- <artifactId>jettison</artifactId>
- <exclusions>
- <exclusion>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<!--For JspC used in ant task-->
<groupId>org.glassfish.web</groupId>
<artifactId>javax.servlet.jsp</artifactId>
@@ -365,12 +352,6 @@
<artifactId>findbugs-annotations</artifactId>
<optional>true</optional>
</dependency>
- <!--Test-->
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<profiles>
<!-- Skip the tests in this module -->
@@ -419,6 +400,12 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
diff --git a/hbase-rsgroup/pom.xml b/dev-support/create-release/hbase-2.0.5-bin/hbase-rsgroup/pom.xml
similarity index 97%
copy from hbase-rsgroup/pom.xml
copy to dev-support/create-release/hbase-2.0.5-bin/hbase-rsgroup/pom.xml
index 5bd5344..8f432fe 100644
--- a/hbase-rsgroup/pom.xml
+++ b/dev-support/create-release/hbase-2.0.5-bin/hbase-rsgroup/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
<artifactId>hbase-rsgroup</artifactId>
@@ -194,6 +194,10 @@
<artifactId>hadoop-common</artifactId>
<exclusions>
<exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>net.java.dev.jets3t</groupId>
<artifactId>jets3t</artifactId>
</exclusion>
diff --git a/hbase-server/pom.xml b/dev-support/create-release/hbase-2.0.5-bin/hbase-server/pom.xml
similarity index 94%
copy from hbase-server/pom.xml
copy to dev-support/create-release/hbase-2.0.5-bin/hbase-server/pom.xml
index a15ab34..e1e1404 100644
--- a/hbase-server/pom.xml
+++ b/dev-support/create-release/hbase-2.0.5-bin/hbase-server/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
<artifactId>hbase-server</artifactId>
@@ -71,14 +71,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
<version>1.5</version>
- <dependencies>
- <!-- resource bundle only needed at build time -->
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-resource-bundle</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
<executions>
<execution>
<id>default</id>
@@ -400,6 +392,12 @@
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-metrics</artifactId>
</dependency>
+ <!-- resource bundle only needed at build time -->
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-resource-bundle</artifactId>
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
@@ -439,16 +437,19 @@
<artifactId>jetty-webapp</artifactId>
</dependency>
<dependency>
- <!-- For JspC used in ant task, then needed at compile /runtime
- because the source code made from the JSP refers to its runtime
- -->
+ <!--For JspC used in ant task-->
<groupId>org.glassfish.web</groupId>
<artifactId>javax.servlet.jsp</artifactId>
</dependency>
- <!-- Also used by generated sources from our JSP -->
<dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>javax.servlet.jsp-api</artifactId>
+ <groupId>org.codehaus.jettison</groupId>
+ <artifactId>jettison</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- General dependencies -->
<dependency>
@@ -500,20 +501,9 @@
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
- <!-- Jackson only used in compile/runtime scope by BlockCacheUtil class
- also used by some tests
- -->
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </dependency>
<dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>javax.ws.rs-api</artifactId>
</dependency>
<!-- tracing Dependencies -->
@@ -522,6 +512,11 @@
<artifactId>htrace-core4</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ <version>${htrace-hadoop.version}</version>
+ </dependency>
+ <dependency>
<groupId>com.lmax</groupId>
<artifactId>disruptor</artifactId>
</dependency>
@@ -567,15 +562,6 @@
<artifactId>httpcore</artifactId>
<scope>test</scope>
</dependency>
- <!-- commons-logging is used by HBTU to monkey with log levels
- have to put it at compile scope because Hadoop's IOUtils uses it
- both for hadoop 2.7 and 3.0, so we'll fail at compile if it's at test scope.
- -->
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <scope>compile</scope>
- </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-crypto</artifactId>
@@ -696,10 +682,34 @@
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-distcp</artifactId>
+ <version>${hadoop-two.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-auth</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-annotations</artifactId>
+ <version>${hadoop-two.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-core</artifactId>
<exclusions>
<exclusion>
@@ -792,32 +802,21 @@
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs-client</artifactId>
- <version>${hadoop.version}</version>
+ <artifactId>hadoop-distcp</artifactId>
+ <version>${hadoop-three.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-mapreduce-client-core</artifactId>
+ <artifactId>hadoop-common</artifactId>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
+ <artifactId>hadoop-annotations</artifactId>
+ <version>${hadoop-three.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
diff --git a/hbase-shaded/hbase-shaded-with-hadoop-check-invariants/pom.xml b/dev-support/create-release/hbase-2.0.5-bin/hbase-shaded/hbase-shaded-check-invariants/pom.xml
similarity index 76%
copy from hbase-shaded/hbase-shaded-with-hadoop-check-invariants/pom.xml
copy to dev-support/create-release/hbase-2.0.5-bin/hbase-shaded/hbase-shaded-check-invariants/pom.xml
index 5202a30..7963bcf 100644
--- a/hbase-shaded/hbase-shaded-with-hadoop-check-invariants/pom.xml
+++ b/dev-support/create-release/hbase-2.0.5-bin/hbase-shaded/hbase-shaded-check-invariants/pom.xml
@@ -16,32 +16,34 @@
<parent>
<artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../..</relativePath>
</parent>
- <artifactId>hbase-shaded-with-hadoop-check-invariants</artifactId>
+ <artifactId>hbase-shaded-check-invariants</artifactId>
<packaging>pom</packaging>
<description>
Enforces our invariants for our shaded artifacts. e.g. shaded clients have
a specific set of transitive dependencies and shaded clients only contain
classes that are in particular packages. Does the enforcement through
- the maven-enforcer-plugin and integration test.
+ the maven-enforcer-plugin and and integration test.
</description>
- <name>Apache HBase Shaded Packaging Invariants (with Hadoop bundled)</name>
+ <name>Apache HBase Shaded Packaging Invariants</name>
<properties>
</properties>
<dependencies>
- <!-- This should only be client facing artifacts that bundle
- Apache Hadoop related artifacts.
- -->
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-shaded-client</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-shaded-mapreduce</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<!-- parent pom defines these for children. :( :( :( -->
<dependency>
<groupId>com.github.stephenc.findbugs</groupId>
@@ -111,9 +113,6 @@
<exclude>com.github.stephenc.findbugs:*</exclude>
<!-- We leave HTrace as an unshaded dependnecy on purpose so that tracing within a JVM will work -->
<exclude>org.apache.htrace:*</exclude>
- <!-- NB we don't exclude Hadoop from this check here, because the assumption is any needed classes
- are contained in our artifacts.
- -->
</excludes>
</banTransitiveDependencies>
<banDuplicateClasses>
@@ -159,39 +158,20 @@
</execution>
</executions>
</plugin>
+ <!--
+ Check that we actually relocated everything we included.
+ It's critical that we don't ship third party dependencies that haven't
+ been relocated under our pacakge space, since this will lead to
+ difficult to debug classpath errors for downstream. Unfortunately, that
+ means inspecting all the jars.
+ -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.6.0</version>
<executions>
- <!-- It's easier to have two copies of our validation
- script than to copy it via remote-resources-plugin, but
- we need to make sure they stay the same.
- -->
- <execution>
- <id>make-sure-validation-files-are-in-sync</id>
- <phase>validate</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <executable>diff</executable>
- <requiresOnline>false</requiresOnline>
- <arguments>
- <argument>../hbase-shaded-with-hadoop-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh</argument>
- <argument>../hbase-shaded-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh</argument>
- </arguments>
- </configuration>
- </execution>
- <!--
- Check that we actually relocated everything we included.
- It's critical that we don't ship third party dependencies that haven't
- been relocated under our package space, since this will lead to
- difficult to debug classpath errors for downstream. Unfortunately, that
- means inspecting all the jars.
- -->
<execution>
- <id>check-jar-contents-for-stuff-with-hadoop</id>
+ <id>check-jar-contents</id>
<phase>integration-test</phase>
<goals>
<goal>exec</goal>
@@ -202,7 +182,6 @@
<requiresOnline>false</requiresOnline>
<arguments>
<argument>ensure-jars-have-correct-contents.sh</argument>
- <argument>--allow-hadoop</argument>
<argument>${hbase-client-artifacts}</argument>
</arguments>
</configuration>
diff --git a/hbase-shaded/hbase-shaded-client-byo-hadoop/pom.xml b/dev-support/create-release/hbase-2.0.5-bin/hbase-shaded/hbase-shaded-client/pom.xml
similarity index 82%
copy from hbase-shaded/hbase-shaded-client-byo-hadoop/pom.xml
copy to dev-support/create-release/hbase-2.0.5-bin/hbase-shaded/hbase-shaded-client/pom.xml
index 1948fcf..15853a1 100644
--- a/hbase-shaded/hbase-shaded-client-byo-hadoop/pom.xml
+++ b/dev-support/create-release/hbase-2.0.5-bin/hbase-shaded/hbase-shaded-client/pom.xml
@@ -24,10 +24,10 @@
<parent>
<artifactId>hbase-shaded</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>..</relativePath>
</parent>
- <artifactId>hbase-shaded-client-byo-hadoop</artifactId>
+ <artifactId>hbase-shaded-client</artifactId>
<name>Apache HBase - Shaded - Client</name>
<build>
<plugins>
@@ -45,10 +45,6 @@
<skipAssembly>true</skipAssembly>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- </plugin>
</plugins>
</build>
<dependencies>
@@ -58,4 +54,17 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/hbase-shaded/hbase-shaded-mapreduce/pom.xml b/dev-support/create-release/hbase-2.0.5-bin/hbase-shaded/hbase-shaded-mapreduce/pom.xml
similarity index 51%
copy from hbase-shaded/hbase-shaded-mapreduce/pom.xml
copy to dev-support/create-release/hbase-2.0.5-bin/hbase-shaded/hbase-shaded-mapreduce/pom.xml
index ff9344a..7465188 100644
--- a/hbase-shaded/hbase-shaded-mapreduce/pom.xml
+++ b/dev-support/create-release/hbase-2.0.5-bin/hbase-shaded/hbase-shaded-mapreduce/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>hbase-shaded</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>..</relativePath>
</parent>
<artifactId>hbase-shaded-mapreduce</artifactId>
@@ -59,17 +59,9 @@
</archive>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- </plugin>
</plugins>
</build>
<dependencies>
- <!--
- We want to ensure needed hadoop bits are at provided scope for our shaded
- artifact, so we list them below in hadoop specific profiles.
- -->
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-mapreduce</artifactId>
@@ -146,6 +138,10 @@
<artifactId>jetty-webapp</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.glassfish.web</groupId>
+ <artifactId>javax.servlet.jsp</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-server</artifactId>
</exclusion>
@@ -153,162 +149,21 @@
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet-core</artifactId>
</exclusion>
- <!-- We excluded the server-side generated classes for JSP, so exclude
- their runtime support libraries too
- -->
- <exclusion>
- <groupId>org.glassfish.web</groupId>
- <artifactId>javax.servlet.jsp</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>javax.servlet.jsp-api</artifactId>
- </exclusion>
</exclusions>
</dependency>
</dependencies>
<profiles>
- <!-- These hadoop profiles should be derived from those in the hbase-mapreduce
- module. Essentially, you must list the same hadoop-* dependencies
- since provided dependencies are not transitively included.
- -->
- <!-- profile against Hadoop 2.x: This is the default. -->
- <profile>
- <id>hadoop-2.0</id>
- <activation>
- <property>
- <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
- <!--h2--><name>!hadoop.profile</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>net.java.dev.jets3t</groupId>
- <artifactId>jets3t</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-server</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-json</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>tomcat</groupId>
- <artifactId>jasper-compiler</artifactId>
- </exclusion>
- <exclusion>
- <groupId>tomcat</groupId>
- <artifactId>jasper-runtime</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs</artifactId>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
- </exclusion>
- <exclusion>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- </exclusions>
- <version>${hadoop-two.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-mapreduce-client-core</artifactId>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-auth</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
-
- <!--
- profile for building against Hadoop 3.0.x. Activate using:
- mvn -Dhadoop.profile=3.0
- -->
<profile>
- <id>hadoop-3.0</id>
- <activation>
- <property>
- <name>hadoop.profile</name>
- <value>3.0</value>
- </property>
- </activation>
- <properties>
- <hadoop.version>${hadoop-three.version}</hadoop.version>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-auth</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</profile>
</profiles>
</project>
diff --git a/hbase-shaded/pom.xml b/dev-support/create-release/hbase-2.0.5-bin/hbase-shaded/pom.xml
similarity index 95%
copy from hbase-shaded/pom.xml
copy to dev-support/create-release/hbase-2.0.5-bin/hbase-shaded/pom.xml
index 5e97654..a14cfee 100644
--- a/hbase-shaded/pom.xml
+++ b/dev-support/create-release/hbase-2.0.5-bin/hbase-shaded/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
<artifactId>hbase-shaded</artifactId>
@@ -39,11 +39,9 @@
<shaded.prefix>org.apache.hadoop.hbase.shaded</shaded.prefix>
</properties>
<modules>
- <module>hbase-shaded-client-byo-hadoop</module>
<module>hbase-shaded-client</module>
<module>hbase-shaded-mapreduce</module>
<module>hbase-shaded-check-invariants</module>
- <module>hbase-shaded-with-hadoop-check-invariants</module>
</modules>
<dependencies>
<dependency>
@@ -120,7 +118,6 @@
<artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
- <id>aggregate-into-a-jar-with-relocated-third-parties</id>
<phase>package</phase>
<goals>
<goal>shade</goal>
@@ -132,11 +129,6 @@
<shadeTestJar>false</shadeTestJar>
<artifactSet>
<excludes>
- <!-- default to excluding Hadoop, have module that want
- to include it redefine the exclude list -->
- <exclude>org.apache.hadoop:*</exclude>
- <!-- the rest of this needs to be kept in sync with any
- hadoop-including module -->
<exclude>org.apache.hbase:hbase-resource-bundle</exclude>
<exclude>org.slf4j:*</exclude>
<exclude>com.google.code.findbugs:*</exclude>
@@ -456,22 +448,11 @@
</excludes>
</filter>
<filter>
- <!-- Duplication of classes that ship in commons-collections 2.x and 3.x
- If we stop bundling a relevant commons-collections artifact we'll
- need to revisit. See: https://s.apache.org/e09o
- -->
- <artifact>commons-beanutils:commons-beanutils-core</artifact>
- <excludes>
- <exclude>org/apache/commons/collections/*.class</exclude>
- </excludes>
- </filter>
- <filter>
<!-- server side webapps that we don't need -->
<artifact>org.apache.hbase:hbase-server</artifact>
<excludes>
<exclude>hbase-webapps/*</exclude>
<exclude>hbase-webapps/**/*</exclude>
- <exclude>**/*_jsp.class</exclude>
</excludes>
</filter>
<filter>
diff --git a/hbase-shell/pom.xml b/dev-support/create-release/hbase-2.0.5-bin/hbase-shell/pom.xml
similarity index 96%
copy from hbase-shell/pom.xml
copy to dev-support/create-release/hbase-2.0.5-bin/hbase-shell/pom.xml
index 7ead141..d8685ef 100644
--- a/hbase-shell/pom.xml
+++ b/dev-support/create-release/hbase-2.0.5-bin/hbase-shell/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
<artifactId>hbase-shell</artifactId>
@@ -277,6 +277,12 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
@@ -336,6 +342,10 @@
<scope>test</scope>
<exclusions>
<exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
@@ -399,6 +409,10 @@
<artifactId>hadoop-minicluster</artifactId>
<exclusions>
<exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
diff --git a/hbase-testing-util/pom.xml b/dev-support/create-release/hbase-2.0.5-bin/hbase-testing-util/pom.xml
similarity index 92%
copy from hbase-testing-util/pom.xml
copy to dev-support/create-release/hbase-2.0.5-bin/hbase-testing-util/pom.xml
index 2b54524..6810a5f 100644
--- a/hbase-testing-util/pom.xml
+++ b/dev-support/create-release/hbase-2.0.5-bin/hbase-testing-util/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
<artifactId>hbase-testing-util</artifactId>
@@ -140,6 +140,12 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
@@ -196,6 +202,10 @@
<scope>compile</scope>
<exclusions>
<exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
@@ -232,6 +242,12 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minicluster</artifactId>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
diff --git a/hbase-thrift/pom.xml b/dev-support/create-release/hbase-2.0.5-bin/hbase-thrift/pom.xml
similarity index 97%
copy from hbase-thrift/pom.xml
copy to dev-support/create-release/hbase-2.0.5-bin/hbase-thrift/pom.xml
index 9498a91..9addb36 100644
--- a/hbase-thrift/pom.xml
+++ b/dev-support/create-release/hbase-2.0.5-bin/hbase-thrift/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
<artifactId>hbase-thrift</artifactId>
@@ -284,11 +284,6 @@
<groupId>org.glassfish</groupId>
<artifactId>javax.el</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.kerby</groupId>
- <artifactId>kerb-simplekdc</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<profiles>
@@ -496,6 +491,12 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
@@ -503,6 +504,10 @@
<scope>test</scope>
<exclusions>
<exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
@@ -559,6 +564,12 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minicluster</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
<build>
diff --git a/hbase-zookeeper/pom.xml b/dev-support/create-release/hbase-2.0.5-bin/hbase-zookeeper/pom.xml
similarity index 98%
copy from hbase-zookeeper/pom.xml
copy to dev-support/create-release/hbase-2.0.5-bin/hbase-zookeeper/pom.xml
index ba1f6b7..38bc89c 100644
--- a/hbase-zookeeper/pom.xml
+++ b/dev-support/create-release/hbase-2.0.5-bin/hbase-zookeeper/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
<artifactId>hbase-zookeeper</artifactId>
@@ -92,13 +92,6 @@
<artifactId>findbugs-maven-plugin</artifactId>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <failOnViolation>true</failOnViolation>
- </configuration>
- </plugin>
- <plugin>
<groupId>net.revelc.code</groupId>
<artifactId>warbucks-maven-plugin</artifactId>
</plugin>
diff --git a/pom.xml b/dev-support/create-release/hbase-2.0.5-bin/pom.xml
similarity index 96%
copy from pom.xml
copy to dev-support/create-release/hbase-2.0.5-bin/pom.xml
index 83e9b4d..a094b53 100755
--- a/pom.xml
+++ b/dev-support/create-release/hbase-2.0.5-bin/pom.xml
@@ -32,14 +32,14 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>21</version>
+ <version>18</version>
<relativePath/>
<!-- no parent resolution -->
</parent>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase</artifactId>
<packaging>pom</packaging>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<name>Apache HBase</name>
<description>
Apache HBase is the Hadoop database. Use it when you need
@@ -91,6 +91,14 @@
<module>hbase-metrics</module>
<module>hbase-zookeeper</module>
</modules>
+ <!--Add apache snapshots in case we want to use unreleased versions of plugins:
+ e.g. surefire 2.18-SNAPSHOT-->
+ <pluginRepositories>
+ <pluginRepository>
+ <id>apache.snapshots</id>
+ <url>http://repository.apache.org/snapshots/</url>
+ </pluginRepository>
+ </pluginRepositories>
<scm>
<connection>scm:git:git://gitbox.apache.org/repos/asf/hbase.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/hbase.git</developerConnection>
@@ -100,6 +108,10 @@
<system>JIRA</system>
<url>http://issues.apache.org/jira/browse/HBASE</url>
</issueManagement>
+ <ciManagement>
+ <system>hudson</system>
+ <url>http://hudson.zones.apache.org/hudson/view/HBase/job/HBase-TRUNK/</url>
+ </ciManagement>
<mailingLists>
<mailingList>
<name>User List</name>
@@ -519,10 +531,25 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>${maven.dependency.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${maven.javadoc.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>${maven.shade.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<configuration>
<!--You need this profile. It'll sign your artifacts.
@@ -541,6 +568,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>${maven.compiler.version}</version>
<configuration>
<source>${compileSource}</source>
<target>${compileSource}</target>
@@ -615,6 +643,19 @@
<version>${surefire.version}</version>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <!--dfs tests have build dir hardcoded. Clean it as part of
+ clean target-->
+ <directory>build</directory>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<version>${buildnumber.maven.version}</version>
@@ -684,6 +725,10 @@
<exclude>log4j.properties</exclude>
<exclude>mapred-queues.xml</exclude>
<exclude>mapred-site.xml</exclude>
+ <!--I was seeing this w/o the below addition:
+ [ERROR] Failed to execute goal org.apache.maven.plugins:maven-jar-plugin:2.4:jar (default-jar) on project hbase-protocol-shaded: Error assembling JAR: A zip file cannot include itself -> [Help 1]
+ -->
+ <exclude>*.jar</exclude>
</excludes>
</configuration>
</plugin>
@@ -780,10 +825,11 @@
<exclude>**/.*</exclude>
<exclude>**/*.tgz</exclude>
<exclude>**/*.orig</exclude>
+ <exclude>**/8e8ab58dcf39412da19833fcd8f687ac</exclude>
+ <exclude>**/a6a6562b777440fd9c34885428f5cb61.21e75333ada3d5bafb34bb918f29576c</exclude>
<exclude>**/0000000000000016310</exclude>
<exclude>**/.idea/**</exclude>
<exclude>**/*.iml</exclude>
- <exclude>**/CHANGES.txt</exclude>
<exclude>**/generated/**</exclude>
<exclude>**/gen-*/**</exclude>
<!-- No material contents -->
@@ -796,7 +842,6 @@
<exclude>**/src/main/asciidoc/hbase.css</exclude>
<!-- MIT http://jquery.org/license -->
<exclude>**/jquery.min.js</exclude>
- <exclude>**/jquery.tablesorter.min.js</exclude>
<!-- vector graphics -->
<exclude>**/*.vm</exclude>
<!-- apache doxia generated -->
@@ -810,7 +855,7 @@
<exclude>.svn/**</exclude>
<exclude>**/.settings/**</exclude>
<exclude>**/patchprocess/**</exclude>
- <exclude>src/site/resources/repo/**</exclude>
+ <exclude>src/main/site/resources/repo/**</exclude>
<exclude>**/dependency-reduced-pom.xml</exclude>
<exclude>**/rat.txt</exclude>
<!-- exclude the shaded protobuf files -->
@@ -1157,6 +1202,8 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
+ <version>${maven.site.version}</version>
+ <inherited>false</inherited>
<dependencies>
<dependency>
<!-- add support for ssh/scp -->
@@ -1166,8 +1213,8 @@
</dependency>
</dependencies>
<configuration>
- <siteDirectory>${basedir}/src/site</siteDirectory>
- <customBundle>${basedir}/src/site/custom/project-info-report.properties</customBundle>
+ <siteDirectory>${basedir}/src/main/site</siteDirectory>
+ <customBundle>${basedir}/src/main/site/custom/project-info-report.properties</customBundle>
<inputEncoding>UTF-8</inputEncoding>
<outputEncoding>UTF-8</outputEncoding>
</configuration>
@@ -1247,7 +1294,7 @@
<outputDirectory>${project.reporting.outputDirectory}/</outputDirectory>
<resources>
<resource>
- <directory>${basedir}/src/site/resources/</directory>
+ <directory>${basedir}/src/main/site/resources/</directory>
<includes>
<include>.htaccess</include>
</includes>
@@ -1266,7 +1313,7 @@
<outputDirectory>${project.reporting.outputDirectory}/</outputDirectory>
<resources>
<resource>
- <directory>${basedir}/src/site/resources/</directory>
+ <directory>${basedir}/src/main/site/resources/</directory>
<includes>
<include>book/**</include>
</includes>
@@ -1360,11 +1407,8 @@
<hadoop.guava.version>11.0.2</hadoop.guava.version>
<compat.module>hbase-hadoop2-compat</compat.module>
<assembly.file>src/main/assembly/hadoop-two-compat.xml</assembly.file>
- <!--This property is for hadoops netty. HBase netty
- comes in via hbase-thirdparty hbase-shaded-netty-->
- <netty.hadoop.version>3.6.2.Final</netty.hadoop.version>
- <!-- end HBASE-15925 default hadoop compatibility values -->
<audience-annotations.version>0.5.0</audience-annotations.version>
+ <!-- end HBASE-15925 default hadoop compatibility values -->
<avro.version>1.7.7</avro.version>
<commons-codec.version>1.10</commons-codec.version>
<!-- pretty outdated -->
@@ -1372,23 +1416,27 @@
<commons-lang3.version>3.6</commons-lang3.version>
<commons-math.version>3.6.1</commons-math.version>
<disruptor.version>3.3.6</disruptor.version>
+ <!-- Do not use versions earlier than 3.2.2 due to a security vulnerability -->
+ <collections.version>4.1</collections.version>
<httpclient.version>4.5.3</httpclient.version>
<httpcore.version>4.4.6</httpcore.version>
<metrics-core.version>3.2.1</metrics-core.version>
<jackson.version>2.9.2</jackson.version>
<jaxb-api.version>2.2.12</jaxb-api.version>
- <jetty.version>9.3.25.v20180904</jetty.version>
- <jetty-jsp.version>9.2.26.v20180806</jetty-jsp.version>
+ <jetty.version>9.3.19.v20170502</jetty.version>
+ <jetty-jsp.version>9.2.19.v20160908</jetty-jsp.version>
<servlet.api.version>3.1.0</servlet.api.version>
<wx.rs.api.version>2.0.1</wx.rs.api.version>
<!-- Jersey 2.26 requires jetty 9.4 which breaks hadoop. Tread lightly. -->
<jersey.version>2.25.1</jersey.version>
<glassfish.jsp.version>2.3.2</glassfish.jsp.version>
<glassfish.el.version>3.0.1-b08</glassfish.el.version>
- <jruby.version>9.1.13.0</jruby.version>
+ <jetty.jspapi.version>6.1.14</jetty.jspapi.version>
+ <jruby.version>9.1.10.0</jruby.version>
<junit.version>4.12</junit.version>
<hamcrest.version>1.3</hamcrest.version>
<htrace.version>4.2.0-incubating</htrace.version>
+ <htrace-hadoop.version>3.2.0-incubating</htrace-hadoop.version>
<log4j.version>1.2.17</log4j.version>
<mockito-core.version>2.1.0</mockito-core.version>
<!--Internally we use a different version of protobuf. See hbase-protocol-shaded-->
@@ -1417,7 +1465,7 @@
<asciidoctorj.pdf.version>1.5.0-alpha.15</asciidoctorj.pdf.version>
<build.helper.maven.version>3.0.0</build.helper.maven.version>
<buildnumber.maven.version>1.4</buildnumber.maven.version>
- <checkstyle.version>8.11</checkstyle.version>
+ <checkstyle.version>6.18</checkstyle.version>
<exec.maven.version>1.6.0</exec.maven.version>
<error-prone.version>2.2.0</error-prone.version>
<findbugs-annotations>1.3.9-1</findbugs-annotations>
@@ -1426,15 +1474,31 @@
<lifecycle.mapping.version>1.0.0</lifecycle.mapping.version>
<maven.antrun.version>1.8</maven.antrun.version>
<maven.bundle.version>3.3.0</maven.bundle.version>
- <maven.checkstyle.version>3.0.0</maven.checkstyle.version>
+ <maven.checkstyle.version>2.17</maven.checkstyle.version>
+ <maven.compiler.version>3.6.1</maven.compiler.version>
+ <maven.dependency.version>3.0.1</maven.dependency.version>
<maven.eclipse.version>2.10</maven.eclipse.version>
+ <maven.install.version>2.5.2</maven.install.version>
+ <maven.jar.version>3.0.2</maven.jar.version>
+ <maven.javadoc.version>3.0.0</maven.javadoc.version>
+ <maven.patch.version>1.2</maven.patch.version>
+ <maven.shade.version>3.0.0</maven.shade.version>
+ <maven.site.version>3.4</maven.site.version>
+ <maven.source.version>3.0.1</maven.source.version>
<maven.warbucks.version>1.1.0</maven.warbucks.version>
<os.maven.version>1.5.0.Final</os.maven.version>
<plexus.errorprone.javac.version>2.8.2</plexus.errorprone.javac.version>
- <spotbugs.version>3.1.11</spotbugs.version>
+ <spotbugs.version>3.1.0-RC3</spotbugs.version>
<wagon.ssh.version>2.12</wagon.ssh.version>
<xml.maven.version>1.0.1</xml.maven.version>
<hbase-thirdparty.version>2.1.0</hbase-thirdparty.version>
+ <!-- General Packaging -->
+ <package.prefix>/usr</package.prefix>
+ <package.conf.dir>/etc/hbase</package.conf.dir>
+ <package.log.dir>/var/log/hbase</package.log.dir>
+ <package.pid.dir>/var/run/hbase</package.pid.dir>
+ <package.release>1</package.release>
+ <final.name>${project.artifactId}-${project.version}</final.name>
<!-- Intraproject jar naming properties -->
<!-- TODO this is pretty ugly, but works for the moment.
Modules are pretty heavy-weight things, so doing this work isn't too bad. -->
@@ -1445,8 +1509,8 @@
<annotations.test.jar>hbase-annotations-${project.version}-tests.jar</annotations.test.jar>
<rsgroup.test.jar>hbase-rsgroup-${project.version}-tests.jar</rsgroup.test.jar>
<mapreduce.test.jar>hbase-mapreduce-${project.version}-tests.jar</mapreduce.test.jar>
- <zookeeper.test.jar>hbase-zookeeper-${project.version}-tests.jar</zookeeper.test.jar>
<shell-executable>bash</shell-executable>
+ <surefire.version>2.21.0</surefire.version>
<surefire.provider>surefire-junit47</surefire.provider>
<!-- default: run small & medium, medium with 2 threads -->
<surefire.skipFirstPart>false</surefire.skipFirstPart>
@@ -1498,8 +1562,7 @@
org.mortbay.jetty:servlet-api, javax.servlet:servlet-api: These are excluded because they are
the same implementations. I chose org.mortbay.jetty:servlet-api-2.5 instead, which is a third
implementation of the same, because Hadoop also uses this version
- javax.servlet:jsp-api in favour of javax.servlet.jsp:javax.servlet.jsp-api:2.3.1 since it
- is what glassfish's jspC jar uses and that's where we get our own need for a jsp-api.
+ javax.servlet:jsp-api in favour of org.mortbay.jetty:jsp-api-2.1
-->
<!-- Intra-module dependencies -->
<dependency>
@@ -1722,21 +1785,6 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-shaded-client</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-shaded-client-byo-hadoop</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-shaded-mapreduce</artifactId>
- <version>${project.version}</version>
- </dependency>
<!-- General dependencies -->
<dependency>
<groupId>com.github.stephenc.findbugs</groupId>
@@ -1808,14 +1856,6 @@
<version>${commons-math.version}</version>
</dependency>
<dependency>
- <!-- commons-logging is only used by hbase-http's HttpRequestLog and hbase-server's
- HBaseTestingUtil.
- -->
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<version>${zookeeper.version}</version>
@@ -1880,16 +1920,6 @@
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
@@ -1992,12 +2022,6 @@
<version>${glassfish.jsp.version}</version>
</dependency>
<dependency>
- <!-- this lib is used by the compiled Jsp from the above JspC -->
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>javax.servlet.jsp-api</artifactId>
- <version>2.3.1</version>
- </dependency>
- <dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.el</artifactId>
<version>${glassfish.el.version}</version>
@@ -2462,6 +2486,10 @@
<version>${hadoop-two.version}</version>
<exclusions>
<exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
</exclusion>
@@ -2503,6 +2531,10 @@
<scope>test</scope>
<exclusions>
<exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
</exclusion>
@@ -2547,6 +2579,10 @@
<version>${hadoop-two.version}</version>
<exclusions>
<exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
</exclusion>
@@ -2597,6 +2633,10 @@
<version>${hadoop-two.version}</version>
<exclusions>
<exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
</exclusion>
@@ -2715,6 +2755,10 @@
<version>${hadoop-three.version}</version>
<exclusions>
<exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
</exclusion>
@@ -2760,6 +2804,10 @@
<scope>test</scope>
<exclusions>
<exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
</exclusion>
@@ -2844,6 +2892,10 @@
<artifactId>jersey-server</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
</exclusion>
@@ -2908,6 +2960,10 @@
<version>${hadoop-three.version}</version>
<exclusions>
<exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
</exclusion>
@@ -3383,6 +3439,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>${maven.compiler.version}</version>
<configuration>
<compilerId>javac-with-errorprone</compilerId>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
@@ -3435,26 +3492,28 @@
<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.9</version>
<reportSets>
<reportSet>
<reports>
+ <report>cim</report>
<report>dependencies</report>
<report>dependency-convergence</report>
<report>dependency-info</report>
<report>dependency-management</report>
<report>index</report>
- <report>issue-management</report>
- <report>licenses</report>
- <report>mailing-lists</report>
+ <report>issue-tracking</report>
+ <report>license</report>
+ <report>mailing-list</report>
<report>plugin-management</report>
<report>plugins</report>
- <report>team</report>
+ <report>project-team</report>
<report>scm</report>
<report>summary</report>
</reports>
</reportSet>
</reportSets>
- <!-- see src/site/site.xml for selected reports -->
+ <!-- see src/main/site/site.xml for selected reports -->
<configuration>
<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
</configuration>
@@ -3463,6 +3522,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>${maven.javadoc.version}</version>
<reportSets>
<!-- Dev API -->
<reportSet>
diff --git a/hbase-annotations/pom.xml b/dev-support/create-release/hbase/hbase-annotations/pom.xml
similarity index 98%
copy from hbase-annotations/pom.xml
copy to dev-support/create-release/hbase/hbase-annotations/pom.xml
index c38fcb5..a00258c 100644
--- a/hbase-annotations/pom.xml
+++ b/dev-support/create-release/hbase/hbase-annotations/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>..</relativePath>
</parent>
diff --git a/hbase-archetypes/hbase-archetype-builder/pom.xml b/dev-support/create-release/hbase/hbase-archetypes/hbase-archetype-builder/pom.xml
similarity index 99%
copy from hbase-archetypes/hbase-archetype-builder/pom.xml
copy to dev-support/create-release/hbase/hbase-archetypes/hbase-archetype-builder/pom.xml
index 26a880d..3ed683c 100644
--- a/hbase-archetypes/hbase-archetype-builder/pom.xml
+++ b/dev-support/create-release/hbase/hbase-archetypes/hbase-archetype-builder/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>hbase-archetypes</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>..</relativePath>
</parent>
diff --git a/hbase-archetypes/hbase-client-project/pom.xml b/dev-support/create-release/hbase/hbase-archetypes/hbase-client-project/pom.xml
similarity index 99%
copy from hbase-archetypes/hbase-client-project/pom.xml
copy to dev-support/create-release/hbase/hbase-archetypes/hbase-client-project/pom.xml
index 2378d07..b44f5e0 100644
--- a/hbase-archetypes/hbase-client-project/pom.xml
+++ b/dev-support/create-release/hbase/hbase-archetypes/hbase-client-project/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>hbase-archetypes</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>..</relativePath>
</parent>
<artifactId>hbase-client-project</artifactId>
diff --git a/hbase-archetypes/hbase-shaded-client-project/pom.xml b/dev-support/create-release/hbase/hbase-archetypes/hbase-shaded-client-project/pom.xml
similarity index 98%
copy from hbase-archetypes/hbase-shaded-client-project/pom.xml
copy to dev-support/create-release/hbase/hbase-archetypes/hbase-shaded-client-project/pom.xml
index a6b4b99..1408d1b 100644
--- a/hbase-archetypes/hbase-shaded-client-project/pom.xml
+++ b/dev-support/create-release/hbase/hbase-archetypes/hbase-shaded-client-project/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>hbase-archetypes</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>..</relativePath>
</parent>
<artifactId>hbase-shaded-client-project</artifactId>
diff --git a/hbase-archetypes/pom.xml b/dev-support/create-release/hbase/hbase-archetypes/pom.xml
similarity index 99%
copy from hbase-archetypes/pom.xml
copy to dev-support/create-release/hbase/hbase-archetypes/pom.xml
index 290093f..df83ce7 100644
--- a/hbase-archetypes/pom.xml
+++ b/dev-support/create-release/hbase/hbase-archetypes/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
diff --git a/hbase-assembly/pom.xml b/dev-support/create-release/hbase/hbase-assembly/pom.xml
similarity index 90%
copy from hbase-assembly/pom.xml
copy to dev-support/create-release/hbase/hbase-assembly/pom.xml
index 40bdc04..f44a2f3 100644
--- a/hbase-assembly/pom.xml
+++ b/dev-support/create-release/hbase/hbase-assembly/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
<artifactId>hbase-assembly</artifactId>
@@ -79,7 +79,6 @@
<tarLongFileMode>gnu</tarLongFileMode>
<descriptors>
<descriptor>${assembly.file}</descriptor>
- <descriptor>src/main/assembly/client.xml</descriptor>
</descriptors>
</configuration>
</plugin>
@@ -95,7 +94,7 @@
</goals>
<configuration>
<outputFile>${project.parent.basedir}/target/cached_classpath.txt</outputFile>
- <excludeArtifactIds>jline,jruby-complete,hbase-shaded-client,hbase-shaded-client-byo-hadoop,hbase-shaded-mapreduce</excludeArtifactIds>
+ <excludeArtifactIds>jline,jruby-complete</excludeArtifactIds>
</configuration>
</execution>
@@ -174,19 +173,6 @@
</plugins>
</build>
<dependencies>
- <!-- client artifacts for downstream use -->
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-shaded-client</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-shaded-client-byo-hadoop</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-shaded-mapreduce</artifactId>
- </dependency>
<!-- Intra-project dependencies -->
<dependency>
<groupId>org.apache.hbase</groupId>
@@ -226,22 +212,22 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-hadoop-compat</artifactId>
- <exclusions>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-hadoop-compat</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>${compat.module}</artifactId>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>${compat.module}</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-shell</artifactId>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-shell</artifactId>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
diff --git a/hbase-build-configuration/pom.xml b/dev-support/create-release/hbase/hbase-build-configuration/pom.xml
similarity index 98%
copy from hbase-build-configuration/pom.xml
copy to dev-support/create-release/hbase/hbase-build-configuration/pom.xml
index fd43d72..32e1ac0 100644
--- a/hbase-build-configuration/pom.xml
+++ b/dev-support/create-release/hbase/hbase-build-configuration/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>..</relativePath>
</parent>
@@ -75,6 +75,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>${maven.compiler.version}</version>
<configuration>
<compilerId>javac-with-errorprone</compilerId>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
@@ -83,7 +84,6 @@
<arg>-XepDisableWarningsInGeneratedCode</arg>
<arg>-Xep:FallThrough:OFF</arg> <!-- already in findbugs -->
<arg>-Xep:ClassNewInstance:ERROR</arg>
- <arg>-Xep:MissingDefault:ERROR</arg>
</compilerArgs>
<annotationProcessorPaths>
<path>
diff --git a/hbase-build-support/hbase-error-prone/pom.xml b/dev-support/create-release/hbase/hbase-build-support/hbase-error-prone/pom.xml
similarity index 97%
copy from hbase-build-support/hbase-error-prone/pom.xml
copy to dev-support/create-release/hbase/hbase-build-support/hbase-error-prone/pom.xml
index 21c251f..88d7b0c 100644
--- a/hbase-build-support/hbase-error-prone/pom.xml
+++ b/dev-support/create-release/hbase/hbase-build-support/hbase-error-prone/pom.xml
@@ -23,11 +23,11 @@
<parent>
<artifactId>hbase-build-support</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>..</relativePath>
</parent>
<artifactId>hbase-error-prone</artifactId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<name>Apache HBase - Error Prone Rules</name>
<description>Module to hold error prone custom rules for HBase.</description>
@@ -83,4 +83,4 @@
</plugin>
</plugins>
</build>
-</project>
+</project>
\ No newline at end of file
diff --git a/hbase-build-support/pom.xml b/dev-support/create-release/hbase/hbase-build-support/pom.xml
similarity index 99%
copy from hbase-build-support/pom.xml
copy to dev-support/create-release/hbase/hbase-build-support/pom.xml
index 49bb7c5..68d786f 100644
--- a/hbase-build-support/pom.xml
+++ b/dev-support/create-release/hbase/hbase-build-support/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>..</relativePath>
</parent>
diff --git a/hbase-checkstyle/pom.xml b/dev-support/create-release/hbase/hbase-checkstyle/pom.xml
similarity index 97%
copy from hbase-checkstyle/pom.xml
copy to dev-support/create-release/hbase/hbase-checkstyle/pom.xml
index adc8d67..a270eea 100644
--- a/hbase-checkstyle/pom.xml
+++ b/dev-support/create-release/hbase/hbase-checkstyle/pom.xml
@@ -24,7 +24,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-checkstyle</artifactId>
-<version>2.1.4</version>
+<version>2.0.5</version>
<name>Apache HBase - Checkstyle</name>
<description>Module to hold Checkstyle properties for HBase.</description>
<!--REMOVE-->
@@ -32,7 +32,7 @@
<parent>
<artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>..</relativePath>
</parent>
diff --git a/hbase-client/pom.xml b/dev-support/create-release/hbase/hbase-client/pom.xml
similarity index 98%
copy from hbase-client/pom.xml
copy to dev-support/create-release/hbase/hbase-client/pom.xml
index dbae3a3..016b364 100644
--- a/hbase-client/pom.xml
+++ b/dev-support/create-release/hbase/hbase-client/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
@@ -235,6 +235,10 @@
<artifactId>hadoop-common</artifactId>
<exclusions>
<exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>net.java.dev.jets3t</groupId>
<artifactId>jets3t</artifactId>
</exclusion>
diff --git a/hbase-common/pom.xml b/dev-support/create-release/hbase/hbase-common/pom.xml
similarity index 96%
copy from hbase-common/pom.xml
copy to dev-support/create-release/hbase/hbase-common/pom.xml
index f026bc2..ed76e56 100644
--- a/hbase-common/pom.xml
+++ b/dev-support/create-release/hbase/hbase-common/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
@@ -314,6 +314,12 @@
<artifactId>hadoop-common</artifactId>
<!--FYI This pulls in hadoop's guava. Its needed for Configuration
at least-->
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
<build>
@@ -360,6 +366,12 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
<build>
diff --git a/hbase-endpoint/pom.xml b/dev-support/create-release/hbase/hbase-endpoint/pom.xml
similarity index 95%
copy from hbase-endpoint/pom.xml
copy to dev-support/create-release/hbase/hbase-endpoint/pom.xml
index 11bf47f..eab8148 100644
--- a/hbase-endpoint/pom.xml
+++ b/dev-support/create-release/hbase/hbase-endpoint/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
<artifactId>hbase-endpoint</artifactId>
@@ -266,6 +266,12 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
@@ -297,6 +303,10 @@
<scope>test</scope>
<exclusions>
<exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
@@ -340,6 +350,10 @@
<artifactId>hadoop-minicluster</artifactId>
<exclusions>
<exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
diff --git a/hbase-examples/pom.xml b/dev-support/create-release/hbase/hbase-examples/pom.xml
similarity index 96%
copy from hbase-examples/pom.xml
copy to dev-support/create-release/hbase/hbase-examples/pom.xml
index 8d8080c..1843c61 100644
--- a/hbase-examples/pom.xml
+++ b/dev-support/create-release/hbase/hbase-examples/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
<artifactId>hbase-examples</artifactId>
@@ -232,6 +232,12 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
<build>
@@ -281,6 +287,12 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minicluster</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
<build>
diff --git a/hbase-external-blockcache/pom.xml b/dev-support/create-release/hbase/hbase-external-blockcache/pom.xml
similarity index 98%
copy from hbase-external-blockcache/pom.xml
copy to dev-support/create-release/hbase/hbase-external-blockcache/pom.xml
index 673fbae..5023395 100644
--- a/hbase-external-blockcache/pom.xml
+++ b/dev-support/create-release/hbase/hbase-external-blockcache/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
<artifactId>hbase-external-blockcache</artifactId>
@@ -225,6 +225,10 @@
<artifactId>hadoop-common</artifactId>
<exclusions>
<exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
diff --git a/hbase-hadoop-compat/pom.xml b/dev-support/create-release/hbase/hbase-hadoop-compat/pom.xml
similarity index 99%
copy from hbase-hadoop-compat/pom.xml
copy to dev-support/create-release/hbase/hbase-hadoop-compat/pom.xml
index 41e14fd..b341d0b 100644
--- a/hbase-hadoop-compat/pom.xml
+++ b/dev-support/create-release/hbase/hbase-hadoop-compat/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
diff --git a/hbase-hadoop2-compat/pom.xml b/dev-support/create-release/hbase/hbase-hadoop2-compat/pom.xml
similarity index 97%
copy from hbase-hadoop2-compat/pom.xml
copy to dev-support/create-release/hbase/hbase-hadoop2-compat/pom.xml
index db90a4e..666d906 100644
--- a/hbase-hadoop2-compat/pom.xml
+++ b/dev-support/create-release/hbase/hbase-hadoop2-compat/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
@@ -167,6 +167,12 @@ limitations under the License.
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<version>${hadoop.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
diff --git a/hbase-http/pom.xml b/dev-support/create-release/hbase/hbase-http/pom.xml
similarity index 99%
copy from hbase-http/pom.xml
copy to dev-support/create-release/hbase/hbase-http/pom.xml
index 65acb05..dce7d7b 100644
--- a/hbase-http/pom.xml
+++ b/dev-support/create-release/hbase/hbase-http/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
<artifactId>hbase-http</artifactId>
diff --git a/hbase-it/pom.xml b/dev-support/create-release/hbase/hbase-it/pom.xml
similarity index 98%
copy from hbase-it/pom.xml
copy to dev-support/create-release/hbase/hbase-it/pom.xml
index 8684b85..da4804f 100644
--- a/hbase-it/pom.xml
+++ b/dev-support/create-release/hbase/hbase-it/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
@@ -330,6 +330,12 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
diff --git a/hbase-mapreduce/pom.xml b/dev-support/create-release/hbase/hbase-mapreduce/pom.xml
similarity index 95%
copy from hbase-mapreduce/pom.xml
copy to dev-support/create-release/hbase/hbase-mapreduce/pom.xml
index c99012e..58b5a49 100644
--- a/hbase-mapreduce/pom.xml
+++ b/dev-support/create-release/hbase/hbase-mapreduce/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
<artifactId>hbase-mapreduce</artifactId>
@@ -196,15 +196,6 @@
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-server</artifactId>
- <exclusions>
- <!-- commons-logging is only used by hbase-http's HttpRequestLog and hbase-server's
- HBaseTestingUtil. We don't need either of those here, so execlude it.
- -->
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
@@ -255,19 +246,10 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <!-- jackson(s) used by PerformanceEvaluation and it looks like TableMapReduceUtil -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- </dependency>
</dependencies>
<profiles>
<!-- Skip the tests in this module -->
@@ -303,6 +285,10 @@
<artifactId>hadoop-common</artifactId>
<exclusions>
<exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>net.java.dev.jets3t</groupId>
<artifactId>jets3t</artifactId>
</exclusion>
@@ -349,6 +335,10 @@
<artifactId>hadoop-hdfs</artifactId>
<exclusions>
<exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
</exclusion>
@@ -388,6 +378,10 @@
<scope>test</scope>
<exclusions>
<exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
</exclusion>
diff --git a/hbase-metrics-api/pom.xml b/dev-support/create-release/hbase/hbase-metrics-api/pom.xml
similarity index 99%
copy from hbase-metrics-api/pom.xml
copy to dev-support/create-release/hbase/hbase-metrics-api/pom.xml
index 76076db..9092b2a 100644
--- a/hbase-metrics-api/pom.xml
+++ b/dev-support/create-release/hbase/hbase-metrics-api/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
diff --git a/hbase-metrics/pom.xml b/dev-support/create-release/hbase/hbase-metrics/pom.xml
similarity index 99%
copy from hbase-metrics/pom.xml
copy to dev-support/create-release/hbase/hbase-metrics/pom.xml
index 8bf5859..1c98cac 100644
--- a/hbase-metrics/pom.xml
+++ b/dev-support/create-release/hbase/hbase-metrics/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
diff --git a/hbase-procedure/pom.xml b/dev-support/create-release/hbase/hbase-procedure/pom.xml
similarity index 97%
copy from hbase-procedure/pom.xml
copy to dev-support/create-release/hbase/hbase-procedure/pom.xml
index 966ee8c..c4810f6 100644
--- a/hbase-procedure/pom.xml
+++ b/dev-support/create-release/hbase/hbase-procedure/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
@@ -57,8 +57,8 @@
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-common</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
+ <version>${project.version}</version>
+ <classifier>tests</classifier>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
diff --git a/hbase-protocol-shaded/pom.xml b/dev-support/create-release/hbase/hbase-protocol-shaded/pom.xml
similarity index 97%
copy from hbase-protocol-shaded/pom.xml
copy to dev-support/create-release/hbase/hbase-protocol-shaded/pom.xml
index aefdc69..336ea22 100644
--- a/hbase-protocol-shaded/pom.xml
+++ b/dev-support/create-release/hbase/hbase-protocol-shaded/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
<artifactId>hbase-protocol-shaded</artifactId>
@@ -108,7 +108,7 @@
<version>1.5.3</version>
<executions>
<execution>
- <phase>process-sources</phase>
+ <phase>generate-sources</phase>
<goals>
<goal>replace</goal>
</goals>
@@ -119,9 +119,6 @@
<includes>
<include>**/*.java</include>
</includes>
- <!-- Ignore errors when missing files, because it means this build
- was run with -Dprotoc.skip and there is no -Dreplacer.skip -->
- <ignoreErrors>true</ignoreErrors>
<replacements>
<replacement>
<token>([^\.])com.google.protobuf</token>
diff --git a/hbase-protocol/pom.xml b/dev-support/create-release/hbase/hbase-protocol/pom.xml
similarity index 99%
copy from hbase-protocol/pom.xml
copy to dev-support/create-release/hbase/hbase-protocol/pom.xml
index 5fc0369..9a1fe79 100644
--- a/hbase-protocol/pom.xml
+++ b/dev-support/create-release/hbase/hbase-protocol/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
<artifactId>hbase-protocol</artifactId>
diff --git a/hbase-replication/pom.xml b/dev-support/create-release/hbase/hbase-replication/pom.xml
similarity index 94%
copy from hbase-replication/pom.xml
copy to dev-support/create-release/hbase/hbase-replication/pom.xml
index f884314..43bc66d 100644
--- a/hbase-replication/pom.xml
+++ b/dev-support/create-release/hbase/hbase-replication/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
<artifactId>hbase-replication</artifactId>
@@ -101,18 +101,6 @@
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-zookeeper</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-common</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-zookeeper</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
<!-- General dependencies -->
<dependency>
<groupId>org.apache.commons</groupId>
@@ -149,6 +137,10 @@
<artifactId>hadoop-common</artifactId>
<exclusions>
<exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>net.java.dev.jets3t</groupId>
<artifactId>jets3t</artifactId>
</exclusion>
diff --git a/hbase-resource-bundle/pom.xml b/dev-support/create-release/hbase/hbase-resource-bundle/pom.xml
similarity index 98%
copy from hbase-resource-bundle/pom.xml
copy to dev-support/create-release/hbase/hbase-resource-bundle/pom.xml
index 4062665..3ee7c24 100644
--- a/hbase-resource-bundle/pom.xml
+++ b/dev-support/create-release/hbase/hbase-resource-bundle/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
diff --git a/hbase-rest/pom.xml b/dev-support/create-release/hbase/hbase-rest/pom.xml
similarity index 96%
copy from hbase-rest/pom.xml
copy to dev-support/create-release/hbase/hbase-rest/pom.xml
index 3368747..8ed67c7 100644
--- a/hbase-rest/pom.xml
+++ b/dev-support/create-release/hbase/hbase-rest/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
<artifactId>hbase-rest</artifactId>
@@ -306,19 +306,6 @@
<artifactId>jackson-jaxrs-json-provider</artifactId>
</dependency>
<dependency>
- <!-- We *might* need this for XMLStreamReader use in RemoteAdmin
- TODO figure out if we can remove it.
- -->
- <groupId>org.codehaus.jettison</groupId>
- <artifactId>jettison</artifactId>
- <exclusions>
- <exclusion>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<!--For JspC used in ant task-->
<groupId>org.glassfish.web</groupId>
<artifactId>javax.servlet.jsp</artifactId>
@@ -365,12 +352,6 @@
<artifactId>findbugs-annotations</artifactId>
<optional>true</optional>
</dependency>
- <!--Test-->
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<profiles>
<!-- Skip the tests in this module -->
@@ -419,6 +400,12 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
diff --git a/hbase-rsgroup/pom.xml b/dev-support/create-release/hbase/hbase-rsgroup/pom.xml
similarity index 97%
copy from hbase-rsgroup/pom.xml
copy to dev-support/create-release/hbase/hbase-rsgroup/pom.xml
index 5bd5344..8f432fe 100644
--- a/hbase-rsgroup/pom.xml
+++ b/dev-support/create-release/hbase/hbase-rsgroup/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
<artifactId>hbase-rsgroup</artifactId>
@@ -194,6 +194,10 @@
<artifactId>hadoop-common</artifactId>
<exclusions>
<exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>net.java.dev.jets3t</groupId>
<artifactId>jets3t</artifactId>
</exclusion>
diff --git a/hbase-server/pom.xml b/dev-support/create-release/hbase/hbase-server/pom.xml
similarity index 94%
copy from hbase-server/pom.xml
copy to dev-support/create-release/hbase/hbase-server/pom.xml
index a15ab34..e1e1404 100644
--- a/hbase-server/pom.xml
+++ b/dev-support/create-release/hbase/hbase-server/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
<artifactId>hbase-server</artifactId>
@@ -71,14 +71,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
<version>1.5</version>
- <dependencies>
- <!-- resource bundle only needed at build time -->
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-resource-bundle</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
<executions>
<execution>
<id>default</id>
@@ -400,6 +392,12 @@
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-metrics</artifactId>
</dependency>
+ <!-- resource bundle only needed at build time -->
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-resource-bundle</artifactId>
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
@@ -439,16 +437,19 @@
<artifactId>jetty-webapp</artifactId>
</dependency>
<dependency>
- <!-- For JspC used in ant task, then needed at compile /runtime
- because the source code made from the JSP refers to its runtime
- -->
+ <!--For JspC used in ant task-->
<groupId>org.glassfish.web</groupId>
<artifactId>javax.servlet.jsp</artifactId>
</dependency>
- <!-- Also used by generated sources from our JSP -->
<dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>javax.servlet.jsp-api</artifactId>
+ <groupId>org.codehaus.jettison</groupId>
+ <artifactId>jettison</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- General dependencies -->
<dependency>
@@ -500,20 +501,9 @@
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
- <!-- Jackson only used in compile/runtime scope by BlockCacheUtil class
- also used by some tests
- -->
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </dependency>
<dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>javax.ws.rs-api</artifactId>
</dependency>
<!-- tracing Dependencies -->
@@ -522,6 +512,11 @@
<artifactId>htrace-core4</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ <version>${htrace-hadoop.version}</version>
+ </dependency>
+ <dependency>
<groupId>com.lmax</groupId>
<artifactId>disruptor</artifactId>
</dependency>
@@ -567,15 +562,6 @@
<artifactId>httpcore</artifactId>
<scope>test</scope>
</dependency>
- <!-- commons-logging is used by HBTU to monkey with log levels
- have to put it at compile scope because Hadoop's IOUtils uses it
- both for hadoop 2.7 and 3.0, so we'll fail at compile if it's at test scope.
- -->
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <scope>compile</scope>
- </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-crypto</artifactId>
@@ -696,10 +682,34 @@
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-distcp</artifactId>
+ <version>${hadoop-two.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-auth</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-annotations</artifactId>
+ <version>${hadoop-two.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-core</artifactId>
<exclusions>
<exclusion>
@@ -792,32 +802,21 @@
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs-client</artifactId>
- <version>${hadoop.version}</version>
+ <artifactId>hadoop-distcp</artifactId>
+ <version>${hadoop-three.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-mapreduce-client-core</artifactId>
+ <artifactId>hadoop-common</artifactId>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
+ <artifactId>hadoop-annotations</artifactId>
+ <version>${hadoop-three.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
diff --git a/hbase-shaded/hbase-shaded-with-hadoop-check-invariants/pom.xml b/dev-support/create-release/hbase/hbase-shaded/hbase-shaded-check-invariants/pom.xml
similarity index 76%
copy from hbase-shaded/hbase-shaded-with-hadoop-check-invariants/pom.xml
copy to dev-support/create-release/hbase/hbase-shaded/hbase-shaded-check-invariants/pom.xml
index 5202a30..7963bcf 100644
--- a/hbase-shaded/hbase-shaded-with-hadoop-check-invariants/pom.xml
+++ b/dev-support/create-release/hbase/hbase-shaded/hbase-shaded-check-invariants/pom.xml
@@ -16,32 +16,34 @@
<parent>
<artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../..</relativePath>
</parent>
- <artifactId>hbase-shaded-with-hadoop-check-invariants</artifactId>
+ <artifactId>hbase-shaded-check-invariants</artifactId>
<packaging>pom</packaging>
<description>
Enforces our invariants for our shaded artifacts. e.g. shaded clients have
a specific set of transitive dependencies and shaded clients only contain
classes that are in particular packages. Does the enforcement through
- the maven-enforcer-plugin and integration test.
+ the maven-enforcer-plugin and and integration test.
</description>
- <name>Apache HBase Shaded Packaging Invariants (with Hadoop bundled)</name>
+ <name>Apache HBase Shaded Packaging Invariants</name>
<properties>
</properties>
<dependencies>
- <!-- This should only be client facing artifacts that bundle
- Apache Hadoop related artifacts.
- -->
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-shaded-client</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-shaded-mapreduce</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<!-- parent pom defines these for children. :( :( :( -->
<dependency>
<groupId>com.github.stephenc.findbugs</groupId>
@@ -111,9 +113,6 @@
<exclude>com.github.stephenc.findbugs:*</exclude>
<!-- We leave HTrace as an unshaded dependnecy on purpose so that tracing within a JVM will work -->
<exclude>org.apache.htrace:*</exclude>
- <!-- NB we don't exclude Hadoop from this check here, because the assumption is any needed classes
- are contained in our artifacts.
- -->
</excludes>
</banTransitiveDependencies>
<banDuplicateClasses>
@@ -159,39 +158,20 @@
</execution>
</executions>
</plugin>
+ <!--
+ Check that we actually relocated everything we included.
+ It's critical that we don't ship third party dependencies that haven't
+ been relocated under our pacakge space, since this will lead to
+ difficult to debug classpath errors for downstream. Unfortunately, that
+ means inspecting all the jars.
+ -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.6.0</version>
<executions>
- <!-- It's easier to have two copies of our validation
- script than to copy it via remote-resources-plugin, but
- we need to make sure they stay the same.
- -->
- <execution>
- <id>make-sure-validation-files-are-in-sync</id>
- <phase>validate</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <executable>diff</executable>
- <requiresOnline>false</requiresOnline>
- <arguments>
- <argument>../hbase-shaded-with-hadoop-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh</argument>
- <argument>../hbase-shaded-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh</argument>
- </arguments>
- </configuration>
- </execution>
- <!--
- Check that we actually relocated everything we included.
- It's critical that we don't ship third party dependencies that haven't
- been relocated under our package space, since this will lead to
- difficult to debug classpath errors for downstream. Unfortunately, that
- means inspecting all the jars.
- -->
<execution>
- <id>check-jar-contents-for-stuff-with-hadoop</id>
+ <id>check-jar-contents</id>
<phase>integration-test</phase>
<goals>
<goal>exec</goal>
@@ -202,7 +182,6 @@
<requiresOnline>false</requiresOnline>
<arguments>
<argument>ensure-jars-have-correct-contents.sh</argument>
- <argument>--allow-hadoop</argument>
<argument>${hbase-client-artifacts}</argument>
</arguments>
</configuration>
diff --git a/hbase-shaded/hbase-shaded-client-byo-hadoop/pom.xml b/dev-support/create-release/hbase/hbase-shaded/hbase-shaded-client/pom.xml
similarity index 82%
copy from hbase-shaded/hbase-shaded-client-byo-hadoop/pom.xml
copy to dev-support/create-release/hbase/hbase-shaded/hbase-shaded-client/pom.xml
index 1948fcf..15853a1 100644
--- a/hbase-shaded/hbase-shaded-client-byo-hadoop/pom.xml
+++ b/dev-support/create-release/hbase/hbase-shaded/hbase-shaded-client/pom.xml
@@ -24,10 +24,10 @@
<parent>
<artifactId>hbase-shaded</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>..</relativePath>
</parent>
- <artifactId>hbase-shaded-client-byo-hadoop</artifactId>
+ <artifactId>hbase-shaded-client</artifactId>
<name>Apache HBase - Shaded - Client</name>
<build>
<plugins>
@@ -45,10 +45,6 @@
<skipAssembly>true</skipAssembly>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- </plugin>
</plugins>
</build>
<dependencies>
@@ -58,4 +54,17 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/hbase-shaded/hbase-shaded-mapreduce/pom.xml b/dev-support/create-release/hbase/hbase-shaded/hbase-shaded-mapreduce/pom.xml
similarity index 51%
copy from hbase-shaded/hbase-shaded-mapreduce/pom.xml
copy to dev-support/create-release/hbase/hbase-shaded/hbase-shaded-mapreduce/pom.xml
index ff9344a..7465188 100644
--- a/hbase-shaded/hbase-shaded-mapreduce/pom.xml
+++ b/dev-support/create-release/hbase/hbase-shaded/hbase-shaded-mapreduce/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>hbase-shaded</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>..</relativePath>
</parent>
<artifactId>hbase-shaded-mapreduce</artifactId>
@@ -59,17 +59,9 @@
</archive>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- </plugin>
</plugins>
</build>
<dependencies>
- <!--
- We want to ensure needed hadoop bits are at provided scope for our shaded
- artifact, so we list them below in hadoop specific profiles.
- -->
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-mapreduce</artifactId>
@@ -146,6 +138,10 @@
<artifactId>jetty-webapp</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.glassfish.web</groupId>
+ <artifactId>javax.servlet.jsp</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-server</artifactId>
</exclusion>
@@ -153,162 +149,21 @@
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet-core</artifactId>
</exclusion>
- <!-- We excluded the server-side generated classes for JSP, so exclude
- their runtime support libraries too
- -->
- <exclusion>
- <groupId>org.glassfish.web</groupId>
- <artifactId>javax.servlet.jsp</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>javax.servlet.jsp-api</artifactId>
- </exclusion>
</exclusions>
</dependency>
</dependencies>
<profiles>
- <!-- These hadoop profiles should be derived from those in the hbase-mapreduce
- module. Essentially, you must list the same hadoop-* dependencies
- since provided dependencies are not transitively included.
- -->
- <!-- profile against Hadoop 2.x: This is the default. -->
- <profile>
- <id>hadoop-2.0</id>
- <activation>
- <property>
- <!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
- <!--h2--><name>!hadoop.profile</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>net.java.dev.jets3t</groupId>
- <artifactId>jets3t</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-server</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-json</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>tomcat</groupId>
- <artifactId>jasper-compiler</artifactId>
- </exclusion>
- <exclusion>
- <groupId>tomcat</groupId>
- <artifactId>jasper-runtime</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs</artifactId>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
- </exclusion>
- <exclusion>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- </exclusions>
- <version>${hadoop-two.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-mapreduce-client-core</artifactId>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-auth</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
-
- <!--
- profile for building against Hadoop 3.0.x. Activate using:
- mvn -Dhadoop.profile=3.0
- -->
<profile>
- <id>hadoop-3.0</id>
- <activation>
- <property>
- <name>hadoop.profile</name>
- <value>3.0</value>
- </property>
- </activation>
- <properties>
- <hadoop.version>${hadoop-three.version}</hadoop.version>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-auth</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</profile>
</profiles>
</project>
diff --git a/hbase-shaded/pom.xml b/dev-support/create-release/hbase/hbase-shaded/pom.xml
similarity index 95%
copy from hbase-shaded/pom.xml
copy to dev-support/create-release/hbase/hbase-shaded/pom.xml
index 5e97654..a14cfee 100644
--- a/hbase-shaded/pom.xml
+++ b/dev-support/create-release/hbase/hbase-shaded/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
<artifactId>hbase-shaded</artifactId>
@@ -39,11 +39,9 @@
<shaded.prefix>org.apache.hadoop.hbase.shaded</shaded.prefix>
</properties>
<modules>
- <module>hbase-shaded-client-byo-hadoop</module>
<module>hbase-shaded-client</module>
<module>hbase-shaded-mapreduce</module>
<module>hbase-shaded-check-invariants</module>
- <module>hbase-shaded-with-hadoop-check-invariants</module>
</modules>
<dependencies>
<dependency>
@@ -120,7 +118,6 @@
<artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
- <id>aggregate-into-a-jar-with-relocated-third-parties</id>
<phase>package</phase>
<goals>
<goal>shade</goal>
@@ -132,11 +129,6 @@
<shadeTestJar>false</shadeTestJar>
<artifactSet>
<excludes>
- <!-- default to excluding Hadoop, have module that want
- to include it redefine the exclude list -->
- <exclude>org.apache.hadoop:*</exclude>
- <!-- the rest of this needs to be kept in sync with any
- hadoop-including module -->
<exclude>org.apache.hbase:hbase-resource-bundle</exclude>
<exclude>org.slf4j:*</exclude>
<exclude>com.google.code.findbugs:*</exclude>
@@ -456,22 +448,11 @@
</excludes>
</filter>
<filter>
- <!-- Duplication of classes that ship in commons-collections 2.x and 3.x
- If we stop bundling a relevant commons-collections artifact we'll
- need to revisit. See: https://s.apache.org/e09o
- -->
- <artifact>commons-beanutils:commons-beanutils-core</artifact>
- <excludes>
- <exclude>org/apache/commons/collections/*.class</exclude>
- </excludes>
- </filter>
- <filter>
<!-- server side webapps that we don't need -->
<artifact>org.apache.hbase:hbase-server</artifact>
<excludes>
<exclude>hbase-webapps/*</exclude>
<exclude>hbase-webapps/**/*</exclude>
- <exclude>**/*_jsp.class</exclude>
</excludes>
</filter>
<filter>
diff --git a/hbase-shell/pom.xml b/dev-support/create-release/hbase/hbase-shell/pom.xml
similarity index 96%
copy from hbase-shell/pom.xml
copy to dev-support/create-release/hbase/hbase-shell/pom.xml
index 7ead141..d8685ef 100644
--- a/hbase-shell/pom.xml
+++ b/dev-support/create-release/hbase/hbase-shell/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
<artifactId>hbase-shell</artifactId>
@@ -277,6 +277,12 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
@@ -336,6 +342,10 @@
<scope>test</scope>
<exclusions>
<exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
@@ -399,6 +409,10 @@
<artifactId>hadoop-minicluster</artifactId>
<exclusions>
<exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
diff --git a/hbase-testing-util/pom.xml b/dev-support/create-release/hbase/hbase-testing-util/pom.xml
similarity index 92%
copy from hbase-testing-util/pom.xml
copy to dev-support/create-release/hbase/hbase-testing-util/pom.xml
index 2b54524..6810a5f 100644
--- a/hbase-testing-util/pom.xml
+++ b/dev-support/create-release/hbase/hbase-testing-util/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
<artifactId>hbase-testing-util</artifactId>
@@ -140,6 +140,12 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
@@ -196,6 +202,10 @@
<scope>compile</scope>
<exclusions>
<exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
@@ -232,6 +242,12 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minicluster</artifactId>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
diff --git a/hbase-thrift/pom.xml b/dev-support/create-release/hbase/hbase-thrift/pom.xml
similarity index 97%
copy from hbase-thrift/pom.xml
copy to dev-support/create-release/hbase/hbase-thrift/pom.xml
index 9498a91..9addb36 100644
--- a/hbase-thrift/pom.xml
+++ b/dev-support/create-release/hbase/hbase-thrift/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
<artifactId>hbase-thrift</artifactId>
@@ -284,11 +284,6 @@
<groupId>org.glassfish</groupId>
<artifactId>javax.el</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.kerby</groupId>
- <artifactId>kerb-simplekdc</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<profiles>
@@ -496,6 +491,12 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
@@ -503,6 +504,10 @@
<scope>test</scope>
<exclusions>
<exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
@@ -559,6 +564,12 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minicluster</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
<build>
diff --git a/hbase-zookeeper/pom.xml b/dev-support/create-release/hbase/hbase-zookeeper/pom.xml
similarity index 98%
copy from hbase-zookeeper/pom.xml
copy to dev-support/create-release/hbase/hbase-zookeeper/pom.xml
index ba1f6b7..38bc89c 100644
--- a/hbase-zookeeper/pom.xml
+++ b/dev-support/create-release/hbase/hbase-zookeeper/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
<artifactId>hbase-zookeeper</artifactId>
@@ -92,13 +92,6 @@
<artifactId>findbugs-maven-plugin</artifactId>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <failOnViolation>true</failOnViolation>
- </configuration>
- </plugin>
- <plugin>
<groupId>net.revelc.code</groupId>
<artifactId>warbucks-maven-plugin</artifactId>
</plugin>
diff --git a/pom.xml b/dev-support/create-release/hbase/pom.xml
similarity index 96%
copy from pom.xml
copy to dev-support/create-release/hbase/pom.xml
index 83e9b4d..a094b53 100755
--- a/pom.xml
+++ b/dev-support/create-release/hbase/pom.xml
@@ -32,14 +32,14 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>21</version>
+ <version>18</version>
<relativePath/>
<!-- no parent resolution -->
</parent>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase</artifactId>
<packaging>pom</packaging>
- <version>2.1.4</version>
+ <version>2.0.5</version>
<name>Apache HBase</name>
<description>
Apache HBase is the Hadoop database. Use it when you need
@@ -91,6 +91,14 @@
<module>hbase-metrics</module>
<module>hbase-zookeeper</module>
</modules>
+ <!--Add apache snapshots in case we want to use unreleased versions of plugins:
+ e.g. surefire 2.18-SNAPSHOT-->
+ <pluginRepositories>
+ <pluginRepository>
+ <id>apache.snapshots</id>
+ <url>http://repository.apache.org/snapshots/</url>
+ </pluginRepository>
+ </pluginRepositories>
<scm>
<connection>scm:git:git://gitbox.apache.org/repos/asf/hbase.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/hbase.git</developerConnection>
@@ -100,6 +108,10 @@
<system>JIRA</system>
<url>http://issues.apache.org/jira/browse/HBASE</url>
</issueManagement>
+ <ciManagement>
+ <system>hudson</system>
+ <url>http://hudson.zones.apache.org/hudson/view/HBase/job/HBase-TRUNK/</url>
+ </ciManagement>
<mailingLists>
<mailingList>
<name>User List</name>
@@ -519,10 +531,25 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>${maven.dependency.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${maven.javadoc.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>${maven.shade.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<configuration>
<!--You need this profile. It'll sign your artifacts.
@@ -541,6 +568,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>${maven.compiler.version}</version>
<configuration>
<source>${compileSource}</source>
<target>${compileSource}</target>
@@ -615,6 +643,19 @@
<version>${surefire.version}</version>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <!--dfs tests have build dir hardcoded. Clean it as part of
+ clean target-->
+ <directory>build</directory>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<version>${buildnumber.maven.version}</version>
@@ -684,6 +725,10 @@
<exclude>log4j.properties</exclude>
<exclude>mapred-queues.xml</exclude>
<exclude>mapred-site.xml</exclude>
+ <!--I was seeing this w/o the below addition:
+ [ERROR] Failed to execute goal org.apache.maven.plugins:maven-jar-plugin:2.4:jar (default-jar) on project hbase-protocol-shaded: Error assembling JAR: A zip file cannot include itself -> [Help 1]
+ -->
+ <exclude>*.jar</exclude>
</excludes>
</configuration>
</plugin>
@@ -780,10 +825,11 @@
<exclude>**/.*</exclude>
<exclude>**/*.tgz</exclude>
<exclude>**/*.orig</exclude>
+ <exclude>**/8e8ab58dcf39412da19833fcd8f687ac</exclude>
+ <exclude>**/a6a6562b777440fd9c34885428f5cb61.21e75333ada3d5bafb34bb918f29576c</exclude>
<exclude>**/0000000000000016310</exclude>
<exclude>**/.idea/**</exclude>
<exclude>**/*.iml</exclude>
- <exclude>**/CHANGES.txt</exclude>
<exclude>**/generated/**</exclude>
<exclude>**/gen-*/**</exclude>
<!-- No material contents -->
@@ -796,7 +842,6 @@
<exclude>**/src/main/asciidoc/hbase.css</exclude>
<!-- MIT http://jquery.org/license -->
<exclude>**/jquery.min.js</exclude>
- <exclude>**/jquery.tablesorter.min.js</exclude>
<!-- vector graphics -->
<exclude>**/*.vm</exclude>
<!-- apache doxia generated -->
@@ -810,7 +855,7 @@
<exclude>.svn/**</exclude>
<exclude>**/.settings/**</exclude>
<exclude>**/patchprocess/**</exclude>
- <exclude>src/site/resources/repo/**</exclude>
+ <exclude>src/main/site/resources/repo/**</exclude>
<exclude>**/dependency-reduced-pom.xml</exclude>
<exclude>**/rat.txt</exclude>
<!-- exclude the shaded protobuf files -->
@@ -1157,6 +1202,8 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
+ <version>${maven.site.version}</version>
+ <inherited>false</inherited>
<dependencies>
<dependency>
<!-- add support for ssh/scp -->
@@ -1166,8 +1213,8 @@
</dependency>
</dependencies>
<configuration>
- <siteDirectory>${basedir}/src/site</siteDirectory>
- <customBundle>${basedir}/src/site/custom/project-info-report.properties</customBundle>
+ <siteDirectory>${basedir}/src/main/site</siteDirectory>
+ <customBundle>${basedir}/src/main/site/custom/project-info-report.properties</customBundle>
<inputEncoding>UTF-8</inputEncoding>
<outputEncoding>UTF-8</outputEncoding>
</configuration>
@@ -1247,7 +1294,7 @@
<outputDirectory>${project.reporting.outputDirectory}/</outputDirectory>
<resources>
<resource>
- <directory>${basedir}/src/site/resources/</directory>
+ <directory>${basedir}/src/main/site/resources/</directory>
<includes>
<include>.htaccess</include>
</includes>
@@ -1266,7 +1313,7 @@
<outputDirectory>${project.reporting.outputDirectory}/</outputDirectory>
<resources>
<resource>
- <directory>${basedir}/src/site/resources/</directory>
+ <directory>${basedir}/src/main/site/resources/</directory>
<includes>
<include>book/**</include>
</includes>
@@ -1360,11 +1407,8 @@
<hadoop.guava.version>11.0.2</hadoop.guava.version>
<compat.module>hbase-hadoop2-compat</compat.module>
<assembly.file>src/main/assembly/hadoop-two-compat.xml</assembly.file>
- <!--This property is for hadoops netty. HBase netty
- comes in via hbase-thirdparty hbase-shaded-netty-->
- <netty.hadoop.version>3.6.2.Final</netty.hadoop.version>
- <!-- end HBASE-15925 default hadoop compatibility values -->
<audience-annotations.version>0.5.0</audience-annotations.version>
+ <!-- end HBASE-15925 default hadoop compatibility values -->
<avro.version>1.7.7</avro.version>
<commons-codec.version>1.10</commons-codec.version>
<!-- pretty outdated -->
@@ -1372,23 +1416,27 @@
<commons-lang3.version>3.6</commons-lang3.version>
<commons-math.version>3.6.1</commons-math.version>
<disruptor.version>3.3.6</disruptor.version>
+ <!-- Do not use versions earlier than 3.2.2 due to a security vulnerability -->
+ <collections.version>4.1</collections.version>
<httpclient.version>4.5.3</httpclient.version>
<httpcore.version>4.4.6</httpcore.version>
<metrics-core.version>3.2.1</metrics-core.version>
<jackson.version>2.9.2</jackson.version>
<jaxb-api.version>2.2.12</jaxb-api.version>
- <jetty.version>9.3.25.v20180904</jetty.version>
- <jetty-jsp.version>9.2.26.v20180806</jetty-jsp.version>
+ <jetty.version>9.3.19.v20170502</jetty.version>
+ <jetty-jsp.version>9.2.19.v20160908</jetty-jsp.version>
<servlet.api.version>3.1.0</servlet.api.version>
<wx.rs.api.version>2.0.1</wx.rs.api.version>
<!-- Jersey 2.26 requires jetty 9.4 which breaks hadoop. Tread lightly. -->
<jersey.version>2.25.1</jersey.version>
<glassfish.jsp.version>2.3.2</glassfish.jsp.version>
<glassfish.el.version>3.0.1-b08</glassfish.el.version>
- <jruby.version>9.1.13.0</jruby.version>
+ <jetty.jspapi.version>6.1.14</jetty.jspapi.version>
+ <jruby.version>9.1.10.0</jruby.version>
<junit.version>4.12</junit.version>
<hamcrest.version>1.3</hamcrest.version>
<htrace.version>4.2.0-incubating</htrace.version>
+ <htrace-hadoop.version>3.2.0-incubating</htrace-hadoop.version>
<log4j.version>1.2.17</log4j.version>
<mockito-core.version>2.1.0</mockito-core.version>
<!--Internally we use a different version of protobuf. See hbase-protocol-shaded-->
@@ -1417,7 +1465,7 @@
<asciidoctorj.pdf.version>1.5.0-alpha.15</asciidoctorj.pdf.version>
<build.helper.maven.version>3.0.0</build.helper.maven.version>
<buildnumber.maven.version>1.4</buildnumber.maven.version>
- <checkstyle.version>8.11</checkstyle.version>
+ <checkstyle.version>6.18</checkstyle.version>
<exec.maven.version>1.6.0</exec.maven.version>
<error-prone.version>2.2.0</error-prone.version>
<findbugs-annotations>1.3.9-1</findbugs-annotations>
@@ -1426,15 +1474,31 @@
<lifecycle.mapping.version>1.0.0</lifecycle.mapping.version>
<maven.antrun.version>1.8</maven.antrun.version>
<maven.bundle.version>3.3.0</maven.bundle.version>
- <maven.checkstyle.version>3.0.0</maven.checkstyle.version>
+ <maven.checkstyle.version>2.17</maven.checkstyle.version>
+ <maven.compiler.version>3.6.1</maven.compiler.version>
+ <maven.dependency.version>3.0.1</maven.dependency.version>
<maven.eclipse.version>2.10</maven.eclipse.version>
+ <maven.install.version>2.5.2</maven.install.version>
+ <maven.jar.version>3.0.2</maven.jar.version>
+ <maven.javadoc.version>3.0.0</maven.javadoc.version>
+ <maven.patch.version>1.2</maven.patch.version>
+ <maven.shade.version>3.0.0</maven.shade.version>
+ <maven.site.version>3.4</maven.site.version>
+ <maven.source.version>3.0.1</maven.source.version>
<maven.warbucks.version>1.1.0</maven.warbucks.version>
<os.maven.version>1.5.0.Final</os.maven.version>
<plexus.errorprone.javac.version>2.8.2</plexus.errorprone.javac.version>
- <spotbugs.version>3.1.11</spotbugs.version>
+ <spotbugs.version>3.1.0-RC3</spotbugs.version>
<wagon.ssh.version>2.12</wagon.ssh.version>
<xml.maven.version>1.0.1</xml.maven.version>
<hbase-thirdparty.version>2.1.0</hbase-thirdparty.version>
+ <!-- General Packaging -->
+ <package.prefix>/usr</package.prefix>
+ <package.conf.dir>/etc/hbase</package.conf.dir>
+ <package.log.dir>/var/log/hbase</package.log.dir>
+ <package.pid.dir>/var/run/hbase</package.pid.dir>
+ <package.release>1</package.release>
+ <final.name>${project.artifactId}-${project.version}</final.name>
<!-- Intraproject jar naming properties -->
<!-- TODO this is pretty ugly, but works for the moment.
Modules are pretty heavy-weight things, so doing this work isn't too bad. -->
@@ -1445,8 +1509,8 @@
<annotations.test.jar>hbase-annotations-${project.version}-tests.jar</annotations.test.jar>
<rsgroup.test.jar>hbase-rsgroup-${project.version}-tests.jar</rsgroup.test.jar>
<mapreduce.test.jar>hbase-mapreduce-${project.version}-tests.jar</mapreduce.test.jar>
- <zookeeper.test.jar>hbase-zookeeper-${project.version}-tests.jar</zookeeper.test.jar>
<shell-executable>bash</shell-executable>
+ <surefire.version>2.21.0</surefire.version>
<surefire.provider>surefire-junit47</surefire.provider>
<!-- default: run small & medium, medium with 2 threads -->
<surefire.skipFirstPart>false</surefire.skipFirstPart>
@@ -1498,8 +1562,7 @@
org.mortbay.jetty:servlet-api, javax.servlet:servlet-api: These are excluded because they are
the same implementations. I chose org.mortbay.jetty:servlet-api-2.5 instead, which is a third
implementation of the same, because Hadoop also uses this version
- javax.servlet:jsp-api in favour of javax.servlet.jsp:javax.servlet.jsp-api:2.3.1 since it
- is what glassfish's jspC jar uses and that's where we get our own need for a jsp-api.
+ javax.servlet:jsp-api in favour of org.mortbay.jetty:jsp-api-2.1
-->
<!-- Intra-module dependencies -->
<dependency>
@@ -1722,21 +1785,6 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-shaded-client</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-shaded-client-byo-hadoop</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-shaded-mapreduce</artifactId>
- <version>${project.version}</version>
- </dependency>
<!-- General dependencies -->
<dependency>
<groupId>com.github.stephenc.findbugs</groupId>
@@ -1808,14 +1856,6 @@
<version>${commons-math.version}</version>
</dependency>
<dependency>
- <!-- commons-logging is only used by hbase-http's HttpRequestLog and hbase-server's
- HBaseTestingUtil.
- -->
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<version>${zookeeper.version}</version>
@@ -1880,16 +1920,6 @@
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
@@ -1992,12 +2022,6 @@
<version>${glassfish.jsp.version}</version>
</dependency>
<dependency>
- <!-- this lib is used by the compiled Jsp from the above JspC -->
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>javax.servlet.jsp-api</artifactId>
- <version>2.3.1</version>
- </dependency>
- <dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.el</artifactId>
<version>${glassfish.el.version}</version>
@@ -2462,6 +2486,10 @@
<version>${hadoop-two.version}</version>
<exclusions>
<exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
</exclusion>
@@ -2503,6 +2531,10 @@
<scope>test</scope>
<exclusions>
<exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
</exclusion>
@@ -2547,6 +2579,10 @@
<version>${hadoop-two.version}</version>
<exclusions>
<exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
</exclusion>
@@ -2597,6 +2633,10 @@
<version>${hadoop-two.version}</version>
<exclusions>
<exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
</exclusion>
@@ -2715,6 +2755,10 @@
<version>${hadoop-three.version}</version>
<exclusions>
<exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
</exclusion>
@@ -2760,6 +2804,10 @@
<scope>test</scope>
<exclusions>
<exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
</exclusion>
@@ -2844,6 +2892,10 @@
<artifactId>jersey-server</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
</exclusion>
@@ -2908,6 +2960,10 @@
<version>${hadoop-three.version}</version>
<exclusions>
<exclusion>
+ <groupId>org.apache.htrace</groupId>
+ <artifactId>htrace-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
</exclusion>
@@ -3383,6 +3439,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>${maven.compiler.version}</version>
<configuration>
<compilerId>javac-with-errorprone</compilerId>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
@@ -3435,26 +3492,28 @@
<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.9</version>
<reportSets>
<reportSet>
<reports>
+ <report>cim</report>
<report>dependencies</report>
<report>dependency-convergence</report>
<report>dependency-info</report>
<report>dependency-management</report>
<report>index</report>
- <report>issue-management</report>
- <report>licenses</report>
- <report>mailing-lists</report>
+ <report>issue-tracking</report>
+ <report>license</report>
+ <report>mailing-list</report>
<report>plugin-management</report>
<report>plugins</report>
- <report>team</report>
+ <report>project-team</report>
<report>scm</report>
<report>summary</report>
</reports>
</reportSet>
</reportSets>
- <!-- see src/site/site.xml for selected reports -->
+ <!-- see src/main/site/site.xml for selected reports -->
<configuration>
<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
</configuration>
@@ -3463,6 +3522,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>${maven.javadoc.version}</version>
<reportSets>
<!-- Dev API -->
<reportSet>
diff --git a/hbase-annotations/pom.xml b/hbase-annotations/pom.xml
index c38fcb5..1983f66 100644
--- a/hbase-annotations/pom.xml
+++ b/hbase-annotations/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.1.5-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/hbase-archetypes/hbase-archetype-builder/pom.xml b/hbase-archetypes/hbase-archetype-builder/pom.xml
index 26a880d..f74320f 100644
--- a/hbase-archetypes/hbase-archetype-builder/pom.xml
+++ b/hbase-archetypes/hbase-archetype-builder/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>hbase-archetypes</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.1.5-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/hbase-archetypes/hbase-client-project/pom.xml b/hbase-archetypes/hbase-client-project/pom.xml
index 2378d07..eac5e07 100644
--- a/hbase-archetypes/hbase-client-project/pom.xml
+++ b/hbase-archetypes/hbase-client-project/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>hbase-archetypes</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.1.5-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>hbase-client-project</artifactId>
diff --git a/hbase-archetypes/hbase-shaded-client-project/pom.xml b/hbase-archetypes/hbase-shaded-client-project/pom.xml
index a6b4b99..d15b72a 100644
--- a/hbase-archetypes/hbase-shaded-client-project/pom.xml
+++ b/hbase-archetypes/hbase-shaded-client-project/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>hbase-archetypes</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.1.5-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>hbase-shaded-client-project</artifactId>
diff --git a/hbase-archetypes/pom.xml b/hbase-archetypes/pom.xml
index 290093f..686422a 100644
--- a/hbase-archetypes/pom.xml
+++ b/hbase-archetypes/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.1.5-SNAPSHOT</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
diff --git a/hbase-assembly/pom.xml b/hbase-assembly/pom.xml
index 40bdc04..1a40350 100644
--- a/hbase-assembly/pom.xml
+++ b/hbase-assembly/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.1.5-SNAPSHOT</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
<artifactId>hbase-assembly</artifactId>
diff --git a/hbase-build-configuration/pom.xml b/hbase-build-configuration/pom.xml
index fd43d72..7e6f3ee 100644
--- a/hbase-build-configuration/pom.xml
+++ b/hbase-build-configuration/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.1.5-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/hbase-build-support/hbase-error-prone/pom.xml b/hbase-build-support/hbase-error-prone/pom.xml
index 21c251f..4d853a6 100644
--- a/hbase-build-support/hbase-error-prone/pom.xml
+++ b/hbase-build-support/hbase-error-prone/pom.xml
@@ -23,11 +23,11 @@
<parent>
<artifactId>hbase-build-support</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.1.5-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>hbase-error-prone</artifactId>
- <version>2.1.4</version>
+ <version>2.1.5-SNAPSHOT</version>
<name>Apache HBase - Error Prone Rules</name>
<description>Module to hold error prone custom rules for HBase.</description>
diff --git a/hbase-build-support/pom.xml b/hbase-build-support/pom.xml
index 49bb7c5..5185a7e 100644
--- a/hbase-build-support/pom.xml
+++ b/hbase-build-support/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.1.5-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/hbase-checkstyle/pom.xml b/hbase-checkstyle/pom.xml
index adc8d67..e32f35b 100644
--- a/hbase-checkstyle/pom.xml
+++ b/hbase-checkstyle/pom.xml
@@ -24,7 +24,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-checkstyle</artifactId>
-<version>2.1.4</version>
+<version>2.1.5-SNAPSHOT</version>
<name>Apache HBase - Checkstyle</name>
<description>Module to hold Checkstyle properties for HBase.</description>
<!--REMOVE-->
@@ -32,7 +32,7 @@
<parent>
<artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.1.5-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml
index dbae3a3..7a3dbf4 100644
--- a/hbase-client/pom.xml
+++ b/hbase-client/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.1.5-SNAPSHOT</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml
index f026bc2..9712fdb 100644
--- a/hbase-common/pom.xml
+++ b/hbase-common/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.1.5-SNAPSHOT</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
diff --git a/hbase-endpoint/pom.xml b/hbase-endpoint/pom.xml
index 11bf47f..caa8bf6 100644
--- a/hbase-endpoint/pom.xml
+++ b/hbase-endpoint/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.1.5-SNAPSHOT</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
<artifactId>hbase-endpoint</artifactId>
diff --git a/hbase-examples/pom.xml b/hbase-examples/pom.xml
index 8d8080c..d4a9283 100644
--- a/hbase-examples/pom.xml
+++ b/hbase-examples/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.1.5-SNAPSHOT</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
<artifactId>hbase-examples</artifactId>
diff --git a/hbase-external-blockcache/pom.xml b/hbase-external-blockcache/pom.xml
index 673fbae..dd25e11 100644
--- a/hbase-external-blockcache/pom.xml
+++ b/hbase-external-blockcache/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.1.5-SNAPSHOT</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
<artifactId>hbase-external-blockcache</artifactId>
diff --git a/hbase-hadoop-compat/pom.xml b/hbase-hadoop-compat/pom.xml
index 41e14fd..9f46aa4 100644
--- a/hbase-hadoop-compat/pom.xml
+++ b/hbase-hadoop-compat/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.1.5-SNAPSHOT</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
diff --git a/hbase-hadoop2-compat/pom.xml b/hbase-hadoop2-compat/pom.xml
index db90a4e..3929334 100644
--- a/hbase-hadoop2-compat/pom.xml
+++ b/hbase-hadoop2-compat/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.1.5-SNAPSHOT</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
diff --git a/hbase-http/pom.xml b/hbase-http/pom.xml
index 65acb05..df091d1 100644
--- a/hbase-http/pom.xml
+++ b/hbase-http/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.1.5-SNAPSHOT</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
<artifactId>hbase-http</artifactId>
diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml
index 8684b85..f0023c9 100644
--- a/hbase-it/pom.xml
+++ b/hbase-it/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.1.5-SNAPSHOT</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
diff --git a/hbase-mapreduce/pom.xml b/hbase-mapreduce/pom.xml
index c99012e..1947572 100644
--- a/hbase-mapreduce/pom.xml
+++ b/hbase-mapreduce/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.1.5-SNAPSHOT</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
<artifactId>hbase-mapreduce</artifactId>
diff --git a/hbase-metrics-api/pom.xml b/hbase-metrics-api/pom.xml
index 76076db..da999af 100644
--- a/hbase-metrics-api/pom.xml
+++ b/hbase-metrics-api/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.1.5-SNAPSHOT</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
diff --git a/hbase-metrics/pom.xml b/hbase-metrics/pom.xml
index 8bf5859..16f13f4 100644
--- a/hbase-metrics/pom.xml
+++ b/hbase-metrics/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.1.5-SNAPSHOT</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
diff --git a/hbase-procedure/pom.xml b/hbase-procedure/pom.xml
index 966ee8c..9424657 100644
--- a/hbase-procedure/pom.xml
+++ b/hbase-procedure/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.1.5-SNAPSHOT</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
diff --git a/hbase-protocol-shaded/pom.xml b/hbase-protocol-shaded/pom.xml
index aefdc69..6960668 100644
--- a/hbase-protocol-shaded/pom.xml
+++ b/hbase-protocol-shaded/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.1.5-SNAPSHOT</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
<artifactId>hbase-protocol-shaded</artifactId>
diff --git a/hbase-protocol/pom.xml b/hbase-protocol/pom.xml
index 5fc0369..bc4eeb4 100644
--- a/hbase-protocol/pom.xml
+++ b/hbase-protocol/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.1.5-SNAPSHOT</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
<artifactId>hbase-protocol</artifactId>
diff --git a/hbase-replication/pom.xml b/hbase-replication/pom.xml
index f884314..487ff67 100644
--- a/hbase-replication/pom.xml
+++ b/hbase-replication/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.1.5-SNAPSHOT</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
<artifactId>hbase-replication</artifactId>
diff --git a/hbase-resource-bundle/pom.xml b/hbase-resource-bundle/pom.xml
index 4062665..2ae8a5e 100644
--- a/hbase-resource-bundle/pom.xml
+++ b/hbase-resource-bundle/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.1.5-SNAPSHOT</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml
index 3368747..29d01d9 100644
--- a/hbase-rest/pom.xml
+++ b/hbase-rest/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.1.5-SNAPSHOT</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
<artifactId>hbase-rest</artifactId>
diff --git a/hbase-rsgroup/pom.xml b/hbase-rsgroup/pom.xml
index 5bd5344..9de34d1 100644
--- a/hbase-rsgroup/pom.xml
+++ b/hbase-rsgroup/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.1.5-SNAPSHOT</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
<artifactId>hbase-rsgroup</artifactId>
diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
index a15ab34..7b49071 100644
--- a/hbase-server/pom.xml
+++ b/hbase-server/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.1.5-SNAPSHOT</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
<artifactId>hbase-server</artifactId>
diff --git a/hbase-shaded/hbase-shaded-check-invariants/pom.xml b/hbase-shaded/hbase-shaded-check-invariants/pom.xml
index bf8c24a..b54d844 100644
--- a/hbase-shaded/hbase-shaded-check-invariants/pom.xml
+++ b/hbase-shaded/hbase-shaded-check-invariants/pom.xml
@@ -16,7 +16,7 @@
<parent>
<artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.1.5-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<artifactId>hbase-shaded-check-invariants</artifactId>
diff --git a/hbase-shaded/hbase-shaded-client-byo-hadoop/pom.xml b/hbase-shaded/hbase-shaded-client-byo-hadoop/pom.xml
index 1948fcf..22f4a7f 100644
--- a/hbase-shaded/hbase-shaded-client-byo-hadoop/pom.xml
+++ b/hbase-shaded/hbase-shaded-client-byo-hadoop/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>hbase-shaded</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.1.5-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>hbase-shaded-client-byo-hadoop</artifactId>
diff --git a/hbase-shaded/hbase-shaded-client/pom.xml b/hbase-shaded/hbase-shaded-client/pom.xml
index f17c432..8b5f699 100644
--- a/hbase-shaded/hbase-shaded-client/pom.xml
+++ b/hbase-shaded/hbase-shaded-client/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>hbase-shaded</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.1.5-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>hbase-shaded-client</artifactId>
diff --git a/hbase-shaded/hbase-shaded-mapreduce/pom.xml b/hbase-shaded/hbase-shaded-mapreduce/pom.xml
index ff9344a..6aeb2a3 100644
--- a/hbase-shaded/hbase-shaded-mapreduce/pom.xml
+++ b/hbase-shaded/hbase-shaded-mapreduce/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>hbase-shaded</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.1.5-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>hbase-shaded-mapreduce</artifactId>
diff --git a/hbase-shaded/hbase-shaded-with-hadoop-check-invariants/pom.xml b/hbase-shaded/hbase-shaded-with-hadoop-check-invariants/pom.xml
index 5202a30..d5e48ea 100644
--- a/hbase-shaded/hbase-shaded-with-hadoop-check-invariants/pom.xml
+++ b/hbase-shaded/hbase-shaded-with-hadoop-check-invariants/pom.xml
@@ -16,7 +16,7 @@
<parent>
<artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.1.5-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<artifactId>hbase-shaded-with-hadoop-check-invariants</artifactId>
diff --git a/hbase-shaded/pom.xml b/hbase-shaded/pom.xml
index 5e97654..cee6874 100644
--- a/hbase-shaded/pom.xml
+++ b/hbase-shaded/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.1.5-SNAPSHOT</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
<artifactId>hbase-shaded</artifactId>
diff --git a/hbase-shell/pom.xml b/hbase-shell/pom.xml
index 7ead141..2dc9851 100644
--- a/hbase-shell/pom.xml
+++ b/hbase-shell/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.1.5-SNAPSHOT</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
<artifactId>hbase-shell</artifactId>
diff --git a/hbase-testing-util/pom.xml b/hbase-testing-util/pom.xml
index 2b54524..2df64cc 100644
--- a/hbase-testing-util/pom.xml
+++ b/hbase-testing-util/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.1.5-SNAPSHOT</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
<artifactId>hbase-testing-util</artifactId>
diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml
index 9498a91..f769862 100644
--- a/hbase-thrift/pom.xml
+++ b/hbase-thrift/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.1.5-SNAPSHOT</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
<artifactId>hbase-thrift</artifactId>
diff --git a/hbase-zookeeper/pom.xml b/hbase-zookeeper/pom.xml
index ba1f6b7..1acd157 100644
--- a/hbase-zookeeper/pom.xml
+++ b/hbase-zookeeper/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>hbase-build-configuration</artifactId>
<groupId>org.apache.hbase</groupId>
- <version>2.1.4</version>
+ <version>2.1.5-SNAPSHOT</version>
<relativePath>../hbase-build-configuration</relativePath>
</parent>
<artifactId>hbase-zookeeper</artifactId>
diff --git a/pom.xml b/pom.xml
index 83e9b4d..1f7191c 100755
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
<groupId>org.apache.hbase</groupId>
<artifactId>hbase</artifactId>
<packaging>pom</packaging>
- <version>2.1.4</version>
+ <version>2.1.5-SNAPSHOT</version>
<name>Apache HBase</name>
<description>
Apache HBase is the Hadoop database. Use it when you need