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/11 21:50:54 UTC
svn commit: r1719549 - in /axis/axis2/java/rampart/branches/1_6: ./ LICENSE
NOTICE README modules/distribution/bin.xml modules/distribution/src.xml
modules/distribution/src/ release-docs/
Author: veithen
Date: Fri Dec 11 20:50:54 2015
New Revision: 1719549
URL: http://svn.apache.org/viewvc?rev=1719549&view=rev
Log:
Merge latest release process fixes to the 1.6 branch; in particular, fix RAMPART-367.
Added:
axis/axis2/java/rampart/branches/1_6/LICENSE
- copied unchanged from r1719525, axis/axis2/java/rampart/trunk/LICENSE
axis/axis2/java/rampart/branches/1_6/NOTICE
- copied unchanged from r1719525, axis/axis2/java/rampart/trunk/NOTICE
axis/axis2/java/rampart/branches/1_6/README
- copied unchanged from r1719525, axis/axis2/java/rampart/trunk/README
axis/axis2/java/rampart/branches/1_6/modules/distribution/src/
- copied from r1719538, axis/axis2/java/rampart/trunk/modules/distribution/src/
Removed:
axis/axis2/java/rampart/branches/1_6/release-docs/
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/modules/distribution/src.xml
Propchange: axis/axis2/java/rampart/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 11 20:50:54 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-1718683,1718937,1718941,1719191,1719197,1719227,1719229,1719232,171923
6-1719237
+/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,1718937,1718941,1719191,1719197,1719227,1719229,1719232,171923
6-1719237,1719502,1719522,1719525,1719538
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=1719549&r1=1719548&r2=1719549&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 Fri Dec 11 20:50:54 2015
@@ -60,21 +60,22 @@
<directory>../../legal</directory>
<outputDirectory>lib</outputDirectory>
</fileSet>
+ <fileSet>
+ <directory>src/main/files</directory>
+ <outputDirectory>.</outputDirectory>
+ </fileSet>
</fileSets>
<files>
<file>
- <source>../../release-docs/README.txt</source>
- <destName>README</destName>
+ <source>../../README</source>
<filtered>true</filtered>
</file>
<file>
- <source>../../release-docs/LICENSE.txt</source>
- <destName>LICENSE</destName>
+ <source>../../LICENSE</source>
</file>
<file>
- <source>../../release-docs/NOTICE.txt</source>
- <destName>NOTICE</destName>
+ <source>../../NOTICE</source>
</file>
<file>
<source>../../src/site/markdown/release-notes/${release_version}.md</source>
Modified: axis/axis2/java/rampart/branches/1_6/modules/distribution/src.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/distribution/src.xml?rev=1719549&r1=1719548&r2=1719549&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/distribution/src.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/distribution/src.xml Fri Dec 11 20:50:54 2015
@@ -1,6 +1,6 @@
<assembly>
<id>src</id>
- <includeBaseDirectory>false</includeBaseDirectory>
+ <baseDirectory>rampart-src-${project.version}</baseDirectory>
<formats>
<format>zip</format>
</formats>
@@ -8,7 +8,6 @@
<fileSets>
<fileSet>
<directory>../..</directory>
- <outputDirectory>rampart-src-${project.version}</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<excludes>
<!-- build output -->
@@ -46,21 +45,18 @@
<!-- release-plugin temp files -->
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?pom\.xml\.releaseBackup]</exclude>
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?release\.properties]</exclude>
+
+ <exclude>README</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>
<files>
<file>
+ <source>../../README</source>
+ <filtered>true</filtered>
+ </file>
+ <file>
<source>../../src/site/markdown/release-notes/${release_version}.md</source>
- <outputDirectory>rampart-src-${project.version}</outputDirectory>
<destName>RELEASE-NOTE</destName>
</file>
</files>