Modified: hadoop/common/trunk/hadoop-common/src/main/java/org/apache/hadoop/fs/kfs/KFSImpl.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common/src/main/java/org/apache/hadoop/fs/kfs/KFSImpl.java?rev=1153184&r1=1153176&r2=1153184&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-common/src/main/java/org/apache/hadoop/fs/kfs/KFSImpl.java (original) +++ hadoop/common/trunk/hadoop-common/src/main/java/org/apache/hadoop/fs/kfs/KFSImpl.java Tue Aug 2 16:37:57 2011 @@ -73,14 +73,14 @@ class KFSImpl implements IFSImpl { return null; int numEntries = 0; for (int i = 0; i < fattr.length; i++) { - if ((fattr[i].filename.compareTo(".") == 0) || (fattr[i].filename.compareTo("..") == 0)) + if ((fattr[i].filename.compareTo(".") == 0) || (fattr[i].filename.compareTo("target/generated-sources") == 0)) continue; numEntries++; } FileStatus[] fstatus = new FileStatus[numEntries]; int j = 0; for (int i = 0; i < fattr.length; i++) { - if ((fattr[i].filename.compareTo(".") == 0) || (fattr[i].filename.compareTo("..") == 0)) + if ((fattr[i].filename.compareTo(".") == 0) || (fattr[i].filename.compareTo("target/generated-sources") == 0)) continue; Path fn = new Path(path, fattr[i].filename);
Modified: hadoop/common/trunk/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java?rev=1153184&r1=1153176&r2=1153184&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java (original) +++ hadoop/common/trunk/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java Tue Aug 2 16:37:57 2011 @@ -100,7 +100,7 @@ public class ViewFileSystem extends File final StringTokenizer tokens = new StringTokenizer(src, Path.SEPARATOR); while(tokens.hasMoreTokens()) { String element = tokens.nextToken(); - if (element.equals("..") || + if (element.equals("..") || element.equals(".") || (element.indexOf(":") >= 0)) { return false; Modified: hadoop/common/trunk/hadoop-common/src/main/native/Makefile.am URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common/src/main/native/Makefile.am?rev=1153184&r1=1153176&r2=1153184&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-common/src/main/native/Makefile.am (original) +++ hadoop/common/trunk/hadoop-common/src/main/native/Makefile.am Tue Aug 2 16:37:57 2011 @@ -33,10 +33,7 @@ export PLATFORM = $(shell echo $$OS_NAME ACLOCAL_AMFLAGS = -I m4 AM_CPPFLAGS = @JNI_CPPFLAGS@ -I$(HADOOP_NATIVE_SRCDIR)/src \ - -Isrc/org/apache/hadoop/io/compress/zlib \ - -Isrc/org/apache/hadoop/io/compress/snappy \ - -Isrc/org/apache/hadoop/security \ - -Isrc/org/apache/hadoop/io/nativeio/ + -I$(HADOOP_NATIVE_SRCDIR)/javah AM_LDFLAGS = @JNI_LDFLAGS@ AM_CFLAGS = -g -Wall -fPIC -O2 if SPECIFY_DATA_MODEL Modified: hadoop/common/trunk/hadoop-common/src/main/packages/templates/conf/core-site.xml URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common/src/main/packages/templates/conf/core-site.xml?rev=1153184&r1=1153176&r2=1153184&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-common/src/main/packages/templates/conf/core-site.xml (original) +++ hadoop/common/trunk/hadoop-common/src/main/packages/templates/conf/core-site.xml Tue Aug 2 16:37:57 2011 @@ -1,5 +1,21 @@ <?xml version="1.0"?> <?xml-stylesheet type="text/xsl" href="configuration.xsl"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You 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. +--> <!-- Put site-specific property overrides in this file. --> Added: hadoop/common/trunk/hadoop-common/src/main/resources/META-INF/services/org.apache.hadoop.security.SecurityInfo URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common/src/main/resources/META-INF/services/org.apache.hadoop.security.SecurityInfo?rev=1153184&view=auto ============================================================================== --- hadoop/common/trunk/hadoop-common/src/main/resources/META-INF/services/org.apache.hadoop.security.SecurityInfo (added) +++ hadoop/common/trunk/hadoop-common/src/main/resources/META-INF/services/org.apache.hadoop.security.SecurityInfo Tue Aug 2 16:37:57 2011 @@ -0,0 +1 @@ +org.apache.hadoop.security.AnnotatedSecurityInfo Copied: hadoop/common/trunk/hadoop-common/src/main/xsl/configuration.xsl (from r1153176, hadoop/common/trunk/common/conf/configuration.xsl) URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common/src/main/xsl/configuration.xsl?p2=hadoop/common/trunk/hadoop-common/src/main/xsl/configuration.xsl&p1=hadoop/common/trunk/common/conf/configuration.xsl&r1=1153176&r2=1153184&rev=1153184&view=diff ============================================================================== --- hadoop/common/trunk/common/conf/configuration.xsl (original) +++ hadoop/common/trunk/hadoop-common/src/main/xsl/configuration.xsl Tue Aug 2 16:37:57 2011 @@ -1,4 +1,17 @@ <?xml version="1.0"?> +<!-- + 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. +--> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"> <xsl:output method="html"/> <xsl:template match="configuration"> Modified: hadoop/common/trunk/hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemTestHelper.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemTestHelper.java?rev=1153184&r1=1153176&r2=1153184&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemTestHelper.java (original) +++ hadoop/common/trunk/hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemTestHelper.java Tue Aug 2 16:37:57 2011 @@ -34,7 +34,7 @@ import org.junit.Assert; public final class FileSystemTestHelper { // The test root is relative to the <wd>/build/test/data by default public static final String TEST_ROOT_DIR = - System.getProperty("test.build.data", "build/test/data") + "/test"; + System.getProperty("test.build.data", "target/test/data") + "/test"; private static final int DEFAULT_BLOCK_SIZE = 1024; private static final int DEFAULT_NUM_BLOCKS = 2; private static String absTestRootDir = null; Modified: hadoop/common/trunk/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsConfig.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsConfig.java?rev=1153184&r1=1153176&r2=1153184&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsConfig.java (original) +++ hadoop/common/trunk/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsConfig.java Tue Aug 2 16:37:57 2011 @@ -138,6 +138,7 @@ public class TestMetricsConfig { * @return the filename */ public static String getTestFilename(String basename) { - return "build/test/"+ basename +".properties"; + return System.getProperty("test.build.classes", "target/test-classes") + + "/"+ basename +".properties"; } } Modified: hadoop/common/trunk/hadoop-common/src/test/java/org/apache/hadoop/util/TestShell.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common/src/test/java/org/apache/hadoop/util/TestShell.java?rev=1153184&r1=1153176&r2=1153184&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-common/src/test/java/org/apache/hadoop/util/TestShell.java (original) +++ hadoop/common/trunk/hadoop-common/src/test/java/org/apache/hadoop/util/TestShell.java Tue Aug 2 16:37:57 2011 @@ -72,7 +72,7 @@ public class TestShell extends TestCase public void testShellCommandExecutorToString() throws Throwable { Shell.ShellCommandExecutor sce=new Shell.ShellCommandExecutor( - new String[] { "ls","..","arg 2"}); + new String[] { "ls", "..","arg 2"}); String command = sce.toString(); assertInString(command,"ls"); assertInString(command, " .. "); Modified: hadoop/common/trunk/hadoop-common/src/test/system/conf/hadoop-policy-system-test.xml URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common/src/test/system/conf/hadoop-policy-system-test.xml?rev=1153184&r1=1153176&r2=1153184&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-common/src/test/system/conf/hadoop-policy-system-test.xml (original) +++ hadoop/common/trunk/hadoop-common/src/test/system/conf/hadoop-policy-system-test.xml Tue Aug 2 16:37:57 2011 @@ -1,5 +1,21 @@ <?xml version="1.0"?> <?xml-stylesheet type="text/xsl" href="configuration.xsl"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You 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. +--> <configuration> <!-- Added: hadoop/common/trunk/hadoop-project/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-project/pom.xml?rev=1153184&view=auto ============================================================================== --- hadoop/common/trunk/hadoop-project/pom.xml (added) +++ hadoop/common/trunk/hadoop-project/pom.xml Tue Aug 2 16:37:57 2011 @@ -0,0 +1,588 @@ +<?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> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-project</artifactId> + <version>0.23.0-SNAPSHOT</version> + <description>Apache Hadoop Project POM</description> + <name>Apache Hadoop Project POM</name> + <packaging>pom</packaging> + + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + </license> + </licenses> + + <organization> + <name>Apache Software Foundation</name> + <url>http://www.apache.org</url> + </organization> + + <properties> + <failIfNoTests>false</failIfNoTests> + <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile> + + <test.exclude>_</test.exclude> + <test.exclude.pattern>_</test.exclude.pattern> + + <!-- platform encoding override --> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + + <!-- These 2 versions are defined here becuase they are used in the *-docs --> + <!-- module(s) for JDIFF generation from embedded ant in the antrun plugin --> + <hadoop.annotations.version>${project.version}</hadoop.annotations.version> + <jdiff.version>1.0.9</jdiff.version> + + <hadoop.assemblies.version>${project.version}</hadoop.assemblies.version> + </properties> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>jdiff</groupId> + <artifactId>jdiff</artifactId> + <version>${jdiff.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-assemblies</artifactId> + <version>${hadoop.assemblies.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-annotations</artifactId> + <version>${hadoop.annotations.version}</version> + </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> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + <version>${project.version}</version> + <type>test-jar</type> + </dependency> + + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>r09</version> + </dependency> + <dependency> + <groupId>commons-cli</groupId> + <artifactId>commons-cli</artifactId> + <version>1.2</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-math</artifactId> + <version>2.1</version> + </dependency> + <dependency> + <groupId>xmlenc</groupId> + <artifactId>xmlenc</artifactId> + <version>0.52</version> + </dependency> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>3.1</version> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.4</version> + </dependency> + <dependency> + <groupId>commons-net</groupId> + <artifactId>commons-net</artifactId> + <version>1.4.1</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + </dependency> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> + <version>6.1.26</version> + <exclusions> + <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-util</artifactId> + <version>6.1.26</version> + </dependency> + <dependency> + <groupId>tomcat</groupId> + <artifactId>jasper-compiler</artifactId> + <version>5.5.23</version> + <exclusions> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>jsp-api</artifactId> + </exclusion> + <exclusion> + <groupId>ant</groupId> + <artifactId>ant</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>tomcat</groupId> + <artifactId>jasper-runtime</artifactId> + <version>5.5.23</version> + </dependency> + <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <version>2.1</version> + </dependency> + <dependency> + <groupId>commons-el</groupId> + <artifactId>commons-el</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.0.4</version> + <exclusions> + <exclusion> + <groupId>avalon-framework</groupId> + <artifactId>avalon-framework</artifactId> + </exclusion> + <exclusion> + <groupId>logkit</groupId> + <artifactId>logkit</artifactId> + </exclusion> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging-api</artifactId> + <version>1.0.4</version> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.15</version> + <exclusions> + <exclusion> + <groupId>com.sun.jdmk</groupId> + <artifactId>jmxtools</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jmx</groupId> + <artifactId>jmxri</artifactId> + </exclusion> + <exclusion> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + </exclusion> + <exclusion> + <groupId>javax.jms</groupId> + <artifactId>jmx</artifactId> + </exclusion> + <exclusion> + <groupId>javax.jms</groupId> + <artifactId>jms</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>net.java.dev.jets3t</groupId> + <artifactId>jets3t</artifactId> + <version>0.6.1</version> + </dependency> + <dependency> + <groupId>org.apache.mina</groupId> + <artifactId>mina-core</artifactId> + <version>2.0.0-M5</version> + </dependency> + <dependency> + <groupId>org.apache.ftpserver</groupId> + <artifactId>ftplet-api</artifactId> + <version>1.0.0</version> + </dependency> + <dependency> + <groupId>org.apache.ftpserver</groupId> + <artifactId>ftpserver-core</artifactId> + <version>1.0.0</version> + </dependency> + <dependency> + <groupId>org.apache.ftpserver</groupId> + <artifactId>ftpserver-deprecated</artifactId> + <version>1.0.0-M2</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.8.1</version> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.5</version> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.1</version> + </dependency> + <dependency> + <groupId>commons-configuration</groupId> + <artifactId>commons-configuration</artifactId> + <version>1.6</version> + </dependency> + <dependency> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <version>1.8.0.7</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.5.8</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.5.8</version> + </dependency> + <dependency> + <groupId>org.eclipse.jdt</groupId> + <artifactId>core</artifactId> + <version>3.1.1</version> + </dependency> + <dependency> + <groupId>oro</groupId> + <artifactId>oro</artifactId> + <version>2.0.8</version> + </dependency> + <dependency> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-mapper-asl</artifactId> + <version>1.5.2</version> + </dependency> + <dependency> + <groupId>org.aspectj</groupId> + <artifactId>aspectjrt</artifactId> + <version>1.6.5</version> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <version>1.8.5</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>avro</artifactId> + <version>1.3.2</version> + <exclusions> + <exclusion> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>net.sf.kosmosfs</groupId> + <artifactId>kfs</artifactId> + <version>0.3</version> + </dependency> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + <version>1.8.1</version> + </dependency> + <dependency> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + <version>2.4.0a</version> + </dependency> + </dependencies> + </dependencyManagement> + + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <version>1.0</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.3.2</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.1</version> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>1.5</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.6</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>2.3.1</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-3</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.7</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.6</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <version>2.1</version> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>findbugs-maven-plugin</artifactId> + <version>2.3.2</version> + </plugin> + <plugin> + <groupId>com.atlassian.maven.plugins</groupId> + <artifactId>maven-clover2-plugin</artifactId> + <version>3.0.5</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>2.6</version> + </plugin> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <version>0.7</version> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>native-maven-plugin</artifactId> + <version>1.0-alpha-7</version> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>make-maven-plugin</artifactId> + <version>1.0-beta-1</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <version>2.1.2</version> + </plugin> + </plugins> + </pluginManagement> + + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <inherited>false</inherited> + <configuration> + <rules> + <requireMavenVersion> + <version>[3.0.0,)</version> + </requireMavenVersion> + <requireJavaVersion> + <version>1.6</version> + </requireJavaVersion> + <requireOS> + <family>unix</family> + </requireOS> + </rules> + </configuration> + <executions> + <execution> + <id>clean</id> + <goals> + <goal>enforce</goal> + </goals> + <phase>pre-clean</phase> + </execution> + <execution> + <id>default</id> + <goals> + <goal>enforce</goal> + </goals> + <phase>validate</phase> + </execution> + <execution> + <id>site</id> + <goals> + <goal>enforce</goal> + </goals> + <phase>pre-site</phase> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <id>os.linux</id> + <activation> + <os> + <family>Linux</family> + </os> + </activation> + <properties> + <build.platform>${os.name}-${os.arch}-${sun.arch.data.model}</build.platform> + </properties> + <dependencies> + <dependency> + <groupId>jdk.tools</groupId> + <artifactId>jdk.tools</artifactId> + <version>1.6</version> + <scope>system</scope> + <systemPath>${env.JAVA_HOME}/lib/tools.jar</systemPath> + </dependency> + </dependencies> + </profile> + <profile> + <id>os.mac</id> + <activation> + <os> + <family>Mac</family> + </os> + </activation> + <properties> + <build.platform>Mac_OS_X-${sun.arch.data.model}</build.platform> + </properties> + </profile> + + <profile> + <id>clover</id> + <activation> + <activeByDefault>false</activeByDefault> + <property> + <name>clover</name> + </property> + </activation> + <properties> + <cloverLicenseLocation>${user.home}/.clover.license</cloverLicenseLocation> + <cloverDatabase>${project.build.directory}/clover/hadoop-coverage.db</cloverDatabase> + </properties> + <build> + <plugins> + <plugin> + <groupId>com.atlassian.maven.plugins</groupId> + <artifactId>maven-clover2-plugin</artifactId> + <configuration> + <includesTestSourceRoots>true</includesTestSourceRoots> + <licenseLocation>${cloverLicenseLocation}</licenseLocation> + <cloverDatabase>${cloverDatabase}</cloverDatabase> + <targetPercentage>50%</targetPercentage> + <outputDirectory>${project.build.directory}/clover</outputDirectory> + <generateHtml>true</generateHtml> + <generateXml>true</generateXml> + </configuration> + <executions> + <execution> + <id>setup</id> + <phase>generate-sources</phase> + <goals> + <goal>setup</goal> + </goals> + </execution> + <execution> + <id>clover</id> + <phase>test</phase> + <goals> + <goal>clover</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>test-patch</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <fork>true</fork> + <source>1.6</source> + <target>1.6</target> + <compilerArguments> + <Xlint/> + <Xmaxwarns>9999</Xmaxwarns> + </compilerArguments> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> + +</project> Propchange: hadoop/common/trunk/hadoop-project/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Added: hadoop/common/trunk/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/trunk/pom.xml?rev=1153184&view=auto ============================================================================== --- hadoop/common/trunk/pom.xml (added) +++ hadoop/common/trunk/pom.xml Tue Aug 2 16:37:57 2011 @@ -0,0 +1,119 @@ +<?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> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-main</artifactId> + <version>0.23.0-SNAPSHOT</version> + <description>Apache Hadoop Main</description> + <name>Apache Hadoop Main</name> + <packaging>pom</packaging> + + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + </license> + </licenses> + + <organization> + <name>Apache Software Foundation</name> + <url>http://www.apache.org</url> + </organization> + + <modules> + <module>hadoop-project</module> + <module>hadoop-assemblies</module> + <module>hadoop-annotations</module> + <module>hadoop-common</module> + </modules> + + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <version>1.0</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-3</version> + </plugin> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <version>0.7</version> + </plugin> + </plugins> + </pluginManagement> + + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <inherited>false</inherited> + <configuration> + <rules> + <requireMavenVersion> + <version>[3.0.0,)</version> + </requireMavenVersion> + <requireJavaVersion> + <version>1.6</version> + </requireJavaVersion> + <requireOS> + <family>unix</family> + </requireOS> + </rules> + </configuration> + <executions> + <execution> + <id>clean</id> + <goals> + <goal>enforce</goal> + </goals> + <phase>pre-clean</phase> + </execution> + <execution> + <id>default</id> + <goals> + <goal>enforce</goal> + </goals> + <phase>validate</phase> + </execution> + <execution> + <id>site</id> + <goals> + <goal>enforce</goal> + </goals> + <phase>pre-site</phase> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <includes> + <include>dev-support/*</include> + <include>pom.xml</include> + </includes> + </configuration> + </plugin> + </plugins> + </build> + +</project> Propchange: hadoop/common/trunk/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native
