From 7426cd54d185062cb52dd7d6dc2a16543e4101a7 Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Sat, 27 Oct 2018 16:04:38 +0700
Subject: [PATCH] IDEMPIERE-3798:Move iDempiere default branch to openjdk 10
 (tycho access restriction on classpath entry of jaxws-api)

jaxws-api look same javax.xml.ws but when build with tycho it said about access restriction on package javax.xml.ws,..
(i guess jaxws-api is new and it follow jdk mudule)
javax.xml.ws is special package, it's marked for remove on next jdk release.

it can't resolve ever i use <arg>-warn:+discouraged,forbidden</arg>
---
 .../feature.xml                               |  7 ++
 .../org.idempiere.p2.targetplatform.target    |  6 +-
 org.idempiere.parent/pom.xml                  | 67 -------------------
 .../META-INF/MANIFEST.MF                      |  4 +-
 4 files changed, 12 insertions(+), 72 deletions(-)

diff --git a/org.adempiere.target.platform-feature/feature.xml b/org.adempiere.target.platform-feature/feature.xml
index c5631882ec..c64f70d933 100644
--- a/org.adempiere.target.platform-feature/feature.xml
+++ b/org.adempiere.target.platform-feature/feature.xml
@@ -330,4 +330,11 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="javax.xml.ws"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
index b97f77192e..31193d8b4a 100644
--- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
+++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
@@ -876,8 +876,8 @@
 		<unit id="javax.xml.soap-api.source" version="1.4.0"/>
 		<unit id="jaxb-api" version="2.3.1"/>
 		<unit id="jaxb-api.source" version="2.3.1"/>
-		<unit id="jaxws-api" version="0.0.0"/>
-		<unit id="jaxws-api.source" version="0.0.0"/>
+		<unit id="jaxws-api" version="2.3.1"/>
+		<unit id="jaxws-api.source" version="2.3.1"/>
 		<unit id="joda-time" version="2.10.0"/>
 		<unit id="joda-time.source" version="2.10.0"/>
 		<unit id="json" version="20171018.0.0"/>
@@ -1048,4 +1048,4 @@
 	</location>
 </locations>
 <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-10"/>
-</target>
\ No newline at end of file
+</target>
diff --git a/org.idempiere.parent/pom.xml b/org.idempiere.parent/pom.xml
index 0b44032245..47aac53fc4 100644
--- a/org.idempiere.parent/pom.xml
+++ b/org.idempiere.parent/pom.xml
@@ -500,73 +500,6 @@
 			            <version>${tycho.version}</version>
 			            <configuration>
 				            <targetDefinitionIncludeSource>honor</targetDefinitionIncludeSource>
-				            <filters>
-				            	<filter>
-				            		<type>java-package</type>
-				            		<id>javax.xml.ws</id>
-				            		<restrictTo>
-				            			<type>eclipse-plugin</type>
-				            			<id>jaxws-api</id>
-				            		</restrictTo>
-				            	</filter>
-				            	<filter>
-				            		<type>java-package</type>
-				            		<id>javax.xml.ws.handler</id>
-				            		<restrictTo>
-				            			<type>eclipse-plugin</type>
-				            			<id>jaxws-api</id>
-				            		</restrictTo>
-				            	</filter>
-				            	<filter>
-				            		<type>java-package</type>
-				            		<id>javax.xml.ws.handler.soap</id>
-				            		<restrictTo>
-				            			<type>eclipse-plugin</type>
-				            			<id>jaxws-api</id>
-				            		</restrictTo>
-				            	</filter>
-				            	<filter>
-				            		<type>java-package</type>
-				            		<id>javax.xml.ws.http</id>
-				            		<restrictTo>
-				            			<type>eclipse-plugin</type>
-				            			<id>jaxws-api</id>
-				            		</restrictTo>
-				            	</filter>
-				            	<filter>
-				            		<type>java-package</type>
-				            		<id>javax.xml.ws.soap</id>
-				            		<restrictTo>
-				            			<type>eclipse-plugin</type>
-				            			<id>jaxws-api</id>
-				            		</restrictTo>
-				            	</filter>
-				            	<filter>
-				            		<type>java-package</type>
-				            		<id>javax.xml.ws.spi</id>
-				            		<restrictTo>
-				            			<type>eclipse-plugin</type>
-				            			<id>jaxws-api</id>
-				            		</restrictTo>
-				            	</filter>
-				            	<filter>
-				            		<type>java-package</type>
-				            		<id>javax.xml.ws.spi.http</id>
-				            		<restrictTo>
-				            			<type>eclipse-plugin</type>
-				            			<id>jaxws-api</id>
-				            		</restrictTo>
-				            	</filter>
-				            	<filter>
-				            		<type>java-package</type>
-				            		<id>javax.xml.ws.wsadressing</id>
-				            		<restrictTo>
-				            			<type>eclipse-plugin</type>
-				            			<id>jaxws-api</id>
-				            		</restrictTo>
-				            	</filter>
-				           	</filters>
-
 				            <!-- work-around for split package message error "Missing Constraint: 
 					            Bundle-RequiredExecutionEnvironment" track:https://bugs.eclipse.org/bugs/show_bug.cgi?id=403196 
 					            discuss:https://dev.eclipse.org/mhonarc/lists/tycho-user/msg03941.html -->
diff --git a/org.idempiere.webservices/META-INF/MANIFEST.MF b/org.idempiere.webservices/META-INF/MANIFEST.MF
index 8f9ebcc1c2..0f23ee8501 100644
--- a/org.idempiere.webservices/META-INF/MANIFEST.MF
+++ b/org.idempiere.webservices/META-INF/MANIFEST.MF
@@ -75,7 +75,6 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
  org.apache.cxf.cxf-rt-frontend-simple;bundle-version="3.2.6",
  org.apache.cxf.cxf-rt-transports-http;bundle-version="3.2.6",
  org.apache.cxf.cxf-rt-wsdl;bundle-version="3.2.6",
- jaxws-api;bundle-version="0.0.0",
  javax.jws-api;bundle-version="1.1.0",
  javax.xml.soap-api;bundle-version="1.4.0",
  org.springframework.spring-aop;bundle-version="5.1.1",
@@ -86,7 +85,8 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
  org.springframework.spring-jcl;bundle-version="5.1.1",
  org.springframework.spring-web;bundle-version="5.1.1",
  javax.annotation-api;bundle-version="1.3.2",
- com.sun.activation.javax.activation;bundle-version="1.2.0"
+ com.sun.activation.javax.activation;bundle-version="1.2.0",
+ javax.xml.ws;bundle-version="2.1.0"
 Bundle-ClassPath: .,
  WEB-INF/lib/aopalliance.jar,
  WEB-INF/lib/axis.jar,