midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
hieplq 2018-10-25 23:59:10 +07:00
parent 5488ef3928
commit 69c91e1111
9 changed files with 133 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
org.adempiere.base/META-INF/MANIFEST.MF
View File

@ -58,7 +58,6 @@ Export-Package: bsh,
org.idempiere.model org.idempiere.model
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
Import-Package: com.sun.mail.smtp;version="1.5", Import-Package: com.sun.mail.smtp;version="1.5",
javax.activation,
javax.jms;version="1.1.0", javax.jms;version="1.1.0",
javax.mail;version="1.5", javax.mail;version="1.5",
javax.mail.internet;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, groovy,
javax.xml;bundle-version="1.3.4", javax.xml;bundle-version="1.3.4",
org.apache.poi.poi;bundle-version="3.15.0", 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 Automatic-Module-Name: org.adempiere.base
Bundle-Vendor: iDempiere Community Bundle-Vendor: iDempiere Community

6
org.adempiere.base/pom.xml
View File

@ -17,7 +17,11 @@
<artifactId>tycho-compiler-plugin</artifactId> <artifactId>tycho-compiler-plugin</artifactId>
<configuration> <configuration>
<!-- https://bugs.eclipse.org/bugs/show_bug.cgi?id=367431 --> <!-- https://bugs.eclipse.org/bugs/show_bug.cgi?id=367431 -->
<compilerArgument>-warn:+forbidden</compilerArgument> <compilerArgs>
<arg>-warn:+forbidden</arg>
<arg>--add-exports</arg>
<arg>java.sql.rowset/com.sun.rowset=ALL-UNNAMED</arg>
</compilerArgs>
</configuration> </configuration>
</plugin> </plugin>

15
org.adempiere.install/pom.xml
View File

@ -9,4 +9,19 @@
</parent> </parent>
<artifactId>org.adempiere.install</artifactId> <artifactId>org.adempiere.install</artifactId>
<packaging>eclipse-plugin</packaging> <packaging>eclipse-plugin</packaging>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-compiler-plugin</artifactId>
<configuration>
<compilerArgs>
<arg>--add-exports</arg>
<arg>java.base/sun.security.tools.keytool=ALL-UNNAMED</arg>
</compilerArgs>
</configuration>
</plugin>
</plugins>
</build>
</project> </project>

8
org.adempiere.server/pom.xml
View File

@ -16,8 +16,12 @@
<groupId>org.eclipse.tycho</groupId> <groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-compiler-plugin</artifactId> <artifactId>tycho-compiler-plugin</artifactId>
<configuration> <configuration>
<!-- https://bugs.eclipse.org/bugs/show_bug.cgi?id=367431 --> <compilerArgs>
<compilerArgument>-warn:+forbidden</compilerArgument> <!-- https://bugs.eclipse.org/bugs/show_bug.cgi?id=367431 -->
<arg>-warn:+forbidden</arg>
<arg>--add-exports</arg>
<arg>java.naming/com.sun.jndi.ldap=ALL-UNNAMED</arg>
</compilerArgs>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>

8
org.adempiere.ui.swing/pom.xml
View File

@ -16,8 +16,12 @@
<groupId>org.eclipse.tycho</groupId> <groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-compiler-plugin</artifactId> <artifactId>tycho-compiler-plugin</artifactId>
<configuration> <configuration>
<!-- https://bugs.eclipse.org/bugs/show_bug.cgi?id=367431 --> <compilerArgs>
<compilerArgument>-warn:+forbidden</compilerArgument> <!-- https://bugs.eclipse.org/bugs/show_bug.cgi?id=367431 -->
<arg>-warn:+forbidden</arg>
<arg>--add-exports</arg>
<arg>java.desktop/sun.awt=ALL-UNNAMED</arg>
</compilerArgs>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>

6
org.adempiere.ui.zk/META-INF/MANIFEST.MF
View File

