Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-8917 Minor cleanup and fixes for POM 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1501883 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2013-07-10 17:59:55 +00:00
parent e194ee4d98
commit da3e3046ad
3 changed files with 213 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

370
hbase-client/pom.xml
View File

@ -1,45 +1,46 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<!-- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
/** <!--
* Licensed to the Apache Software Foundation (ASF) under one /**
* or more contributor license agreements. See the NOTICE file * Licensed to the Apache Software Foundation (ASF) under one
* distributed with this work for additional information * or more contributor license agreements. See the NOTICE file
* regarding copyright ownership. The ASF licenses this file * distributed with this work for additional information
* to you under the Apache License, Version 2.0 (the * regarding copyright ownership. The ASF licenses this file
* "License"); you may not use this file except in compliance * to you under the Apache License, Version 2.0 (the
* with the License. You may obtain a copy of the License at * "License"); you may not use this file except in compliance
* * with the License. You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0 *
* * http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software *
* distributed under the License is distributed on an "AS IS" BASIS, * Unless required by applicable law or agreed to in writing, software
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * distributed under the License is distributed on an "AS IS" BASIS,
* See the License for the specific language governing permissions and * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* limitations under the License. * See the License for the specific language governing permissions and
*/ * limitations under the License.
--> */
<modelVersion>4.0.0</modelVersion> -->
<parent> <modelVersion>4.0.0</modelVersion>
<artifactId>hbase</artifactId> <parent>
<groupId>org.apache.hbase</groupId> <artifactId>hbase</artifactId>
<version>0.97.0-SNAPSHOT</version> <groupId>org.apache.hbase</groupId>
<relativePath>..</relativePath> <version>0.97.0-SNAPSHOT</version>
</parent> <relativePath>..</relativePath>
</parent>
<artifactId>hbase-client</artifactId> <artifactId>hbase-client</artifactId>
<name>HBase - Client</name> <name>HBase - Client</name>
<description>Client of HBase</description> <description>Client of HBase</description>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId> <artifactId>maven-site-plugin</artifactId>
<configuration> <configuration>
<skip>true</skip> <skip>true</skip>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<!--Make it so assembly:single does nothing in here--> <!--Make it so assembly:single does nothing in here-->
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
@ -48,141 +49,170 @@
<skipAssembly>true</skipAssembly> <skipAssembly>true</skipAssembly>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<!-- Always skip the second part executions, since we only run <!-- Always skip the second part executions, since we only run
simple unit tests in this module --> simple unit tests in this module -->
<executions> <executions>
<execution> <execution>
<id>secondPartTestsExecution</id> <id>secondPartTestsExecution</id>
<phase>test</phase> <phase>test</phase>
<goals> <goals>
<goal>test</goal> <goal>test</goal>
</goals> </goals>
<configuration> <configuration>
<skip>true</skip> <skip>true</skip>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<!-- Make a jar and put the sources in the jar --> <!-- Make a jar and put the sources in the jar -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId> <artifactId>maven-source-plugin</artifactId>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<dependencies> <dependencies>
<!-- Intra-project dependencies --> <!-- Intra-project dependencies -->
<dependency> <dependency>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
<artifactId>hbase-common</artifactId> <artifactId>hbase-common</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
<artifactId>hbase-common</artifactId> <artifactId>hbase-common</artifactId>
<type>test-jar</type> <type>test-jar</type>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
<artifactId>hbase-protocol</artifactId> <artifactId>hbase-protocol</artifactId>
</dependency> </dependency>
<!-- General dependencies --> <!-- General dependencies -->
<dependency> <dependency>
<groupId>com.google.protobuf</groupId> <groupId>commons-codec</groupId>
<artifactId>protobuf-java</artifactId> <artifactId>commons-codec</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.zookeeper</groupId> <groupId>commons-io</groupId>
<artifactId>zookeeper</artifactId> <artifactId>commons-io</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.cloudera.htrace</groupId> <groupId>commons-lang</groupId>
<artifactId>htrace</artifactId> <artifactId>commons-lang</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>commons-logging</groupId>
<artifactId>netty</artifactId> <artifactId>commons-logging</artifactId>
</dependency> </dependency>
</dependencies> <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
</dependency>
<dependency>
<groupId>org.cloudera.htrace</groupId>
<artifactId>htrace</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<profiles> <profiles>
<!-- Skip the tests in this module --> <!-- Skip the tests in this module -->
<profile> <profile>
<id>skipClientTests</id> <id>skipClientTests</id>
<activation> <activation>
<property> <property>
<name>skipClientTests</name> <name>skipClientTests</name>
</property> </property>
</activation> </activation>
<properties> <properties>
<surefire.skipFirstPart>true</surefire.skipFirstPart> <surefire.skipFirstPart>true</surefire.skipFirstPart>
</properties> </properties>
</profile> </profile>
<!-- profile against Hadoop 1.0.x: This is the default. It has to have the same <!-- 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 activation property as the parent Hadoop 1.0.x profile to make sure it gets run at
the same time. --> the same time. -->
<profile> <profile>
<id>hadoop-1.0</id> <id>hadoop-1.0</id>
<activation> <activation>
<property> <property>
<name>!hadoop.profile</name> <name>!hadoop.profile</name>
</property> </property>
</activation> </activation>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId> <artifactId>hadoop-core</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
</profile> </profile>
<!-- <!--
profile for building against Hadoop 2.0.0-alpha. Activate using: profile for building against Hadoop 2.0.0-alpha. Activate using:
mvn -Dhadoop.profile=2.0 mvn -Dhadoop.profile=2.0
--> -->
<profile> <profile>
<id>hadoop-2.0</id> <id>hadoop-2.0</id>
<activation> <activation>
<property> <property>
<name>hadoop.profile</name> <name>hadoop.profile</name>
<value>2.0</value> <value>2.0</value>
</property> </property>
</activation> </activation>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId> <artifactId>hadoop-client</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-annotations</artifactId> <artifactId>hadoop-annotations</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
</profile> </profile>
<!-- <!--
profile for building against Hadoop 3.0.x. Activate using: profile for building against Hadoop 3.0.x. Activate using:
mvn -Dhadoop.profile=3.0 mvn -Dhadoop.profile=3.0
--> -->
<profile> <profile>
<id>hadoop-3.0</id> <id>hadoop-3.0</id>
<activation> <activation>
<property> <property>
<name>hadoop.profile</name> <name>hadoop.profile</name>
<value>3.0</value> <value>3.0</value>
</property> </property>
</activation> </activation>
<properties> <properties>
<hadoop.version>3.0-SNAPSHOT</hadoop.version> <hadoop.version>3.0-SNAPSHOT</hadoop.version>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId> <artifactId>hadoop-common</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
</profile> </profile>
</profiles> </profiles>
</project> </project>

