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

IDEMPIERE-2003: patch for ZK-4198 by Carlos 

Capturing wrong numbers with numeric keypad when decimal separator is not dot
This commit is contained in:
hieplq 2019-01-18 19:29:43 +07:00
parent 4d9912c6e3
commit 272d212b1a
3 changed files with 66 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

41
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.1/zk-bin-osgi-8.6.0.1.zip</zk-osgi-zip-file> <zk-osgi-zip-file>https://sourceforge.net/project/zk1/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>
@ -115,12 +115,6 @@
<source>true</source> <source>true</source>
<transitive>false</transitive> <transitive>false</transitive>
</artifact> </artifact>
<artifact>
<!-- it's maintain and up to date than org.eclipse.jdt.core.compiler.batch -->
<id>org.eclipse.jdt:org.eclipse.jdt.core:jar:${jdtVersion}</id>
<source>true</source>
<transitive>false</transitive>
</artifact>
<artifact> <artifact>
<id>javax.websocket:javax.websocket-api:jar:1.1</id> <id>javax.websocket:javax.websocket-api:jar:1.1</id>
<source>true</source> <source>true</source>
@ -1762,6 +1756,39 @@ it also resolve issue confilic between eclipse runtime and tycho build
<retries>5</retries> <retries>5</retries>
</configuration> </configuration>
</execution> </execution>
<!--hot fix for https://tracker.zkoss.org/browse/ZK-4198, https://idempiere.atlassian.net/browse/IDEMPIERE-2003-->
<execution>
<id>download-zk-patch-source-for-IDEMPIERE-2003</id>
<phase>package</phase>
<goals>
<goal>wget</goal>
</goals>
<configuration>
<url>${url.file.srv}/extra.jar/zul.sources_8.6.0.1-patched.jar</url>
<unpack>false</unpack>
<outputFileName>zul.sources_8.6.0.1-patched.jar</outputFileName>
<outputDirectory>${project.build.directory}/repository/plugins</outputDirectory>
<retries>5</retries>
<overwrite>true</overwrite>
<skipCache>true</skipCache>
</configuration>
</execution>
<execution>
<id>download-zk-patch-binary-for-IDEMPIERE-2003</id>
<phase>package</phase>
<goals>
<goal>wget</goal>
</goals>
<configuration>
<url>${url.file.srv}/extra.jar/zul_8.6.0.1-patched.jar</url>
<unpack>false</unpack>
<outputFileName>zul_8.6.0.1-patched.jar</outputFileName>
<outputDirectory>${project.build.directory}/repository/plugins</outputDirectory>
<retries>5</retries>
<overwrite>true</overwrite>
<skipCache>true</skipCache>
</configuration>
</execution>
</executions> </executions>
</plugin> </plugin>
<!-- copy zk osgi bundle to repository folder --> <!-- copy zk osgi bundle to repository folder -->

