Idempiere-4298:support update jdk (jdk 12 13 14) (#69)

* IDEMPIERE-4298: remove Bundle-RequiredExecutionEnvironment

when build by tycho value of Bundle-RequiredExecutionEnvironment and jdt need to compatibility
in case we use Bundle-RequiredExecutionEnvironment = 11 then can't build by jdk != 11
so stick on fix value isn't good

eclipse now also support Require-Capability, so don't need Bundle-RequiredExecutionEnvironment anymore

* IDEMPIERE-4298:support update jdk (jdk 12 13 14)

default environment still jdk-11 but you can build for any jdk by below command

export JAVA_HOME=path to jdk
mvn verify -Djdk.version=11

in case on JAVA_HOME is jdk 14 then can set jdk.version for 11, 12, 13, 14 and same for other jdk

at moment java 14 just support on eclipse 2020-03 with install plugin
Java 14 Support for Eclipse 2020-03 (4.15)
This commit is contained in:
hieplq 2020-05-20 10:18:31 +07:00 committed by GitHub
parent d2c02c1bf0
commit 595e0df99c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
28 changed files with 51 additions and 72 deletions

View File

@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-Name: iDempiere Callout
Bundle-SymbolicName: org.adempiere.base.callout
Bundle-Version: 7.1.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
Eclipse-RegisterBuddy: org.adempiere.base

View File

@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-Name: iDempiere Processes
Bundle-SymbolicName: org.adempiere.base.process
Bundle-Version: 7.1.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
Export-Package: org.adempiere.process,

View File

@ -53,7 +53,6 @@ Export-Package: bsh,
org.idempiere.distributed,
org.idempiere.fa.service.api,
org.idempiere.model
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
Import-Package: com.google.zxing,
com.google.zxing.qrcode.decoder,

View File

@ -1,6 +1,5 @@
Manifest-Version: 1.0
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
Bundle-SymbolicName: org.adempiere.eclipse.equinox.http.servlet
Eclipse-LazyStart: true

View File

@ -6,7 +6,6 @@ Bundle-Version: 7.1.0.qualifier
Export-Package: org.adempiere.install,
org.compiere.install
Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
Import-Package: javax.mail;version="1.5",
javax.mail.internet;version="1.5",

View File

@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-Name: iDempiere Payment Processor
Bundle-SymbolicName: org.adempiere.payment.processor;singleton:=true
Bundle-Version: 7.1.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
Bundle-ClassPath: .,

View File

@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-Name: iDempiere 2Pack Handlers
Bundle-SymbolicName: org.adempiere.pipo.handlers;singleton:=true
Bundle-Version: 7.1.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
Require-Bundle: org.adempiere.pipo;bundle-version="0.0.0",
org.adempiere.base;bundle-version="0.0.0"

View File

@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-Name: iDempiere 2Pack Core
Bundle-SymbolicName: org.adempiere.pipo;singleton:=true
Bundle-Version: 7.1.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
Import-Package: org.apache.commons.codec,
org.apache.commons.codec.binary,

View File

@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-Name: iDempiere Plugin Utils
Bundle-SymbolicName: org.adempiere.plugin.utils
Bundle-Version: 7.1.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
Import-Package: org.adempiere.base,
org.adempiere.util,

View File

@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-Name: iDempiere Replication Server
Bundle-SymbolicName: org.adempiere.replication.server;singleton:=true
Bundle-Version: 7.1.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
Require-Bundle: org.adempiere.server;bundle-version="0.0.0",
org.adempiere.replication;bundle-version="0.0.0",

View File

@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-Name: iDempiere Replication
Bundle-SymbolicName: org.adempiere.replication;singleton:=true
Bundle-Version: 7.1.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
Export-Package: org.adempiere.process.rpl,

View File

@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-Name: Library
Bundle-SymbolicName: org.adempiere.report.jasper.library;singleton:=true
Bundle-Version: 7.1.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
Fragment-Host: net.sf.jasperreports.engine;bundle-version="6.11.0"
Bundle-ClassPath: .,

View File

@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-Name: iDempiere JasperReport integration
Bundle-SymbolicName: org.adempiere.report.jasper;singleton:=true
Bundle-Version: 7.1.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
Import-Package: net.sourceforge.barbecue,
org.apache.commons.codec,

View File

@ -312,9 +312,9 @@
<setEntry value="org.krysalis.barcode4j@default:default"/>
<setEntry value="org.mortbay.jasper.apache-el@default:true"/>
<setEntry value="org.mortbay.jasper.apache-jsp@default:true"/>
<setEntry value="org.objectweb.asm*7.2.0.v20191010-1910@default:default"/>
<setEntry value="org.objectweb.asm.commons*7.2.0.v20191010-1910@default:default"/>
<setEntry value="org.objectweb.asm.tree*7.2.0.v20191010-1910@default:default"/>
<setEntry value="org.objectweb.asm*7.3.1@default:default"/>
<setEntry value="org.objectweb.asm.commons*7.3.1@default:default"/>
<setEntry value="org.objectweb.asm.tree*7.3.1@default:default"/>
<setEntry value="org.passay@default:default"/>
<setEntry value="org.sat4j.core@default:default"/>
<setEntry value="org.sat4j.pb@default:default"/>

View File

@ -6,7 +6,6 @@ Bundle-Version: 7.1.0.qualifier
Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
org.eclipse.equinox.app;bundle-version="0.0.0",
org.eclipse.jetty.apache-jsp;bundle-version="0.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
Web-ContextPath: /
Bundle-ClassPath: .

View File

@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-Name: iDempiere Web Client
Bundle-SymbolicName: org.adempiere.ui.zk;singleton:=true
Bundle-Version: 7.1.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
Import-Package: groovy.transform.stc;version="2.4.7",
javax.annotation,

View File

@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-Name: iDempiere UI base
Bundle-SymbolicName: org.adempiere.ui;singleton:=true
Bundle-Version: 7.1.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
org.apache.servicemix.bundles.xerces;bundle-version="0.0.0",

View File

@ -5,7 +5,6 @@ Bundle-SymbolicName: org.apache.ecs
Bundle-Version: 7.1.0.qualifier
Bundle-Activator: org.apache.ecs.Activator
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
Import-Package: org.osgi.framework;version="1.3.0"
Export-Package: org.apache.ecs;uses:="org.apache.ecs.xhtml",

View File

@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-Name: iDempiere Oracle Provider
Bundle-SymbolicName: org.compiere.db.oracle.provider;singleton:=true
Bundle-Version: 7.1.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
org.adempiere.install;bundle-version="0.0.0"

View File

@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-Name: iDempiere Postgresql Provider
Bundle-SymbolicName: org.compiere.db.postgresql.provider;singleton:=true
Bundle-Version: 7.1.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
Bundle-ClassPath: .,
lib/c3p0.jar,

View File

@ -5,7 +5,6 @@ Bundle-SymbolicName: org.idempiere.felix.webconsole
Bundle-Version: 7.1.0.qualifier
Bundle-Activator: org.idempiere.felix.webconsole.Activator
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
Import-Package: javax.servlet;version="2.5.0",
javax.servlet.descriptor;version="3.1.0",

View File

@ -30,7 +30,6 @@ Bundle-ClassPath: .,
lib/hazelcast-aws.jar,
lib/hazelcast.jar
Service-Component: OSGI-INF/*.xml
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
Require-Bundle: org.eclipse.osgi
Automatic-Module-Name: org.idempiere.hazelcast.service

View File

@ -28,7 +28,7 @@
<apache.cxf.databinding.version>3.1.18</apache.cxf.databinding.version>
<activation.version>1.2.1</activation.version>
<annotation.version>1.3.3</annotation.version>
<asm.version>7.0</asm.version>
<asm.version>7.3.1</asm.version>
<javamail.version>1.6.3</javamail.version>
<poi.version>4.1.0</poi.version>
<batik.version>1.11</batik.version>
@ -174,7 +174,7 @@
<transitive>false</transitive>
</artifact>
<artifact>
<id>org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:jar:1.2</id>
<id>org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:jar:1.2.4</id>
<source>true</source>
<transitive>false</transitive>
</artifact>

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<target name="idempiere-200508" sequenceNumber="110">
<target name="idempiere-200519" sequenceNumber="110">
<locations>
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<repository location="https://idempiere.github.io/binary.file/p2.maven/org.idempiere.webservice.client-p2-R20190412"/>
@ -410,7 +410,33 @@
<unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
</location>
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<repository location="https://idempiere.github.io/binary.file/p2.maven/maven-p2-R20200430/"/>
<repository location="https://idempiere.github.io/binary.file/p2.zk/9.0.1.2"/>
<unit id="zcommon" version="9.0.1.2"/>
<unit id="zcommon.source" version="9.0.1.2"/>
<unit id="zel" version="9.0.1.2"/>
<unit id="zel.source" version="9.0.1.2"/>
<unit id="zhtml" version="9.0.1.2"/>
<unit id="zhtml.source" version="9.0.1.2"/>
<unit id="zjavassist" version="9.0.1.2"/>
<unit id="zk" version="9.0.1.2"/>
<unit id="zk.source" version="9.0.1.2"/>
<unit id="zkbind" version="9.0.1.2"/>
<unit id="zkbind.source" version="9.0.1.2"/>
<unit id="zkplus" version="9.0.1.2"/>
<unit id="zkplus-legacy" version="9.0.1.2"/>
<unit id="zkplus-legacy.source" version="9.0.1.2"/>
<unit id="zkplus.source" version="9.0.1.2"/>
<unit id="zkwebfragment" version="9.0.1.2"/>
<unit id="zkwebfragment.source" version="9.0.1.2"/>
<unit id="zul" version="9.0.1.2"/>
<unit id="zul.source" version="9.0.1.2"/>
<unit id="zweb" version="9.0.1.2"/>
<unit id="zweb-dsp" version="9.0.1.2"/>
<unit id="zweb-dsp.source" version="9.0.1.2"/>
<unit id="zweb.source" version="9.0.1.2"/>
</location>
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<repository location="https://idempiere.github.io/binary.file/p2.maven/maven-p2-R20200519/"/>
<unit id="bcmail" version="1.60.0"/>
<unit id="bcmail.source" version="1.60.0"/>
<unit id="bcpkix" version="1.60.0"/>
@ -542,8 +568,8 @@
<unit id="org.apache.activemq.activemq-core.source" version="5.7.0"/>
<unit id="org.apache.activemq.kahadb" version="5.7.0"/>
<unit id="org.apache.activemq.kahadb.source" version="5.7.0"/>
<unit id="org.apache.aries.spifly.dynamic.bundle" version="1.2.0"/>
<unit id="org.apache.aries.spifly.dynamic.bundle.source" version="1.2.0"/>
<unit id="org.apache.aries.spifly.dynamic.bundle" version="1.2.4"/>
<unit id="org.apache.aries.spifly.dynamic.bundle.source" version="1.2.4"/>
<unit id="org.apache.aries.util" version="1.1.3"/>
<unit id="org.apache.aries.util.source" version="1.1.3"/>
<unit id="org.apache.commons.commons-collections4" version="4.4.0"/>
@ -785,16 +811,16 @@
<unit id="org.mortbay.jasper.apache-el" version="8.5.49"/>
<unit id="org.mortbay.jasper.apache-el.source" version="8.5.49"/>
<unit id="org.mortbay.jasper.apache-jsp" version="8.5.49"/>
<unit id="org.objectweb.asm" version="7.0.0"/>
<unit id="org.objectweb.asm.commons" version="7.0.0"/>
<unit id="org.objectweb.asm.commons.source" version="7.0.0"/>
<unit id="org.objectweb.asm.source" version="7.0.0"/>
<unit id="org.objectweb.asm.tree" version="7.0.0"/>
<unit id="org.objectweb.asm.tree.analysis" version="7.0.0"/>
<unit id="org.objectweb.asm.tree.analysis.source" version="7.0.0"/>
<unit id="org.objectweb.asm.tree.source" version="7.0.0"/>
<unit id="org.objectweb.asm.util" version="7.0.0"/>
<unit id="org.objectweb.asm.util.source" version="7.0.0"/>
<unit id="org.objectweb.asm" version="7.3.1"/>
<unit id="org.objectweb.asm.commons" version="7.3.1"/>
<unit id="org.objectweb.asm.commons.source" version="7.3.1"/>
<unit id="org.objectweb.asm.source" version="7.3.1"/>
<unit id="org.objectweb.asm.tree" version="7.3.1"/>
<unit id="org.objectweb.asm.tree.analysis" version="7.3.1"/>
<unit id="org.objectweb.asm.tree.analysis.source" version="7.3.1"/>
<unit id="org.objectweb.asm.tree.source" version="7.3.1"/>
<unit id="org.objectweb.asm.util" version="7.3.1"/>
<unit id="org.objectweb.asm.util.source" version="7.3.1"/>
<unit id="org.passay" version="1.3.1"/>
<unit id="org.passay.source" version="1.3.1"/>
<unit id="org.springframework.spring-jcl" version="5.1.1.RELEASE"/>
@ -811,32 +837,6 @@
<unit id="stax2-api" version="4.2.0"/>
<unit id="stax2-api.source" version="4.2.0"/>
</location>
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<repository location="https://idempiere.github.io/binary.file/p2.zk/9.0.1.2"/>
<unit id="zcommon" version="9.0.1.2"/>
<unit id="zcommon.source" version="9.0.1.2"/>
<unit id="zel" version="9.0.1.2"/>
<unit id="zel.source" version="9.0.1.2"/>
<unit id="zhtml" version="9.0.1.2"/>
<unit id="zhtml.source" version="9.0.1.2"/>
<unit id="zjavassist" version="9.0.1.2"/>
<unit id="zk" version="9.0.1.2"/>
<unit id="zk.source" version="9.0.1.2"/>
<unit id="zkbind" version="9.0.1.2"/>
<unit id="zkbind.source" version="9.0.1.2"/>
<unit id="zkplus" version="9.0.1.2"/>
<unit id="zkplus-legacy" version="9.0.1.2"/>
<unit id="zkplus-legacy.source" version="9.0.1.2"/>
<unit id="zkplus.source" version="9.0.1.2"/>
<unit id="zkwebfragment" version="9.0.1.2"/>
<unit id="zkwebfragment.source" version="9.0.1.2"/>
<unit id="zul" version="9.0.1.2"/>
<unit id="zul.source" version="9.0.1.2"/>
<unit id="zweb" version="9.0.1.2"/>
<unit id="zweb-dsp" version="9.0.1.2"/>
<unit id="zweb-dsp.source" version="9.0.1.2"/>
<unit id="zweb.source" version="9.0.1.2"/>
</location>
</locations>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
</target>

View File

@ -10,6 +10,7 @@
<name>Maven parent project for idempiere</name>
<properties>
<jdk.version>11</jdk.version>
<tycho.version>1.7.0</tycho.version>
<tycho.extras.version>${tycho.version}</tycho.extras.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@ -347,7 +348,9 @@
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-compiler-plugin</artifactId>
<version>${tycho.version}</version>
<configuration>
<configuration>
<source>${jdk.version}</source>
<target>${jdk.version}</target>
<verbose>true</verbose>
</configuration>
</plugin>
@ -555,8 +558,8 @@
<arch>x86_64</arch>
</environment>
</environments>
<executionEnvironmentDefault>JavaSE-11</executionEnvironmentDefault>
<executionEnvironment>JavaSE-11</executionEnvironment>
<executionEnvironmentDefault>JavaSE-${jdk.version}</executionEnvironmentDefault>
<executionEnvironment>JavaSE-${jdk.version}</executionEnvironment>
</configuration>
</plugin>
</plugins>

View File

@ -5,7 +5,6 @@ Bundle-SymbolicName: org.idempiere.test
Bundle-Version: 7.1.0.qualifier
Bundle-Vendor: iDempiere
Automatic-Module-Name: org.idempiere.test
Bundle-RequiredExecutionEnvironment: JavaSE-11
Import-Package: org.junit.jupiter.api;version="5.6.0",
org.junit.jupiter.api.condition;version="5.6.0",
org.junit.jupiter.api.extension;version="5.6.0",

View File

@ -4,7 +4,6 @@ Bundle-Name: iDempiere Webservices
Bundle-SymbolicName: org.idempiere.webservices;singleton:=true
Bundle-Version: 7.1.0.qualifier
Bundle-Activator: org.idempiere.webservices.Activator
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
Service-Component: OSGI-INF/*.xml
Import-Package: javax.activation,

View File

@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-Name: extra zk library
Bundle-SymbolicName: org.idempiere.zk.extra
Bundle-Version: 7.1.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
Bundle-ClassPath: .,
lib/breeze.jar,