More pom updates.
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/ed04d5bb Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/ed04d5bb Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/ed04d5bb Branch: refs/heads/master Commit: ed04d5bbc4844282d6f54453975b45e6df827a9c Parents: 91a5579 Author: Aaron McCurry <[email protected]> Authored: Thu Jun 6 17:31:26 2013 -0400 Committer: Aaron McCurry <[email protected]> Committed: Thu Jun 6 17:31:26 2013 -0400 ---------------------------------------------------------------------- distribution/pom.xml | 103 +++++++++++++++++++++++++--------------------- pom.xml | 31 +------------- 2 files changed, 56 insertions(+), 78 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/ed04d5bb/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/pom.xml b/distribution/pom.xml index a26bf92..d7737f1 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -1,54 +1,61 @@ <?xml version="1.0" encoding="UTF-8"?> -<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.blur</groupId> - <artifactId>blur</artifactId> - <version>0.1.5-incubating</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>apache-blur</artifactId> +<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.blur</groupId> + <artifactId>blur</artifactId> + <version>0.1.5-incubating</version> + <relativePath>../pom.xml</relativePath> + </parent> - <packaging>pom</packaging> + <artifactId>apache-blur</artifactId> - <name>Distribution</name> + <packaging>pom</packaging> - <dependencies> - <dependency> - <groupId>org.apache.blur</groupId> - <artifactId>blur-mapred</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.blur</groupId> - <artifactId>blur-shell</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> + <name>Distribution</name> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>distro-assembly</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptors> - <descriptor>src/assemble/bin.xml</descriptor> - <descriptor>src/assemble/src.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> + <dependencies> + <dependency> + <groupId>org.apache.blur</groupId> + <artifactId>blur-mapred</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.blur</groupId> + <artifactId>blur-shell</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + + <profiles> + <profile> + <id>distribution</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>distro-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>src/assemble/bin.xml</descriptor> + <descriptor>src/assemble/src.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/ed04d5bb/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index e0ddeb8..46a90f5 100644 --- a/pom.xml +++ b/pom.xml @@ -176,36 +176,7 @@ under the License. </plugins> </build> </profile> - - <profile> - <id>distribution</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>distro-assembly</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptors> - <!--descriptor>src/assemble/bin.xml</descriptor--> - <descriptor>src/assemble/src.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - + <profile> <id>integration-test</id> <activation>
