This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch 1_5_x in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit da94a7de268bb9cda46315ce55db7f0c614a6d42 Author: Andreas Veithen <veit...@apache.org> AuthorDate: Wed Oct 19 21:14:49 2011 +0000 Merged r1186491 to the 1.5 branch. --- modules/distribution/bin.xml | 1 + modules/distribution/pom.xml | 21 +++++++++++++++++++++ modules/distribution/src.xml | 9 +++++++++ release-docs/README.txt | 6 +++--- 4 files changed, 34 insertions(+), 3 deletions(-) diff --git a/modules/distribution/bin.xml b/modules/distribution/bin.xml index 2a075a7..bc32fdf 100644 --- a/modules/distribution/bin.xml +++ b/modules/distribution/bin.xml @@ -59,6 +59,7 @@ <source>../../release-docs/README.txt</source> <outputDirectory>${dist.dir}</outputDirectory> <destName>README</destName> + <filtered>true</filtered> </file> <file> <source>../../release-docs/LICENSE.txt</source> diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 0da00fd..3f5b5bc 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -69,6 +69,27 @@ </executions> </plugin> <plugin> + <groupId>org.codehaus.gmaven</groupId> + <artifactId>gmaven-plugin</artifactId> + <version>1.2</version> + <executions> + <execution> + <id>generate-timestamp</id> + <phase>prepare-package</phase> + <goals> + <goal>execute</goal> + </goals> + <configuration> + <source> + import java.util.Date + import java.text.MessageFormat + project.properties['buildTimestamp'] = MessageFormat.format("{0,date,MMM dd, yyyy}", new Date()) + </source> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> <executions> diff --git a/modules/distribution/src.xml b/modules/distribution/src.xml index b4802d7..9c3575c 100644 --- a/modules/distribution/src.xml +++ b/modules/distribution/src.xml @@ -28,7 +28,16 @@ <exclude>**/.settings</exclude> <exclude>**/.settings/**/*</exclude> <exclude>**/.svn/**</exclude> + <exclude>release-docs/README.txt</exclude> </excludes> </fileSet> + <fileSet> + <directory>../..</directory> + <outputDirectory>rampart-src-${project.version}</outputDirectory> + <filtered>true</filtered> + <includes> + <include>release-docs/README.txt</include> + </includes> + </fileSet> </fileSets> </assembly> diff --git a/release-docs/README.txt b/release-docs/README.txt index 27acc24..b79bbb9 100644 --- a/release-docs/README.txt +++ b/release-docs/README.txt @@ -1,5 +1,5 @@ ====================================================== -Apache Rampart-1.5.1 build (Jan 04, 2011) +Apache Rampart-${project.version} build (${buildTimestamp}) http://axis.apache.org/axis2/java/rampart ------------------------------------------------------ @@ -13,8 +13,8 @@ lib - This directory contains all the libraries required by rampart release. -rampart-1.5.1.mar - WS-Security and WS-SecureConversation support for Axis2 -rahas-1.5.1.mar - STS module - to be used to add STS operations to a service +rampart-${project.version}.mar - WS-Security and WS-SecureConversation support for Axis2 +rahas-${project.version}.mar - STS module - to be used to add STS operations to a service samples - This contains samples on using Apache Rampart and configuring different components to carryout different WS-Sec* operations.