60
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-181229" sequenceNumber="107"> <?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="idempiere-190118" 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"/>
@ -888,30 +888,30 @@
<unit id="bcprov.source" version="1.60.0"/> <unit id="bcprov.source" version="1.60.0"/>
<unit id="bctsp" version="1.46.0"/> <unit id="bctsp" version="1.46.0"/>
<unit id="bctsp.source" version="1.46.0"/> <unit id="bctsp.source" version="1.46.0"/>
<unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.9.7"/> <unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.9.8"/>
<unit id="com.fasterxml.jackson.core.jackson-annotations.source" version="2.9.7"/> <unit id="com.fasterxml.jackson.core.jackson-annotations.source" version="2.9.8"/>
<unit id="com.fasterxml.jackson.core.jackson-core" version="2.9.7"/> <unit id="com.fasterxml.jackson.core.jackson-core" version="2.9.8"/>
<unit id="com.fasterxml.jackson.core.jackson-core.source" version="2.9.7"/> <unit id="com.fasterxml.jackson.core.jackson-core.source" version="2.9.8"/>
<unit id="com.fasterxml.jackson.core.jackson-databind" version="2.9.7"/> <unit id="com.fasterxml.jackson.core.jackson-databind" version="2.9.8"/>
<unit id="com.fasterxml.jackson.core.jackson-databind.source" version="2.9.7"/> <unit id="com.fasterxml.jackson.core.jackson-databind.source" version="2.9.8"/>
<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-xml" version="2.9.7"/> <unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-xml" version="2.9.8"/>
<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-xml.source" version="2.9.7"/> <unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-xml.source" version="2.9.8"/>
<unit id="com.fasterxml.jackson.datatype.jackson-datatype-guava" version="2.9.7"/> <unit id="com.fasterxml.jackson.datatype.jackson-datatype-guava" version="2.9.8"/>
<unit id="com.fasterxml.jackson.datatype.jackson-datatype-guava.source" version="2.9.7"/> <unit id="com.fasterxml.jackson.datatype.jackson-datatype-guava.source" version="2.9.8"/>
<unit id="com.fasterxml.jackson.datatype.jackson-datatype-joda" version="2.9.7"/> <unit id="com.fasterxml.jackson.datatype.jackson-datatype-joda" version="2.9.8"/>
<unit id="com.fasterxml.jackson.datatype.jackson-datatype-joda.source" version="2.9.7"/> <unit id="com.fasterxml.jackson.datatype.jackson-datatype-joda.source" version="2.9.8"/>
<unit id="com.fasterxml.jackson.datatype.jackson-datatype-json-org" version="2.9.7"/> <unit id="com.fasterxml.jackson.datatype.jackson-datatype-json-org" version="2.9.8"/>
<unit id="com.fasterxml.jackson.datatype.jackson-datatype-json-org.source" version="2.9.7"/> <unit id="com.fasterxml.jackson.datatype.jackson-datatype-json-org.source" version="2.9.8"/>
<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base" version="2.9.7"/> <unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base" version="2.9.8"/>
<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base.source" version="2.9.7"/> <unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base.source" version="2.9.8"/>
<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" version="2.9.7"/> <unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" version="2.9.8"/>
<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider.source" version="2.9.7"/> <unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider.source" version="2.9.8"/>
<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-xml-provider" version="2.9.7"/> <unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-xml-provider" version="2.9.8"/>
<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-xml-provider.source" version="2.9.7"/> <unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-xml-provider.source" version="2.9.8"/>
<unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations" version="2.9.7"/> <unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations" version="2.9.8"/>
<unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations.source" version="2.9.7"/> <unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations.source" version="2.9.8"/>
<unit id="com.fasterxml.jackson.module.jackson-module-jsonSchema" version="2.9.7"/> <unit id="com.fasterxml.jackson.module.jackson-module-jsonSchema" version="2.9.8"/>
<unit id="com.fasterxml.jackson.module.jackson-module-jsonSchema.source" version="2.9.7"/> <unit id="com.fasterxml.jackson.module.jackson-module-jsonSchema.source" version="2.9.8"/>
<unit id="com.fasterxml.woodstox.woodstox-core" version="5.0.3"/> <unit id="com.fasterxml.woodstox.woodstox-core" version="5.0.3"/>
<unit id="com.fasterxml.woodstox.woodstox-core.source" version="5.0.3"/> <unit id="com.fasterxml.woodstox.woodstox-core.source" version="5.0.3"/>
<unit id="com.google.zxing.core" version="3.2.1"/> <unit id="com.google.zxing.core" version="3.2.1"/>
@ -1152,8 +1152,6 @@
<unit id="org.atmosphere.runtime.source" version="2.5.0"/> <unit id="org.atmosphere.runtime.source" version="2.5.0"/>
<unit id="org.cryptacular" version="1.2.2"/> <unit id="org.cryptacular" version="1.2.2"/>
<unit id="org.cryptacular.source" version="1.2.2"/> <unit id="org.cryptacular.source" version="1.2.2"/>
<unit id="org.eclipse.jdt.core" version="3.15.0.v20180905-0317"/>
<unit id="org.eclipse.jdt.core.source" version="3.15.0.v20180905-0317"/>
<unit id="org.eclipse.jetty.alpn.api" version="1.1.3.v20160715"/> <unit id="org.eclipse.jetty.alpn.api" version="1.1.3.v20160715"/>
<unit id="org.eclipse.jetty.alpn.api.source" version="1.1.3.v20160715"/> <unit id="org.eclipse.jetty.alpn.api.source" version="1.1.3.v20160715"/>
<unit id="org.eclipse.jetty.alpn.client" version="9.4.14.v20181114"/> <unit id="org.eclipse.jetty.alpn.client" version="9.4.14.v20181114"/>
@ -1244,8 +1242,8 @@
<unit id="org.eclipse.jetty.websocket.servlet.source" version="9.4.14.v20181114"/> <unit id="org.eclipse.jetty.websocket.servlet.source" version="9.4.14.v20181114"/>
<unit id="org.eclipse.jetty.xml" version="9.4.14.v20181114"/> <unit id="org.eclipse.jetty.xml" version="9.4.14.v20181114"/>
<unit id="org.eclipse.jetty.xml.source" version="9.4.14.v20181114"/> <unit id="org.eclipse.jetty.xml.source" version="9.4.14.v20181114"/>
<unit id="org.idempiere.org.conscrypt.openjdk-uber" version="1.4.0"/> <unit id="org.idempiere.org.conscrypt.openjdk-uber" version="1.4.2"/>
<unit id="org.idempiere.org.conscrypt.openjdk-uber.source" version="1.4.0"/> <unit id="org.idempiere.org.conscrypt.openjdk-uber.source" version="1.4.2"/>
<unit id="org.jfree.chart-osgi" version="1.0.19"/> <unit id="org.jfree.chart-osgi" version="1.0.19"/>
<unit id="org.jfree.jcommon-osgi" version="1.0.23"/> <unit id="org.jfree.jcommon-osgi" version="1.0.23"/>
<unit id="org.krysalis.barcode4j" version="2.1.0"/> <unit id="org.krysalis.barcode4j" version="2.1.0"/>
@ -1298,10 +1296,12 @@
<unit id="zkwebfragment" version="8.6.0.1"/> <unit id="zkwebfragment" version="8.6.0.1"/>
<unit id="zkwebfragment.sources" version="8.6.0.1"/> <unit id="zkwebfragment.sources" version="8.6.0.1"/>
<unit id="zul" version="8.6.0.1"/> <unit id="zul" version="8.6.0.1"/>
<unit id="zul" version="8.6.0.1-patched"/>
<unit id="zul.sources" version="8.6.0.1"/> <unit id="zul.sources" version="8.6.0.1"/>
<unit id="zul.sources" version="8.6.0.1-patched"/>
<unit id="zweb" version="8.6.0.1"/> <unit id="zweb" version="8.6.0.1"/>
<unit id="zweb.sources" version="8.6.0.1"/> <unit id="zweb.sources" version="8.6.0.1"/>
<repository location="https://raw.githubusercontent.com/idempiere/binary.file/master/p2.maven/maven-p2-R20181229"/> <repository location="https://raw.githubusercontent.com/idempiere/binary.file/master/p2.maven/maven-p2-R20190118"/>
</location> </location>
</locations> </locations>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>