hieplq 2019-03-05 11:33:04 +07:00
parent 599f0a90dd
commit d0ca3eb7be
12 changed files with 40 additions and 18 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -370,12 +370,6 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="javax.xml.soap"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin <plugin
id="org.glassfish.hk2.api" id="org.glassfish.hk2.api"
download-size="0" download-size="0"
@ -446,4 +440,11 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="jakarta.xml.soap-api"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature> </feature>

File diff suppressed because one or more lines are too long

View File

@ -1763,6 +1763,26 @@
<skipCache>true</skipCache> <skipCache>true</skipCache>
</configuration> </configuration>
</execution> </execution>
<execution>
<!--axis dependency to bundle javax.xml.soap and javax.xml.rpc
that library move to https://github.com/eclipse-ee4j and newer version use by other library
so to avoid conflict, update dependency to newer version
-->
<id>download-axis</id>
<phase>package</phase>
<goals>
<goal>wget</goal>
</goals>
<configuration>
<url>${url.file.srv}/extra.jar/org.apache.axis_1.4.0.v201903052030.jar</url>
<unpack>false</unpack>
<outputFileName>org.apache.axis_1.4.0.v201903052030.jar</outputFileName>
<outputDirectory>${project.build.directory}/repository/plugins</outputDirectory>
<retries>5</retries>
<overwrite>true</overwrite>
<skipCache>true</skipCache>
</configuration>
</execution>
</executions> </executions>
</plugin> </plugin>
<!-- copy zk osgi bundle to repository folder --> <!-- copy zk osgi bundle to repository folder -->

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="idempiere-190302" sequenceNumber="107"> <?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="idempiere-190304" sequenceNumber="107">
<locations> <locations>
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.e4.core.tools.feature.source.feature.group" version="4.10.0.v20181116-0958"/> <unit id="org.eclipse.e4.core.tools.feature.source.feature.group" version="4.10.0.v20181116-0958"/>
@ -1300,6 +1300,7 @@
<unit id="zweb" version="8.6.0.1"/> <unit id="zweb" version="8.6.0.1"/>
<unit id="zweb.sources" version="8.6.0.1"/> <unit id="zweb.sources" version="8.6.0.1"/>
<repository location="https://raw.githubusercontent.com/idempiere/binary.file/master/p2.maven/maven-p2-R20190304"/> <repository location="https://raw.githubusercontent.com/idempiere/binary.file/master/p2.maven/maven-p2-R20190304"/>
<unit id="org.apache.axis" version="1.4.0.v201903052030"/>
</location> </location>
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="com.sun.istack.commons-runtime" version="3.0.8"/> <unit id="com.sun.istack.commons-runtime" version="3.0.8"/>

View File

@ -89,7 +89,6 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
org.apache.servicemix.bundles.spring-web, org.apache.servicemix.bundles.spring-web,
org.apache.cxf.cxf-rt-rs-extension-providers;bundle-version="3.1.17", org.apache.cxf.cxf-rt-rs-extension-providers;bundle-version="3.1.17",
org.apache.axis;bundle-version="1.4.0", org.apache.axis;bundle-version="1.4.0",
javax.xml.soap;bundle-version="1.3.0",
javax.annotation-api;bundle-version="1.3.2", javax.annotation-api;bundle-version="1.3.2",
org.glassfish.jersey.core.jersey-common;bundle-version="2.22.1", org.glassfish.jersey.core.jersey-common;bundle-version="2.22.1",
org.apache.cxf.cxf-rt-rs-service-description;bundle-version="3.2.6", org.apache.cxf.cxf-rt-rs-service-description;bundle-version="3.2.6",
@ -99,7 +98,8 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
org.glassfish.hk2.utils;bundle-version="2.5.0", org.glassfish.hk2.utils;bundle-version="2.5.0",
org.glassfish.jersey.bundles.repackaged.jersey-guava;bundle-version="2.22.1", org.glassfish.jersey.bundles.repackaged.jersey-guava;bundle-version="2.22.1",
jakarta.ws.rs-api;bundle-version="2.1.5", jakarta.ws.rs-api;bundle-version="2.1.5",
jakarta.xml.ws-api;bundle-version="2.3.2" jakarta.xml.ws-api;bundle-version="2.3.2",
jakarta.xml.soap-api;bundle-version="1.4.1"
Bundle-ClassPath: ., Bundle-ClassPath: .,
WEB-INF/lib/idempiere-xmlbeans.jar WEB-INF/lib/idempiere-xmlbeans.jar
Export-Package: org.compiere.model, Export-Package: org.compiere.model,