IDEMPIERE-3136:update equinox to 4.6.3 (neon)

swt.gtk.solaris.x86 swt.cocoa.macosx.x86 is stop support
launch isn't yet update, because it often conflic with launch on main branch hard for merged
This commit is contained in:
hieplq 2017-04-27 00:00:41 +07:00
parent ebd4fcece8
commit 624932c064
9 changed files with 22 additions and 41 deletions

View File

@ -108,11 +108,6 @@
<rm:property key="buckminster.mutable" value="false"/>
<rm:uri format="${url.orbit}"/>
</rm:provider>
<rm:provider componentTypes="osgi.bundle" readerType="p2" source="false" mutable="false">
<rm:property key="buckminster.source" value="false"/>
<rm:property key="buckminster.mutable" value="false"/>
<rm:uri format="${url.orbit.neon}"/>
</rm:provider>
</rm:searchPath>
<rm:searchPath name="restlet.p2">
<rm:provider componentTypes="osgi.bundle" readerType="p2" source="false" mutable="false">

View File

@ -89,17 +89,6 @@
fragment="true"
unpack="false"/>
<plugin
id="org.eclipse.swt.cocoa.macosx"
os="macosx"
ws="cocoa"
arch="x86"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin
id="org.eclipse.swt.cocoa.macosx.x86_64"
os="macosx"
@ -111,15 +100,4 @@
fragment="true"
unpack="false"/>
<plugin
id="org.eclipse.swt.gtk.solaris.x86"
os="solaris"
ws="gtk"
arch="x86"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
</feature>

View File

@ -18,10 +18,9 @@ url.zkoss.osgi=http://downloads.sourceforge.net/project/idempiere/binary.file/ja
url.maven.restlet=http://maven.restlet.org
url.equinox=http://download.eclipse.org/eclipse/updates/4.4
url.equinox=http://download.eclipse.org/eclipse/updates/4.6
url.jetty=http://download.eclipse.org/jetty/updates/jetty-bundles-9.x
url.orbit=http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository
url.orbit.neon=http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/
url.orbit=http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository
url.file.srv=http://downloads.sourceforge.net/project/idempiere/binary.file

View File

@ -1,5 +1,5 @@
-startup
plugins/org.eclipse.equinox.launcher_1.3.0.v20140415-2008.jar
plugins/org.eclipse.equinox.launcher_1.3.201.v20161025-1711.jar
-install
setup
--launcher.XXMaxPermSize

View File

@ -1,6 +1,5 @@
osgi.framework=file\:../plugins/org.eclipse.osgi_3.10.2.v20150203-1939.jar
osgi.framework=file\:../plugins/org.eclipse.osgi_3.11.3.v20170209-1843.jar
osgi.install.area=setup
equinox.use.ds=true
osgi.bundles=org.eclipse.equinox.ds@1:start,\
org.eclipse.equinox.util,\
org.eclipse.core.variables,\
@ -35,9 +34,6 @@ osgi.bundles=org.eclipse.equinox.ds@1:start,\
javax.xml.rpc,\
javax.xml.soap,\
javax.xml,\
org.apache.xerces@3:start,\
org.apache.xml.resolver@3:start,\
org.apache.xml.serializer@3:start,\
javax.activation,\
org.apache.activemq.activemq-core,\
org.apache.activemq.kahadb,\
@ -46,15 +42,16 @@ osgi.bundles=org.eclipse.equinox.ds@1:start,\
javax.annotation-api,\
org.slf4j.api,\
org.slf4j.jcl,\
org.slf4j.jdk14,\
org.apache.commons.codec,\
org.eclipse.osgi.compatibility.state,\
org.eclipse.osgi.compatibility.plugins,\
org.cryptacular,\
net.sf.supercsv.super-csv,\
zjavassist,\
com.itextpdf,\
bcprov,\
org.apache.xalan,\
bcpkix,\
org.eclipse.equinox.common,\
org.passay,\
groovy-all,\
org.eclipse.osgi@start

View File

@ -30,6 +30,11 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.wst.validation.validationbuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>

View File

@ -1,4 +1,4 @@
osgi.framework=file\:../plugins/org.eclipse.osgi_3.10.2.v20150203-1939.jar
osgi.framework=file\:../plugins/org.eclipse.osgi_3.11.3.v20170209-1843.jar
osgi.install.area=director
equinox.use.ds=true
osgi.bundles=org.eclipse.core.net@start,\

View File

@ -179,4 +179,11 @@
version="0.0.0"
unpack="false"/>
<plugin
id="org.tukaani.xz"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature>