You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2015/12/08 20:55:08 UTC
svn commit: r1718683 - in /axis/axis2/java/rampart/trunk:
modules/distribution/bin.xml pom.xml
Author: veithen
Date: Tue Dec 8 19:55:07 2015
New Revision: 1718683
URL: http://svn.apache.org/viewvc?rev=1718683&view=rev
Log:
Use baseDirectory.
Modified:
axis/axis2/java/rampart/trunk/modules/distribution/bin.xml
axis/axis2/java/rampart/trunk/pom.xml
Modified: axis/axis2/java/rampart/trunk/modules/distribution/bin.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/distribution/bin.xml?rev=1718683&r1=1718682&r2=1718683&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/distribution/bin.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/distribution/bin.xml Tue Dec 8 19:55:07 2015
@@ -1,19 +1,19 @@
<assembly>
<id>bin</id>
- <includeBaseDirectory>false</includeBaseDirectory>
+ <baseDirectory>rampart-${version}</baseDirectory>
<formats>
<format>zip</format>
</formats>
<dependencySets>
<dependencySet>
- <outputDirectory>${dist.dir}/modules</outputDirectory>
+ <outputDirectory>modules</outputDirectory>
<includes>
<include>org.apache.rampart:rampart:mar</include>
<include>org.apache.rampart:rahas:mar</include>
</includes>
</dependencySet>
<dependencySet>
- <outputDirectory>${dist.dir}/lib</outputDirectory>
+ <outputDirectory>lib</outputDirectory>
<includes>
<include>org.apache.santuario:xmlsec:jar</include>
<include>org.apache.ws.security:wss4j:jar</include>
@@ -38,7 +38,7 @@
</includes>
</dependencySet>
<dependencySet>
- <outputDirectory>${dist.dir}/docs/apidocs</outputDirectory>
+ <outputDirectory>docs/apidocs</outputDirectory>
<includes>
<include>*:apidocs:zip:javadoc</include>
</includes>
@@ -49,34 +49,30 @@
<fileSets>
<fileSet>
<directory>../rampart-samples</directory>
- <outputDirectory>${dist.dir}/samples</outputDirectory>
+ <outputDirectory>samples</outputDirectory>
</fileSet>
<fileSet>
<directory>../../legal</directory>
- <outputDirectory>${dist.dir}/lib</outputDirectory>
+ <outputDirectory>lib</outputDirectory>
</fileSet>
</fileSets>
<files>
<file>
<source>../../release-docs/README.txt</source>
- <outputDirectory>${dist.dir}</outputDirectory>
<destName>README</destName>
<filtered>true</filtered>
</file>
<file>
<source>../../release-docs/LICENSE.txt</source>
- <outputDirectory>${dist.dir}</outputDirectory>
<destName>LICENSE</destName>
</file>
<file>
<source>../../release-docs/NOTICE.txt</source>
- <outputDirectory>${dist.dir}</outputDirectory>
<destName>NOTICE</destName>
</file>
<file>
<source>../../src/site/markdown/release-notes/${release_version}.md</source>
- <outputDirectory>${dist.dir}</outputDirectory>
<destName>RELEASE-NOTE</destName>
</file>
</files>
Modified: axis/axis2/java/rampart/trunk/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/pom.xml?rev=1718683&r1=1718682&r2=1718683&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/pom.xml Tue Dec 8 19:55:07 2015
@@ -545,8 +545,6 @@
<bcprov.jdk15.version>1.49</bcprov.jdk15.version>
- <!-- distribution properties -->
- <dist.dir>rampart-${project.version}</dist.dir>
<failIfNoTests>false</failIfNoTests>
<jacoco.version>0.6.1.201212231917</jacoco.version>