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:
parent
ebd4fcece8
commit
624932c064
|
@ -108,11 +108,6 @@
|
||||||
<rm:property key="buckminster.mutable" value="false"/>
|
<rm:property key="buckminster.mutable" value="false"/>
|
||||||
<rm:uri format="${url.orbit}"/>
|
<rm:uri format="${url.orbit}"/>
|
||||||
</rm:provider>
|
</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>
|
||||||
<rm:searchPath name="restlet.p2">
|
<rm:searchPath name="restlet.p2">
|
||||||
<rm:provider componentTypes="osgi.bundle" readerType="p2" source="false" mutable="false">
|
<rm:provider componentTypes="osgi.bundle" readerType="p2" source="false" mutable="false">
|
||||||
|
@ -165,7 +160,7 @@
|
||||||
<maven:entry groupId="org.codehaus.groovy" artifactId="groovy-all" name="groovy-all" />
|
<maven:entry groupId="org.codehaus.groovy" artifactId="groovy-all" name="groovy-all" />
|
||||||
<maven:entry groupId="com.ibm.icu" artifactId="icu4j" name="com.ibm.icu" />
|
<maven:entry groupId="com.ibm.icu" artifactId="icu4j" name="com.ibm.icu" />
|
||||||
<maven:entry groupId="joda-time" artifactId="joda-time" name="joda-time" />
|
<maven:entry groupId="joda-time" artifactId="joda-time" name="joda-time" />
|
||||||
<maven:entry groupId="commons-configuration" artifactId="commons-configuration" name="org.apache.commons.configuration"/>
|
<maven:entry groupId="commons-configuration" artifactId="commons-configuration" name="org.apache.commons.configuration"/>
|
||||||
<maven:entry artifactId="commons-collections4" groupId="org.apache.commons" name="org.apache.commons.collections4"/>
|
<maven:entry artifactId="commons-collections4" groupId="org.apache.commons" name="org.apache.commons.collections4"/>
|
||||||
</maven:mappings>
|
</maven:mappings>
|
||||||
</rm:provider>
|
</rm:provider>
|
||||||
|
|
|
@ -89,17 +89,6 @@
|
||||||
fragment="true"
|
fragment="true"
|
||||||
unpack="false"/>
|
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
|
<plugin
|
||||||
id="org.eclipse.swt.cocoa.macosx.x86_64"
|
id="org.eclipse.swt.cocoa.macosx.x86_64"
|
||||||
os="macosx"
|
os="macosx"
|
||||||
|
@ -111,15 +100,4 @@
|
||||||
fragment="true"
|
fragment="true"
|
||||||
unpack="false"/>
|
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>
|
</feature>
|
||||||
|
|
|
@ -18,10 +18,9 @@ url.zkoss.osgi=http://downloads.sourceforge.net/project/idempiere/binary.file/ja
|
||||||
|
|
||||||
url.maven.restlet=http://maven.restlet.org
|
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.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=http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository
|
||||||
url.orbit.neon=http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/
|
|
||||||
|
|
||||||
url.file.srv=http://downloads.sourceforge.net/project/idempiere/binary.file
|
url.file.srv=http://downloads.sourceforge.net/project/idempiere/binary.file
|
||||||
|
|
||||||
|
|
|
@ -495,7 +495,7 @@
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="0.0.0"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.eclipse.jetty.http2.hpack"
|
id="org.eclipse.jetty.http2.hpack"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
-startup
|
-startup
|
||||||
plugins/org.eclipse.equinox.launcher_1.3.0.v20140415-2008.jar
|
plugins/org.eclipse.equinox.launcher_1.3.201.v20161025-1711.jar
|
||||||
-install
|
-install
|
||||||
setup
|
setup
|
||||||
--launcher.XXMaxPermSize
|
--launcher.XXMaxPermSize
|
||||||
|
|
|
@ -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
|
osgi.install.area=setup
|
||||||
equinox.use.ds=true
|
|
||||||
osgi.bundles=org.eclipse.equinox.ds@1:start,\
|
osgi.bundles=org.eclipse.equinox.ds@1:start,\
|
||||||
org.eclipse.equinox.util,\
|
org.eclipse.equinox.util,\
|
||||||
org.eclipse.core.variables,\
|
org.eclipse.core.variables,\
|
||||||
|
@ -35,9 +34,6 @@ osgi.bundles=org.eclipse.equinox.ds@1:start,\
|
||||||
javax.xml.rpc,\
|
javax.xml.rpc,\
|
||||||
javax.xml.soap,\
|
javax.xml.soap,\
|
||||||
javax.xml,\
|
javax.xml,\
|
||||||
org.apache.xerces@3:start,\
|
|
||||||
org.apache.xml.resolver@3:start,\
|
|
||||||
org.apache.xml.serializer@3:start,\
|
|
||||||
javax.activation,\
|
javax.activation,\
|
||||||
org.apache.activemq.activemq-core,\
|
org.apache.activemq.activemq-core,\
|
||||||
org.apache.activemq.kahadb,\
|
org.apache.activemq.kahadb,\
|
||||||
|
@ -46,15 +42,16 @@ osgi.bundles=org.eclipse.equinox.ds@1:start,\
|
||||||
javax.annotation-api,\
|
javax.annotation-api,\
|
||||||
org.slf4j.api,\
|
org.slf4j.api,\
|
||||||
org.slf4j.jcl,\
|
org.slf4j.jcl,\
|
||||||
|
org.slf4j.jdk14,\
|
||||||
org.apache.commons.codec,\
|
org.apache.commons.codec,\
|
||||||
org.eclipse.osgi.compatibility.state,\
|
org.eclipse.osgi.compatibility.state,\
|
||||||
org.eclipse.osgi.compatibility.plugins,\
|
org.eclipse.osgi.compatibility.plugins,\
|
||||||
org.cryptacular,\
|
org.cryptacular,\
|
||||||
net.sf.supercsv.super-csv,\
|
net.sf.supercsv.super-csv,\
|
||||||
zjavassist,\
|
|
||||||
com.itextpdf,\
|
com.itextpdf,\
|
||||||
bcprov,\
|
bcprov,\
|
||||||
org.apache.xalan,\
|
bcpkix,\
|
||||||
|
org.eclipse.equinox.common,\
|
||||||
org.passay,\
|
org.passay,\
|
||||||
groovy-all,\
|
groovy-all,\
|
||||||
org.eclipse.osgi@start
|
org.eclipse.osgi@start
|
||||||
|
|
|
@ -30,6 +30,11 @@
|
||||||
<arguments>
|
<arguments>
|
||||||
</arguments>
|
</arguments>
|
||||||
</buildCommand>
|
</buildCommand>
|
||||||
|
<buildCommand>
|
||||||
|
<name>org.eclipse.wst.validation.validationbuilder</name>
|
||||||
|
<arguments>
|
||||||
|
</arguments>
|
||||||
|
</buildCommand>
|
||||||
</buildSpec>
|
</buildSpec>
|
||||||
<natures>
|
<natures>
|
||||||
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
|
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
|
||||||
|
|
|
@ -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
|
osgi.install.area=director
|
||||||
equinox.use.ds=true
|
equinox.use.ds=true
|
||||||
osgi.bundles=org.eclipse.core.net@start,\
|
osgi.bundles=org.eclipse.core.net@start,\
|
||||||
|
|
|
@ -179,4 +179,11 @@
|
||||||
version="0.0.0"
|
version="0.0.0"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
|
<plugin
|
||||||
|
id="org.tukaani.xz"
|
||||||
|
download-size="0"
|
||||||
|
install-size="0"
|
||||||
|
version="0.0.0"
|
||||||
|
unpack="false"/>
|
||||||
|
|
||||||
</feature>
|
</feature>
|
||||||
|
|
Loading…
Reference in New Issue