Changes to console pom to get the build to work correctly and adding a build script to help build all artifacts correctly.
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/6a5f5b72 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/6a5f5b72 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/6a5f5b72 Branch: refs/heads/apache-blur-0.2 Commit: 6a5f5b72690a7abfb35d5c58dae9b2355d41a439 Parents: 480df91 Author: Aaron McCurry <[email protected]> Authored: Sat Jul 12 20:48:03 2014 -0400 Committer: Aaron McCurry <[email protected]> Committed: Sat Jul 12 20:48:03 2014 -0400 ---------------------------------------------------------------------- blur-console/pom.xml | 45 +++++++++++++++++++++++---------------------- build_release.sh | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/6a5f5b72/blur-console/pom.xml ---------------------------------------------------------------------- diff --git a/blur-console/pom.xml b/blur-console/pom.xml index e7b7c0f..352703e 100644 --- a/blur-console/pom.xml +++ b/blur-console/pom.xml @@ -129,6 +129,28 @@ </execution> </executions> </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <archive> + <manifest> + <mainClass>org.apache.blur.console.Main</mainClass> + </manifest> + </archive> + <descriptors> + <descriptor>src/assemble/webapp.xml</descriptor> + </descriptors> + </configuration> + <executions> + <execution> + <id>make-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> @@ -190,28 +212,7 @@ <target>1.6</target> </configuration> </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <archive> - <manifest> - <mainClass>org.apache.blur.console.Main</mainClass> - </manifest> - </archive> - <descriptors> - <descriptor>src/assemble/webapp.xml</descriptor> - </descriptors> - </configuration> - <executions> - <execution> - <id>make-assembly</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/6a5f5b72/build_release.sh ---------------------------------------------------------------------- diff --git a/build_release.sh b/build_release.sh new file mode 100755 index 0000000..202e5fc --- /dev/null +++ b/build_release.sh @@ -0,0 +1,35 @@ +#!/usr/bin/env bash + +# 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. + +if [ -z "$1" ]; then + echo "No output directory specified." +fi +OUTPUT_DIR=$1 +mvn clean -Dhadoop1 +mvn install -Dhadoop1 -Djava.awt.headless=true +mvn site -Ddependency.locations.enabled=false -DskipTests -Dhadoop1 -Djava.awt.headless=true +mvn site:stage -DskipTests -Dhadoop1 -Djava.awt.headless=true +mvn package -DskipTests -Dhadoop1 -Djava.awt.headless=true +cp distribution/target/*-bin.tar.gz $OUTPUT_DIR +cp distribution/target/*-src.tar.gz $OUTPUT_DIR + +mvn clean -Dhadoop2 +mvn install -Dhadoop2 -Djava.awt.headless=true +mvn site -Ddependency.locations.enabled=false -DskipTests -Dhadoop2 -Djava.awt.headless=true +mvn site:stage -DskipTests -Dhadoop2 -Djava.awt.headless=true +mvn package -DskipTests -Dhadoop2 -Djava.awt.headless=true +cp distribution/target/*-bin.tar.gz $OUTPUT_DIR \ No newline at end of file
