You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mrunit.apache.org by jd...@apache.org on 2012/04/15 01:28:48 UTC
svn commit: r1326230 - in /incubator/mrunit/branches/mrunit-0.9: pom.xml
src/main/assembly/bin-assembly.xml
Author: jdonofrio
Date: Sat Apr 14 23:28:47 2012
New Revision: 1326230
URL: http://svn.apache.org/viewvc?rev=1326230&view=rev
Log:
MRUNIT-96: Cleanup release: remove unnecesssary artifacts from nexus and distribute single binary distribution with 2 build artifacts, 1 for hadoop 1+ and 1 for hadoop 2+
Modified:
incubator/mrunit/branches/mrunit-0.9/pom.xml
incubator/mrunit/branches/mrunit-0.9/src/main/assembly/bin-assembly.xml
Modified: incubator/mrunit/branches/mrunit-0.9/pom.xml
URL: http://svn.apache.org/viewvc/incubator/mrunit/branches/mrunit-0.9/pom.xml?rev=1326230&r1=1326229&r2=1326230&view=diff
==============================================================================
--- incubator/mrunit/branches/mrunit-0.9/pom.xml (original)
+++ incubator/mrunit/branches/mrunit-0.9/pom.xml Sat Apr 14 23:28:47 2012
@@ -105,10 +105,36 @@
<email>brock@apache.org</email>
<name>Brock Noland</name>
</developer>
+ <developer>
+ <id>jdonofrio.apache.org</id>
+ <email>jdonofrio@apache.org</email>
+ <name>Jim Donofrio</name>
+ </developer>
+ <developer>
+ <id>jarcec.apache.org</id>
+ <email>jarcec@apache.org</email>
+ <name>Jarek Jarcec Cecho</name>
+ </developer>
</developers>
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.4.1</version>
+ <configuration>
+ <excludeDefaultDirectories>true</excludeDefaultDirectories>
+ <filesets>
+ <fileset>
+ <directory>${project.build.directory}</directory>
+ <excludes>
+ <exclude>*hadoop*.jar</exclude>
+ </excludes>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -130,56 +156,12 @@
</plugin>
<plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <classifier>${envClassifier}</classifier>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- <executions>
- <execution>
- <id>src</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/src-assembly.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- <execution>
- <id>bin</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin-assembly.xml</descriptor>
- </descriptors>
- <finalName>${project.build.finalName}-${envClassifier}</finalName>
- <appendAssemblyId>false</appendAssemblyId>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<version>0.8</version>
<executions>
<execution>
- <phase>verify</phase>
+ <phase>prepare-package</phase>
<goals>
<goal>check</goal>
</goals>
@@ -196,6 +178,15 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <classifier>${envClassifier}</classifier>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.8.1</version>
<configuration>
@@ -223,11 +214,129 @@
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>2.7</version>
+ </plugin>
</plugins>
</build>
- <dependencies>
+ <profiles>
+ <profile>
+ <id>hadoop1</id>
+ <activation>
+ <property>
+ <name>!hadoop.version</name>
+ </property>
+ </activation>
+ <properties>
+ <envClassifier>hadoop1</envClassifier>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ <version>1.0.2</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <id>hadoop2</id>
+ <activation>
+ <property>
+ <name>hadoop.version</name>
+ <value>2</value>
+ </property>
+ </activation>
+
+ <properties>
+ <envClassifier>hadoop2</envClassifier>
+ <specificHadoopVersion>0.23.1</specificHadoopVersion>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <version>${specificHadoopVersion}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-core</artifactId>
+ <version>${specificHadoopVersion}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <id>sign</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.4</version>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>dist-src</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ <descriptors>
+ <descriptor>src/main/assembly/src-assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>dist-bin</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ <descriptors>
+ <descriptor>src/main/assembly/bin-assembly.xml</descriptor>
+ </descriptors>
+ <appendAssemblyId>false</appendAssemblyId>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+ <dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -244,7 +353,6 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.15</version>
-
<exclusions>
<exclusion>
<groupId>com.sun.jdmk</groupId>
@@ -270,116 +378,5 @@
<artifactId>mockito-all</artifactId>
<version>1.8.5</version>
</dependency>
-
</dependencies>
-
- <profiles>
- <profile>
- <!-- Used only when cutting a full release to sign the artifacts -->
- <id>deploy</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <properties>
- <update-release-info>true</update-release-info>
- </properties>
- </profile>
- <profile>
- <id>hadoop-0.20</id>
- <activation>
- <property>
- <name>hadoop.version</name>
- <value>0.20</value>
- </property>
- </activation>
- <properties>
- <envClassifier>hadoop020</envClassifier>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- <version>0.20.2</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>hadoop-1.0</id>
- <activation>
- <property>
- <name>!hadoop.version</name>
- </property>
- </activation>
- <properties>
- <envClassifier>hadoop100</envClassifier>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- <version>1.0.0</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>hadoop-0.23</id>
- <activation>
- <property>
- <name>hadoop.version</name>
- <value>0.23</value>
- </property>
- </activation>
- <properties>
- <envClassifier>hadoop023</envClassifier>
- <specificHadoopVersion>0.23.1</specificHadoopVersion>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- <version>${specificHadoopVersion}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-mapreduce-client-common</artifactId>
- <version>${specificHadoopVersion}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-mapreduce-client-core</artifactId>
- <version>${specificHadoopVersion}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
- <version>1.8.2</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <version>1.8.2</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
</project>
Modified: incubator/mrunit/branches/mrunit-0.9/src/main/assembly/bin-assembly.xml
URL: http://svn.apache.org/viewvc/incubator/mrunit/branches/mrunit-0.9/src/main/assembly/bin-assembly.xml?rev=1326230&r1=1326229&r2=1326230&view=diff
==============================================================================
--- incubator/mrunit/branches/mrunit-0.9/src/main/assembly/bin-assembly.xml (original)
+++ incubator/mrunit/branches/mrunit-0.9/src/main/assembly/bin-assembly.xml Sat Apr 14 23:28:47 2012
@@ -23,8 +23,6 @@
<id>bin</id>
- <baseDirectory>${project.build.finalName}-${envClassifier}</baseDirectory>
-
<formats>
<format>tar.gz</format>
</formats>
@@ -45,7 +43,7 @@
<directory>${project.build.directory}</directory>
<outputDirectory>lib</outputDirectory>
<includes>
- <include>${project.build.finalName}-${envClassifier}.jar</include>
+ <include>*hadoop*.jar</include>
</includes>
</fileSet>
</fileSets>
@@ -53,11 +51,6 @@
<dependencySets>
<dependencySet>
<outputDirectory>lib</outputDirectory>
- <!-- assembly plugin throws exception on target/classes folder is not
- a file if dont exclude itself -->
- <excludes>
- <exclude>org.apache.mrunit:mrunit</exclude>
- </excludes>
</dependencySet>
</dependencySets>
</assembly>