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

HBASE-2267 More improvements to the Maven build 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@919095 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2010-03-04 17:54:27 +00:00
parent d5a9b7f67f
commit 6db73b1c8d
9 changed files with 73 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -408,6 +408,7 @@ Release 0.21.0 - Unreleased
(Benoit Sigoure via JD) (Benoit Sigoure via JD)
HBASE-2282 More directories should be ignored when using git for development HBASE-2282 More directories should be ignored when using git for development
(Alexey Kovyrin via Stack) (Alexey Kovyrin via Stack)
HBASE-2267 More improvements to the Maven build (Lars Francke via Stack)
NEW FEATURES NEW FEATURES
HBASE-1961 HBase EC2 scripts HBASE-1961 HBase EC2 scripts

1
contrib/pom.xml
View File

@ -2,7 +2,6 @@
<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/maven-v4_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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-contrib</artifactId> <artifactId>hbase-contrib</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>HBase Contrib</name> <name>HBase Contrib</name>

8
contrib/stargate/pom.xml
View File

@ -17,6 +17,8 @@
<jsr311.version>1.1.1</jsr311.version> <jsr311.version>1.1.1</jsr311.version>
<protobuf.version>2.3.0</protobuf.version> <protobuf.version>2.3.0</protobuf.version>
<jersey.version>1.1.4.1</jersey.version> <jersey.version>1.1.4.1</jersey.version>
<json.version>20090211</json.version>
<hsqldb.version>1.8.0.10</hsqldb.version>
</properties> </properties>
<build> <build>
@ -72,13 +74,13 @@
<dependency> <dependency>
<groupId>org.json</groupId> <groupId>org.json</groupId>
<artifactId>json</artifactId> <artifactId>json</artifactId>
<version>20090211</version> <version>${json.version}</version>
</dependency> </dependency>
<!-- we only use this for TestJDBCAuthenticator -->
<dependency> <dependency>
<groupId>hsqldb</groupId> <groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId> <artifactId>hsqldb</artifactId>
<version>1.8.0.10</version> <version>${hsqldb.version}</version>
<scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

16
contrib/transactional/pom.xml
View File

@ -13,6 +13,18 @@
<version>0.21.0-SNAPSHOT</version> <version>0.21.0-SNAPSHOT</version>
</parent> </parent>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkMode>always</forkMode>
</configuration>
</plugin>
</plugins>
</build>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
@ -23,6 +35,10 @@
<artifactId>hbase-core</artifactId> <artifactId>hbase-core</artifactId>
<classifier>tests</classifier> <classifier>tests</classifier>
</dependency> </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core-test</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs-test</artifactId> <artifactId>hadoop-hdfs-test</artifactId>

0
core/src/main/resources/overview.html → core/src/main/javadoc/overview.html
View File

43
core/src/main/resources/webapps/master/WEB-INF/web.xml
View File

@ -1,43 +0,0 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!DOCTYPE web-app
PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
"http://java.sun.com/dtd/web-app_2_3.dtd">
<!--
Automatically created by Apache Jakarta Tomcat JspC.
-->
<web-app>
<servlet>
<servlet-name>org.apache.hadoop.hbase.generated.master.master_jsp</servlet-name>
<servlet-class>org.apache.hadoop.hbase.generated.master.master_jsp</servlet-class>
</servlet>
<servlet>
<servlet-name>org.apache.hadoop.hbase.generated.master.table_jsp</servlet-name>
<servlet-class>org.apache.hadoop.hbase.generated.master.table_jsp</servlet-class>
</servlet>
<servlet>
<servlet-name>org.apache.hadoop.hbase.generated.master.zk_jsp</servlet-name>
<servlet-class>org.apache.hadoop.hbase.generated.master.zk_jsp</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>org.apache.hadoop.hbase.generated.master.master_jsp</servlet-name>
<url-pattern>/master.jsp</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>org.apache.hadoop.hbase.generated.master.table_jsp</servlet-name>
<url-pattern>/table.jsp</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>org.apache.hadoop.hbase.generated.master.zk_jsp</servlet-name>
<url-pattern>/zk.jsp</url-pattern>
</servlet-mapping>
</web-app>

23
core/src/main/resources/webapps/regionserver/WEB-INF/web.xml
View File

@ -1,23 +0,0 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!DOCTYPE web-app
PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
"http://java.sun.com/dtd/web-app_2_3.dtd">
<!--
Automatically created by Apache Jakarta Tomcat JspC.
-->
<web-app>
<servlet>
<servlet-name>org.apache.hadoop.hbase.generated.regionserver.regionserver_jsp</servlet-name>
<servlet-class>org.apache.hadoop.hbase.generated.regionserver.regionserver_jsp</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>org.apache.hadoop.hbase.generated.regionserver.regionserver_jsp</servlet-name>
<url-pattern>/regionserver.jsp</url-pattern>
</servlet-mapping>
</web-app>

49
pom.xml
View File

