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 2014/03/20 00:08:56 UTC
svn commit: r1579449 - in /hbase/trunk: ./ dev-support/
hbase-assembly/src/main/assembly/ hbase-hadoop1-compat/ src/main/docbkx/
Author: stack
Date: Wed Mar 19 23:08:55 2014
New Revision: 1579449
URL: http://svn.apache.org/r1579449
Log:
HBASE-10781 Remove hadoop-one-compat module and all references to hadoop1
Removed:
hbase/trunk/dev-support/generate-hadoopX-poms.sh
hbase/trunk/hbase-assembly/src/main/assembly/hadoop-one-compat.xml
hbase/trunk/hbase-hadoop1-compat/
Modified:
hbase/trunk/dev-support/make_rc.sh
hbase/trunk/hbase-assembly/src/main/assembly/components.xml
hbase/trunk/pom.xml
hbase/trunk/src/main/docbkx/developer.xml
Modified: hbase/trunk/dev-support/make_rc.sh
URL: http://svn.apache.org/viewvc/hbase/trunk/dev-support/make_rc.sh?rev=1579449&r1=1579448&r2=1579449&view=diff
==============================================================================
--- hbase/trunk/dev-support/make_rc.sh (original)
+++ hbase/trunk/dev-support/make_rc.sh Wed Mar 19 23:08:55 2014
@@ -44,7 +44,7 @@ if [ "$MAVEN_OPTS" != "" ]; then
fi
# Make a dir to save tgzs in.
-d=`date -u +"%Y-%m-%dT%H:%M:%SZ"`
+d=`date -u +"%Y%m%dT%H%M%SZ"`
archivedir="${HBASE_HOME}/../`basename $0`.$d"
echo "Archive dir ${archivedir}"
mkdir -p "${archivedir}"
@@ -54,10 +54,10 @@ function tgz_mover {
}
function deploy {
- MAVEN_OPTS="${mvnopts}" ${mvn} -f pom.xml.$1 clean install -DskipTests -Prelease
- MAVEN_OPTS="${mvnopts}" ${mvn} -f pom.xml.$1 install -DskipTests site assembly:single -Prelease
+ MAVEN_OPTS="${mvnopts}" ${mvn} clean install -DskipTests -Prelease
+ MAVEN_OPTS="${mvnopts}" ${mvn} install -DskipTests site assembly:single -Prelease
tgz_mover
- MAVEN_OPTS="${mvnopts}" ${mvn} -f pom.xml.$1 deploy -DskipTests -Papache-release
+ MAVEN_OPTS="${mvnopts}" ${mvn} deploy -DskipTests -Papache-release
}
# Build src tarball
@@ -65,8 +65,7 @@ MAVEN_OPTS="${mvnopts}" ${mvn} clean ins
tgz_mover
# Now do the two builds, one for hadoop1, then hadoop2
-deploy "hadoop1"
-deploy "hadoop2"
+deploy
echo "DONE"
echo "Check the content of ${archivedir}. If good, sign and push to people.apache.org"
Modified: hbase/trunk/hbase-assembly/src/main/assembly/components.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-assembly/src/main/assembly/components.xml?rev=1579449&r1=1579448&r2=1579449&view=diff
==============================================================================
Binary files - no diff available.
Modified: hbase/trunk/pom.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/pom.xml?rev=1579449&r1=1579448&r2=1579449&view=diff
==============================================================================
--- hbase/trunk/pom.xml (original)
+++ hbase/trunk/pom.xml Wed Mar 19 23:08:55 2014
@@ -899,7 +899,6 @@
<compileSource>1.6</compileSource>
<!-- Dependencies -->
<hadoop-two.version>2.3.0</hadoop-two.version>
- <hadoop-one.version>1.2.1</hadoop-one.version>
<commons-cli.version>1.2</commons-cli.version>
<commons-codec.version>1.7</commons-codec.version>
<!-- pretty outdated -->
@@ -1504,124 +1503,6 @@
profiles with activation properties matching the profile here.
Generally, it should be sufficient to copy the first
few lines of the profile you want to match. -->
- <!-- profile against Hadoop 1.1.x. -->
- <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>
- <modules>
- <module>hbase-hadoop1-compat</module>
- </modules>
- <properties>
- <hadoop.version>${hadoop-one.version}</hadoop.version>
- <compat.module>hbase-hadoop1-compat</compat.module>
- <assembly.file>src/main/assembly/hadoop-one-compat.xml</assembly.file>
- </properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- <version>${hadoop.version}</version>
- <optional>true</optional>
- <exclusions>
- <exclusion>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- </exclusion>
- <exclusion>
- <groupId>net.sf.kosmosfs</groupId>
- <artifactId>kfs</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>net.java.dev.jets3t</groupId>
- <artifactId>jets3t</artifactId>
- </exclusion>
- <exclusion>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-test</artifactId>
- <version>${hadoop.version}</version>
- <optional>true</optional>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
- </profile>
-
- <!-- profile for building against Hadoop 1.0.x: -->
- <profile>
- <id>hadoop-1.0</id>
- <activation>
- <property>
- <name>hadoop.profile</name>
- <value>1.0</value>
- </property>
- </activation>
- <modules>
- <module>hbase-hadoop1-compat</module>
- </modules>
- <properties>
- <hadoop.version>1.0.4</hadoop.version>
- <!-- Need to set this for the Hadoop 1 compat module -->
- <hadoop-one.version>${hadoop.version}</hadoop-one.version>
- <compat.module>hbase-hadoop1-compat</compat.module>
- <assembly.file>src/main/assembly/hadoop-one-compat.xml</assembly.file>
- </properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- <version>${hadoop.version}</version>
- <optional>true</optional>
- <exclusions>
- <exclusion>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- </exclusion>
- <exclusion>
- <groupId>net.sf.kosmosfs</groupId>
- <artifactId>kfs</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>net.java.dev.jets3t</groupId>
- <artifactId>jets3t</artifactId>
- </exclusion>
- <exclusion>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-test</artifactId>
- <version>${hadoop.version}</version>
- <optional>true</optional>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
- </profile>
-
<!-- profile for building against Hadoop 2.0.x
This is the default.
-->
Modified: hbase/trunk/src/main/docbkx/developer.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/docbkx/developer.xml?rev=1579449&r1=1579448&r2=1579449&view=diff
==============================================================================
Binary files - no diff available.