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 2016/02/14 13:21:36 UTC

svn commit: r1730325 - in /axis/axis2/java/core/branches/1_7: ./ modules/tool/axis2-eclipse-codegen-plugin/pom.xml modules/tool/axis2-eclipse-service-plugin/pom.xml

Author: veithen
Date: Sun Feb 14 12:21:35 2016
New Revision: 1730325

URL: http://svn.apache.org/viewvc?rev=1730325&view=rev
Log:
AXIS2-5738: Merge r1730310 to the 1.7 branch to fix the Eclipse plugins.

Modified:
    axis/axis2/java/core/branches/1_7/   (props changed)
    axis/axis2/java/core/branches/1_7/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
    axis/axis2/java/core/branches/1_7/modules/tool/axis2-eclipse-service-plugin/pom.xml

Propchange: axis/axis2/java/core/branches/1_7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 14 12:21:35 2016
@@ -1,4 +1,4 @@
 /axis/axis2/java/core/branches/1_6:1295540
 /axis/axis2/java/core/branches/AXIOM-420:1334386-1336397
 /axis/axis2/java/core/branches/AXIS2-4318:1230452,1295542,1324772,1327468,1329571,1332141,1335355,1335357,1340985
-/axis/axis2/java/core/trunk:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139,1730186,1730195,1730197,1730222,1730300
+/axis/axis2/java/core/trunk:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139,1730186,1730195,1730197,1730222,1730300,1730310

Modified: axis/axis2/java/core/branches/1_7/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/tool/axis2-eclipse-codegen-plugin/pom.xml?rev=1730325&r1=1730324&r2=1730325&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/tool/axis2-eclipse-codegen-plugin/pom.xml (original)
+++ axis/axis2/java/core/branches/1_7/modules/tool/axis2-eclipse-codegen-plugin/pom.xml Sun Feb 14 12:21:35 2016
@@ -190,7 +190,7 @@
                         <Embed-Directory>lib</Embed-Directory>
                         <Embed-Transitive>true</Embed-Transitive>
                         <!-- Exclude imports that are actually not used -->
-                        <Import-Package>!org.dom4j*,!nu.xom,!org.jdom*,!javax.portlet,!com.sun.*,!org.apache.xmlbeans.*,!org.xmlpull.*,!org.apache.commons.io*,!org.relaxng.datatype,*</Import-Package>
+                        <Import-Package>!org.dom4j*,!nu.xom,!org.jdom*,!javax.portlet,!com.sun.*,!org.jvnet.ws.databinding,!org.apache.xmlbeans.*,!org.xmlpull.*,!org.apache.commons.io*,!org.relaxng.datatype,*</Import-Package>
                         <Export-Package />
                         <Bundle-Name>Axis2 Codegen Wizard Plug-in</Bundle-Name>
                         <Bundle-Activator>org.apache.axis2.tool.codegen.eclipse.plugin.CodegenWizardPlugin</Bundle-Activator>

Modified: axis/axis2/java/core/branches/1_7/modules/tool/axis2-eclipse-service-plugin/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/tool/axis2-eclipse-service-plugin/pom.xml?rev=1730325&r1=1730324&r2=1730325&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/tool/axis2-eclipse-service-plugin/pom.xml (original)
+++ axis/axis2/java/core/branches/1_7/modules/tool/axis2-eclipse-service-plugin/pom.xml Sun Feb 14 12:21:35 2016
@@ -167,7 +167,7 @@
                         <Embed-Directory>lib</Embed-Directory>
                         <Embed-Transitive>true</Embed-Transitive>
                         <!-- Exclude imports that are actually not used -->
-                        <Import-Package>!org.dom4j*,!nu.xom,!org.jdom*,!javax.portlet,!com.sun.*,!org.apache.commons.io*,!org.relaxng.datatype,*</Import-Package>
+                        <Import-Package>!org.dom4j*,!nu.xom,!org.jdom*,!javax.portlet,!com.sun.*,!org.jvnet.ws.databinding,!org.apache.commons.io*,!org.relaxng.datatype,*</Import-Package>
                         <Export-Package />
                         <Bundle-Name>Axis2 Service Maker</Bundle-Name>
                         <Bundle-Activator>org.apache.axis2.tool.service.eclipse.plugin.ServiceArchiver</Bundle-Activator>