http://git-wip-us.apache.org/repos/asf/hadoop/blob/c64fe9f0/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml.versionsBackup ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml.versionsBackup b/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml.versionsBackup deleted file mode 100644 index acbe3a2..0000000 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml.versionsBackup +++ /dev/null @@ -1,318 +0,0 @@ -<?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. ---> -<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";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-project</artifactId> - <version>2.8.0</version> - <relativePath>../../hadoop-project</relativePath> - </parent> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-mapreduce-client</artifactId> - <version>2.8.0</version> - <name>Apache Hadoop MapReduce Client</name> - <packaging>pom</packaging> - - <properties> - <hadoop.common.build.dir>${basedir}/../../../hadoop-common-project/hadoop-common/target</hadoop.common.build.dir> - <!-- Used by jdiff --> - <!-- Antrun cannot resolve yarn.basedir, so we need to setup something else --> - <dev-support.relative.dir>../dev-support</dev-support.relative.dir> - </properties> - - <dependencies> - <dependency> - <groupId>com.google.protobuf</groupId> - <artifactId>protobuf-java</artifactId> - </dependency> - <dependency> - <groupId>org.apache.avro</groupId> - <artifactId>avro</artifactId> - <exclusions> - <exclusion> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.ant</groupId> - <artifactId>ant</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.velocity</groupId> - <artifactId>velocity</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - <exclusion> - <artifactId>paranamer-ant</artifactId> - <groupId>com.thoughtworks.paranamer</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-annotations</artifactId> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.google.inject.extensions</groupId> - <artifactId>guice-servlet</artifactId> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>commons-cli</groupId> - <artifactId>commons-cli</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.sun.jersey.jersey-test-framework</groupId> - <artifactId>jersey-test-framework-grizzly2</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <configuration> - <findbugsXmlOutput>true</findbugsXmlOutput> - <xmlOutput>true</xmlOutput> - <excludeFilterFile>${mr.basedir}/dev-support/findbugs-exclude.xml</excludeFilterFile> - <effort>Max</effort> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <properties> - <property> - <name>listener</name> - <value>org.apache.hadoop.test.TimedOutTestsListener</value> - </property> - </properties> - </configuration> - </plugin> - </plugins> - </build> - <profiles> - <profile> - <id>docs</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <properties> - <jdiff.stable.api>2.7.2</jdiff.stable.api> - <jdiff.stability>-unstable</jdiff.stability> - <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.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>${project.version}</version> - <overWrite>false</overWrite> - <outputDirectory>${project.build.directory}</outputDirectory> - <destFileName>hadoop-annotations.jar</destFileName> - </artifactItem> - <artifactItem> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>${xerces.version.jdiff}</version> - <overWrite>false</overWrite> - <outputDirectory>${project.build.directory}</outputDirectory> - <destFileName>xerces.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="should.run.jdiff"> - - <!-- Jdiff --> - <mkdir dir="${project.build.directory}/site/jdiff/xml"/> - <javadoc maxmemory="${jdiff.javadoc.maxmemory}" verbose="yes"> - <doclet name="org.apache.hadoop.classification.tools.IncludePublicAnnotationsJDiffDoclet" - 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="${project.name} ${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="${dev-support.relative.dir}/jdiff/Null.java" - maxmemory="${jdiff.javadoc.maxmemory}"> - <doclet name="org.apache.hadoop.classification.tools.IncludePublicAnnotationsJDiffDoclet" - path="${project.build.directory}/hadoop-annotations.jar:${project.build.directory}/jdiff.jar:${project.build.directory}/xerces.jar"> - <param name="-oldapi" value="${project.name} ${jdiff.stable.api}"/> - <param name="-newapi" value="${project.name} ${project.version}"/> - <param name="-oldapidir" value="${basedir}/${dev-support.relative.dir}/jdiff"/> - <param name="-newapidir" value="${project.build.directory}/site/jdiff/xml"/> - <param name="-javadocold" - value="http://hadoop.apache.org/docs/r${jdiff.stable.api}/api/"/> - <param name="-javadocnew" value="${project.build.directory}/site/api/"/> - <param name="-stats"/> - <param name="${jdiff.stability}"/> - </doclet> - <classpath> - <path refid="maven.compile.classpath"/> - </classpath> - </javadoc> - <property name="compile_classpath" refid="maven.compile.classpath"/> - - </target> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - - <modules> - <module>hadoop-mapreduce-client-core</module> - <module>hadoop-mapreduce-client-common</module> - <module>hadoop-mapreduce-client-shuffle</module> - <module>hadoop-mapreduce-client-app</module> - <module>hadoop-mapreduce-client-jobclient</module> - <module>hadoop-mapreduce-client-hs</module> - <module>hadoop-mapreduce-client-hs-plugins</module> - </modules> -</project>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c64fe9f0/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml index d021c2f..ec49d6b0 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml @@ -20,12 +20,12 @@ <parent> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-project</artifactId> - <version>2.8.1</version> + <version>2.8.2-SNAPSHOT</version> <relativePath>../../hadoop-project</relativePath> </parent> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-examples</artifactId> - <version>2.8.1</version> + <version>2.8.2-SNAPSHOT</version> <description>Apache Hadoop MapReduce Examples</description> <name>Apache Hadoop MapReduce Examples</name> <packaging>jar</packaging> http://git-wip-us.apache.org/repos/asf/hadoop/blob/c64fe9f0/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml.versionsBackup ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml.versionsBackup b/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml.versionsBackup deleted file mode 100644 index 8d8e745..0000000 --- a/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml.versionsBackup +++ /dev/null @@ -1,154 +0,0 @@ -<?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 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";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-project</artifactId> - <version>2.8.0</version> - <relativePath>../../hadoop-project</relativePath> - </parent> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-mapreduce-examples</artifactId> - <version>2.8.0</version> - <description>Apache Hadoop MapReduce Examples</description> - <name>Apache Hadoop MapReduce Examples</name> - <packaging>jar</packaging> - - <properties> - <mr.examples.basedir>${basedir}</mr.examples.basedir> - </properties> - - <dependencies> - <dependency> - <groupId>commons-cli</groupId> - <artifactId>commons-cli</artifactId> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-mapreduce-client-jobclient</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-mapreduce-client-jobclient</artifactId> - <scope>test</scope> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - <scope>test</scope> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs-client</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> - <scope>test</scope> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-yarn-server-tests</artifactId> - <scope>test</scope> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-mapreduce-client-app</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-mapreduce-client-app</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.sun.jersey.jersey-test-framework</groupId> - <artifactId>jersey-test-framework-grizzly2</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-mapreduce-client-hs</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.hsqldb</groupId> - <artifactId>hsqldb</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifest> - <mainClass>org.apache.hadoop.examples.ExampleDriver</mainClass> - </manifest> - </archive> - </configuration> - </plugin> - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <configuration> - <findbugsXmlOutput>true</findbugsXmlOutput> - <xmlOutput>true</xmlOutput> - <excludeFilterFile>${mr.examples.basedir}/dev-support/findbugs-exclude.xml</excludeFilterFile> - <effort>Max</effort> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <configuration> - <excludes> - <exclude>src/main/java/org/apache/hadoop/examples/dancing/puzzle1.dta</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> -</project> http://git-wip-us.apache.org/repos/asf/hadoop/blob/c64fe9f0/hadoop-mapreduce-project/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/pom.xml b/hadoop-mapreduce-project/pom.xml index 447d52f..83c2a91 100644 --- a/hadoop-mapreduce-project/pom.xml +++ b/hadoop-mapreduce-project/pom.xml @@ -18,12 +18,12 @@ <parent> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-project</artifactId> - <version>2.8.1</version> + <version>2.8.2-SNAPSHOT</version> <relativePath>../hadoop-project</relativePath> </parent> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce</artifactId> - <version>2.8.1</version> + <version>2.8.2-SNAPSHOT</version> <packaging>pom</packaging> <name>Apache Hadoop MapReduce</name> <url>http://hadoop.apache.org/mapreduce/</url> http://git-wip-us.apache.org/repos/asf/hadoop/blob/c64fe9f0/hadoop-mapreduce-project/pom.xml.versionsBackup ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/pom.xml.versionsBackup b/hadoop-mapreduce-project/pom.xml.versionsBackup deleted file mode 100644 index 3083a0a..0000000 --- a/hadoop-mapreduce-project/pom.xml.versionsBackup +++ /dev/null @@ -1,286 +0,0 @@ -<?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 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";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-project</artifactId> - <version>2.8.0</version> - <relativePath>../hadoop-project</relativePath> - </parent> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-mapreduce</artifactId> - <version>2.8.0</version> - <packaging>pom</packaging> - <name>Apache Hadoop MapReduce</name> - <url>http://hadoop.apache.org/mapreduce/</url> - - <properties> - <test.logs>true</test.logs> - <test.timeout>600000</test.timeout> - <fork.mode>once</fork.mode> - <mr.basedir>${basedir}</mr.basedir> - <hadoop.component>mapreduce</hadoop.component> - <is.hadoop.component>true</is.hadoop.component> - </properties> - - <modules> - <module>hadoop-mapreduce-client</module> - <module>hadoop-mapreduce-examples</module> - </modules> - - <dependencies> - <dependency> - <groupId>com.google.protobuf</groupId> - <artifactId>protobuf-java</artifactId> - </dependency> - <dependency> - <groupId>org.apache.avro</groupId> - <artifactId>avro</artifactId> - <exclusions> - <exclusion> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.ant</groupId> - <artifactId>ant</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.velocity</groupId> - <artifactId>velocity</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - <exclusion> - <artifactId>paranamer-ant</artifactId> - <groupId>com.thoughtworks.paranamer</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-annotations</artifactId> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.google.inject</groupId> - <artifactId>guice</artifactId> - </dependency> - <dependency> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-server</artifactId> - </dependency> - <dependency> - <groupId>com.sun.jersey.contribs</groupId> - <artifactId>jersey-guice</artifactId> - </dependency> - <dependency> - <groupId>com.google.inject.extensions</groupId> - <artifactId>guice-servlet</artifactId> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - <dependency> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - <dependency> - <groupId>org.hsqldb</groupId> - <artifactId>hsqldb</artifactId> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.fusesource.leveldbjni</groupId> - <artifactId>leveldbjni-all</artifactId> - </dependency> - - </dependencies> - - <build> - <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>tar</id> - <phase>package</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <!-- this is identical from hadoop-project-dist, eventually they must be unified --> - <target if="tar"> - <!-- Using Unix script to preserve symlinks --> - <echo file="${project.build.directory}/dist-maketar.sh"> - cd "${project.build.directory}" - tar cf - ${project.artifactId}-${project.version} | gzip > ${project.artifactId}-${project.version}.tar.gz - </echo> - <exec executable="${shell-executable}" dir="${project.build.directory}" failonerror="true"> - <arg line="./dist-maketar.sh"/> - </exec> - </target> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <configuration> - <findbugsXmlOutput>true</findbugsXmlOutput> - <xmlOutput>true</xmlOutput> - <excludeFilterFile>${mr.basedir}/dev-support/findbugs-exclude.xml</excludeFilterFile> - <effort>Max</effort> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <configuration> - <excludes> - <exclude>.eclipse.templates/</exclude> - <exclude>lib/jdiff/**</exclude> - <exclude>dev-support/jdiff/**</exclude> - </excludes> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <properties> - <property> - <name>listener</name> - <value>org.apache.hadoop.test.TimedOutTestsListener</value> - </property> - </properties> - </configuration> - </plugin> - </plugins> - </build> - - <profiles> - <profile> - <id>dist</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <id>attach-sources</id> - <goals> - <!-- avoid warning about recursion --> - <goal>jar-no-fork</goal> - </goals> - </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>${project.version}</version> - </dependency> - </dependencies> - <configuration> - <tarLongFileMode>gnu</tarLongFileMode> - <appendAssemblyId>false</appendAssemblyId> - <attach>false</attach> - <finalName>${project.artifactId}-${project.version}</finalName> - <descriptorRefs> - <descriptorRef>hadoop-mapreduce-dist</descriptorRef> - </descriptorRefs> - </configuration> - <executions> - <execution> - <id>package-mapreduce</id> - <phase>prepare-package</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - - - <reporting> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <!-- until we have reporting management cf. MSITE-443 --> - <version>2.3.2</version> - <configuration> - <findbugsXmlOutput>true</findbugsXmlOutput> - <xmlOutput>true</xmlOutput> - </configuration> - </plugin> - </plugins> - </reporting> -</project> http://git-wip-us.apache.org/repos/asf/hadoop/blob/c64fe9f0/hadoop-maven-plugins/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-maven-plugins/pom.xml b/hadoop-maven-plugins/pom.xml index ef09335..0414281 100644 --- a/hadoop-maven-plugins/pom.xml +++ b/hadoop-maven-plugins/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-project</artifactId> - <version>2.8.1</version> + <version>2.8.2-SNAPSHOT</version> <relativePath>../hadoop-project</relativePath> </parent> <groupId>org.apache.hadoop</groupId> http://git-wip-us.apache.org/repos/asf/hadoop/blob/c64fe9f0/hadoop-maven-plugins/pom.xml.versionsBackup ---------------------------------------------------------------------- diff --git a/hadoop-maven-plugins/pom.xml.versionsBackup b/hadoop-maven-plugins/pom.xml.versionsBackup deleted file mode 100644 index 87774de..0000000 --- a/hadoop-maven-plugins/pom.xml.versionsBackup +++ /dev/null @@ -1,85 +0,0 @@ -<?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 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";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-project</artifactId> - <version>2.8.0</version> - <relativePath>../hadoop-project</relativePath> - </parent> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-maven-plugins</artifactId> - <packaging>maven-plugin</packaging> - <name>Apache Hadoop Maven Plugins</name> - <properties> - <maven.dependency.version>3.0</maven.dependency.version> - <maven.plugin-tools.version>3.4</maven.plugin-tools.version> - </properties> - <dependencies> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-plugin-api</artifactId> - <version>${maven.dependency.version}</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-core</artifactId> - <version>${maven.dependency.version}</version> - </dependency> - <dependency> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-annotations</artifactId> - <version>${maven.plugin-tools.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-core-asl</artifactId> - </dependency> - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-plugin-plugin</artifactId> - <version>${maven.plugin-tools.version}</version> - <executions> - <execution> - <id>default-descriptor</id> - <phase>process-classes</phase> - </execution> - </executions> - </plugin> - <!-- - Skip Clover instrumentation for this module to prevent error finding Clover - classes during plugin execution when running a build with Clover enabled. - --> - <plugin> - <groupId>com.atlassian.maven.plugins</groupId> - <artifactId>maven-clover2-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - </plugins> - </build> -</project> http://git-wip-us.apache.org/repos/asf/hadoop/blob/c64fe9f0/hadoop-minicluster/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-minicluster/pom.xml b/hadoop-minicluster/pom.xml index cf2a94f..56146a9 100644 --- a/hadoop-minicluster/pom.xml +++ b/hadoop-minicluster/pom.xml @@ -18,12 +18,12 @@ <parent> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-project</artifactId> - <version>2.8.1</version> + <version>2.8.2-SNAPSHOT</version> <relativePath>../hadoop-project</relativePath> </parent> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-minicluster</artifactId> - <version>2.8.1</version> + <version>2.8.2-SNAPSHOT</version> <packaging>jar</packaging> <description>Apache Hadoop Mini-Cluster</description> http://git-wip-us.apache.org/repos/asf/hadoop/blob/c64fe9f0/hadoop-minicluster/pom.xml.versionsBackup ---------------------------------------------------------------------- diff --git a/hadoop-minicluster/pom.xml.versionsBackup b/hadoop-minicluster/pom.xml.versionsBackup deleted file mode 100644 index 6fb45da..0000000 --- a/hadoop-minicluster/pom.xml.versionsBackup +++ /dev/null @@ -1,105 +0,0 @@ -<?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 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";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-project</artifactId> - <version>2.8.0</version> - <relativePath>../hadoop-project</relativePath> - </parent> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-minicluster</artifactId> - <version>2.8.0</version> - <packaging>jar</packaging> - - <description>Apache Hadoop Mini-Cluster</description> - <name>Apache Hadoop Mini-Cluster</name> - - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - <scope>compile</scope> - <type>test-jar</type> - </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> - <scope>compile</scope> - <type>test-jar</type> - </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-yarn-server-tests</artifactId> - <scope>compile</scope> - <type>test-jar</type> - </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-mapreduce-client-jobclient</artifactId> - <scope>compile</scope> - <type>test-jar</type> - </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-mapreduce-client-app</artifactId> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-yarn-api</artifactId> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-mapreduce-client-core</artifactId> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-mapreduce-client-jobclient</artifactId> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-mapreduce-client-hs</artifactId> - <scope>compile</scope> - </dependency> - </dependencies> - -</project> - http://git-wip-us.apache.org/repos/asf/hadoop/blob/c64fe9f0/hadoop-project-dist/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-project-dist/pom.xml b/hadoop-project-dist/pom.xml index 69ebcd9..e73ac69 100644 --- a/hadoop-project-dist/pom.xml +++ b/hadoop-project-dist/pom.xml @@ -20,12 +20,12 @@ <parent> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-project</artifactId> - <version>2.8.1</version> + <version>2.8.2-SNAPSHOT</version> <relativePath>../hadoop-project</relativePath> </parent> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-project-dist</artifactId> - <version>2.8.1</version> + <version>2.8.2-SNAPSHOT</version> <description>Apache Hadoop Project Dist POM</description> <name>Apache Hadoop Project Dist POM</name> <packaging>pom</packaging> http://git-wip-us.apache.org/repos/asf/hadoop/blob/c64fe9f0/hadoop-project-dist/pom.xml.versionsBackup ---------------------------------------------------------------------- diff --git a/hadoop-project-dist/pom.xml.versionsBackup b/hadoop-project-dist/pom.xml.versionsBackup deleted file mode 100644 index c41016a..0000000 --- a/hadoop-project-dist/pom.xml.versionsBackup +++ /dev/null @@ -1,425 +0,0 @@ -<?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 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";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-project</artifactId> - <version>2.8.0</version> - <relativePath>../hadoop-project</relativePath> - </parent> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-project-dist</artifactId> - <version>2.8.0</version> - <description>Apache Hadoop Project Dist POM</description> - <name>Apache Hadoop Project Dist 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> - <snappy.lib></snappy.lib> - <bundle.snappy>false</bundle.snappy> - <bundle.snappy.in.bin>false</bundle.snappy.in.bin> - <openssl.lib></openssl.lib> - <bundle.openssl>false</bundle.openssl> - <bundle.openssl.in.bin>false</bundle.openssl.in.bin> - </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> - <include>webapps/**</include> - <include>META-INF/LICENSE.txt</include> - <include>META-INF/NOTICE.txt</include> - </includes> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <configuration> - <excludeFilterFile>${basedir}/dev-support/findbugsExcludeFile.xml</excludeFilterFile> - <fork>true</fork> - <maxHeap>2048</maxHeap> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <maxmemory>512m</maxmemory> - <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>2.8.0</jdiff.stable.api> - <jdiff.stability>-unstable</jdiff.stability> - <!-- Commented out for HADOOP-11776 --> - <!-- Uncomment param name="${jdiff.compatibility}" in javadoc doclet if compatibility is not empty --> - <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>${project.version}</version> - <overWrite>false</overWrite> - <outputDirectory>${project.build.directory}</outputDirectory> - <destFileName>hadoop-annotations.jar</destFileName> - </artifactItem> - <artifactItem> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>${xerces.jdiff.version}</version> - <overWrite>false</overWrite> - <outputDirectory>${project.build.directory}</outputDirectory> - <destFileName>xerces.jar</destFileName> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - - <!-- Pre site --> - <execution> - <id>pre-site</id> - <phase>prepare-package</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <target if="is.hadoop.common.component"> - <!-- HADOOP-13428: This is for workaround issues of JDiff - - https://sourceforge.net/p/javadiff/bugs/19/ --> - <exec executable="patch" input="dev-support/jdiff-workaround.patch" dir="${basedir}"> - <arg value="-p3"/> - </exec> - </target> - </configuration> - </execution> - - - <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"/> - - <!-- Docs --> - <style basedir="${basedir}/src/main/resources" - destdir="${project.build.directory}/site" - includes="core-default.xml" - style="${basedir}/src/main/xsl/configuration.xsl"/> - - <!-- Jdiff --> - <mkdir dir="${project.build.directory}/site/jdiff/xml"/> - - <javadoc maxmemory="${jdiff.javadoc.maxmemory}" verbose="yes"> - <doclet name="org.apache.hadoop.classification.tools.IncludePublicAnnotationsJDiffDoclet" - 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="${project.name} ${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.IncludePublicAnnotationsJDiffDoclet" - path="${project.build.directory}/hadoop-annotations.jar:${project.build.directory}/jdiff.jar:${project.build.directory}/xerces.jar"> - <param name="-oldapi" value="${project.name} ${jdiff.stable.api}"/> - <param name="-newapi" value="${project.name} ${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/r${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> - - <!-- post site phase --> - <execution> - <id>post-site</id> - <phase>prepare-package</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <target if="is.hadoop.common.component"> - <!-- HADOOP-13428: Revert temporary patch--> - <exec executable="patch" input="dev-support/jdiff-workaround.patch" dir="${basedir}"> - <arg value="-p3"/> - <arg value="-R"/> - </exec> - </target> - </configuration> - </execution> - - </executions> - </plugin> - </plugins> - </build> - </profile> - - <profile> - <id>dist</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <version>${exec-maven-plugin.version}</version> - <executions> - <execution> - <id>pre-dist</id> - <phase>prepare-package</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <executable>${shell-executable}</executable> - <workingDirectory>${project.build.directory}</workingDirectory> - <requiresOnline>false</requiresOnline> - <arguments> - <argument>${project.parent.basedir}/../dev-support/bin/dist-copynativelibs</argument> - <argument>--version=${project.version}</argument> - <argument>--builddir=${project.build.directory}</argument> - <argument>--artifactid=${project.artifactId}</argument> - <argument>--openssllib=${openssl.lib}</argument> - <argument>--opensslbinbundle=${bundle.openssl.in.bin}</argument> - <argument>--openssllibbundle=${bundle.openssl}</argument> - <argument>--snappybinbundle=${bundle.snappy.in.bin}</argument> - <argument>--snappylib=${snappy.lib}</argument> - <argument>--snappylibbundle=${bundle.snappy}</argument> - </arguments> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>tar</id> - <phase>package</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <target if="tar"> - <!-- Using Unix script to preserve symlinks --> - <echo file="${project.build.directory}/dist-maketar.sh"> - cd "${project.build.directory}" - tar cf - ${project.artifactId}-${project.version} | gzip > ${project.artifactId}-${project.version}.tar.gz - </echo> - <exec executable="${shell-executable}" dir="${project.build.directory}" failonerror="true"> - <arg line="./dist-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>${project.version}</version> - </dependency> - </dependencies> - <executions> - <execution> - <id>dist</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-dist</descriptorRef> - </descriptorRefs> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> -</project> http://git-wip-us.apache.org/repos/asf/hadoop/blob/c64fe9f0/hadoop-project/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 89fc33a..8b6b07a 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -20,11 +20,11 @@ <parent> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-main</artifactId> - <version>2.8.1</version> + <version>2.8.2-SNAPSHOT</version> </parent> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-project</artifactId> - <version>2.8.1</version> + <version>2.8.2-SNAPSHOT</version> <description>Apache Hadoop Project POM</description> <name>Apache Hadoop Project POM</name> <packaging>pom</packaging> --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
