build updates for assembly
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/ce71b725 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/ce71b725 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/ce71b725 Branch: refs/heads/apache-blur-0.2 Commit: ce71b7251cadddd990dcdf1fb9c3b033636fad83 Parents: e9e6e00 Author: chrisrohr <[email protected]> Authored: Tue May 20 19:02:13 2014 +0000 Committer: chrisrohr <[email protected]> Committed: Tue May 20 19:02:13 2014 +0000 ---------------------------------------------------------------------- contrib/blur-console/pom.xml | 16 +++----------- contrib/blur-console/src/assemble/bin.xml | 30 ++++++++++++++++++++++++++ pom.xml | 3 ++- 3 files changed, 35 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/ce71b725/contrib/blur-console/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/blur-console/pom.xml b/contrib/blur-console/pom.xml index e3f22d5..574cf71 100644 --- a/contrib/blur-console/pom.xml +++ b/contrib/blur-console/pom.xml @@ -28,21 +28,11 @@ <name>Blur Console</name> <properties> - <!-- Default Jetty Configuration Properties --> - <jetty-version>9.2.0.M1</jetty-version> - <jetty.port>2880</jetty.port> - <jetty.maxIdleTime>60000</jetty.maxIdleTime> - - <!-- Library Versions --> - <jersey-version>2.8</jersey-version> - <atmosphere-version>0.8.5</atmosphere-version> - <!-- Grunt Execution Target. Valid values are [ development | production ] --> <grunt.target>development</grunt.target> <!-- Maven Plugin Versions --> <plugin.maven.exec.version>1.2.1</plugin.maven.exec.version> - <plugin.maven.war.version>2.4</plugin.maven.war.version> </properties> <dependencies> @@ -150,9 +140,9 @@ <mainClass>org.apache.blur.console.Main</mainClass> </manifest> </archive> - <descriptorRefs> - <descriptorRef>jar-with-dependencies</descriptorRef> - </descriptorRefs> + <descriptors> + <descriptor>src/assemble/bin.xml</descriptor> + </descriptors> </configuration> <executions> <execution> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/ce71b725/contrib/blur-console/src/assemble/bin.xml ---------------------------------------------------------------------- diff --git a/contrib/blur-console/src/assemble/bin.xml b/contrib/blur-console/src/assemble/bin.xml index aaedf12..8b7ce78 100644 --- a/contrib/blur-console/src/assemble/bin.xml +++ b/contrib/blur-console/src/assemble/bin.xml @@ -19,4 +19,34 @@ under the License. <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>bin</id> + <formats> + <format>jar</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <dependencySets> + <dependencySet> + <unpack>true</unpack> + <useTransitiveDependencies>true</useTransitiveDependencies> + <includes> + <include>org.apache.blur:blur-thrift</include> + <include>org.apache.blur:blur-core</include> + <include>org.codehaus.jackson:*</include> + </includes> + </dependencySet> + </dependencySets> + <fileSets> + <fileSet> + <directory>target/classes</directory> + <outputDirectory></outputDirectory> + </fileSet> + <fileSet> + <directory>src/main/webapp</directory> + <outputDirectory>webapp</outputDirectory> + <!-- Remove unneccessary web files --> + <excludes> + + </excludes> + </fileSet> + </fileSets> </assembly> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/ce71b725/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index ad4ff24..adb0828 100644 --- a/pom.xml +++ b/pom.xml @@ -235,7 +235,8 @@ under the License. <exclude>**/.idea/**</exclude> <exclude>**/*.iml</exclude> <exclude>**/target/**</exclude> - <exclude>**/build/**</exclude> + <exclude>**/build/**</exclude> + <exclude>**/.codio</exclude> <!-- These javascript libs are added at build time but are not included in the src --> <exclude>**/src/main/webapp/libs/**</exclude>
