svn commit: r1137383 - /axis/axis2/java/sandesha/trunk/src/site/xdoc/download.xml.vm
Author: veithen Date: Sun Jun 19 16:00:20 2011 New Revision: 1137383 URL: http://svn.apache.org/viewvc?rev=1137383&view=rev Log: Pushing back the changes done in r1130464 to the trunk to avoid loosing them in the next major release. Modified: axis/axis2/java/sandesha/trunk/src/site/xdoc/download.xml.vm Modified: axis/axis2/java/sandesha/trunk/src/site/xdoc/download.xml.vm URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/src/site/xdoc/download.xml.vm?rev=1137383&r1=1137382&r2=1137383&view=diff == --- axis/axis2/java/sandesha/trunk/src/site/xdoc/download.xml.vm (original) +++ axis/axis2/java/sandesha/trunk/src/site/xdoc/download.xml.vm Sun Jun 19 16:00:20 2011 @@ -40,6 +40,21 @@ the binay distribution and the source di Description Compatible Axis2 version + 1.6.0Release + Source Distribution + zip + http://www.apache.org/dist/axis/axis2/java/sandesha/1.6.0/sandesha2-1.6.0-src.zip.md5"; class="externalLink" title="http://www.apache.org/dist/axis/axis2/java/sandesha/1.6.0/sandesha2-1.6.0-src.zip.md5";>MD5 + http://www.apache.org/dist/axis/axis2/java/sandesha/1.6.0/sandesha2-1.6.0-src.zip.asc"; class="externalLink" title="http://www.apache.org/dist/axis/axis2/java/sandesha/1.6.0/sandesha2-1.6.0-src.zip.asc";>PGP + + Binary Distribution + zip + http://www.apache.org/dist/axis/axis2/java/sandesha/1.6.0/sandesha2-1.6.0-bin.zip.md5"; class="externalLink" title="http://www.apache.org/dist/axis/axis2/java/sandesha/1.6.0/sandesha2-1.6.0-bin.zip.md5";>MD5 + http://www.apache.org/dist/axis/axis2/java/sandesha/1.6.0/sandesha2-1.6.0-bin.zip.asc"; class="externalLink" title="http://www.apache.org/dist/axis/axis2/java/sandesha/1.6.0/sandesha2-1.6.0-bin.zip.asc";>PGP + +02 - Jun - 2011 +1.6.0 Release (Mirrored) +1.6.0 + 1.4Release Source Distribution zip
svn commit: r1137386 [1/3] - in /axis/axis2/java/rampart/branches/1_5_x: ./ modules/distribution/ modules/documentation/ modules/rampart-core/ modules/rampart-integration/ modules/rampart-mar/ modules
Author: veithen
Date: Sun Jun 19 16:32:22 2011
New Revision: 1137386
URL: http://svn.apache.org/viewvc?rev=1137386&view=rev
Log:
Set correct svn:eol-style on POM files on the 1.5 branch.
Modified:
axis/axis2/java/rampart/branches/1_5_x/ (props changed)
axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml
(contents, props changed)
axis/axis2/java/rampart/branches/1_5_x/modules/documentation/pom.xml
(contents, props changed)
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/pom.xml
(contents, props changed)
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml
(contents, props changed)
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml
(contents, props changed)
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-policy/pom.xml
(contents, props changed)
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-tests/pom.xml
(contents, props changed)
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml
(contents, props changed)
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust/pom.xml
(contents, props changed)
axis/axis2/java/rampart/branches/1_5_x/pom.xml (contents, props changed)
Propchange: axis/axis2/java/rampart/branches/1_5_x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jun 19 16:32:22 2011
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk:1072187,1083686,1132548,1134683
+/axis/axis2/java/rampart/trunk:1072187,1083686,1130570,1132548,1134683
Modified: axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml?rev=1137386&r1=1137385&r2=1137386&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml Sun Jun
19 16:32:22 2011
@@ -1,133 +1,133 @@
-
-
-
-
-
-http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
-
-
-org.apache.rampart
-rampart-project
-1.5.2-SNAPSHOT
-../../pom.xml
-
-4.0.0
-rampart-dist
-pom
-Rampart - Distribution
-
-
-
-
-org.apache.maven.plugins
-maven-antrun-plugin
-1.1
-
-
-build-javadoc
-package
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-run
-
-
-
-
-
-org.apache.maven.plugins
-maven-assembly-plugin
-
-
-distribution-package
-package
-
-single
-
-
-
-bin.xml
-src.xml
-
-
-
-
-
-
-
-
-
-
-org.apache.rampart
-rampart
-${project.version}
-mar
-
-
-org.apache.rampart
-rahas
-${project.version}
-mar
-
-
-org.apache.rampart
-rampart-core
-${project.version}
-
-
-org.apache.rampart
-rampart-policy
-${project.version}
-
-
-org.apache.rampart
-rampart-trust
-${project.version}
-
-
-bouncycastle
-bcprov-jdk14
-${bcprov.jdk14.version}
-
-
-bouncycastle
-bcprov-jdk15
-${bcprov.jdk15.version}
-
-
-
-
+
+
+
+
+
+http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://mav
svn commit: r1137384 - /axis/axis2/java/sandesha/branches/1_6/
Author: veithen Date: Sun Jun 19 16:01:36 2011 New Revision: 1137384 URL: http://svn.apache.org/viewvc?rev=1137384&view=rev Log: Marked r1137383 as merged to the 1.6 branch. Modified: axis/axis2/java/sandesha/branches/1_6/ (props changed) Propchange: axis/axis2/java/sandesha/branches/1_6/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Jun 19 16:01:36 2011 @@ -1 +1 @@ -/axis/axis2/java/sandesha/trunk:1081570,1098145 +/axis/axis2/java/sandesha/trunk:1081570,1098145,1137383
svn commit: r1137396 - in /axis/axis2/java/rampart/trunk/modules: rampart-mar/pom.xml rampart-trust-mar/pom.xml
Author: veithen
Date: Sun Jun 19 18:10:20 2011
New Revision: 1137396
URL: http://svn.apache.org/viewvc?rev=1137396&view=rev
Log:
Removed redundant distributionManagement entries. On the 1.5 branch, this was
done in r1055352, but the corresponding commit on the trunk (r1055376) didn't
remove it.
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml
axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/pom.xml
Modified: axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml?rev=1137396&r1=1137395&r2=1137396&view=diff
==
--- axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-mar/pom.xml Sun Jun 19
18:10:20 2011
@@ -105,12 +105,4 @@
-
-
-apache.snapshots.https
-${distMgmtSnapshotsName}
-${distMgmtSnapshotsUrl}
-false
-
-
Modified: axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/pom.xml?rev=1137396&r1=1137395&r2=1137396&view=diff
==
--- axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/pom.xml Sun Jun 19
18:10:20 2011
@@ -82,13 +82,4 @@
${project.version}
-
-
-
-apache.snapshots.https
-${distMgmtSnapshotsName}
-${distMgmtSnapshotsUrl}
-false
-
-
svn commit: r1137415 - in /axis/axis2/java/rampart/branches/1_6: ./ modules/rampart-mar/pom.xml modules/rampart-trust-mar/pom.xml
Author: veithen
Date: Sun Jun 19 19:11:48 2011
New Revision: 1137415
URL: http://svn.apache.org/viewvc?rev=1137415&view=rev
Log:
Merged r1137396 to the 1.6 branch.
Modified:
axis/axis2/java/rampart/branches/1_6/ (props changed)
axis/axis2/java/rampart/branches/1_6/modules/rampart-mar/pom.xml
axis/axis2/java/rampart/branches/1_6/modules/rampart-trust-mar/pom.xml
Propchange: axis/axis2/java/rampart/branches/1_6/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jun 19 19:11:48 2011
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk:1072266-1072267,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075684,1083686,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683
+/axis/axis2/java/rampart/trunk:1072266-1072267,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075684,1083686,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683,1137396
Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-mar/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-mar/pom.xml?rev=1137415&r1=1137414&r2=1137415&view=diff
==
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-mar/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-mar/pom.xml Sun Jun 19
19:11:48 2011
@@ -105,12 +105,4 @@
-
-
-apache.snapshots.https
-${distMgmtSnapshotsName}
-${distMgmtSnapshotsUrl}
-false
-
-
Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-trust-mar/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-trust-mar/pom.xml?rev=1137415&r1=1137414&r2=1137415&view=diff
==
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-trust-mar/pom.xml
(original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-trust-mar/pom.xml Sun
Jun 19 19:11:48 2011
@@ -82,13 +82,4 @@
${project.version}
-
-
-
-apache.snapshots.https
-${distMgmtSnapshotsName}
-${distMgmtSnapshotsUrl}
-false
-
-
svn commit: r1137425 - in /axis/axis2/java/rampart/branches/1_5_x: ./ pom.xml
Author: veithen Date: Sun Jun 19 20:00:28 2011 New Revision: 1137425 URL: http://svn.apache.org/viewvc?rev=1137425&view=rev Log: Merged r1072182 to the 1.5 branch. Modified: axis/axis2/java/rampart/branches/1_5_x/ (props changed) axis/axis2/java/rampart/branches/1_5_x/pom.xml Propchange: axis/axis2/java/rampart/branches/1_5_x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Jun 19 20:00:28 2011 @@ -1 +1 @@ -/axis/axis2/java/rampart/trunk:1072187,1083686,1130570,1132548,1134683 +/axis/axis2/java/rampart/trunk:1072182,1072187,1083686,1130570,1132548,1134683 Modified: axis/axis2/java/rampart/branches/1_5_x/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/pom.xml?rev=1137425&r1=1137424&r2=1137425&view=diff == --- axis/axis2/java/rampart/branches/1_5_x/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_5_x/pom.xml Sun Jun 19 20:00:28 2011 @@ -163,6 +163,16 @@ + + + +maven-release-plugin + +true + + + +
svn commit: r1137430 - in /axis/axis2/java/rampart/branches/1_5_x: ./ modules/rampart-trust-mar/pom.xml
Author: veithen
Date: Sun Jun 19 20:36:28 2011
New Revision: 1137430
URL: http://svn.apache.org/viewvc?rev=1137430&view=rev
Log:
Merged r1072313 to the 1.5 branch.
Modified:
axis/axis2/java/rampart/branches/1_5_x/ (props changed)
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml
Propchange: axis/axis2/java/rampart/branches/1_5_x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jun 19 20:36:28 2011
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk:1072182,1072187,1083686,1130570,1132548,1134683
+/axis/axis2/java/rampart/trunk:1072182,1072187,1072313,1083686,1130570,1132548,1134683
Modified:
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml?rev=1137430&r1=1137429&r2=1137430&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml
Sun Jun 19 20:36:28 2011
@@ -58,26 +58,26 @@
1.5
-
- org.apache.axis2
- axis2-mar-maven-plugin
- 1.2
- true
-
- false
- module.xml
-
-
-
+
+org.apache.axis2
+axis2-mar-maven-plugin
+1.2
+true
+
+false
+module.xml
+
+
+
-
+
org.apache.rampart
rampart-policy
${project.version}
-
+
org.apache.rampart
rampart-trust
${project.version}
svn commit: r1137431 - in /axis/axis2/java/rampart/branches/1_5_x: ./ modules/rampart-mar/pom.xml modules/rampart-trust-mar/pom.xml pom.xml
Author: veithen Date: Sun Jun 19 20:48:28 2011 New Revision: 1137431 URL: http://svn.apache.org/viewvc?rev=1137431&view=rev Log: Merged r1072316 to the 1.5 branch. Modified: axis/axis2/java/rampart/branches/1_5_x/ (props changed) axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml axis/axis2/java/rampart/branches/1_5_x/pom.xml Propchange: axis/axis2/java/rampart/branches/1_5_x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Jun 19 20:48:28 2011 @@ -1 +1 @@ -/axis/axis2/java/rampart/trunk:1072182,1072187,1072313,1083686,1130570,1132548,1134683 +/axis/axis2/java/rampart/trunk:1072182,1072187,1072313,1072316,1083686,1130570,1132548,1134683 Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml?rev=1137431&r1=1137430&r2=1137431&view=diff == --- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-mar/pom.xml Sun Jun 19 20:48:28 2011 @@ -61,7 +61,6 @@ org.apache.axis2 axis2-mar-maven-plugin -1.2 true false Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml?rev=1137431&r1=1137430&r2=1137431&view=diff == --- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-trust-mar/pom.xml Sun Jun 19 20:48:28 2011 @@ -61,7 +61,6 @@ org.apache.axis2 axis2-mar-maven-plugin -1.2 true false Modified: axis/axis2/java/rampart/branches/1_5_x/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/pom.xml?rev=1137431&r1=1137430&r2=1137431&view=diff == --- axis/axis2/java/rampart/branches/1_5_x/pom.xml (original) +++ axis/axis2/java/rampart/branches/1_5_x/pom.xml Sun Jun 19 20:48:28 2011 @@ -132,36 +132,6 @@ - - - - -snapshot-apache -Apache Snapshot repository -http://people.apache.org/repo/m2-snapshot-repository - -true - - -false - - - - -snapshot -Snapshot repository -http://snapshots.maven.codehaus.org/maven2 - -true - - -false - - - - - - @@ -171,6 +141,11 @@ true + +org.apache.axis2 +axis2-mar-maven-plugin +1.5.4 +
