Added: hadoop/common/trunk/hadoop-project-distro/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-project-distro/pom.xml?rev=1159702&view=auto ============================================================================== --- hadoop/common/trunk/hadoop-project-distro/pom.xml (added) +++ hadoop/common/trunk/hadoop-project-distro/pom.xml Fri Aug 19 17:36:23 2011 @@ -0,0 +1,574 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed under the Apache License, Version 2.0 (the "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 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. See accompanying LICENSE file. +--> +<project> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-project</artifactId> + <version>0.23.0-SNAPSHOT</version> + <relativePath>../hadoop-project</relativePath> + </parent> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-project-distro</artifactId> + <version>0.23.0-SNAPSHOT</version> + <description>Apache Hadoop Project Distro POM</description> + <name>Apache Hadoop Project Distro POM</name> + <packaging>pom</packaging> + + <properties> + <hadoop.tmp.dir>${project.build.directory}/test</hadoop.tmp.dir> + <test.build.data>${project.build.directory}/test/data</test.build.data> + <hadoop.log.dir>${project.build.directory}/log</hadoop.log.dir> + <test.build.webapps>${project.build.directory}/test-classes/webapps</test.build.webapps> + <test.cache.data>${project.build.directory}/test-classes</test.cache.data> + <test.build.classes>${project.build.directory}/test-classes</test.build.classes> + + <hadoop.component>UNDEF</hadoop.component> + <bundle.snappy>false</bundle.snappy> + </properties> + + <dependencies> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-annotations</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <id>prepare-jar</id> + <phase>prepare-package</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + <execution> + <id>prepare-test-jar</id> + <phase>prepare-package</phase> + <goals> + <goal>test-jar</goal> + </goals> + <configuration> + <includes> + <include>**/*.class</include> + </includes> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <phase>prepare-package</phase> + <goals> + <goal>jar</goal> + <goal>test-jar</goal> + </goals> + </execution> + </executions> + <configuration> + <attach>true</attach> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>findbugs-maven-plugin</artifactId> + <configuration> + <excludeFilterFile>${basedir}/dev-support/findbugsExcludeFile.xml</excludeFilterFile> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <configuration> + <configLocation>file://${basedir}/dev-support/checkstyle.xml</configLocation> + <failOnViolation>false</failOnViolation> + <format>xml</format> + <format>html</format> + <outputFile>${project.build.directory}/test/checkstyle-errors.xml</outputFile> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <linksource>true</linksource> + <quiet>true</quiet> + <verbose>false</verbose> + <source>${maven.compile.source}</source> + <charset>${maven.compile.encoding}</charset> + <reportOutputDirectory>${project.build.directory}/site</reportOutputDirectory> + <destDir>api</destDir> + <groups> + <group> + <title>${project.name} API</title> + <packages>org.apache.hadoop*</packages> + </group> + </groups> + <doclet>org.apache.hadoop.classification.tools.ExcludePrivateAnnotationsStandardDoclet</doclet> + <docletArtifacts> + <docletArtifact> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-annotations</artifactId> + <version>${project.version}</version> + </docletArtifact> + </docletArtifacts> + <useStandardDocletOptions>true</useStandardDocletOptions> + + <!-- switch on dependency-driven aggregation --> + <includeDependencySources>false</includeDependencySources> + + <dependencySourceIncludes> + <!-- include ONLY dependencies I control --> + <dependencySourceInclude>org.apache.hadoop:hadoop-annotations</dependencySourceInclude> + </dependencySourceIncludes> + + </configuration> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <id>docs</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <properties> + <jdiff.stable.api>0.20.2</jdiff.stable.api> + <jdiff.stability>-unstable</jdiff.stability> + <jdiff.compatibility></jdiff.compatibility> + <jdiff.javadoc.maxmemory>512m</jdiff.javadoc.maxmemory> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>javadoc</goal> + </goals> + <phase>prepare-package</phase> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>findbugs-maven-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>findbugs</goal> + </goals> + <phase>prepare-package</phase> + </execution> + </executions> + <configuration> + <excludeFilterFile>${basedir}/dev-support/findbugsExcludeFile.xml</excludeFilterFile> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>site</id> + <phase>prepare-package</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>jdiff</groupId> + <artifactId>jdiff</artifactId> + <version>${jdiff.version}</version> + <overWrite>false</overWrite> + <outputDirectory>${project.build.directory}</outputDirectory> + <destFileName>jdiff.jar</destFileName> + </artifactItem> + <artifactItem> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-annotations</artifactId> + <version>${hadoop.annotations.version}</version> + <overWrite>false</overWrite> + <outputDirectory>${project.build.directory}</outputDirectory> + <destFileName>hadoop-annotations.jar</destFileName> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>site</id> + <phase>prepare-package</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <target if="is.hadoop.component"> + + <mkdir dir="${project.build.directory}/docs-src"/> + + <copy todir="${project.build.directory}/docs-src"> + <fileset dir="${basedir}/src/main/docs"/> + </copy> + + <!-- Docs --> + <exec dir="${project.build.directory}/docs-src" + executable="${env.FORREST_HOME}/bin/forrest" + failonerror="true"> + </exec> + <copy todir="${project.build.directory}/site"> + <fileset dir="${project.build.directory}/docs-src/build/site"/> + </copy> + <copy file="${project.build.directory}/docs-src/releasenotes.html" + todir="${project.build.directory}/site"/> + <style basedir="${basedir}/src/main/resources" + destdir="${project.build.directory}/site" + includes="core-default.xml" + style="${basedir}/src/main/xsl/configuration.xsl"/> + + <!-- Convert 'CHANGES.txt' to 'changes.html" --> + <exec executable="perl" input="${basedir}/../CHANGES.txt" + output="${project.build.directory}/site/changes.html" + failonerror="true"> + <arg value="${project.build.directory}/docs-src/changes/changes2html.pl"/> + </exec> + <copy todir="${project.build.directory}/site"> + <fileset dir="${project.build.directory}/docs-src/changes" includes="*.css"/> + </copy> + + <!-- Jdiff --> + <mkdir dir="${project.build.directory}/site/jdiff/xml"/> + + <javadoc maxmemory="${jdiff.javadoc.maxmemory}" verbose="yes"> + <doclet name="org.apache.hadoop.classification.tools.ExcludePrivateAnnotationsJDiffDoclet" + path="${project.build.directory}/hadoop-annotations.jar:${project.build.directory}/jdiff.jar"> + <param name="-apidir" value="${project.build.directory}/site/jdiff/xml"/> + <param name="-apiname" value="hadoop-core ${project.version}"/> + <param name="${jdiff.stability}"/> + </doclet> + <packageset dir="${basedir}/src/main/java"/> + <classpath> + <path refid="maven.compile.classpath"/> + </classpath> + </javadoc> + <javadoc sourcepath="${basedir}/src/main/java" + destdir="${project.build.directory}/site/jdiff/xml" + sourceFiles="${basedir}/dev-support/jdiff/Null.java" + maxmemory="${jdiff.javadoc.maxmemory}"> + <doclet name="org.apache.hadoop.classification.tools.ExcludePrivateAnnotationsJDiffDoclet" + path="${project.build.directory}/hadoop-annotations.jar:${project.build.directory}/jdiff.jar"> + <param name="-oldapi" value="hadoop-core ${jdiff.stable.api}"/> + <param name="-newapi" value="hadoop-core ${project.version}"/> + <param name="-oldapidir" value="${basedir}/dev-support/jdiff"/> + <param name="-newapidir" value="${project.build.directory}/site/jdiff/xml"/> + <param name="-javadocold" + value="http://hadoop.apache.org/docs/${jdiff.stable.api}/api/"/> + <param name="-javadocnew" value="${project.build.directory}/site/api"/> + <param name="-stats"/> + <param name="${jdiff.stability}"/> + <param name="${jdiff.compatibility}"/> + </doclet> + <classpath> + <path refid="maven.compile.classpath"/> + </classpath> + </javadoc> + + <xslt style="${env.FINDBUGS_HOME}/src/xsl/default.xsl" + in="${project.build.directory}/findbugsXml.xml" + out="${project.build.directory}/site/findbugs.html"/> + + </target> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + + <profile> + <id>src</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-assemblies</artifactId> + <version>${hadoop.assemblies.version}</version> + </dependency> + </dependencies> + <executions> + <execution> + <id>pre-tar-src</id> + <phase>prepare-package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <appendAssemblyId>false</appendAssemblyId> + <attach>false</attach> + <finalName>${project.artifactId}-${project.version}</finalName> + <descriptorRefs> + <descriptorRef>hadoop-src</descriptorRef> + </descriptorRefs> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + + <profile> + <id>tar</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>pre-tar</id> + <phase>prepare-package</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <target> + <!-- Using Unix script to preserve symlinks --> + <echo file="${project.build.directory}/tar-copynativelibs.sh"> + + which cygpath 2> /dev/null + if [ $? = 1 ]; then + BUILD_DIR="${project.build.directory}" + else + BUILD_DIR=`cygpath --unix '${project.build.directory}'` + fi + TAR='tar cf -' + UNTAR='tar xfBp -' + LIB_DIR="${BUILD_DIR}/native/target/usr/local/lib" + if [ -d $${LIB_DIR} ] ; then + TARGET_DIR="${BUILD_DIR}/${project.artifactId}-${project.version}/lib/native/${build.platform}" + mkdir -p $${TARGET_DIR} + cd $${LIB_DIR} + $$TAR lib* | (cd $${TARGET_DIR}/; $$UNTAR) + if [ "${bundle.snappy}" = "true" ] ; then + cd ${snappy.lib} + $$TAR *snappy* | (cd $${TARGET_DIR}/; $$UNTAR) + fi + fi + </echo> + <exec executable="sh" dir="${project.build.directory}" failonerror="true"> + <arg line="./tar-copynativelibs.sh"/> + </exec> + </target> + </configuration> + </execution> + <execution> + <id>tar</id> + <phase>package</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <target> + <!-- Using Unix script to preserve symlinks --> + <echo file="${project.build.directory}/tar-maketar.sh"> + + which cygpath 2> /dev/null + if [ $? = 1 ]; then + BUILD_DIR="${project.build.directory}" + else + BUILD_DIR=`cygpath --unix '${project.build.directory}'` + fi + cd ${BUILD_DIR} + tar czf ${project.artifactId}-${project.version}.tar.gz ${project.artifactId}-${project.version} + </echo> + <exec executable="sh" dir="${project.build.directory}" failonerror="true"> + <arg line="./tar-maketar.sh"/> + </exec> + </target> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-assemblies</artifactId> + <version>${hadoop.assemblies.version}</version> + </dependency> + </dependencies> + <executions> + <execution> + <id>pre-tar</id> + <phase>prepare-package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <appendAssemblyId>false</appendAssemblyId> + <attach>false</attach> + <finalName>${project.artifactId}-${project.version}</finalName> + <descriptorRefs> + <descriptorRef>hadoop-tar</descriptorRef> + </descriptorRefs> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + + <profile> + <id>bintar</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>pre-bintar</id> + <phase>prepare-package</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <target> + <!-- Using Unix script to preserve symlinks --> + <echo file="${project.build.directory}/bintar-copynativelibs.sh"> + + which cygpath 2> /dev/null + if [ $? = 1 ]; then + BUILD_DIR="${project.build.directory}" + else + BUILD_DIR=`cygpath --unix '${project.build.directory}'` + fi + TAR='tar cf -' + UNTAR='tar xfBp -' + LIB_DIR="${BUILD_DIR}/native/target/usr/local/lib" + if [ -d $${LIB_DIR} ] ; then + TARGET_DIR="${BUILD_DIR}/${project.artifactId}-${project.version}-bin/lib" + mkdir -p $${TARGET_DIR} + cd $${LIB_DIR} + $$TAR lib* | (cd $${TARGET_DIR}/; $$UNTAR) + if [ "${bundle.snappy}" = "true" ] ; then + cd ${snappy.lib} + $$TAR *snappy* | (cd $${TARGET_DIR}/; $$UNTAR) + fi + fi + </echo> + <exec executable="sh" dir="${project.build.directory}" failonerror="true"> + <arg line="./bintar-copynativelibs.sh"/> + </exec> + </target> + </configuration> + </execution> + <execution> + <id>bintar</id> + <phase>package</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <target> + <!-- Using Unix script to preserve symlinks --> + <echo file="${project.build.directory}/bintar-maketar.sh"> + + which cygpath 2> /dev/null + if [ $? = 1 ]; then + BUILD_DIR="${project.build.directory}" + else + BUILD_DIR=`cygpath --unix '${project.build.directory}'` + fi + cd ${BUILD_DIR} + tar czf ${project.artifactId}-${project.version}-bin.tar.gz ${project.artifactId}-${project.version}-bin + </echo> + <exec executable="sh" dir="${project.build.directory}" failonerror="true"> + <arg line="./bintar-maketar.sh"/> + </exec> + </target> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-assemblies</artifactId> + <version>${hadoop.assemblies.version}</version> + </dependency> + </dependencies> + <executions> + <execution> + <id>pre-bintar</id> + <phase>prepare-package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <appendAssemblyId>false</appendAssemblyId> + <attach>false</attach> + <finalName>${project.artifactId}-${project.version}-bin</finalName> + <descriptorRefs> + <descriptorRef>hadoop-bintar</descriptorRef> + </descriptorRefs> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> +</project>
Propchange: hadoop/common/trunk/hadoop-project-distro/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: hadoop/common/trunk/hadoop-project/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-project/pom.xml?rev=1159702&r1=1159701&r2=1159702&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-project/pom.xml (original) +++ hadoop/common/trunk/hadoop-project/pom.xml Fri Aug 19 17:36:23 2011 @@ -34,6 +34,14 @@ </snapshotRepository> </distributionManagement> + <repositories> + <repository> + <id>apache.snapshots.https</id> + <name>${distMgmtSnapshotsName}</name> + <url>${distMgmtSnapshotsUrl}</url> + </repository> + </repositories> + <licenses> <license> <name>The Apache Software License, Version 2.0</name> @@ -87,11 +95,6 @@ </dependency> <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common-docs</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> <version>${project.version}</version> </dependency> @@ -316,6 +319,11 @@ </dependency> <dependency> <groupId>org.aspectj</groupId> + <artifactId>aspectjtools</artifactId> + <version>1.6.5</version> + </dependency> + <dependency> + <groupId>org.aspectj</groupId> <artifactId>aspectjrt</artifactId> <version>1.6.5</version> </dependency> @@ -349,6 +357,11 @@ <artifactId>protobuf-java</artifactId> <version>2.4.0a</version> </dependency> + <dependency> + <groupId>commons-daemon</groupId> + <artifactId>commons-daemon</artifactId> + <version>1.0.1</version> + </dependency> </dependencies> </dependencyManagement> @@ -450,6 +463,11 @@ <artifactId>avro-maven-plugin</artifactId> <version>1.5.2</version> </plugin> + <plugin> + <groupId>org.codehaus.mojo.jspc</groupId> + <artifactId>jspc-maven-plugin</artifactId> + <version>2.0-alpha-3</version> + </plugin> </plugins> </pluginManagement> @@ -500,6 +518,41 @@ <target>1.6</target> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <forkMode>always</forkMode> + <forkedProcessTimeoutInSeconds>900</forkedProcessTimeoutInSeconds> + <argLine>-Xmx1024m</argLine> + <environmentVariables> + <LD_LIBRARY_PATH>${env.LD_LIBRARY_PATH}:${project.build.directory}/native/target/usr/local/lib</LD_LIBRARY_PATH> + </environmentVariables> + <systemPropertyVariables> + + + <!-- TODO: all references in testcases should be updated to this default --> + <test.build.dir>${test.build.dir}</test.build.dir> + <hadoop.tmp.dir>${hadoop.tmp.dir}</hadoop.tmp.dir> + <test.build.data>${test.build.data}</test.build.data> + <test.build.webapps>${test.build.webapps}</test.build.webapps> + <test.cache.data>${test.cache.data}</test.cache.data> + <hadoop.log.dir>${hadoop.log.dir}</hadoop.log.dir> + <test.build.classes>${test.build.classes}</test.build.classes> + + <java.net.preferIPv4Stack>true</java.net.preferIPv4Stack> + <java.security.krb5.conf>${basedir}/src/test/resources/krb5.conf</java.security.krb5.conf> + </systemPropertyVariables> + <includes> + <include>**/Test*.java</include> + </includes> + <excludes> + <exclude>**/${test.exclude}.java</exclude> + <exclude>${test.exclude.pattern}</exclude> + <exclude>**/Test*$*.java</exclude> + </excludes> + </configuration> + </plugin> </plugins> </build> @@ -606,5 +659,4 @@ </build> </profile> </profiles> - </project> Modified: hadoop/common/trunk/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/trunk/pom.xml?rev=1159702&r1=1159701&r2=1159702&view=diff ============================================================================== --- hadoop/common/trunk/pom.xml (original) +++ hadoop/common/trunk/pom.xml Fri Aug 19 17:36:23 2011 @@ -35,9 +35,11 @@ <modules> <module>hadoop-project</module> + <module>hadoop-project-distro</module> <module>hadoop-assemblies</module> <module>hadoop-annotations</module> <module>hadoop-common</module> + <module>hadoop-hdfs</module> </modules> <build>