From 624932c0644aea4165ff0117d8f9d9d1085faf35 Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Thu, 27 Apr 2017 00:00:41 +0700
Subject: [PATCH] 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
---
 org.adempiere.sdk-feature/adempiere.rmap      |  7 +-----
 org.adempiere.sdk-feature/feature.xml         | 22 -------------------
 .../materialize.properties                    |  5 ++---
 org.adempiere.server-feature/feature.xml      |  2 +-
 org.adempiere.server-feature/setup.ini        |  2 +-
 .../setup/configuration/config.ini            | 11 ++++------
 org.adempiere.ui.zk/.project                  |  5 +++++
 .../director/configuration/config.ini         |  2 +-
 .../feature.xml                               |  7 ++++++
 9 files changed, 22 insertions(+), 41 deletions(-)

diff --git a/org.adempiere.sdk-feature/adempiere.rmap b/org.adempiere.sdk-feature/adempiere.rmap
index 6843a9b0c8..879a39bfa9 100644
--- a/org.adempiere.sdk-feature/adempiere.rmap
+++ b/org.adempiere.sdk-feature/adempiere.rmap
@@ -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">
@@ -165,7 +160,7 @@
         <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="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:mappings>
     </rm:provider>
diff --git a/org.adempiere.sdk-feature/feature.xml b/org.adempiere.sdk-feature/feature.xml
index 6ba20fbeb4..c18971989a 100644
--- a/org.adempiere.sdk-feature/feature.xml
+++ b/org.adempiere.sdk-feature/feature.xml
@@ -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>
diff --git a/org.adempiere.sdk-feature/materialize.properties b/org.adempiere.sdk-feature/materialize.properties
index 2cc27b38d4..04838906f2 100644
--- a/org.adempiere.sdk-feature/materialize.properties
+++ b/org.adempiere.sdk-feature/materialize.properties
@@ -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
 
diff --git a/org.adempiere.server-feature/feature.xml b/org.adempiere.server-feature/feature.xml
index 6074387de0..f4f34fd107 100644
--- a/org.adempiere.server-feature/feature.xml
+++ b/org.adempiere.server-feature/feature.xml
@@ -495,7 +495,7 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-         
+
    <plugin
          id="org.eclipse.jetty.http2.hpack"
          download-size="0"
diff --git a/org.adempiere.server-feature/setup.ini b/org.adempiere.server-feature/setup.ini
index 15a3006159..2bc8b8cbc5 100644
--- a/org.adempiere.server-feature/setup.ini
+++ b/org.adempiere.server-feature/setup.ini
@@ -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
diff --git a/org.adempiere.server-feature/setup/configuration/config.ini b/org.adempiere.server-feature/setup/configuration/config.ini
index ee8fb0eb1a..2291ba4e26 100644
--- a/org.adempiere.server-feature/setup/configuration/config.ini
+++ b/org.adempiere.server-feature/setup/configuration/config.ini
@@ -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
diff --git a/org.adempiere.ui.zk/.project b/org.adempiere.ui.zk/.project
index 962d1b1ce5..75687c893a 100644
--- a/org.adempiere.ui.zk/.project
+++ b/org.adempiere.ui.zk/.project
@@ -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>
diff --git a/org.idempiere.eclipse.platform-feature/director/configuration/config.ini b/org.idempiere.eclipse.platform-feature/director/configuration/config.ini
index 2c3262519f..c8f6654146 100644
--- a/org.idempiere.eclipse.platform-feature/director/configuration/config.ini
+++ b/org.idempiere.eclipse.platform-feature/director/configuration/config.ini
@@ -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,\
diff --git a/org.idempiere.eclipse.platform-feature/feature.xml b/org.idempiere.eclipse.platform-feature/feature.xml
index 60f029a951..9c6731a3fd 100644
--- a/org.idempiere.eclipse.platform-feature/feature.xml
+++ b/org.idempiere.eclipse.platform-feature/feature.xml
@@ -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>