Fixes BLUR-123 BLUR-121.
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/091f507a Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/091f507a Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/091f507a Branch: refs/heads/master Commit: 091f507a0ba4b42866dc3631fef9282fad6dde71 Parents: b0e2664 Author: Aaron McCurry <[email protected]> Authored: Thu Jun 6 16:26:31 2013 -0400 Committer: Aaron McCurry <[email protected]> Committed: Thu Jun 6 16:26:31 2013 -0400 ---------------------------------------------------------------------- blur-core/pom.xml | 2 +- blur-gui/pom.xml | 2 +- blur-jdbc/pom.xml | 2 +- blur-mapred/pom.xml | 2 +- blur-query/pom.xml | 2 +- blur-shell/pom.xml | 2 +- blur-store/pom.xml | 2 +- blur-thrift/pom.xml | 2 +- blur-util/pom.xml | 2 +- distribution/pom.xml | 3 ++- distribution/src/assemble/bin.xml | 1 + distribution/src/assemble/src.xml | 20 ++++++++++++++++++++ pom.xml | 32 +++++++++++++++++++++++++++++++- 13 files changed, 63 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/091f507a/blur-core/pom.xml ---------------------------------------------------------------------- diff --git a/blur-core/pom.xml b/blur-core/pom.xml index 1dc7d7e..620e7d3 100644 --- a/blur-core/pom.xml +++ b/blur-core/pom.xml @@ -23,7 +23,7 @@ under the License. <parent> <groupId>org.apache.blur</groupId> <artifactId>blur</artifactId> - <version>0.1.5</version> + <version>0.1.5-incubating</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.blur</groupId> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/091f507a/blur-gui/pom.xml ---------------------------------------------------------------------- diff --git a/blur-gui/pom.xml b/blur-gui/pom.xml index 8e2b3ce..9a429c8 100644 --- a/blur-gui/pom.xml +++ b/blur-gui/pom.xml @@ -15,7 +15,7 @@ <parent> <groupId>org.apache.blur</groupId> <artifactId>blur</artifactId> - <version>0.1.5</version> + <version>0.1.5-incubating</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.blur</groupId> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/091f507a/blur-jdbc/pom.xml ---------------------------------------------------------------------- diff --git a/blur-jdbc/pom.xml b/blur-jdbc/pom.xml index 1830533..46e4b1f 100644 --- a/blur-jdbc/pom.xml +++ b/blur-jdbc/pom.xml @@ -14,7 +14,7 @@ <parent> <groupId>org.apache.blur</groupId> <artifactId>blur</artifactId> - <version>0.1.5</version> + <version>0.1.5-incubating</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/091f507a/blur-mapred/pom.xml ---------------------------------------------------------------------- diff --git a/blur-mapred/pom.xml b/blur-mapred/pom.xml index 5e09359..808d5c0 100644 --- a/blur-mapred/pom.xml +++ b/blur-mapred/pom.xml @@ -15,7 +15,7 @@ <parent> <groupId>org.apache.blur</groupId> <artifactId>blur</artifactId> - <version>0.1.5</version> + <version>0.1.5-incubating</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.blur</groupId> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/091f507a/blur-query/pom.xml ---------------------------------------------------------------------- diff --git a/blur-query/pom.xml b/blur-query/pom.xml index ca48a51..8fe2bc7 100644 --- a/blur-query/pom.xml +++ b/blur-query/pom.xml @@ -23,7 +23,7 @@ under the License. <parent> <groupId>org.apache.blur</groupId> <artifactId>blur</artifactId> - <version>0.1.5</version> + <version>0.1.5-incubating</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.blur</groupId> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/091f507a/blur-shell/pom.xml ---------------------------------------------------------------------- diff --git a/blur-shell/pom.xml b/blur-shell/pom.xml index 37f90eb..5d3cc92 100644 --- a/blur-shell/pom.xml +++ b/blur-shell/pom.xml @@ -23,7 +23,7 @@ under the License. <parent> <groupId>org.apache.blur</groupId> <artifactId>blur</artifactId> - <version>0.1.5</version> + <version>0.1.5-incubating</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.blur</groupId> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/091f507a/blur-store/pom.xml ---------------------------------------------------------------------- diff --git a/blur-store/pom.xml b/blur-store/pom.xml index a6702b5..e1c8134 100644 --- a/blur-store/pom.xml +++ b/blur-store/pom.xml @@ -23,7 +23,7 @@ under the License. <parent> <groupId>org.apache.blur</groupId> <artifactId>blur</artifactId> - <version>0.1.5</version> + <version>0.1.5-incubating</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.blur</groupId> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/091f507a/blur-thrift/pom.xml ---------------------------------------------------------------------- diff --git a/blur-thrift/pom.xml b/blur-thrift/pom.xml index 58c7a96..53703be 100644 --- a/blur-thrift/pom.xml +++ b/blur-thrift/pom.xml @@ -15,7 +15,7 @@ <parent> <groupId>org.apache.blur</groupId> <artifactId>blur</artifactId> - <version>0.1.5</version> + <version>0.1.5-incubating</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.blur</groupId> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/091f507a/blur-util/pom.xml ---------------------------------------------------------------------- diff --git a/blur-util/pom.xml b/blur-util/pom.xml index 2940d79..c5b4eb6 100644 --- a/blur-util/pom.xml +++ b/blur-util/pom.xml @@ -15,7 +15,7 @@ <parent> <groupId>org.apache.blur</groupId> <artifactId>blur</artifactId> - <version>0.1.5</version> + <version>0.1.5-incubating</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.blur</groupId> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/091f507a/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/pom.xml b/distribution/pom.xml index e52fa2a..a26bf92 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.apache.blur</groupId> <artifactId>blur</artifactId> - <version>0.1.5</version> + <version>0.1.5-incubating</version> <relativePath>../pom.xml</relativePath> </parent> @@ -43,6 +43,7 @@ <configuration> <descriptors> <descriptor>src/assemble/bin.xml</descriptor> + <descriptor>src/assemble/src.xml</descriptor> </descriptors> </configuration> </execution> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/091f507a/distribution/src/assemble/bin.xml ---------------------------------------------------------------------- diff --git a/distribution/src/assemble/bin.xml b/distribution/src/assemble/bin.xml index 4b266fe..319727b 100644 --- a/distribution/src/assemble/bin.xml +++ b/distribution/src/assemble/bin.xml @@ -4,6 +4,7 @@ <id>bin</id> <formats> <format>tar.gz</format> + <format>zip</format> </formats> <includeBaseDirectory>false</includeBaseDirectory> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/091f507a/distribution/src/assemble/src.xml ---------------------------------------------------------------------- diff --git a/distribution/src/assemble/src.xml b/distribution/src/assemble/src.xml new file mode 100644 index 0000000..b677b3c --- /dev/null +++ b/distribution/src/assemble/src.xml @@ -0,0 +1,20 @@ +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd";> + <id>src</id> + <formats> + <format>tar.gz</format> + <format>zip</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <fileSets> + <fileSet> + <directory>${project.parent.basedir}</directory> + <outputDirectory>apache-blur-${project.version}</outputDirectory> + <excludes> + <exclude>**/.empty</exclude> + <exclude>**/target/**</exclude> + </excludes> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/091f507a/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index d0a92f7..e0ddeb8 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ under the License. <groupId>org.apache.blur</groupId> <artifactId>blur</artifactId> - <version>0.1.5</version> + <version>0.1.5-incubating</version> <packaging>pom</packaging> <name>Blur</name> @@ -176,6 +176,36 @@ 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>
