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

IDEMPIERE-3808:collect info to move idempiere to jdk-11 (update lib zk 8.6.0.1 ) 

https://issues.apache.org/jira/browse/ARIES-1859
https://tracker.zkoss.org/browse/ZK-4127
This commit is contained in:
hieplq 2018-12-23 12:26:44 +07:00
parent 35b47c9cc1
commit 49d0076c58
4 changed files with 44 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
org.adempiere.server-feature/server.product.launch
View File

File diff suppressed because one or more lines are too long

29
org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml
View File

@ -10,7 +10,7 @@
<artifactId>org.idempiere.maven.to.p2</artifactId> <artifactId>org.idempiere.maven.to.p2</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<properties> <properties>
<zk-osgi-zip-file>https://sourceforge.net/projects/zk1/files/ZK/zk-8.6.0/zk-bin-osgi-8.6.0.zip</zk-osgi-zip-file> <zk-osgi-zip-file>https://sourceforge.net/projects/zk1/files/ZK/zk-8.6.0.1/zk-bin-osgi-8.6.0.1.zip</zk-osgi-zip-file>
<!-- https://github.com/eclipse/jetty.project/blob/jetty-9.4.9.v20180320/pom.xml up to verison of jetty --> <!-- https://github.com/eclipse/jetty.project/blob/jetty-9.4.9.v20180320/pom.xml up to verison of jetty -->
<jetty.version>9.4.14.v20181114</jetty.version> <jetty.version>9.4.14.v20181114</jetty.version>
<jetty.alpn.api.version>1.1.3.v20160715</jetty.alpn.api.version> <jetty.alpn.api.version>1.1.3.v20160715</jetty.alpn.api.version>
@ -173,7 +173,7 @@
<transitive>false</transitive> <transitive>false</transitive>
</artifact> </artifact>
<artifact> <artifact>
<id>org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:jar:1.1</id> <id>org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:jar:1.2</id>
<source>true</source> <source>true</source>
<transitive>false</transitive> <transitive>false</transitive>
</artifact> </artifact>
@ -1845,31 +1845,6 @@ it also resolve issue confilic between eclipse runtime and tycho build
</executions> </executions>
</plugin> </plugin>
<plugin>
<groupId>com.googlecode.maven-download-plugin</groupId>
<artifactId>download-maven-plugin</artifactId>
<executions>
<execution>
<id>replace-source-of-org.apache.aries.spifly.dynamic.bundle</id>
<phase>package</phase>
<goals>
<goal>wget</goal>
</goals>
<configuration>
<!-- binary of org.apache.aries.spifly.dynamic.bundle combine from org.apache.aries.spifly.core-internal org.apache.aries.spifly.weaver-internal and org.apache.aries.spifly.dynamic.bundle but on maven source come only org.apache.aries.spifly.dynamic.bundle
so i recreate source bundle to help debug
https://issues.apache.org/jira/browse/ARIES-1859 -->
<url>${url.file.srv}/extra.jar/org.apache.aries.spifly.dynamic.bundle.source_1.1.jar</url>
<unpack>false</unpack>
<outputDirectory>${project.build.directory}/repository/plugins</outputDirectory>
<skipCache>true</skipCache>
<overwrite>true</overwrite>
<retries>5</retries>
</configuration>
</execution>
</executions>
</plugin>
<!-- update P2 after add zk lib --> <!-- update P2 after add zk lib -->
<plugin> <plugin>
<groupId>org.eclipse.tycho.extras</groupId> <groupId>org.eclipse.tycho.extras</groupId>

