Repository: hbase
Updated Branches:
  refs/heads/branch-1 e7e660d5b -> 13d6acbc7


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/13d6acbc
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/13d6acbc
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/13d6acbc

Branch: refs/heads/branch-1
Commit: 13d6acbc7f719bad6e0b618455c034577deae528
Parents: e7e660d
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:52:19 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-server/pom.xml              | 47 ++-----------------------------
 hbase-shell/pom.xml               | 47 ++-----------------------------
 hbase-testing-util/pom.xml        | 51 ++--------------------------------
 hbase-thrift/pom.xml              | 47 +------------------------------
 11 files changed, 15 insertions(+), 433 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/13d6acbc/hbase-client/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml
index 2d661b4..688e61c 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/13d6acbc/hbase-common/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml
index 509f5fe..8578a1a 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/13d6acbc/hbase-examples/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-examples/pom.xml b/hbase-examples/pom.xml
index 1439a0d..a3d16e0 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/13d6acbc/hbase-external-blockcache/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-external-blockcache/pom.xml 
b/hbase-external-blockcache/pom.xml
index 0469c90..fd3c02d 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/13d6acbc/hbase-it/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml
index 490e00f..845ccc5 100644
--- a/hbase-it/pom.xml
+++ b/hbase-it/pom.xml
@@ -278,52 +278,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/13d6acbc/hbase-prefix-tree/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-prefix-tree/pom.xml b/hbase-prefix-tree/pom.xml
index 9a2976a..05b50f3 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/13d6acbc/hbase-procedure/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-procedure/pom.xml b/hbase-procedure/pom.xml
index fa1fc03..eef31d7 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/13d6acbc/hbase-server/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
index 3d97c59..c1a5329 100644
--- a/hbase-server/pom.xml
+++ b/hbase-server/pom.xml
@@ -679,51 +679,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/13d6acbc/hbase-shell/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-shell/pom.xml b/hbase-shell/pom.xml
index 663ee3e..1bf067f 100644
--- a/hbase-shell/pom.xml
+++ b/hbase-shell/pom.xml
@@ -270,51 +270,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/13d6acbc/hbase-testing-util/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-testing-util/pom.xml b/hbase-testing-util/pom.xml
index e85a66f..41b8433 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/13d6acbc/hbase-thrift/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml
index 6347c8b..febc3d4 100644
--- a/hbase-thrift/pom.xml
+++ b/hbase-thrift/pom.xml
@@ -492,52 +492,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>

Reply via email to