Author: veithen
Date: Tue Dec 8 20:16:15 2015
New Revision: 1718689
URL: http://svn.apache.org/viewvc?rev=1718689&view=rev
Log:
Merge r1718683 to the 1.6 branch.
Modified:
axis/axis2/java/rampart/branches/1_6/ (props changed)
axis/axis2/java/rampart/branches/1_6/modules/distribution/bin.xml
axis/axis2/java/rampart/branches/1_6/pom.xml
Propchange: axis/axis2/java/rampart/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 8 20:16:15 2015
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk:1072266-1072267,1072300,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075683-1075684,1083686,1087998,1088013,1088558,1088571,1089599,1090533,1090540,1090570,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683,1137396,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175271,1175324,1177260,1177279,1177413,1178193,1180718,1186491,1190533,1190600,1194848,1194994,1220915,1221926,1221937,1221940,1222136,1222418,1235059,1240337,1240373,1299342,1299389-1299390,1303198,1327863,1327890,1327893,1329145-1329146,1330675,1330682,1330695,1338876,1350592,1353719,1355738,1357818,1377230,1383060,1409175,1455319,1455337,1455697,1456067,1470135,1478156,1479069-1479070,1479160,1479183,1479188,1479299,1566329,1610243,1610817,1611122,1612072,1612138,1718154,1718156-1718157,1718159-1718160,1718174-1718175,1718198,1718225,1718231-1718232,1718682
+/axis/axis2/java/rampart/trunk:1072266-1072267,1072300,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075683-1075684,1083686,1087998,1088013,1088558,1088571,1089599,1090533,1090540,1090570,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683,1137396,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175271,1175324,1177260,1177279,1177413,1178193,1180718,1186491,1190533,1190600,1194848,1194994,1220915,1221926,1221937,1221940,1222136,1222418,1235059,1240337,1240373,1299342,1299389-1299390,1303198,1327863,1327890,1327893,1329145-1329146,1330675,1330682,1330695,1338876,1350592,1353719,1355738,1357818,1377230,1383060,1409175,1455319,1455337,1455697,1456067,1470135,1478156,1479069-1479070,1479160,1479183,1479188,1479299,1566329,1610243,1610817,1611122,1612072,1612138,1718154,1718156-1718157,1718159-1718160,1718174-1718175,1718198,1718225,1718231-1718232,1718682-1718683
Modified: axis/axis2/java/rampart/branches/1_6/modules/distribution/bin.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/distribution/bin.xml?rev=1718689&r1=1718688&r2=1718689&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/distribution/bin.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/distribution/bin.xml Tue Dec
8 20:16:15 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>opensaml:opensaml:jar</include>
@@ -39,7 +39,7 @@
</includes>
</dependencySet>
<dependencySet>
- <outputDirectory>${dist.dir}/docs/apidocs</outputDirectory>
+ <outputDirectory>docs/apidocs</outputDirectory>
<includes>
<include>*:apidocs:zip:javadoc</include>
</includes>
@@ -50,34 +50,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/branches/1_6/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/pom.xml?rev=1718689&r1=1718688&r2=1718689&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/pom.xml Tue Dec 8 20:16:15 2015
@@ -549,8 +549,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>
