From 69c91e1111d14cc77df5f34d1bce1ddd58865f68 Mon Sep 17 00:00:00 2001 From: hieplq Date: Thu, 25 Oct 2018 23:59:10 +0700 Subject: [PATCH] IDEMPIERE-3798:Move iDempiere default branch to openjdk 10 (build by tycho issue) https://bugs.eclipse.org/bugs/show_bug.cgi https://bugs.eclipse.org/bugs/show_bug.cgi?id=537016 1. use latest jdt for support jdk10 2. tycho resolve dependency to javax.activation, javax.xml.bind from jdk, but jdk don't public it. eclipse resolve by get highest version from com.sun.activation.javax.activation, jaxb-api so need use Require-Bundle to force tycho choose com.sun.activation.javax.activation 2.1 if keep both import javax.activation and Require-Bundle com.sun.activation.javax.activation with get bellow exception on tycho but org.adempiere.base don't have this issue [ERROR] /home/hieplq/1Dev/project/native/idempiere-dev-11/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultFeedbackService.java:[16] [ERROR] import javax.activation.DataSource; [ERROR] ^^^^^^^^^^^^^^^^^^^^^^^^^^^ [ERROR] Access restriction: The type 'DataSource' is not API (restriction on classpath entry '/home/hieplq/.m2/repository/p2/osgi/bundle/com.sun.activation.javax.activation/1.2.0/com.sun.activation.javax.activation-1.2.0.jar') 3. pass --add-exports for org.adempiere.base, install, server and swing --- org.adempiere.base/META-INF/MANIFEST.MF | 5 +- org.adempiere.base/pom.xml | 6 +- org.adempiere.install/pom.xml | 15 ++++ org.adempiere.server/pom.xml | 8 +- org.adempiere.ui.swing/pom.xml | 8 +- org.adempiere.ui.zk/META-INF/MANIFEST.MF | 6 +- org.idempiere.parent/pom.xml | 81 +++++++++++++++++++ .../META-INF/MANIFEST.MF | 8 +- org.idempiere.webservices/pom.xml | 10 +++ 9 files changed, 133 insertions(+), 14 deletions(-) diff --git a/org.adempiere.base/META-INF/MANIFEST.MF b/org.adempiere.base/META-INF/MANIFEST.MF index 20b323e3ba..c914069787 100644 --- a/org.adempiere.base/META-INF/MANIFEST.MF +++ b/org.adempiere.base/META-INF/MANIFEST.MF @@ -58,7 +58,6 @@ Export-Package: bsh, org.idempiere.model Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Import-Package: com.sun.mail.smtp;version="1.5", - javax.activation, javax.jms;version="1.1.0", javax.mail;version="1.5", javax.mail.internet;version="1.5", @@ -124,6 +123,8 @@ Require-Bundle: org.eclipse.equinox.app;bundle-version="0.0.0", groovy, javax.xml;bundle-version="1.3.4", org.apache.poi.poi;bundle-version="3.15.0", - org.apache.poi.poi-ooxml;bundle-version="3.15.0" + org.apache.poi.poi-ooxml;bundle-version="3.15.0", + com.sun.activation.javax.activation;bundle-version="1.2.0", + jaxb-api;bundle-version="2.3.1" Automatic-Module-Name: org.adempiere.base Bundle-Vendor: iDempiere Community diff --git a/org.adempiere.base/pom.xml b/org.adempiere.base/pom.xml index ad992278d3..310b23576a 100644 --- a/org.adempiere.base/pom.xml +++ b/org.adempiere.base/pom.xml @@ -17,7 +17,11 @@ tycho-compiler-plugin - -warn:+forbidden + + -warn:+forbidden + --add-exports + java.sql.rowset/com.sun.rowset=ALL-UNNAMED + diff --git a/org.adempiere.install/pom.xml b/org.adempiere.install/pom.xml index 078bc2bbf9..3ade39391d 100644 --- a/org.adempiere.install/pom.xml +++ b/org.adempiere.install/pom.xml @@ -9,4 +9,19 @@ org.adempiere.install eclipse-plugin + + + + + org.eclipse.tycho + tycho-compiler-plugin + + + --add-exports + java.base/sun.security.tools.keytool=ALL-UNNAMED + + + + + \ No newline at end of file diff --git a/org.adempiere.server/pom.xml b/org.adempiere.server/pom.xml index d627bc0fa7..bdfda1ddda 100644 --- a/org.adempiere.server/pom.xml +++ b/org.adempiere.server/pom.xml @@ -16,8 +16,12 @@ org.eclipse.tycho tycho-compiler-plugin - - -warn:+forbidden + + + -warn:+forbidden + --add-exports + java.naming/com.sun.jndi.ldap=ALL-UNNAMED + diff --git a/org.adempiere.ui.swing/pom.xml b/org.adempiere.ui.swing/pom.xml index e67a3516d3..207d31f82a 100644 --- a/org.adempiere.ui.swing/pom.xml +++ b/org.adempiere.ui.swing/pom.xml @@ -16,8 +16,12 @@ org.eclipse.tycho tycho-compiler-plugin - - -warn:+forbidden + + + -warn:+forbidden + --add-exports + java.desktop/sun.awt=ALL-UNNAMED + diff --git a/org.adempiere.ui.zk/META-INF/MANIFEST.MF b/org.adempiere.ui.zk/META-INF/MANIFEST.MF index 3dd9efd616..167d1785ec 100644 --- a/org.adempiere.ui.zk/META-INF/MANIFEST.MF +++ b/org.adempiere.ui.zk/META-INF/MANIFEST.MF @@ -5,7 +5,6 @@ Bundle-SymbolicName: org.adempiere.ui.zk;singleton:=true Bundle-Version: 5.1.0.qualifier Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Import-Package: groovy.transform.stc;version="2.4.7", - javax.activation, javax.annotation, javax.annotation.processing, javax.annotation.security;version="1.2.0", @@ -15,7 +14,6 @@ Import-Package: groovy.transform.stc;version="2.4.7", javax.servlet.http, javax.servlet.jsp.resources;version="2.3.0", javax.servlet.resources;version="3.1.0", - javax.xml.bind, net.sf.jasperreports.engine, net.sf.jasperreports.engine.export, net.sf.jasperreports.engine.util, @@ -154,7 +152,9 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0", org.junit;bundle-version="0.0.0", org.apache.commons.io;bundle-version="0.0.0", com.itextpdf;bundle-version="0.0.0", - org.atmosphere.runtime;bundle-version="0.0.0" + org.atmosphere.runtime;bundle-version="0.0.0", + com.sun.activation.javax.activation;bundle-version="1.2.0", + jaxb-api;bundle-version="2.3.1" Bundle-Activator: org.adempiere.webui.WebUIActivator Eclipse-ExtensibleAPI: true Web-ContextPath: webui diff --git a/org.idempiere.parent/pom.xml b/org.idempiere.parent/pom.xml index 07847e7c36..0b44032245 100644 --- a/org.idempiere.parent/pom.xml +++ b/org.idempiere.parent/pom.xml @@ -344,6 +344,21 @@ org.apache.commons commons-exec 1.3 + + + org.eclipse.jdt + org.eclipse.jdt.compiler.tool + 1.2.300 + + + org.eclipse.jdt + org.eclipse.jdt.core + ${jdtVersion} + + + org.eclipse.jdt + org.eclipse.jdt.compiler.apt + ${jdtAptVersion} @@ -485,6 +500,72 @@ ${tycho.version} honor + + + java-package + javax.xml.ws + + eclipse-plugin + jaxws-api + + + + java-package + javax.xml.ws.handler + + eclipse-plugin + jaxws-api + + + + java-package + javax.xml.ws.handler.soap + + eclipse-plugin + jaxws-api + + + + java-package + javax.xml.ws.http + + eclipse-plugin + jaxws-api + + + + java-package + javax.xml.ws.soap + + eclipse-plugin + jaxws-api + + + + java-package + javax.xml.ws.spi + + eclipse-plugin + jaxws-api + + + + java-package + javax.xml.ws.spi.http + + eclipse-plugin + jaxws-api + + + + java-package + javax.xml.ws.wsadressing + + eclipse-plugin + jaxws-api + + + + + -warn:+forbidden + + + org.apache.maven.plugins maven-dependency-plugin