Repository: hbase Updated Branches: refs/heads/master 055dde7df -> a90d433a2
HBASE-12088 Remove unused hadoop-1.0, hadoop-1.1 profiles from non-root poms Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/a90d433a Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a90d433a Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a90d433a Branch: refs/heads/master Commit: a90d433a2c1f3e2d89948a08dae6dc449e6ee996 Parents: 055dde7 Author: Jonathan M Hsieh <jmhs...@apache.org> Authored: Wed Sep 21 06:13:00 2016 -0700 Committer: Jonathan M Hsieh <jmhs...@apache.org> Committed: Wed Sep 21 20:45:03 2016 -0700 ---------------------------------------------------------------------- hbase-client/pom.xml | 23 +-------------- hbase-common/pom.xml | 46 +----------------------------- hbase-examples/pom.xml | 28 ++----------------- hbase-external-blockcache/pom.xml | 47 +------------------------------ hbase-it/pom.xml | 46 +----------------------------- hbase-prefix-tree/pom.xml | 30 -------------------- hbase-procedure/pom.xml | 36 ++---------------------- hbase-rsgroup/pom.xml | 23 +-------------- hbase-server/pom.xml | 47 ++----------------------------- hbase-shell/pom.xml | 47 ++----------------------------- hbase-testing-util/pom.xml | 51 ++-------------------------------- hbase-thrift/pom.xml | 49 +------------------------------- 12 files changed, 16 insertions(+), 457 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/a90d433a/hbase-client/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml index b78f198..be69528 100644 --- a/hbase-client/pom.xml +++ b/hbase-client/pom.xml @@ -214,29 +214,8 @@ <surefire.skipFirstPart>true</surefire.skipFirstPart> </properties> </profile> - <!-- profile against Hadoop 1.0.x: This is the default. It has to have the same - activation property as the parent Hadoop 1.0.x profile to make sure it gets run at - the same time. --> - <profile> - <id>hadoop-1.1</id> - <activation> - <property> - <!--Below formatting for dev-support/generate-hadoopX-poms.sh--> - <!--h1--><name>hadoop.profile</name><value>1.1</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - </dependency> - </dependencies> - </profile> - <!-- - profile for building against Hadoop 2.0.0-alpha. Activate using: - mvn -Dhadoop.profile=2.0 - --> + <!-- profile for building against Hadoop 2.x. This is the default --> <profile> <id>hadoop-2.0</id> <activation> http://git-wip-us.apache.org/repos/asf/hbase/blob/a90d433a/hbase-common/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml index 5b43553..aaaca5a 100644 --- a/hbase-common/pom.xml +++ b/hbase-common/pom.xml @@ -329,52 +329,8 @@ </properties> </profile> - <!-- profile against Hadoop 1.1.x: This is the default. It has to have the same - activation property as the parent Hadoop 1.1.x profile to make sure it gets run at - the same time. --> - <profile> - <id>hadoop-1.1</id> - <activation> - <property> - <!--Below formatting for dev-support/generate-hadoopX-poms.sh--> - <!--h1--><name>hadoop.profile</name><value>1.1</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - </dependency> - </dependencies> - </profile> - - <!-- profile against Hadoop 1.0.x: - mvn -Dhadoop.profile=1.0 - --> - <profile> - <id>hadoop-1.0</id> - <activation> - <property> - <name>hadoop.profile</name> - <value>1.0</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - </dependencies> - </profile> - <!-- - profile for building against Hadoop 2.0.0-alpha. Activate using: - mvn -Dhadoop.profile=2.0 - --> + <!-- profile for building against Hadoop 2.x. This is the default --> <profile> <id>hadoop-2.0</id> <activation> http://git-wip-us.apache.org/repos/asf/hbase/blob/a90d433a/hbase-examples/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-examples/pom.xml b/hbase-examples/pom.xml index 468c01d..22afa4db 100644 --- a/hbase-examples/pom.xml +++ b/hbase-examples/pom.xml @@ -173,32 +173,8 @@ <!-- Profiles for building against different hadoop versions --> <!-- There are a lot of common dependencies used here, should investigate if we can combine these profiles somehow --> - <!-- profile against Hadoop 1.1.x: This is the default. It has to have the same - activation property as the parent Hadoop 1.1.x profile to make sure it gets run at - the same time. --> - <profile> - <id>hadoop-1.1</id> - <activation> - <property> - <!--Below formatting for dev-support/generate-hadoopX-poms.sh--> - <!--h1--><name>hadoop.profile</name><value>1.1</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-test</artifactId> - </dependency> - </dependencies> - </profile> - <!-- - profile for building against Hadoop 2.0.0-alpha. Activate using: - mvn -Dhadoop.profile=2.0 - --> + + <!-- profile for building against Hadoop 2.x. This is the default --> <profile> <id>hadoop-2.0</id> <activation> http://git-wip-us.apache.org/repos/asf/hbase/blob/a90d433a/hbase-external-blockcache/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-external-blockcache/pom.xml b/hbase-external-blockcache/pom.xml index 17def38..9467693 100644 --- a/hbase-external-blockcache/pom.xml +++ b/hbase-external-blockcache/pom.xml @@ -227,52 +227,7 @@ </properties> </profile> - <!-- profile against Hadoop 1.1.x: This is the default. It has to have the same - activation property as the parent Hadoop 1.1.x profile to make sure it gets run at - the same time. --> - <profile> - <id>hadoop-1.1</id> - <activation> - <property> - <!--Below formatting for dev-support/generate-hadoopX-poms.sh--> - <!--h1--><name>hadoop.profile</name><value>1.1</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - </dependency> - </dependencies> - </profile> - - <!-- profile against Hadoop 1.0.x: - mvn -Dhadoop.profile=1.0 - --> - <profile> - <id>hadoop-1.0</id> - <activation> - <property> - <name>hadoop.profile</name> - <value>1.0</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - </dependencies> - </profile> - - <!-- - profile for building against Hadoop 2.0.0-alpha. Activate using: - mvn -Dhadoop.profile=2.0 - --> + <!-- profile for building against Hadoop 2.x: This is the default --> <profile> <id>hadoop-2.0</id> <activation> http://git-wip-us.apache.org/repos/asf/hbase/blob/a90d433a/hbase-it/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml index 70d13ad..f27b47a 100644 --- a/hbase-it/pom.xml +++ b/hbase-it/pom.xml @@ -290,52 +290,8 @@ </properties> </profile> - <!-- profile against Hadoop 1.1.x: This is the default. It has to have the same - activation property as the parent Hadoop 1.1.x profile to make sure it gets run at - the same time. --> - <profile> - <id>hadoop-1.1</id> - <activation> - <property> - <!--Below formatting for dev-support/generate-hadoopX-poms.sh--> - <!--h1--><name>hadoop.profile</name><value>1.1</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-test</artifactId> - </dependency> - </dependencies> - </profile> - <profile> - <id>hadoop-1.0</id> - <activation> - <property> - <name>hadoop.profile</name> - <value>1.0</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-test</artifactId> - </dependency> - </dependencies> - </profile> - <!-- - profile for building against Hadoop 2.0.0-alpha. Activate using: - mvn -Dhadoop.profile=2.0 - --> + <!-- profile for building against Hadoop 2.x. This is the default --> <profile> <id>hadoop-2.0</id> <activation> http://git-wip-us.apache.org/repos/asf/hbase/blob/a90d433a/hbase-prefix-tree/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-prefix-tree/pom.xml b/hbase-prefix-tree/pom.xml index 03b4000..a16e948 100644 --- a/hbase-prefix-tree/pom.xml +++ b/hbase-prefix-tree/pom.xml @@ -145,36 +145,6 @@ <profiles> <!-- Profiles for building against different hadoop versions --> - <profile> - <id>hadoop-1.1</id> - <activation> - <property> - <!--Below formatting for dev-support/generate-hadoopX-poms.sh--> - <!--h1--><name>hadoop.profile</name><value>1.1</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - </dependency> - </dependencies> - </profile> - <profile> - <id>hadoop-1.0</id> - <activation> - <property> - <name>hadoop.profile</name> - <value>1.0</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - </dependency> - </dependencies> - </profile> <!-- profile for building against Hadoop 2.0.0-alpha. Activate using: mvn -Dhadoop.profile=2.0 http://git-wip-us.apache.org/repos/asf/hbase/blob/a90d433a/hbase-procedure/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-procedure/pom.xml b/hbase-procedure/pom.xml index 4b396ce..9d1ac8d 100644 --- a/hbase-procedure/pom.xml +++ b/hbase-procedure/pom.xml @@ -106,40 +106,8 @@ <profiles> <!-- Profiles for building against different hadoop versions --> - <profile> - <id>hadoop-1.1</id> - <activation> - <property> - <!--Below formatting for dev-support/generate-hadoopX-poms.sh--> - <!--h1--><name>hadoop.profile</name><value>1.1</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - </dependency> - </dependencies> - </profile> - <profile> - <id>hadoop-1.0</id> - <activation> - <property> - <name>hadoop.profile</name> - <value>1.0</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - </dependency> - </dependencies> - </profile> - <!-- - profile for building against Hadoop 2.0.0-alpha. Activate using: - mvn -Dhadoop.profile=2.0 - --> + + <!-- profile for building against Hadoop 2.x. This is the default --> <profile> <id>hadoop-2.0</id> <activation> http://git-wip-us.apache.org/repos/asf/hbase/blob/a90d433a/hbase-rsgroup/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-rsgroup/pom.xml b/hbase-rsgroup/pom.xml index d216263..58802cf 100644 --- a/hbase-rsgroup/pom.xml +++ b/hbase-rsgroup/pom.xml @@ -226,29 +226,8 @@ <surefire.skipFirstPart>true</surefire.skipFirstPart> </properties> </profile> - <!-- profile against Hadoop 1.0.x: This is the default. It has to have the same - activation property as the parent Hadoop 1.0.x profile to make sure it gets run at - the same time. --> - <profile> - <id>hadoop-1.1</id> - <activation> - <property> - <!--Below formatting for dev-support/generate-hadoopX-poms.sh--> - <!--h1--><name>hadoop.profile</name><value>1.1</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - </dependency> - </dependencies> - </profile> - <!-- - profile for building against Hadoop 2.0.0-alpha. Activate using: - mvn -Dhadoop.profile=2.0 - --> + <!-- profile against Hadoop 2.x: This is the default. --> <profile> <id>hadoop-2.0</id> <activation> http://git-wip-us.apache.org/repos/asf/hbase/blob/a90d433a/hbase-server/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index 6cf1bb6..a431006 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -669,51 +669,8 @@ <!-- Profiles for building against different hadoop versions --> <!-- There are a lot of common dependencies used here, should investigate if we can combine these profiles somehow --> - <!-- profile against Hadoop 1.1.x: This is the default. It has to have the same - activation property as the parent Hadoop 1.1.x profile to make sure it gets run at - the same time. --> - <profile> - <id>hadoop-1.1</id> - <activation> - <property> - <!--Below formatting for dev-support/generate-hadoopX-poms.sh--> - <!--h1--><name>hadoop.profile</name><value>1.1</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-test</artifactId> - </dependency> - </dependencies> - </profile> - <profile> - <id>hadoop-1.0</id> - <activation> - <property> - <name>hadoop.profile</name> - <value>1.0</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-test</artifactId> - </dependency> - </dependencies> - </profile> - <!-- - profile for building against Hadoop 2.0.0-alpha. Activate using: - mvn -Dhadoop.profile=2.0 - --> + + <!-- profile for building against Hadoop 2.x. This is the default. --> <profile> <id>hadoop-2.0</id> <activation> http://git-wip-us.apache.org/repos/asf/hbase/blob/a90d433a/hbase-shell/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-shell/pom.xml b/hbase-shell/pom.xml index cf63e94..0f9a5a6 100644 --- a/hbase-shell/pom.xml +++ b/hbase-shell/pom.xml @@ -304,51 +304,8 @@ <!-- Profiles for building against different hadoop versions --> <!-- There are a lot of common dependencies used here, should investigate if we can combine these profiles somehow --> - <!-- profile against Hadoop 1.1.x: This is the default. It has to have the same - activation property as the parent Hadoop 1.1.x profile to make sure it gets run at - the same time. --> - <profile> - <id>hadoop-1.1</id> - <activation> - <property> - <!--Below formatting for dev-support/generate-hadoopX-poms.sh--> - <!--h1--><name>hadoop.profile</name><value>1.1</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-test</artifactId> - </dependency> - </dependencies> - </profile> - <profile> - <id>hadoop-1.0</id> - <activation> - <property> - <name>hadoop.profile</name> - <value>1.0</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-test</artifactId> - </dependency> - </dependencies> - </profile> - <!-- - profile for building against Hadoop 2.0.0-alpha. Activate using: - mvn -Dhadoop.profile=2.0 - --> + + <!-- profile for building against Hadoop 2.x. This is the default. --> <profile> <id>hadoop-2.0</id> <activation> http://git-wip-us.apache.org/repos/asf/hbase/blob/a90d433a/hbase-testing-util/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-testing-util/pom.xml b/hbase-testing-util/pom.xml index 3e07288..79411ec 100644 --- a/hbase-testing-util/pom.xml +++ b/hbase-testing-util/pom.xml @@ -125,55 +125,8 @@ <!-- Profiles for building against different hadoop versions --> <!-- There are a lot of common dependencies used here, should investigate if we can combine these profiles somehow --> - <!-- profile against Hadoop 1.1.x: This is the default. It has to have the same - activation property as the parent Hadoop 1.1.x profile to make sure it gets run at - the same time. --> - <profile> - <id>hadoop-1.1</id> - <activation> - <property> - <!--Below formatting for dev-support/generate-hadoopX-poms.sh--> - <!--h1--><name>hadoop.profile</name><value>1.1</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-test</artifactId> - <scope>compile</scope> - </dependency> - </dependencies> - </profile> - <profile> - <id>hadoop-1.0</id> - <activation> - <property> - <name>hadoop.profile</name> - <value>1.0</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-test</artifactId> - <scope>compile</scope> - </dependency> - </dependencies> - </profile> - <!-- - profile for building against Hadoop 2.0.0-alpha. Activate using: - mvn -Dhadoop.profile=2.0 - --> + + <!-- profile for building against Hadoop 2.x. This is the default --> <profile> <id>hadoop-2.0</id> <activation> http://git-wip-us.apache.org/repos/asf/hbase/blob/a90d433a/hbase-thrift/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml index ff999dc..d097f38 100644 --- a/hbase-thrift/pom.xml +++ b/hbase-thrift/pom.xml @@ -500,54 +500,7 @@ </build> </profile> - <!-- profile against Hadoop 1.1.x: This is the default. It has to have the same -activation property as the parent Hadoop 1.1.x profile to make sure it gets run at -the same time. --> - <profile> - <id>hadoop-1.1</id> - <activation> - <property> - <!--Below formatting for dev-support/generate-hadoopX-poms.sh--> - <!--h1--> - <name>hadoop.profile</name> - <value>1.1</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-test</artifactId> - </dependency> - </dependencies> - </profile> - <profile> - <id>hadoop-1.0</id> - <activation> - <property> - <name>hadoop.profile</name> - <value>1.0</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-test</artifactId> - </dependency> - </dependencies> - </profile> - - <!-- - profile for building against Hadoop 2.0.0-alpha. Activate using: - mvn -Dhadoop.profile=2.0 - --> + <!-- profile against Hadoop 2.x: This is the default --> <profile> <id>hadoop-2.0</id> <activation>