@ -5,7 +5,6 @@ Bundle-SymbolicName: org.adempiere.ui.zk;singleton:=true
Bundle-Version: 5.1.0.qualifier Bundle-Version: 5.1.0.qualifier
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
Import-Package: groovy.transform.stc;version="2.4.7", Import-Package: groovy.transform.stc;version="2.4.7",
javax.activation,
javax.annotation, javax.annotation,
javax.annotation.processing, javax.annotation.processing,
javax.annotation.security;version="1.2.0", 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.http,
javax.servlet.jsp.resources;version="2.3.0", javax.servlet.jsp.resources;version="2.3.0",
javax.servlet.resources;version="3.1.0", javax.servlet.resources;version="3.1.0",
javax.xml.bind,
net.sf.jasperreports.engine, net.sf.jasperreports.engine,
net.sf.jasperreports.engine.export, net.sf.jasperreports.engine.export,
net.sf.jasperreports.engine.util, 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.junit;bundle-version="0.0.0",
org.apache.commons.io;bundle-version="0.0.0", org.apache.commons.io;bundle-version="0.0.0",
com.itextpdf;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 Bundle-Activator: org.adempiere.webui.WebUIActivator
Eclipse-ExtensibleAPI: true Eclipse-ExtensibleAPI: true
Web-ContextPath: webui Web-ContextPath: webui

81
org.idempiere.parent/pom.xml
View File

@ -344,6 +344,21 @@
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-exec</artifactId> <artifactId>commons-exec</artifactId>
<version>1.3</version> <version>1.3</version>
</dependency>
<dependency>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.compiler.tool</artifactId>
<version>1.2.300</version>
</dependency>
<dependency>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.core</artifactId>
<version>${jdtVersion}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.compiler.apt</artifactId>
<version>${jdtAptVersion}</version>
</dependency> </dependency>
</dependencies> </dependencies>
</plugin> </plugin>
@ -485,6 +500,72 @@
<version>${tycho.version}</version> <version>${tycho.version}</version>
<configuration> <configuration>
<targetDefinitionIncludeSource>honor</targetDefinitionIncludeSource> <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: <!-- work-around for split package message error "Missing Constraint:
Bundle-RequiredExecutionEnvironment" track:https://bugs.eclipse.org/bugs/show_bug.cgi?id=403196 Bundle-RequiredExecutionEnvironment" track:https://bugs.eclipse.org/bugs/show_bug.cgi?id=403196

8
org.idempiere.webservices/META-INF/MANIFEST.MF
View File

@ -6,9 +6,7 @@ Bundle-Version: 5.1.0.qualifier
Bundle-Activator: org.idempiere.webservices.Activator Bundle-Activator: org.idempiere.webservices.Activator
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
Service-Component: OSGI-INF/ws_modelfactory.xml Service-Component: OSGI-INF/ws_modelfactory.xml
Import-Package: javax.activation, Import-Package: javax.mail;version="1.4.1",
javax.annotation,
javax.mail;version="1.4.1",
javax.mail.internet;version="1.5", javax.mail.internet;version="1.5",
javax.servlet;version="3.0.0", javax.servlet;version="3.0.0",
javax.servlet.http;version="3.0.0", javax.servlet.http;version="3.0.0",
@ -86,7 +84,9 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
org.springframework.spring-core;bundle-version="5.1.1", org.springframework.spring-core;bundle-version="5.1.1",
org.springframework.spring-expression;bundle-version="5.1.1", org.springframework.spring-expression;bundle-version="5.1.1",
org.springframework.spring-jcl;bundle-version="5.1.1", org.springframework.spring-jcl;bundle-version="5.1.1",
org.springframework.spring-web;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"
Bundle-ClassPath: ., Bundle-ClassPath: .,
WEB-INF/lib/aopalliance.jar, WEB-INF/lib/aopalliance.jar,
WEB-INF/lib/axis.jar, WEB-INF/lib/axis.jar,

10
org.idempiere.webservices/pom.xml
View File

@ -12,6 +12,16 @@
<build> <build>
<plugins> <plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-compiler-plugin</artifactId>
<configuration>
<!-- https://bugs.eclipse.org/bugs/show_bug.cgi?id=367431 -->
<compilerArgs>
<arg>-warn:+forbidden</arg>
</compilerArgs>
</configuration>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId> <artifactId>maven-dependency-plugin</artifactId>