14
hbase-client/src/test/java/org/apache/hadoop/hbase/ipc/TestIPCUtil.java
View File

@ -24,6 +24,9 @@ import java.nio.ByteBuffer;
import java.util.Arrays; import java.util.Arrays;
import org.apache.commons.lang.time.StopWatch; import org.apache.commons.lang.time.StopWatch;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.logging.impl.Log4JLogger;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CellScanner; import org.apache.hadoop.hbase.CellScanner;
@ -39,15 +42,16 @@ import org.apache.hadoop.hbase.util.ClassSize;
import org.apache.hadoop.io.compress.CompressionCodec; import org.apache.hadoop.io.compress.CompressionCodec;
import org.apache.hadoop.io.compress.DefaultCodec; import org.apache.hadoop.io.compress.DefaultCodec;
import org.apache.hadoop.io.compress.GzipCodec; import org.apache.hadoop.io.compress.GzipCodec;
import org.apache.log4j.Level;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.experimental.categories.Category; import org.junit.experimental.categories.Category;
import org.mortbay.log.Log;
import org.apache.commons.logging.impl.Log4JLogger;
import org.apache.log4j.Level;
@Category(SmallTests.class) @Category(SmallTests.class)
public class TestIPCUtil { public class TestIPCUtil {
public static final Log LOG = LogFactory.getLog(IPCUtil.class);
IPCUtil util; IPCUtil util;
@Before @Before
public void before() { public void before() {
@ -148,7 +152,7 @@ public class TestIPCUtil {
timerTest(util, timer, count, size, codec, compressor, false); timerTest(util, timer, count, size, codec, compressor, false);
} }
timer.stop(); timer.stop();
Log.info("Codec=" + codec + ", compression=" + compressor + ", sized=" + false + LOG.info("Codec=" + codec + ", compression=" + compressor + ", sized=" + false +
", count=" + count + ", size=" + size + ", + took=" + timer.getTime() + "ms"); ", count=" + count + ", size=" + size + ", + took=" + timer.getTime() + "ms");
timer.reset(); timer.reset();
timer.start(); timer.start();
@ -156,7 +160,7 @@ public class TestIPCUtil {
timerTest(util, timer, count, size, codec, compressor, true); timerTest(util, timer, count, size, codec, compressor, true);
} }
timer.stop(); timer.stop();
Log.info("Codec=" + codec + ", compression=" + compressor + ", sized=" + true + LOG.info("Codec=" + codec + ", compression=" + compressor + ", sized=" + true +
", count=" + count + ", size=" + size + ", + took=" + timer.getTime() + "ms"); ", count=" + count + ", size=" + size + ", + took=" + timer.getTime() + "ms");
} }

6
pom.xml
View File

@ -694,7 +694,7 @@
</excludes> </excludes>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<version>${maven.assembly.version}</version> <version>${maven.assembly.version}</version>
<configuration> <configuration>
@ -704,7 +704,7 @@
<!--Do not attach assembly to project.--> <!--Do not attach assembly to project.-->
<attach>false</attach> <attach>false</attach>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
</pluginManagement> </pluginManagement>
<plugins> <plugins>
@ -871,7 +871,7 @@
</dependency> </dependency>
</dependencies> </dependencies>
<configuration> <configuration>
<siteDirectory>${basedir}/src/main/site</siteDirectory> <siteDirectory>${basedir}/src/main/site</siteDirectory>
<inputEncoding>UTF-8</inputEncoding> <inputEncoding>UTF-8</inputEncoding>
<outputEncoding>UTF-8</outputEncoding> <outputEncoding>UTF-8</outputEncoding>
<templateFile>${basedir}/src/main/site/site.vm</templateFile> <templateFile>${basedir}/src/main/site/site.vm</templateFile>