Author: [email protected]
Date: Mon Aug 8 11:18:25 2011
New Revision: 1280
Log:
[AMDATUAUTH-83] Fixed resource filtering by upgrade of assembly plugin
Modified:
trunk/amdatu-auth/release/pom.xml
trunk/amdatu-auth/release/src/main/assembly/bin-component.xml
trunk/amdatu-auth/release/src/main/assembly/bin-release.xml
trunk/amdatu-auth/release/src/main/assembly/src-release.xml
Modified: trunk/amdatu-auth/release/pom.xml
==============================================================================
--- trunk/amdatu-auth/release/pom.xml (original)
+++ trunk/amdatu-auth/release/pom.xml Mon Aug 8 11:18:25 2011
@@ -108,6 +108,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2.1</version>
<executions>
<execution>
<id>create-release</id>
Modified: trunk/amdatu-auth/release/src/main/assembly/bin-component.xml
==============================================================================
--- trunk/amdatu-auth/release/src/main/assembly/bin-component.xml
(original)
+++ trunk/amdatu-auth/release/src/main/assembly/bin-component.xml Mon Aug
8 11:18:25 2011
@@ -38,6 +38,7 @@
<dependencySet>
<outputDirectory>conf</outputDirectory>
+ <outputFileNameMapping></outputFileNameMapping>
<includes>
<include>org.amdatu.auth:org.amdatu.auth.config</include>
</includes>
Modified: trunk/amdatu-auth/release/src/main/assembly/bin-release.xml
==============================================================================
--- trunk/amdatu-auth/release/src/main/assembly/bin-release.xml (original)
+++ trunk/amdatu-auth/release/src/main/assembly/bin-release.xml Mon Aug 8
11:18:25 2011
@@ -24,7 +24,7 @@
<format>zip</format>
</formats>
<baseDirectory>amdatu-auth-${project.version}</baseDirectory>
- <includeBaseDirectory>true</includeBaseDirectory> <!-- strip the module
prefixes -->
+ <includeBaseDirectory>false</includeBaseDirectory> <!-- strip the module
prefixes -->
<componentDescriptors>
<componentDescriptor>src/main/assembly/bin-component.xml</componentDescriptor>
Modified: trunk/amdatu-auth/release/src/main/assembly/src-release.xml
==============================================================================
--- trunk/amdatu-auth/release/src/main/assembly/src-release.xml (original)
+++ trunk/amdatu-auth/release/src/main/assembly/src-release.xml Mon Aug 8
11:18:25 2011
@@ -23,25 +23,23 @@
<format>tar.gz</format>
<format>zip</format>
</formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
- <sources>
- <outputDirectory>src</outputDirectory>
- <fileSets>
- <fileSet>
- <directory>..</directory>
- <outputDirectory>src</outputDirectory>
- <excludes>
- <exclude>**/target/**</exclude>
- <exclude>**/.settings/**</exclude>
- <exclude>**/.classpath</exclude>
- <exclude>**/.project</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>src/main/resources</directory>
- <outputDirectory></outputDirectory>
- </fileSet>
- </fileSets>
- </sources>
+ <fileSets>
+ <fileSet>
+ <directory>..</directory>
+ <outputDirectory>src</outputDirectory>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ <exclude>**/.settings/**</exclude>
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/resources</directory>
+ <outputDirectory></outputDirectory>
+ </fileSet>
+ </fileSets>
</assembly>
\ No newline at end of file
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