@ -117,7 +117,7 @@
<developer> <developer>
<id>larsgeorge</id> <id>larsgeorge</id>
<name>Lars George</name> <name>Lars George</name>
<email>lars.george@gmail.com</email> <email>larsgeorge@apache.org</email>
<timezone>+1</timezone> <timezone>+1</timezone>
<organization>WorldLingo</organization> <organization>WorldLingo</organization>
<organizationUrl>http://www.worldlingo.com/</organizationUrl> <organizationUrl>http://www.worldlingo.com/</organizationUrl>
@ -163,6 +163,7 @@
<thrift.version>0.2.0</thrift.version> <thrift.version>0.2.0</thrift.version>
<jruby.version>1.4.0</jruby.version> <jruby.version>1.4.0</jruby.version>
<slf4j.version>1.5.8</slf4j.version> <slf4j.version>1.5.8</slf4j.version>
<jopt.version>3.2</jopt.version>
</properties> </properties>
<repositories> <repositories>
@ -225,10 +226,6 @@
</repositories> </repositories>
<build> <build>
<directory>target</directory>
<outputDirectory>target/classes</outputDirectory>
<finalName>${artifactId}-${version}</finalName>
<!-- Some plugins (javadoc for example) can be used in the normal build- and the site phase. <!-- Some plugins (javadoc for example) can be used in the normal build- and the site phase.
These plugins inherit their options from the <reporting> section below. These settings These plugins inherit their options from the <reporting> section below. These settings
can be overwritten here. --> can be overwritten here. -->
@ -260,6 +257,7 @@
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>2.5</version> <version>2.5</version>
<configuration> <configuration>
<forkedProcessTimeoutInSeconds>3600</forkedProcessTimeoutInSeconds>
<argLine>-Xmx512m</argLine> <argLine>-Xmx512m</argLine>
<redirectTestOutputToFile>true</redirectTestOutputToFile> <redirectTestOutputToFile>true</redirectTestOutputToFile>
</configuration> </configuration>
@ -268,6 +266,10 @@
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>2.6.1</version> <version>2.6.1</version>
</plugin> </plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>2.4</version>
</plugin>
</plugins> </plugins>
</pluginManagement> </pluginManagement>
@ -330,6 +332,11 @@
<version>${hadoop-mapred.version}</version> <version>${hadoop-mapred.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>net.sf.jopt-simple</groupId>
<artifactId>jopt-simple</artifactId>
<version>${jopt.version}</version>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
@ -352,10 +359,14 @@
<!-- See http://jira.codehaus.org/browse/MSITE-443 why the settings need to be here and not in pluginManagement. --> <!-- See http://jira.codehaus.org/browse/MSITE-443 why the settings need to be here and not in pluginManagement. -->
<reporting> <reporting>
<plugins> <plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.1.2</version>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId> <artifactId>maven-pmd-plugin</artifactId>
<version>2.3</version> <version>2.4</version>
<configuration> <configuration>
<targetJdk>${compileSource}</targetJdk> <targetJdk>${compileSource}</targetJdk>
</configuration> </configuration>
@ -363,14 +374,16 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId> <artifactId>maven-checkstyle-plugin</artifactId>
<version>2.5</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId> <artifactId>findbugs-maven-plugin</artifactId>
<version>2.3</version> <version>2.3.1</version>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-site-plugin</artifactId> <artifactId>maven-site-plugin</artifactId>
<version>2.1</version>
<configuration> <configuration>
<inputEncoding>UTF-8</inputEncoding> <inputEncoding>UTF-8</inputEncoding>
<outputEncoding>UTF-8</outputEncoding> <outputEncoding>UTF-8</outputEncoding>
@ -391,17 +404,21 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId> <artifactId>cobertura-maven-plugin</artifactId>
<version>2.3</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId> <artifactId>maven-jxr-plugin</artifactId>
<version>2.1</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>jdepend-maven-plugin</artifactId> <artifactId>jdepend-maven-plugin</artifactId>
<version>2.0-beta-2</version>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-changes-plugin</artifactId> <artifactId>maven-changes-plugin</artifactId>
<version>2.3</version>
<configuration> <configuration>
<issueLinkTemplate>%URL%/browse/%ISSUE%</issueLinkTemplate> <issueLinkTemplate>%URL%/browse/%ISSUE%</issueLinkTemplate>
</configuration> </configuration>
@ -413,6 +430,24 @@
</reportSet> </reportSet>
</reportSets> </reportSets>
</plugin> </plugin>
<plugin>
<groupId>com.atlassian.maven.plugins</groupId>
<artifactId>maven-clover2-plugin</artifactId>
<version>2.6.3</version>
</plugin>
<plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
<version>2.5</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>taglist-maven-plugin</artifactId>
<version>2.4</version>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.1</version>
</plugin>
</plugins> </plugins>
</reporting> </reporting>
</project> </project>

9
src/assembly/bin.xml
View File

@ -44,6 +44,15 @@
<unpack>false</unpack> <unpack>false</unpack>
</binaries> </binaries>
</moduleSet> </moduleSet>
<moduleSet>
<includes>
<include>org.apache.hbase:hbase-contrib-mdc_replication</include>
</includes>
<binaries>
<outputDirectory>contrib/mdc_replication/</outputDirectory>
<unpack>false</unpack>
</binaries>
</moduleSet>
<moduleSet> <moduleSet>
<includes> <includes>
<include>org.apache.hbase:hbase-contrib-stargate</include> <include>org.apache.hbase:hbase-contrib-stargate</include>