76
org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="idempiere-181032" sequenceNumber="107"> <?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="idempiere-181223" sequenceNumber="107">
<locations> <locations>
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.e4.core.tools.feature.source.feature.group" version="4.10.0.v20181116-0958"/> <unit id="org.eclipse.e4.core.tools.feature.source.feature.group" version="4.10.0.v20181116-0958"/>
@ -922,6 +922,16 @@
<unit id="com.itextpdf.source" version="5.5.13"/> <unit id="com.itextpdf.source" version="5.5.13"/>
<unit id="com.jaspersoft.studio.bundles.barbecue" version="1.5.0.beta1_b02"/> <unit id="com.jaspersoft.studio.bundles.barbecue" version="1.5.0.beta1_b02"/>
<unit id="com.jaspersoft.studio.bundles.itext" version="2.1.7.js6_b02"/> <unit id="com.jaspersoft.studio.bundles.itext" version="2.1.7.js6_b02"/>
<unit id="com.sun.activation.jakarta.activation" version="1.2.1"/>
<unit id="com.sun.activation.jakarta.activation.source" version="1.2.1"/>
<unit id="com.sun.mail.gimap" version="1.6.3"/>
<unit id="com.sun.mail.gimap.source" version="1.6.3"/>
<unit id="com.sun.mail.imap" version="1.6.3"/>
<unit id="com.sun.mail.imap.source" version="1.6.3"/>
<unit id="com.sun.mail.jakarta.mail" version="1.6.3"/>
<unit id="com.sun.mail.jakarta.mail.source" version="1.6.3"/>
<unit id="com.sun.mail.smtp" version="1.6.3"/>
<unit id="com.sun.mail.smtp.source" version="1.6.3"/>
<unit id="com.sun.xml.bind.jaxb-core" version="2.3.0.1"/> <unit id="com.sun.xml.bind.jaxb-core" version="2.3.0.1"/>
<unit id="com.sun.xml.bind.jaxb-core.source" version="2.3.0.1"/> <unit id="com.sun.xml.bind.jaxb-core.source" version="2.3.0.1"/>
<unit id="com.sun.xml.bind.jaxb-impl" version="2.3.1"/> <unit id="com.sun.xml.bind.jaxb-impl" version="2.3.1"/>
@ -964,6 +974,8 @@
<unit id="groovy-xml" version="2.5.3"/> <unit id="groovy-xml" version="2.5.3"/>
<unit id="groovy-xml.source" version="2.5.3"/> <unit id="groovy-xml.source" version="2.5.3"/>
<unit id="groovy.source" version="2.5.3"/> <unit id="groovy.source" version="2.5.3"/>
<unit id="jakarta.mail.api" version="1.6.3"/>
<unit id="jakarta.mail.api.source" version="1.6.3"/>
<unit id="javax.annotation-api" version="1.3.3"/> <unit id="javax.annotation-api" version="1.3.3"/>
<unit id="javax.annotation-api.source" version="1.3.3"/> <unit id="javax.annotation-api.source" version="1.3.3"/>
<unit id="javax.enterprise.cdi-api" version="2.0.0.SP1"/> <unit id="javax.enterprise.cdi-api" version="2.0.0.SP1"/>
@ -972,6 +984,8 @@
<unit id="javax.interceptor-api.source" version="1.2.2"/> <unit id="javax.interceptor-api.source" version="1.2.2"/>
<unit id="javax.jws-api" version="1.1.0"/> <unit id="javax.jws-api" version="1.1.0"/>
<unit id="javax.jws-api.source" version="1.1.0"/> <unit id="javax.jws-api.source" version="1.1.0"/>
<unit id="javax.persistence-api" version="2.2.99.b01"/>
<unit id="javax.persistence-api.source" version="2.2.99.b01"/>
<unit id="javax.transaction-api" version="1.3.0"/> <unit id="javax.transaction-api" version="1.3.0"/>
<unit id="javax.transaction-api.source" version="1.3.0"/> <unit id="javax.transaction-api.source" version="1.3.0"/>
<unit id="javax.validation.api" version="1.1.0.Final"/> <unit id="javax.validation.api" version="1.1.0.Final"/>
@ -1002,8 +1016,8 @@
<unit id="org.apache.activemq.activemq-core.source" version="5.7.0"/> <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" version="5.7.0"/>
<unit id="org.apache.activemq.kahadb.source" 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.1.0"/> <unit id="org.apache.aries.spifly.dynamic.bundle" version="1.2.0"/>
<unit id="org.apache.aries.spifly.dynamic.bundle.source" version="1.1.0"/> <unit id="org.apache.aries.spifly.dynamic.bundle.source" version="1.2.0"/>
<unit id="org.apache.aries.util" version="1.1.3"/> <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.aries.util.source" version="1.1.3"/>
<unit id="org.apache.batik.anim" version="1.9.1.v20180528-1434"/> <unit id="org.apache.batik.anim" version="1.9.1.v20180528-1434"/>
@ -1267,41 +1281,27 @@
<unit id="stax2-api" version="4.1.0"/> <unit id="stax2-api" version="4.1.0"/>
<unit id="stax2-api.source" version="3.1.4"/> <unit id="stax2-api.source" version="3.1.4"/>
<unit id="stax2-api.source" version="4.1.0"/> <unit id="stax2-api.source" version="4.1.0"/>
<unit id="zcommon" version="8.6.0"/> <unit id="zcommon" version="8.6.0.1"/>
<unit id="zcommon.sources" version="8.6.0"/> <unit id="zcommon.sources" version="8.6.0.1"/>
<unit id="zel" version="8.6.0"/> <unit id="zel" version="8.6.0.1"/>
<unit id="zel.sources" version="8.6.0"/> <unit id="zel.sources" version="8.6.0.1"/>
<unit id="zhtml" version="8.6.0"/> <unit id="zhtml" version="8.6.0.1"/>
<unit id="zhtml.sources" version="8.6.0"/> <unit id="zhtml.sources" version="8.6.0.1"/>
<unit id="zjavassist" version="8.6.0"/> <unit id="zjavassist" version="8.6.0.1"/>
<unit id="zjavassist.sources" version="8.6.0"/> <unit id="zjavassist.sources" version="8.6.0.1"/>
<unit id="zk" version="8.6.0"/> <unit id="zk" version="8.6.0.1"/>
<unit id="zk.sources" version="8.6.0"/> <unit id="zk.sources" version="8.6.0.1"/>
<unit id="zkbind" version="8.6.0"/> <unit id="zkbind" version="8.6.0.1"/>
<unit id="zkbind.sources" version="8.6.0"/> <unit id="zkbind.sources" version="8.6.0.1"/>
<unit id="zkplus" version="8.6.0"/> <unit id="zkplus" version="8.6.0.1"/>
<unit id="zkplus.sources" version="8.6.0"/> <unit id="zkplus.sources" version="8.6.0.1"/>
<unit id="zkwebfragment" version="8.6.0"/> <unit id="zkwebfragment" version="8.6.0.1"/>
<unit id="zkwebfragment.sources" version="8.6.0"/> <unit id="zkwebfragment.sources" version="8.6.0.1"/>
<unit id="zul" version="8.6.0"/> <unit id="zul" version="8.6.0.1"/>
<unit id="zul.sources" version="8.6.0"/> <unit id="zul.sources" version="8.6.0.1"/>
<unit id="zweb" version="8.6.0"/> <unit id="zweb" version="8.6.0.1"/>
<unit id="zweb.sources" version="8.6.0"/> <unit id="zweb.sources" version="8.6.0.1"/>
<repository location="file:/mnt/data/1Dev/project/native/idempiere-dev-11/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/target/repository/"/> <repository location="https://raw.githubusercontent.com/idempiere/binary.file/master/p2.maven/maven-p2-R20181223"/>
<unit id="com.sun.activation.jakarta.activation" version="1.2.1"/>
<unit id="com.sun.activation.jakarta.activation.source" version="1.2.1"/>
<unit id="com.sun.mail.gimap" version="1.6.3"/>
<unit id="com.sun.mail.gimap.source" version="1.6.3"/>
<unit id="com.sun.mail.imap" version="1.6.3"/>
<unit id="com.sun.mail.imap.source" version="1.6.3"/>
<unit id="com.sun.mail.jakarta.mail" version="1.6.3"/>
<unit id="com.sun.mail.jakarta.mail.source" version="1.6.3"/>
<unit id="com.sun.mail.smtp" version="1.6.3"/>
<unit id="com.sun.mail.smtp.source" version="1.6.3"/>
<unit id="jakarta.mail.api" version="1.6.3"/>
<unit id="jakarta.mail.api.source" version="1.6.3"/>
<unit id="javax.persistence-api" version="2.2.99.b01"/>
<unit id="javax.persistence-api.source" version="2.2.99.b01"/>
</location> </location>
</locations> </locations>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-10"/> <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-10"/>

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

@ -14,7 +14,7 @@
<tycho.extras.version>${tycho.version}</tycho.extras.version> <tycho.extras.version>${tycho.version}</tycho.extras.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jp.version>6.7.0</jp.version> <jp.version>6.7.0</jp.version>
<zk.version>8.6.0</zk.version> <zk.version>8.6.0.1</zk.version>
<zk.javassist.src.version>3.23.1-GA</zk.javassist.src.version> <zk.javassist.src.version>3.23.1-GA</zk.javassist.src.version>
<maven.dependency.version>3.1.1</maven.dependency.version> <maven.dependency.version>3.1.1</maven.dependency.version>
<download.maven.version>1.4.1</download.maven.version> <download.maven.version>1.4.1</download.maven.version>