Author: lhazlewood
Date: Tue Mar 29 19:10:59 2011
New Revision: 1086684
URL: http://svn.apache.org/viewvc?rev=1086684&view=rev
Log:
SHIRO-279: simple assembly fix
Added:
shiro/trunk/tools/hasher/src/main/assembly/
shiro/trunk/tools/hasher/src/main/assembly/cli.assembly.xml
Modified:
shiro/trunk/tools/hasher/pom.xml
Modified: shiro/trunk/tools/hasher/pom.xml
URL:
http://svn.apache.org/viewvc/shiro/trunk/tools/hasher/pom.xml?rev=1086684&r1=1086683&r2=1086684&view=diff
==============================================================================
--- shiro/trunk/tools/hasher/pom.xml (original)
+++ shiro/trunk/tools/hasher/pom.xml Tue Mar 29 19:10:59 2011
@@ -62,13 +62,9 @@
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2.1</version>
<configuration>
- <descriptorRefs>
- <descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
- <!-- use the default artifact name, overwriting the
original. This is only
- for Command Line use and won't be referenced as a
library: -->
-
<finalName>${project.artifactId}-${project.version}-cli</finalName>
- <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+
<descriptor>src/main/assembly/cli.assembly.xml</descriptor>
+ </descriptors>
<archive>
<manifest>
<mainClass>org.apache.shiro.tools.hasher.Hasher</mainClass>
@@ -77,9 +73,7 @@
</configuration>
<executions>
<execution>
- <!-- this is used for inheritance merges: -->
<id>make-assembly</id>
- <!-- bind to the packaging phase: -->
<phase>package</phase>
<goals>
<goal>single</goal>
Added: shiro/trunk/tools/hasher/src/main/assembly/cli.assembly.xml
URL:
http://svn.apache.org/viewvc/shiro/trunk/tools/hasher/src/main/assembly/cli.assembly.xml?rev=1086684&view=auto
==============================================================================
--- shiro/trunk/tools/hasher/src/main/assembly/cli.assembly.xml (added)
+++ shiro/trunk/tools/hasher/src/main/assembly/cli.assembly.xml Tue Mar 29
19:10:59 2011
@@ -0,0 +1,17 @@
+<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+ <id>cli</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>/</outputDirectory>
+ <useProjectArtifact>true</useProjectArtifact>
+ <unpack>true</unpack>
+ <scope>runtime</scope>
+ </dependencySet>
+ </dependencySets>
+</assembly>
\ No newline at end of file
