Permalink
Browse files

Neaten up building the dependency zip file

git-svn-id: https://fourtwosix.jira.com/svn/TXPETE/trunk@13240 e6edf6fb-f266-4316-afb4-e53d95876a76
  • Loading branch information...
1 parent cc03175 commit 1f56935135435d647db2079204770effa2e55cf6 bmargulies committed Jun 30, 2011
Showing with 28 additions and 63 deletions.
  1. +2 −23 pipeline/pom.xml
  2. +0 −40 pipeline/src/main/assembly/job.xml
  3. +26 −0 pipeline/src/main/assembly/lib.xml
View
@@ -19,26 +19,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2.1</version>
- <executions>
- <execution>
- <id>job</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <finalName>sleuthkit-pipeline-r${timestamp}</finalName>
- <descriptors>
- <descriptor>src/main/assembly/job.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>1.4</version>
<executions>
@@ -100,7 +80,7 @@
</dependencies>
<profiles>
<profile>
- <id>release</id>
+ <id>dependency-package</id>
<build>
<plugins>
<plugin>
@@ -115,9 +95,8 @@
<goal>single</goal>
</goals>
<configuration>
- <finalName>${project.build.finalName}</finalName>
<descriptors>
- <descriptor>src/main/assembly/job.xml</descriptor>
+ <descriptor>src/main/assembly/lib.xml</descriptor>
</descriptors>
</configuration>
</execution>
@@ -1,40 +0,0 @@
-<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>libs</id>
- <formats>
- <format>zip</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <!-- <dependencySet>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <outputDirectory>lib</outputDirectory>
- <excludes>
- <exclude>org.sleuthkit:sleuthkit-clustering</exclude>
- <exclude>org.sleuthkit:sleuthkit-textextraction</exclude>
- <exclude>org.sleuthkit:sleuthkit-grep</exclude>
- <exclude>org.sleuthkit:sleuthkit-pipeline</exclude>
- <exclude>org.sleuthkit:sleuthkit-core</exclude>
- <exclude>org.sleuthkit:sleuthkit-crossdrive-scoring</exclude>
- <exclude>org.apache.mahout.hbase:hbase:jar:0.20.0</exclude>
- </excludes>
- </dependencySet> -->
- <dependencySet>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <outputDirectory>/</outputDirectory>
- <excludes>
- <exclude>org.apache.mahout.hbase:hbase</exclude>
- <exclude>org.sleuthkit:sleuthkit-clustering</exclude>
- <exclude>org.sleuthkit:sleuthkit-textextraction</exclude>
- <exclude>org.sleuthkit:sleuthkit-grep</exclude>
- <exclude>org.sleuthkit:sleuthkit-pipeline</exclude>
- <exclude>org.sleuthkit:sleuthkit-core</exclude>
- <exclude>org.sleuthkit:sleuthkit-crossdrive-scoring</exclude>
- </excludes>
- </dependencySet>
- </dependencySets>
-</assembly>
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<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">
+ <!-- pack up all the dependencies into a jar for convenience in installing into the distributed
+ cache or whatever -->
+ <id>libs</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ <outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>org.apache.mahout.hbase:hbase</exclude>
+ <exclude>org.sleuthkit:sleuthkit-clustering</exclude>
+ <exclude>org.sleuthkit:sleuthkit-textextraction</exclude>
+ <exclude>org.sleuthkit:sleuthkit-grep</exclude>
+ <exclude>org.sleuthkit:sleuthkit-pipeline</exclude>
+ <exclude>org.sleuthkit:sleuthkit-core</exclude>
+ <exclude>org.sleuthkit:sleuthkit-crossdrive-scoring</exclude>
+ </excludes>
+ </dependencySet>
+ </dependencySets>
+</assembly>

0 comments on commit 1f56935

Please sign in to comment.