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 20:04:40 UTC
svn commit: r1719500 - in /axis/axis2/java/rampart/branches/1_6: ./ apidocs/
code-coverage/ modules/distribution/ modules/rampart-integration/
modules/rampart-samples/ modules/rampart-tests/
Author: veithen
Date: Fri Dec 11 19:04:39 2015
New Revision: 1719500
URL: http://svn.apache.org/viewvc?rev=1719500&view=rev
Log:
Merge latest release process fixes to the 1.6 branch.
Modified:
axis/axis2/java/rampart/branches/1_6/ (props changed)
axis/axis2/java/rampart/branches/1_6/apidocs/pom.xml
axis/axis2/java/rampart/branches/1_6/code-coverage/pom.xml
axis/axis2/java/rampart/branches/1_6/modules/distribution/bin.xml
axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml
axis/axis2/java/rampart/branches/1_6/modules/distribution/src.xml
axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/pom.xml
axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/pom.xml
axis/axis2/java/rampart/branches/1_6/pom.xml
Propchange: axis/axis2/java/rampart/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 11 19:04:39 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
+/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
Modified: axis/axis2/java/rampart/branches/1_6/apidocs/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/apidocs/pom.xml?rev=1719500&r1=1719499&r2=1719500&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/apidocs/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/apidocs/pom.xml Fri Dec 11 19:04:39 2015
@@ -84,7 +84,7 @@
of changes between releases (to avoid mass changes when committing the site for a new release) -->
<notimestamp>true</notimestamp>
<windowtitle>Apache Rampart</windowtitle>
- <bottom>Copyright © {organizationName}. All Rights Reserved.</bottom>
+ <bottom><![CDATA[Copyright © {organizationName}. All Rights Reserved.]]></bottom>
<!-- doctitle only appears in the summary and we should include the version there -->
<doctitle>Apache Rampart ${project.version}</doctitle>
</configuration>
@@ -106,6 +106,12 @@
</executions>
</plugin>
<plugin>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-site-plugin</artifactId>
<executions>
<execution>
Modified: axis/axis2/java/rampart/branches/1_6/code-coverage/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/code-coverage/pom.xml?rev=1719500&r1=1719499&r2=1719500&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/code-coverage/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/code-coverage/pom.xml Fri Dec 11 19:04:39 2015
@@ -170,6 +170,12 @@
</dependencies>
</plugin>
<plugin>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-site-plugin</artifactId>
<configuration>
<skip>true</skip>
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=1719500&r1=1719499&r2=1719500&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 19:04:39 2015
@@ -51,6 +51,10 @@
<fileSet>
<directory>../rampart-samples</directory>
<outputDirectory>samples</outputDirectory>
+ <excludes>
+ <exclude>pom.xml</exclude>
+ <exclude>target/**</exclude>
+ </excludes>
</fileSet>
<fileSet>
<directory>../../legal</directory>
Modified: axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml?rev=1719500&r1=1719499&r2=1719500&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml Fri Dec 11 19:04:39 2015
@@ -90,6 +90,12 @@
</executions>
</plugin>
<plugin>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-site-plugin</artifactId>
<configuration>
<skip>true</skip>
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=1719500&r1=1719499&r2=1719500&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 19:04:39 2015
@@ -9,26 +9,43 @@
<fileSet>
<directory>../..</directory>
<outputDirectory>rampart-src-${project.version}</outputDirectory>
- <includes>
- <include>**/modules/**/*</include>
- <include>**/pom.xml</include>
- <include>src</include>
- <include>release-docs/*</include>
- </includes>
+ <useDefaultExcludes>true</useDefaultExcludes>
<excludes>
- <exclude>**/target</exclude>
- <exclude>**/target/**/*</exclude>
- <exclude>**/build</exclude>
- <exclude>**/build/**/*</exclude>
- <exclude>**/.settings</exclude>
- <exclude>**/.classpath</exclude>
- <exclude>**/.project</exclude>
- <exclude>**/.wtpmodules</exclude>
- <exclude>**/*.iml</exclude>
- <exclude>**/.settings</exclude>
- <exclude>**/.settings/**/*</exclude>
- <exclude>**/.svn/**</exclude>
- <exclude>release-docs/README.txt</exclude>
+ <!-- build output -->
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/).*${project.build.directory}.*]</exclude>
+
+ <!-- NOTE: Most of the following excludes should not be required
+ if the standard release process is followed. This is because the
+ release plugin checks out project sources into a location like
+ target/checkout, then runs the build from there. The result is
+ a source-release archive that comes from a pretty clean directory
+ structure.
+
+ HOWEVER, if the release plugin is configured to run extra goals
+ or generate a project website, it's definitely possible that some
+ of these files will be present. So, it's safer to exclude them.
+ -->
+
+ <!-- IDEs -->
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?maven-eclipse\.xml]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.project]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.classpath]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iws]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.idea(/.*)?]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?out(/.*)?]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.ipr]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iml]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.settings(/.*)?]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.externalToolBuilders(/.*)?]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.deployables(/.*)?]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.wtpmodules(/.*)?]</exclude>
+
+ <!-- misc -->
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?cobertura\.ser]</exclude>
+
+ <!-- release-plugin temp files -->
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?pom\.xml\.releaseBackup]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?release\.properties]</exclude>
</excludes>
</fileSet>
<fileSet>
Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml?rev=1719500&r1=1719499&r2=1719500&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml Fri Dec 11 19:04:39 2015
@@ -737,6 +737,12 @@
</configuration>
</plugin>
<plugin>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-site-plugin</artifactId>
<configuration>
<skip>true</skip>
Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/pom.xml?rev=1719500&r1=1719499&r2=1719500&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/pom.xml Fri Dec 11 19:04:39 2015
@@ -81,6 +81,12 @@
</executions>
</plugin>
<plugin>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-site-plugin</artifactId>
<configuration>
<skip>true</skip>
Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/pom.xml?rev=1719500&r1=1719499&r2=1719500&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/pom.xml Fri Dec 11 19:04:39 2015
@@ -56,6 +56,12 @@
</configuration>
</plugin>
<plugin>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-site-plugin</artifactId>
<configuration>
<skip>true</skip>
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=1719500&r1=1719499&r2=1719500&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/pom.xml Fri Dec 11 19:04:39 2015
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>13</version>
+ <version>17</version>
</parent>
<groupId>org.apache.rampart</groupId>