svn commit: r965136 - /axis/axis2/java/rampart/trunk/pom.xml

Author: veithen Date: Sat Jul 17 21:34:28 2010 New Revision: 965136 URL: http://svn.apache.org/viewvc?rev=965136&view=rev Log: Attempt to fix conflicting dependencies between wss4j and opensaml. This in particular should avoid the double dependency on serializer, which I believe is the root caus

svn commit: r965078 - in /axis/axis2/java/core/branches/java/1_5: ./ modules/distribution/ modules/kernel/src/org/apache/axis2/transport/http/util/ modules/kernel/test/org/apache/axis2/transport/http/

Author: veithen Date: Sat Jul 17 13:49:42 2010 New Revision: 965078 URL: http://svn.apache.org/viewvc?rev=965078&view=rev Log: Merged r905980, r960978, r961012 and r965074 in order keep the root and parent POM up to date on the 1.5 branch. Modified: axis/axis2/java/core/branches/java/1_5/

svn commit: r965074 - in /axis/axis2/java/core/trunk: modules/parent/pom.xml pom.xml

Author: veithen Date: Sat Jul 17 13:36:04 2010 New Revision: 965074 URL: http://svn.apache.org/viewvc?rev=965074&view=rev Log: Upgraded to maven-gpg-plugin 1.1 to avoid the issue described in MGPG-17. Modified: axis/axis2/java/core/trunk/modules/parent/pom.xml axis/axis2/java/core/trunk/p

svn commit: r965070 - in /axis/axis2/java/core/branches/java/1_5: ./ modules/distribution/ modules/kernel/src/org/apache/axis2/transport/http/util/ modules/kernel/test/org/apache/axis2/transport/http/

Author: veithen Date: Sat Jul 17 13:17:10 2010 New Revision: 965070 URL: http://svn.apache.org/viewvc?rev=965070&view=rev Log: Merged r834175, r960995 and r965068 to the 1.5 branch. This updates the build to org.apache:apache:7 and fixes some issues in the POM files. Reverted r958361 which is no

svn commit: r965068 - in /axis/axis2/java/core/trunk: modules/parent/pom.xml pom.xml

Author: veithen Date: Sat Jul 17 13:02:57 2010 New Revision: 965068 URL: http://svn.apache.org/viewvc?rev=965068&view=rev Log: Upgrade to the latest version of org.apache:apache. Modified: axis/axis2/java/core/trunk/modules/parent/pom.xml axis/axis2/java/core/trunk/pom.xml Modified: axis

svn commit: r965066 - in /axis/axis2/java/core/branches/java/1_5: ./ modules/distribution/ modules/distribution/src/main/assembly/ modules/kernel/src/org/apache/axis2/transport/http/util/ modules/kern

Author: veithen Date: Sat Jul 17 12:44:03 2010 New Revision: 965066 URL: http://svn.apache.org/viewvc?rev=965066&view=rev Log: Merged r777897 (as well as parts of r936434) to the 1.5 branch in order to simplify the build of the distribution. This also allows us to get rid of the *.mar.version pr

svn commit: r965042 - /axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/pom.xml

Author: veithen Date: Sat Jul 17 09:34:38 2010 New Revision: 965042 URL: http://svn.apache.org/viewvc?rev=965042&view=rev Log: Committing a change that was missing in r958375. Modified: axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/pom.xml Modified: axis/axis2/java/core/branches

svn commit: r965036 - in /axis/axis2/java/core/trunk/modules/resource-bundle/src/main/resources: LICENSE.txt.vm META-INF/ META-INF/LICENSE.vm META-INF/NOTICE.vm NOTICE.txt.vm

Author: veithen Date: Sat Jul 17 08:53:03 2010 New Revision: 965036 URL: http://svn.apache.org/viewvc?rev=965036&view=rev Log: Changed the location of the LICENSE and NOTICE files inside the JARs so that it matches the conventions used by the default org.apache:apache-jar-resource-bundle. Added

svn commit: r965032 - in /axis/axis2/java/core/trunk/modules: adb-codegen/ adb/ clustering/ codegen/ corba/ fastinfoset/ java2wsdl/ jaxbri/ jaxws-mar/ jaxws/ jibx/ json/ kernel/ metadata/ mex/ mtompol

Author: veithen Date: Sat Jul 17 08:44:52 2010 New Revision: 965032 URL: http://svn.apache.org/viewvc?rev=965032&view=rev Log: AXIS2-4653: Removed the id from the maven-remote-resources-plugin execution, so that it matches (and overrides) the execution defined in org.apache:apache. This prevents