diff --git a/.hgignore b/.hgignore index bce765a476..31dc9e41f1 100644 --- a/.hgignore +++ b/.hgignore @@ -9,6 +9,7 @@ org.adempiere.webstore/bin org.idempiere.hazelcast.service.config/bin */target runtime-server.product +org.idempiere.fitnesse.server/FitNesseRoot syntax: regexp ^adempiere$ ^org\.adempiere\.install/lib$ diff --git a/org.adempiere.base-feature/feature.xml b/org.adempiere.base-feature/feature.xml index 18b199739e..7fa0d38e15 100644 --- a/org.adempiere.base-feature/feature.xml +++ b/org.adempiere.base-feature/feature.xml @@ -93,13 +93,6 @@ install-size="0" version="0.0.0"/> - - + + + + + + + + + + - + - + diff --git a/org.adempiere.plugin.utils/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.plugin.utils/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7a8fc9dd10 100644 --- a/org.adempiere.plugin.utils/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.plugin.utils/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.adempiere.replication/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.replication/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7a8fc9dd10 100644 --- a/org.adempiere.replication/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.replication/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.adempiere.report.jasper.swing/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.report.jasper.swing/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7a8fc9dd10 100644 --- a/org.adempiere.report.jasper.swing/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.report.jasper.swing/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.adempiere.report.jasper/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.report.jasper/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7a8fc9dd10 100644 --- a/org.adempiere.report.jasper/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.report.jasper/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.adempiere.server-feature/hazelcast-template.xml b/org.adempiere.server-feature/hazelcast-template.xml index 9f1dace4bd..79c9a70f84 100644 --- a/org.adempiere.server-feature/hazelcast-template.xml +++ b/org.adempiere.server-feature/hazelcast-template.xml @@ -16,20 +16,27 @@ --> + + http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"> + @ADEMPIERE_DB_USER@.@ADEMPIERE_DB_NAME@/@ADEMPIERE_DB_SERVER@ - @ADEMPIERE_DB_PASSWORD@ + http://localhost:8080/hazelcast-mancenter + false @@ -53,7 +60,39 @@ 127.0.0.1 - + + my-access-key + my-secret-key + + us-west-1 + + ec2.amazonaws.com + + hazelcast-sg + type + hz-nodes + + + us-east1-b,us-east1-c + + + CLIENT_ID + CLIENT_SECRET + TENANT_ID + SUB_ID + HZLCAST001 + GROUP-NAME + + + MY-KUBERNETES-NAMESPACE + MY-SERVICE-NAME + MY-SERVICE-LABEL-NAME + MY-SERVICE-LABEL-VALUE + + + true + hazelcast + @@ -93,6 +132,9 @@ 19 + + + @@ -100,6 +142,9 @@ 0 + + true + - 1 + 0 - 0 + 1 0 + Maximum number of seconds for each entry to stay in the map. Entries that are + older than and not updated for + will get automatically evicted from the map. + Any integer between 0 and Integer.MAX_VALUE. 0 means infinite. Default is 0 + --> 0 + Maximum number of seconds for each entry to stay idle in the map. Entries that are + idle(not touched) for more than will get + automatically evicted from the map. Entry is touched if get, put or containsKey is called. + Any integer between 0 and Integer.MAX_VALUE. 0 means infinite. Default is 0. + --> 1800 - com.hazelcast.map.merge.PutIfAbsentMapMergePolicy + com.hazelcast.spi.merge.PutIfAbsentMergePolicy INDEX-ONLY - + OBJECT true - + + mapName + 10 + + 1 SET + com.hazelcast.spi.merge.PutIfAbsentMergePolicy + + OBJECT + true + true + com.hazelcast.spi.merge.PutIfAbsentMergePolicy + + 1 + com.hazelcast.spi.merge.PutIfAbsentMergePolicy 1 + com.hazelcast.spi.merge.PutIfAbsentMergePolicy @@ -277,8 +344,27 @@ 0 0 BINARY + com.hazelcast.spi.merge.PutIfAbsentMergePolicy + + 100 + 600000 + 0 + 0 + true + + + + com.hazelcast.spi.merge.PutIfAbsentMergePolicy + + + + com.hazelcast.spi.merge.PutIfAbsentMergePolicy + + + + 0 @@ -287,4 +373,26 @@ + + 1 + 0 + HyperLogLogMergePolicy + + + + 100 + 1 + 16 + com.hazelcast.spi.merge.PutIfAbsentMergePolicy + + + + 1000 + 1 + + + + 2147483647 + true + diff --git a/org.adempiere.server-feature/idempiere-server.sh b/org.adempiere.server-feature/idempiere-server.sh index 1d40ac8d2e..f31c4d867f 100644 --- a/org.adempiere.server-feature/idempiere-server.sh +++ b/org.adempiere.server-feature/idempiere-server.sh @@ -37,6 +37,7 @@ VMOPTS="-Dorg.osgi.framework.bootdelegation=sun.security.ssl,org.w3c.dom.events --add-exports java.desktop/sun.awt=ALL-UNNAMED --add-exports java.sql.rowset/com.sun.rowset=ALL-UNNAMED --add-exports java.naming/com.sun.jndi.ldap=ALL-UNNAMED ---add-modules=ALL-SYSTEM" +--add-modules=ALL-SYSTEM +--add-modules java.se --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.management/sun.management=ALL-UNNAMED --add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED --add-exports java.base/jdk.internal.ref=ALL-UNNAMED --add-exports java.desktop/sun.awt=ALL-UNNAMED --add-exports java.sql.rowset/com.sun.rowset=ALL-UNNAMED --add-exports java.naming/com.sun.jndi.ldap=ALL-UNNAMED" $JAVA ${DEBUG} $IDEMPIERE_JAVA_OPTIONS $VMOPTS -jar $BASE/plugins/org.eclipse.equinox.launcher_1.*.jar -application org.adempiere.server.application diff --git a/org.adempiere.server-feature/server.product b/org.adempiere.server-feature/server.product index 489bdd6af2..046d2a5b7b 100644 --- a/org.adempiere.server-feature/server.product +++ b/org.adempiere.server-feature/server.product @@ -9,7 +9,7 @@ -console - --add-exports java.desktop/sun.awt=ALL-UNNAMED --add-exports java.sql.rowset/com.sun.rowset=ALL-UNNAMED --add-exports java.naming/com.sun.jndi.ldap=ALL-UNNAMED -Declipse.product=org.adempiere.server.product -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dorg.osgi.framework.bootdelegation=sun.security.ssl,org.w3c.dom.events -Dosgi.compatibility.bootdelegation=true -Djetty.home=jettyhome -Djetty.etc.config.urls=etc/jetty.xml,etc/jetty-deployer.xml,etc/jetty-ssl.xml,etc/jetty-ssl-context.xml,etc/jetty-http.xml,etc/jetty-alpn.xml,etc/jetty-http2.xml,etc/jetty-https.xml -Dmail.mime.encodefilename=true -Dmail.mime.decodefilename=true -Dmail.mime.encodeparameters=true -Dmail.mime.decodeparameters=true -Dhazelcast.config=hazelcast.xml -Dorg.zkoss.zk.config.path=file://${workspace_loc}/zk.xml + --add-modules java.se --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.management/sun.management=ALL-UNNAMED --add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED --add-exports java.base/jdk.internal.ref=ALL-UNNAMED --add-exports java.desktop/sun.awt=ALL-UNNAMED --add-exports java.sql.rowset/com.sun.rowset=ALL-UNNAMED --add-exports java.naming/com.sun.jndi.ldap=ALL-UNNAMED -Declipse.product=org.adempiere.server.product -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dorg.osgi.framework.bootdelegation=sun.security.ssl,org.w3c.dom.events -Dosgi.compatibility.bootdelegation=true -Djetty.home=jettyhome -Djetty.etc.config.urls=etc/jetty.xml,etc/jetty-deployer.xml,etc/jetty-ssl.xml,etc/jetty-ssl-context.xml,etc/jetty-http.xml,etc/jetty-alpn.xml,etc/jetty-http2.xml,etc/jetty-https.xml -Dmail.mime.encodefilename=true -Dmail.mime.decodefilename=true -Dmail.mime.encodeparameters=true -Dmail.mime.decodeparameters=true -Dhazelcast.config=hazelcast.xml -Dorg.zkoss.zk.config.path=file://${workspace_loc}/zk.xml -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch index e35a28c593..be584c4c44 100644 --- a/org.adempiere.server-feature/server.product.launch +++ b/org.adempiere.server-feature/server.product.launch @@ -22,13 +22,13 @@ - + - - + + diff --git a/org.adempiere.server-feature/setup.ini b/org.adempiere.server-feature/setup.ini index 2b0d897bd2..6bfa731164 100644 --- a/org.adempiere.server-feature/setup.ini +++ b/org.adempiere.server-feature/setup.ini @@ -1,5 +1,5 @@ -startup -plugins/org.eclipse.equinox.launcher_1.5.100.v20180827-1352.jar +plugins/org.eclipse.equinox.launcher_1.5.200.v20180922-1751.jar -install setup --launcher.XXMaxPermSize diff --git a/org.adempiere.server-feature/setup/configuration/config.ini b/org.adempiere.server-feature/setup/configuration/config.ini index 7d76a2653b..a04de95291 100644 --- a/org.adempiere.server-feature/setup/configuration/config.ini +++ b/org.adempiere.server-feature/setup/configuration/config.ini @@ -1,4 +1,4 @@ -osgi.framework=file\:../plugins/org.eclipse.osgi_3.13.100.v20180827-1536.jar +osgi.framework=file\:../plugins/org.eclipse.osgi_3.13.200.v20181130-2106.jar osgi.install.area=setup osgi.bundles=org.eclipse.equinox.ds@1:start,\ org.eclipse.equinox.util,\ @@ -13,8 +13,12 @@ osgi.bundles=org.eclipse.equinox.ds@1:start,\ org.adempiere.install,\ org.restlet,\ org.apache.servicemix.bundles.cglib,\ - com.sun.mail.javax.mail,\ - javax.activation,\ + com.sun.mail.gimap,\ + com.sun.mail.imap,\ + com.sun.mail.jakarta.mail,\ + com.sun.mail.smtp,\ + jakarta.mail.api,\ + com.sun.activation.jakarta.activation,\ org.apache.commons.collections,\ org.apache.ant,\ javax.jms,\ diff --git a/org.adempiere.target.platform-feature/feature.xml b/org.adempiere.target.platform-feature/feature.xml index 437704be16..7d437fe28d 100644 --- a/org.adempiere.target.platform-feature/feature.xml +++ b/org.adempiere.target.platform-feature/feature.xml @@ -314,13 +314,6 @@ version="0.0.0" unpack="false"/> - - + + diff --git a/org.adempiere.ui.zk/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.ui.zk/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7a8fc9dd10 100644 --- a/org.adempiere.ui.zk/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.ui.zk/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.adempiere.ui.zk/META-INF/MANIFEST.MF b/org.adempiere.ui.zk/META-INF/MANIFEST.MF index fed8dc5dde..c231b1a7be 100644 --- a/org.adempiere.ui.zk/META-INF/MANIFEST.MF +++ b/org.adempiere.ui.zk/META-INF/MANIFEST.MF @@ -158,7 +158,8 @@ Require-Bundle: org.adempiere.base;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", - javax.activation;bundle-version="1.1.0" + zkwebfragment, + com.sun.activation.jakarta.activation;bundle-version="1.2.1" Bundle-Activator: org.adempiere.webui.WebUIActivator Eclipse-ExtensibleAPI: true Web-ContextPath: webui diff --git a/org.adempiere.ui.zk/WEB-INF/zk.xml b/org.adempiere.ui.zk/WEB-INF/zk.xml index 97e8697c6d..e26bfde163 100644 --- a/org.adempiere.ui.zk/WEB-INF/zk.xml +++ b/org.adempiere.ui.zk/WEB-INF/zk.xml @@ -98,7 +98,7 @@ - org.zkoss.zul.borderlayout.animation.disabed + org.zkoss.zul.borderlayout.animation.disabled true diff --git a/org.adempiere.webstore.resource/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.webstore.resource/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7a8fc9dd10 100644 --- a/org.adempiere.webstore.resource/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.webstore.resource/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.adempiere.webstore.servlet/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.webstore.servlet/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7a8fc9dd10 100644 --- a/org.adempiere.webstore.servlet/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.webstore.servlet/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.adempiere.webstore/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.webstore/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7a8fc9dd10 100644 --- a/org.adempiere.webstore/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.webstore/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.apache.ecs/.settings/org.eclipse.jdt.core.prefs b/org.apache.ecs/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7a8fc9dd10 100644 --- a/org.apache.ecs/.settings/org.eclipse.jdt.core.prefs +++ b/org.apache.ecs/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.compiere.db.oracle.provider/.settings/org.eclipse.jdt.core.prefs b/org.compiere.db.oracle.provider/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7a8fc9dd10 100644 --- a/org.compiere.db.oracle.provider/.settings/org.eclipse.jdt.core.prefs +++ b/org.compiere.db.oracle.provider/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.compiere.db.postgresql.provider/.settings/org.eclipse.jdt.core.prefs b/org.compiere.db.postgresql.provider/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7a8fc9dd10 100644 --- a/org.compiere.db.postgresql.provider/.settings/org.eclipse.jdt.core.prefs +++ b/org.compiere.db.postgresql.provider/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.idempiere.equinox.p2.director-feature/director/configuration/config.ini b/org.idempiere.equinox.p2.director-feature/director/configuration/config.ini index 9813d97456..dc051329de 100644 --- a/org.idempiere.equinox.p2.director-feature/director/configuration/config.ini +++ b/org.idempiere.equinox.p2.director-feature/director/configuration/config.ini @@ -1,4 +1,4 @@ -osgi.framework=file\:../plugins/org.eclipse.osgi_3.13.100.v20180827-1536.jar +osgi.framework=file\:../plugins/org.eclipse.osgi_3.13.200.v20181130-2106.jar osgi.install.area=director equinox.use.ds=true osgi.bundles=org.eclipse.core.net@start,\ @@ -57,7 +57,6 @@ osgi.bundles=org.eclipse.core.net@start,\ org.hamcrest.core,\ org.junit,\ org.eclipse.osgi.compatibility.state,\ - org.eclipse.osgi.compatibility.plugins,\ org.eclipse.osgi@start,\ org.eclipse.osgi.services,\ org.eclipse.osgi.util,\ diff --git a/org.idempiere.felix.webconsole/.settings/org.eclipse.jdt.core.prefs b/org.idempiere.felix.webconsole/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7a8fc9dd10 100644 --- a/org.idempiere.felix.webconsole/.settings/org.eclipse.jdt.core.prefs +++ b/org.idempiere.felix.webconsole/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.idempiere.hazelcast.service.config/hazelcast.xml b/org.idempiere.hazelcast.service.config/hazelcast.xml index 44d8e6576f..7def213cf7 100644 --- a/org.idempiere.hazelcast.service.config/hazelcast.xml +++ b/org.idempiere.hazelcast.service.config/hazelcast.xml @@ -16,23 +16,26 @@ --> + + http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"> + dev dev-pass http://localhost:8080/hazelcast-mancenter - - false - 5701 @@ -43,7 +46,7 @@ 0 - + 224.2.2.3 54327 @@ -53,22 +56,40 @@ 127.0.0.1 - + + my-access-key + my-secret-key + + us-west-1 + + ec2.amazonaws.com + + hazelcast-sg + type + hz-nodes + + + us-east1-b,us-east1-c + + + CLIENT_ID + CLIENT_SECRET + TENANT_ID + SUB_ID + HZLCAST001 + GROUP-NAME + + + MY-KUBERNETES-NAMESPACE + MY-SERVICE-NAME + MY-SERVICE-LABEL-NAME + MY-SERVICE-LABEL-VALUE + + + true + hazelcast + - - - my-access-key - my-secret-key - - us-east-1 - ec2.amazonaws.com - - hazelcast-sg - type - hz-nodes - 30 - - @@ -93,6 +114,9 @@ 19 + + + @@ -100,6 +124,9 @@ 0 + + true + - 0 + 1 0 + Maximum number of seconds for each entry to stay in the map. Entries that are + older than and not updated for + will get automatically evicted from the map. + Any integer between 0 and Integer.MAX_VALUE. 0 means infinite. Default is 0 + --> 0 - 1800 + Maximum number of seconds for each entry to stay idle in the map. Entries that are + idle(not touched) for more than will get + automatically evicted from the map. Entry is touched if get, put or containsKey is called. + Any integer between 0 and Integer.MAX_VALUE. 0 means infinite. Default is 0. + --> + 0 - LRU + NONE - 1000 + 0 - com.hazelcast.map.merge.PutIfAbsentMapMergePolicy + com.hazelcast.spi.merge.PutIfAbsentMergePolicy INDEX-ONLY - - OBJECT - true - - + + mapName + 10 + + 1 SET + com.hazelcast.spi.merge.PutIfAbsentMergePolicy + + OBJECT + true + true + com.hazelcast.spi.merge.PutIfAbsentMergePolicy + + 1 + com.hazelcast.spi.merge.PutIfAbsentMergePolicy 1 + com.hazelcast.spi.merge.PutIfAbsentMergePolicy @@ -277,8 +322,27 @@ 0 0 BINARY + com.hazelcast.spi.merge.PutIfAbsentMergePolicy + + 100 + 600000 + 0 + 0 + true + + + + com.hazelcast.spi.merge.PutIfAbsentMergePolicy + + + + com.hazelcast.spi.merge.PutIfAbsentMergePolicy + + + + 0 @@ -287,4 +351,26 @@ + + 1 + 0 + HyperLogLogMergePolicy + + + + 100 + 1 + 16 + com.hazelcast.spi.merge.PutIfAbsentMergePolicy + + + + 1000 + 1 + + + + 2147483647 + true + diff --git a/org.idempiere.hazelcast.service/pom.xml b/org.idempiere.hazelcast.service/pom.xml index f609fa56b9..1c95de7dcb 100644 --- a/org.idempiere.hazelcast.service/pom.xml +++ b/org.idempiere.hazelcast.service/pom.xml @@ -26,7 +26,7 @@ com.hazelcast hazelcast - 3.10.6 + 3.11 com.hazelcast diff --git a/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml b/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml index b231173ea6..5f139a8e69 100644 --- a/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml +++ b/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml @@ -10,17 +10,18 @@ org.idempiere.maven.to.p2 pom - https://sourceforge.net/projects/zk1/files/ZK/zk-8.5.0/zk-bin-osgi-8.5.0.zip + https://sourceforge.net/projects/zk1/files/ZK/zk-8.6.0.1/zk-bin-osgi-8.6.0.1.zip + 9.4.14.v20181114 1.1.3.v20160715 - 8.5.33 + 8.5.33.1 8.1.12.v20180117 3.1.0.M3 1.2.5 2.5.3 1.60 1.4.0 - 2.9.5 + 2.9.7 3.1.4 1.1.0.Final 5.0.3 @@ -30,8 +31,11 @@ 2.4 3.2.6 3.1.17 - 1.2.0 - 1.3.2 + 1.2.1 + 1.3.3 + 7.0 + 2.4.1 + 1.6.3 @@ -49,6 +53,14 @@ https://sourceforge.net/projects/jasperstudio/files/updatesite/6.6.0 p2 + + zkoss + http://mavensync.zkoss.org/maven2 + + + restlet-maven + http://maven.restlet.com + @@ -116,21 +128,35 @@ false - javax.annotation:javax.annotation-api:jar:${annotation.version} + jakarta.annotation:jakarta.annotation-api:jar:${annotation.version} true false - - com.sun.mail:javax.mail:jar:1.6.2 + com.sun.mail:jakarta.mail:jar:${javamail.version} + true + false + + + com.sun.mail:smtp:jar:${javamail.version} + true + false + + + com.sun.mail:mailapi:jar:${javamail.version} + true + false + + + com.sun.mail:imap:jar:${javamail.version} + true + false + + + com.sun.mail:gimap:jar:${javamail.version} true false - org.apache.taglibs:taglibs-standard-impl:jar:${org.apache.taglibs.version} true @@ -147,7 +173,7 @@ false - org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:jar:1.0.14 + org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:jar:1.2 true false @@ -408,7 +434,7 @@ - com.sun.activation:javax.activation:jar:${activation.version} + com.sun.activation:jakarta.activation:jar:${activation.version} true false @@ -613,7 +639,7 @@ false - javax.ws.rs:javax.ws.rs-api:jar:2.1.1 + jakarta.ws.rs:jakarta.ws.rs-api:jar:2.1.3 true false @@ -628,7 +654,12 @@ false - javax.xml.rpc:javax.xml.rpc-api:jar:1.1.1 + jakarta.xml.rpc:jakarta.xml.rpc-api:jar:1.1.3 + true + false + + + jakarta.persistence:jakarta.persistence-api:jar:2.2.1 true false @@ -774,284 +805,6 @@ org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-web:jar:${springframework.version} false false - true - - - org.springframework.http;version="4.3.19.RELEASE";uses - :="org.springframework.core.io,org.springframework.core.io.support,or - g.springframework.util",org.springframework.http.client;version="4.3. - 19.RELEASE";uses:="com.squareup.okhttp,io.netty.channel,io.netty.chan - nel.socket,io.netty.handler.ssl,okhttp3,org.apache.http.client,org.ap - ache.http.client.config,org.apache.http.client.methods,org.apache.htt - p.impl.client,org.apache.http.impl.nio.client,org.apache.http.nio.cli - ent,org.apache.http.protocol,org.springframework.beans.factory,org.sp - ringframework.core.task,org.springframework.http,org.springframework. - util.concurrent",org.springframework.http.client.support;version="4.3 - .19.RELEASE";uses:="org.apache.commons.logging,org.springframework.be - ans.factory,org.springframework.http,org.springframework.http.client" - ,org.springframework.http.converter;version="4.3.19.RELEASE";uses:="j - avax.imageio,org.apache.commons.logging,org.springframework.core,org. - springframework.core.convert,org.springframework.core.io,org.springfr - amework.core.io.support,org.springframework.http,org.springframework. - util",org.springframework.http.converter.feed;version="4.3.19.RELEASE - ";uses:="com.rometools.rome.feed,com.rometools.rome.feed.atom,com.rom - etools.rome.feed.rss,org.springframework.http,org.springframework.htt - p.converter",org.springframework.http.converter.json;version="4.3.19. - RELEASE";uses:="com.fasterxml.jackson.annotation,com.fasterxml.jackso - n.core,com.fasterxml.jackson.databind,com.fasterxml.jackson.databind. - cfg,com.fasterxml.jackson.databind.deser,com.fasterxml.jackson.databi - nd.introspect,com.fasterxml.jackson.databind.jsontype,com.fasterxml.j - ackson.databind.ser,com.fasterxml.jackson.databind.util,com.google.gs - on,com.google.gson.reflect,org.springframework.beans.factory,org.spri - ngframework.beans.factory.config,org.springframework.context,org.spri - ngframework.http,org.springframework.http.converter",org.springframew - ork.http.converter.protobuf;version="4.3.19.RELEASE";uses:="com.googl - e.protobuf,org.springframework.http,org.springframework.http.converte - r",org.springframework.http.converter.support;version="4.3.19.RELEASE - ";uses:="org.springframework.http.converter",org.springframework.http - .converter.xml;version="4.3.19.RELEASE";uses:="com.fasterxml.jackson. - databind,javax.xml.bind,javax.xml.stream,javax.xml.transform,org.spri - ngframework.http,org.springframework.http.converter,org.springframewo - rk.http.converter.json,org.springframework.oxm",org.springframework.h - ttp.server;version="4.3.19.RELEASE";uses:="javax.servlet,javax.servle - t.http,org.springframework.http",org.springframework.remoting.caucho; - version="4.3.19.RELEASE";uses:="com.caucho.burlap.client,com.caucho.h - essian.client,com.caucho.hessian.io,com.caucho.hessian.server,com.sun - .net.httpserver,javax.servlet,javax.servlet.http,org.aopalliance.inte - rcept,org.springframework.beans.factory,org.springframework.remoting, - org.springframework.remoting.support,org.springframework.web",org.spr - ingframework.remoting.httpinvoker;version="4.3.19.RELEASE";uses:="com - .sun.net.httpserver,javax.servlet,javax.servlet.http,org.aopalliance. - intercept,org.apache.commons.logging,org.apache.http,org.apache.http. - client,org.apache.http.client.config,org.apache.http.client.methods,o - rg.springframework.beans.factory,org.springframework.remoting,org.spr - ingframework.remoting.rmi,org.springframework.remoting.support,org.sp - ringframework.web",org.springframework.remoting.jaxws;version="4.3.19 - .RELEASE";uses:="com.sun.net.httpserver,javax.jws,javax.xml.namespace - ,javax.xml.soap,javax.xml.ws,javax.xml.ws.handler,javax.xml.ws.soap,o - rg.aopalliance.intercept,org.apache.commons.logging,org.springframewo - rk.beans.factory,org.springframework.core.io,org.springframework.remo - ting.soap",org.springframework.web;version="4.3.19.RELEASE";uses:="ja - vax.servlet,javax.servlet.annotation,javax.servlet.http,org.springfra - mework.http",org.springframework.web.accept;version="4.3.19.RELEASE"; - uses:="javax.servlet,org.springframework.beans.factory,org.springfram - ework.core.io,org.springframework.http,org.springframework.web,org.sp - ringframework.web.context,org.springframework.web.context.request,org - .springframework.web.util",org.springframework.web.bind;version="4.3. - 19.RELEASE";uses:="javax.servlet,org.springframework.beans,org.spring - framework.core,org.springframework.validation,org.springframework.web - .multipart,org.springframework.web.util",org.springframework.web.bind - .annotation;version="4.3.19.RELEASE";uses:="org.springframework.core. - annotation,org.springframework.http,org.springframework.stereotype",o - rg.springframework.web.bind.annotation.support;version="4.3.19.RELEAS - E";uses:="org.springframework.core,org.springframework.http,org.sprin - gframework.http.converter,org.springframework.ui,org.springframework. - web.bind,org.springframework.web.bind.annotation,org.springframework. - web.bind.support,org.springframework.web.context.request",org.springf - ramework.web.bind.support;version="4.3.19.RELEASE";uses:="javax.valid - ation,org.springframework.beans,org.springframework.core,org.springfr - amework.core.convert,org.springframework.validation,org.springframewo - rk.web.bind,org.springframework.web.context,org.springframework.web.c - ontext.request",org.springframework.web.client;version="4.3.19.RELEAS - E";uses:="org.springframework.core,org.springframework.core.task,org. - springframework.http,org.springframework.http.client,org.springframew - ork.http.client.support,org.springframework.http.converter,org.spring - framework.util.concurrent,org.springframework.web.util",org.springfra - mework.web.client.support;version="4.3.19.RELEASE";uses:="org.apache. - commons.logging,org.springframework.http.client,org.springframework.w - eb.client",org.springframework.web.context;version="4.3.19.RELEASE";u - ses:="javax.servlet,org.apache.commons.logging,org.springframework.be - ans.factory,org.springframework.context,org.springframework.core.env, - org.springframework.web",org.springframework.web.context.annotation;v - ersion="4.3.19.RELEASE";uses:="org.springframework.context.annotation - ,org.springframework.core.annotation",org.springframework.web.context - .request;version="4.3.19.RELEASE";uses:="javax.faces.context,javax.se - rvlet,javax.servlet.http,org.apache.log4j,org.springframework.beans.f - actory,org.springframework.beans.factory.config,org.springframework.h - ttp,org.springframework.ui",org.springframework.web.context.request.a - sync;version="4.3.19.RELEASE";uses:="javax.servlet,javax.servlet.http - ,org.springframework.beans.factory,org.springframework.core.task,org. - springframework.web.context.request",org.springframework.web.context. - support;version="4.3.19.RELEASE";uses:="groovy.lang,javax.servlet,jav - ax.servlet.http,org.apache.commons.logging,org.springframework.beans, - org.springframework.beans.factory,org.springframework.beans.factory.c - onfig,org.springframework.beans.factory.groovy,org.springframework.be - ans.factory.support,org.springframework.beans.factory.xml,org.springf - ramework.context,org.springframework.context.annotation,org.springfra - mework.context.support,org.springframework.core.env,org.springframewo - rk.core.io,org.springframework.core.io.support,org.springframework.ui - .context,org.springframework.web.context",org.springframework.web.cor - s;version="4.3.19.RELEASE";uses:="javax.servlet.http,org.springframew - ork.http,org.springframework.http.server,org.springframework.util,org - .springframework.web.util",org.springframework.web.filter;version="4. - 3.19.RELEASE";uses:="javax.servlet,javax.servlet.http,org.apache.comm - ons.logging,org.apache.log4j,org.springframework.beans,org.springfram - ework.beans.factory,org.springframework.context,org.springframework.c - ore.env,org.springframework.http,org.springframework.http.converter,o - rg.springframework.web.context,org.springframework.web.cors",org.spri - ngframework.web.jsf;version="4.3.19.RELEASE";uses:="javax.faces.appli - cation,javax.faces.context,javax.faces.event,org.springframework.bean - s.factory,org.springframework.web.context",org.springframework.web.js - f.el;version="4.3.19.RELEASE";uses:="javax.el,org.apache.commons.logg - ing,org.springframework.beans.factory,org.springframework.beans.facto - ry.access.el,org.springframework.web.context",org.springframework.web - .method;version="4.3.19.RELEASE";uses:="org.apache.commons.logging,or - g.springframework.beans.factory,org.springframework.context,org.sprin - gframework.core,org.springframework.core.annotation,org.springframewo - rk.http,org.springframework.util",org.springframework.web.method.anno - tation;version="4.3.19.RELEASE";uses:="javax.servlet,org.apache.commo - ns.logging,org.springframework.beans,org.springframework.beans.factor - y.config,org.springframework.core,org.springframework.core.convert,or - g.springframework.util,org.springframework.web.bind,org.springframewo - rk.web.bind.support,org.springframework.web.context.request,org.sprin - gframework.web.method,org.springframework.web.method.support,org.spri - ngframework.web.util",org.springframework.web.method.support;version= - "4.3.19.RELEASE";uses:="org.apache.commons.logging,org.springframewor - k.core,org.springframework.core.convert,org.springframework.http,org. - springframework.ui,org.springframework.web.bind.support,org.springfra - mework.web.context.request,org.springframework.web.method,org.springf - ramework.web.util",org.springframework.web.multipart;version="4.3.19. - RELEASE";uses:="javax.servlet.http,org.springframework.core,org.sprin - gframework.core.io,org.springframework.http,org.springframework.util" - ,org.springframework.web.multipart.commons;version="4.3.19.RELEASE";u - ses:="javax.servlet,javax.servlet.http,org.apache.commons.fileupload, - org.apache.commons.fileupload.disk,org.apache.commons.logging,org.spr - ingframework.core.io,org.springframework.util,org.springframework.web - .context,org.springframework.web.multipart",org.springframework.web.m - ultipart.support;version="4.3.19.RELEASE";uses:="javax.servlet,javax. - servlet.http,org.springframework.beans.propertyeditors,org.springfram - ework.core,org.springframework.http,org.springframework.http.server,o - rg.springframework.util,org.springframework.web.filter,org.springfram - ework.web.multipart",org.springframework.web.util;version="4.3.19.REL - EASE";uses:="javax.servlet,javax.servlet.http,javax.servlet.jsp.tagex - t,org.apache.commons.logging,org.springframework.http,org.springframe - work.util" - - com.squareup.okhttp.internal.http;resolution:=optional - ,javax.net.ssl,okhttp3.internal.http;resolution:=optional,com.caucho. - burlap.client;version="[4,5)";resolution:=optional,com.caucho.burlap. - io;version="[4,5)";resolution:=optional,com.caucho.burlap.server;vers - ion="[4,5)";resolution:=optional,com.caucho.hessian;version="[4,5)";r - esolution:=optional,com.caucho.hessian.client;version="[4,5)";resolut - ion:=optional,com.caucho.hessian.io;version="[4,5)";resolution:=optio - nal,com.caucho.hessian.server;version="[4,5)";resolution:=optional,co - m.fasterxml.jackson.annotation;version="[2,3)";resolution:=optional,c - om.fasterxml.jackson.core;version="[2,3)";resolution:=optional,com.fa - sterxml.jackson.core.util;version="[2,3)";resolution:=optional,com.fa - sterxml.jackson.databind;version="[2,3)";resolution:=optional,com.fas - terxml.jackson.databind.cfg;version="[2,3)";resolution:=optional,com. - fasterxml.jackson.databind.deser;version="[2,3)";resolution:=optional - ,com.fasterxml.jackson.databind.introspect;version="[2,3)";resolution - :=optional,com.fasterxml.jackson.databind.jsontype;version="[2,3)";re - solution:=optional,com.fasterxml.jackson.databind.module;version="[2, - 3)";resolution:=optional,com.fasterxml.jackson.databind.ser;version=" - [2,3)";resolution:=optional,com.fasterxml.jackson.databind.type;versi - on="[2,3)";resolution:=optional,com.fasterxml.jackson.databind.util;v - ersion="[2,3)";resolution:=optional,com.fasterxml.jackson.dataformat. - xml;version="[2,3)";resolution:=optional,com.google.gson;version="[2. - 3,3)";resolution:=optional,com.google.gson.reflect;version="[2.3,3)"; - resolution:=optional,com.google.protobuf;version="[2.6,3)";resolution - :=optional,com.googlecode.protobuf.format;resolution:=optional,com.sq - uareup.okhttp;version="[2.4,3)";resolution:=optional,com.rometools.ro - me.feed;version="[1.5,2)";resolution:=optional,com.rometools.rome.fee - d.atom;version="[1.5,2)";resolution:=optional,com.rometools.rome.feed - .rss;version="[1.5,2)";resolution:=optional,com.rometools.rome.io;ver - sion="[1.5,2)";resolution:=optional,com.sun.net.httpserver;resolution - :=optional,groovy.lang;version="[2.4,3)";resolution:=optional,io.nett - y.bootstrap;resolution:=optional,io.netty.buffer;resolution:=optional - ,io.netty.channel;resolution:=optional,io.netty.channel.nio;resolutio - n:=optional,io.netty.channel.socket;resolution:=optional,io.netty.cha - nnel.socket.nio;resolution:=optional,io.netty.handler.codec.http;reso - lution:=optional,io.netty.handler.ssl;resolution:=optional,io.netty.h - andler.timeout;resolution:=optional,io.netty.util.concurrent;resoluti - on:=optional,javax.activation;resolution:=optional,javax.el;resolutio - n:=optional,javax.faces.application;resolution:=optional,javax.faces. - component;resolution:=optional,javax.faces.context;resolution:=option - al,javax.faces.event;resolution:=optional,javax.imageio;resolution:=o - ptional,javax.imageio.metadata;resolution:=optional,javax.imageio.str - eam;resolution:=optional,javax.jws;resolution:=optional,javax.mail.in - ternet;resolution:=optional,javax.portlet;resolution:=optional,javax. - servlet,javax.servlet.http,javax.servlet.annotation;resolution:=optio - nal,javax.servlet.jsp.tagext;resolution:=optional,javax.validation;re - solution:=optional,javax.xml.bind;resolution:=optional,javax.xml.bind - .annotation;resolution:=optional,javax.xml.namespace;resolution:=opti - onal,javax.xml.parsers;resolution:=optional,javax.xml.soap;resolution - :=optional,javax.xml.stream;resolution:=optional,javax.xml.transform; - resolution:=optional,javax.xml.transform.dom;resolution:=optional,jav - ax.xml.transform.sax;resolution:=optional,javax.xml.transform.stax;re - solution:=optional,javax.xml.transform.stream;resolution:=optional,ja - vax.xml.ws;resolution:=optional,javax.xml.ws.handler;resolution:=opti - onal,javax.xml.ws.soap;resolution:=optional,okhttp3;resolution:=optio - nal,org.aopalliance.aop;version="[1,2)",org.aopalliance.intercept;ver - sion="[1,2)",org.apache.commons.fileupload;version="[1.3,2)";resoluti - on:=optional,org.apache.commons.fileupload.disk;version="[1.3,2)";res - olution:=optional,org.apache.commons.fileupload.servlet;version="[1.3 - ,2)";resolution:=optional,org.apache.commons.logging;version="[1.1.1, - 2)",org.apache.http;version="[4,5)";resolution:=optional,org.apache.h - ttp.client;version="[4,5)";resolution:=optional,org.apache.http.clien - t.config;version="[4,5)";resolution:=optional,org.apache.http.client. - methods;version="[4,5)";resolution:=optional,org.apache.http.client.p - rotocol;version="[4,5)";resolution:=optional,org.apache.http.concurre - nt;version="[4,5)";resolution:=optional,org.apache.http.config;versio - n="[4,5)";resolution:=optional,org.apache.http.conn;version="[4,5)";r - esolution:=optional,org.apache.http.conn.socket;version="[4,5)";resol - ution:=optional,org.apache.http.conn.ssl;version="[4,5)";resolution:= - optional,org.apache.http.entity;version="[4,5)";resolution:=optional, - org.apache.http.impl.client;version="[4,5)";resolution:=optional,org. - apache.http.impl.conn;version="[4,5)";resolution:=optional,org.apache - .http.impl.nio.client;version="[4,5)";resolution:=optional,org.apache - .http.message;version="[4,5)";resolution:=optional,org.apache.http.ni - o.client;version="[4,5)";resolution:=optional,org.apache.http.nio.ent - ity;version="[4,5)";resolution:=optional,org.apache.http.params;versi - on="[4,5)";resolution:=optional,org.apache.http.protocol;version="[4, - 5)";resolution:=optional,org.apache.http.util;version="[4,5)";resolut - ion:=optional,org.apache.log4j;version="[1.2,2)";resolution:=optional - ,org.springframework.aop.framework;version="[4.3.19.RELEASE,4.4)",org - .springframework.aop.support;version="[4.3.19.RELEASE,4.4)",org.sprin - gframework.beans;version="[4.3.19.RELEASE,4.4)",org.springframework.b - eans.factory;version="[4.3.19.RELEASE,4.4)",org.springframework.beans - .factory.access;version="[4.3.19.RELEASE,4.4)",org.springframework.be - ans.factory.access.el;version="[4.3.19.RELEASE,4.4)",org.springframew - ork.beans.factory.annotation;version="[4.3.19.RELEASE,4.4)",org.sprin - gframework.beans.factory.config;version="[4.3.19.RELEASE,4.4)",org.sp - ringframework.beans.factory.groovy;version="[4.3.19.RELEASE,4.4)",org - .springframework.beans.factory.support;version="[4.3.19.RELEASE,4.4)" - ,org.springframework.beans.factory.xml;version="[4.3.19.RELEASE,4.4)" - ,org.springframework.beans.propertyeditors;version="[4.3.19.RELEASE,4 - .4)",org.springframework.context;version="[4.3.19.RELEASE,4.4)",org.s - pringframework.context.access;version="[4.3.19.RELEASE,4.4)",org.spri - ngframework.context.annotation;version="[4.3.19.RELEASE,4.4)",org.spr - ingframework.context.i18n;version="[4.3.19.RELEASE,4.4)",org.springfr - amework.context.support;version="[4.3.19.RELEASE,4.4)",org.springfram - ework.core;version="[4.3.19.RELEASE,4.4)",org.springframework.core.an - notation;version="[4.3.19.RELEASE,4.4)",org.springframework.core.conv - ert;version="[4.3.19.RELEASE,4.4)",org.springframework.core.env;versi - on="[4.3.19.RELEASE,4.4)",org.springframework.core.io;version="[4.3.1 - 9.RELEASE,4.4)",org.springframework.core.io.support;version="[4.3.19. - RELEASE,4.4)",org.springframework.core.task;version="[4.3.19.RELEASE, - 4.4)",org.springframework.format.support;version="[4.3.19.RELEASE,4.4 - )";resolution:=optional,org.springframework.jndi;version="[4.3.19.REL - EASE,4.4)";resolution:=optional,org.springframework.oxm;version="[4.3 - .19.RELEASE,4.4)";resolution:=optional,org.springframework.remoting;v - ersion="[4.3.19.RELEASE,4.4)";resolution:=optional,org.springframewor - k.remoting.rmi;version="[4.3.19.RELEASE,4.4)";resolution:=optional,or - g.springframework.remoting.soap;version="[4.3.19.RELEASE,4.4)";resolu - tion:=optional,org.springframework.remoting.support;version="[4.3.19. - RELEASE,4.4)";resolution:=optional,org.springframework.stereotype;ver - sion="[4.3.19.RELEASE,4.4)";resolution:=optional,org.springframework. - ui;version="[4.3.19.RELEASE,4.4)",org.springframework.ui.context;vers - ion="[4.3.19.RELEASE,4.4)",org.springframework.ui.context.support;ver - sion="[4.3.19.RELEASE,4.4)",org.springframework.util;version="[4.3.19 - .RELEASE,4.4)",org.springframework.util.comparator;version="[4.3.19.R - ELEASE,4.4)",org.springframework.util.concurrent;version="[4.3.19.REL - EASE,4.4)",org.springframework.validation;version="[4.3.19.RELEASE,4. - 4)",org.springframework.validation.annotation;version="[4.3.19.RELEAS - E,4.4)",org.springframework.validation.support;version="[4.3.19.RELEA - SE,4.4)",org.xml.sax;resolution:=optional,org.xml.sax.helpers;resolut - ion:=optional,org.w3c.dom;resolution:=optional,org.joda.time;version= - "[2,3)";resolution:=optional,org.joda.time.format;version="[2,3)";res - olution:=optional - - org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-context-support:jar:sources:${springframework.version} @@ -1098,6 +850,129 @@ it also resolve issue confilic between eclipse runtime and tycho build true false + + org.restlet.osgi:org.restlet:${restlet.version} + true + false + true + + + org.restlet.engine.internal.Activator + org.restlet + org.restlet + ${restlet.version} + org.restlet;uses:="org.restlet.engine.application,org.re + stlet.resource,org.restlet.util,org.restlet.engine,org.restlet.routing, + org.restlet.service,org.restlet.engine.resource,org.restlet.security,or + g.restlet.data,org.restlet.engine.connector,org.restlet.representation, + org.restlet.engine.component,org.restlet.engine.util",org.restlet.data; + uses:="org.restlet.engine.util,org.restlet.util,org.restlet,org.restlet + .engine.security,org.restlet.representation,org.restlet.engine,org.rest + let.routing,org.restlet.engine.io,org.restlet.security,org.restlet.engi + ne.header",org.restlet.engine;uses:="org.restlet.routing,org.restlet.da + ta,org.restlet,org.restlet.representation,org.restlet.engine.log,org.re + stlet.engine.security,org.restlet.engine.io,org.restlet.engine.util,org + .restlet.engine.converter,org.restlet.engine.connector,org.restlet.engi + ne.local,org.restlet.service,org.restlet.util",org.restlet.engine.adapt + er;uses:="org.restlet,org.restlet.data,org.restlet.representation,org.r + estlet.util,org.restlet.engine.header,org.restlet.engine,org.restlet.se + rvice,org.restlet.engine.connector,org.restlet.engine.util,org.restlet. + engine.security,org.restlet.engine.io",org.restlet.engine.application;u + ses:="org.restlet.data,org.restlet,org.restlet.routing,org.restlet.serv + ice,org.restlet.util,org.restlet.engine,org.restlet.representation,org. + restlet.engine.util,org.restlet.engine.io,org.restlet.engine.resource,o + rg.restlet.engine.header",org.restlet.engine.component;uses:="org.restl + et.routing,org.restlet.data,org.restlet,org.restlet.util,org.restlet.en + gine.util,org.restlet.service,org.restlet.engine.log,org.restlet.engine + ,org.restlet.resource,org.restlet.representation,javax.xml.parsers,org. + w3c.dom,org.xml.sax",org.restlet.engine.connector;uses:="org.restlet,or + g.restlet.representation,org.restlet.util,org.restlet.service,org.restl + et.data,org.restlet.engine,org.restlet.engine.util,org.restlet.engine.l + ocal,org.restlet.engine.adapter,javax.net.ssl,com.sun.net.httpserver,or + g.restlet.engine.ssl,org.restlet.engine.log",org.restlet.engine.convert + er;uses:="org.restlet.data,org.restlet.resource,org.restlet.representat + ion,org.restlet.engine.resource,org.restlet.engine,org.restlet,org.rest + let.engine.application,org.restlet.engine.util",org.restlet.engine.head + er;uses:="org.restlet.data,org.restlet.util,org.restlet.representation, + org.restlet.engine.util,org.restlet,org.restlet.engine.security",org.re + stlet.engine.internal;uses:="org.osgi.framework,org.restlet,org.restlet + .engine",org.restlet.engine.io;uses:="org.restlet.representation,org.re + stlet,org.restlet.engine.util,org.restlet.data,org.restlet.engine,org.r + estlet.util",org.restlet.engine.local;uses:="org.restlet.service,org.re + stlet.data,org.restlet.representation,org.restlet,org.restlet.resource, + org.restlet.engine.util,org.restlet.engine.io,org.restlet.util,org.rest + let.engine.connector",org.restlet.engine.log;uses:="org.restlet.engine. + io,org.restlet.engine.util,org.restlet,org.restlet.routing,org.restlet. + service,org.restlet.data,org.restlet.engine",org.restlet.engine.resourc + e;uses:="org.restlet.engine.util,org.restlet,org.restlet.service,org.re + stlet.data,org.restlet.resource,org.restlet.representation,org.restlet. + engine.connector,org.restlet.engine.application",org.restlet.engine.sec + urity;uses:="org.restlet.data,org.restlet.util,org.restlet,org.restlet. + engine,org.restlet.engine.header,org.restlet.engine.util,org.restlet.se + curity",org.restlet.engine.ssl;uses:="javax.net.ssl,org.restlet.data,or + g.restlet.util,org.restlet,org.restlet.engine",org.restlet.engine.util; + uses:="org.restlet.data,org.restlet.engine.io,org.restlet.representatio + n,org.restlet,org.restlet.util,org.restlet.service,org.restlet.engine.l + og,org.w3c.dom.ls,org.xml.sax.helpers,org.xml.sax,org.restlet.engine,or + g.restlet.engine.security,org.restlet.routing",org.restlet.representati + on;uses:="org.restlet.data,org.restlet.engine.io,org.restlet,org.restle + t.util,org.restlet.engine,org.restlet.engine.util",org.restlet.resource + ;uses:="org.restlet.representation,org.restlet,org.restlet.util,org.res + tlet.engine,org.restlet.service,org.restlet.data,org.restlet.engine.uti + l,org.restlet.engine.resource,org.restlet.engine.connector,org.restlet. + engine.local,org.restlet.security",org.restlet.routing;uses:="org.restl + et.data,org.restlet.representation,org.restlet,org.restlet.util,org.res + tlet.resource,org.restlet.engine.header",org.restlet.security;uses:="or + g.restlet.routing,org.restlet.data,org.restlet,javax.security.auth.x500 + ,org.restlet.engine.security,org.restlet.util,org.restlet.engine.util", + org.restlet.service;uses:="org.restlet.data,org.restlet.representation, + org.restlet.engine.application,org.restlet,org.restlet.resource,org.res + tlet.engine.converter,org.restlet.engine,org.restlet.routing,org.restle + t.engine.util,org.restlet.engine.log,org.restlet.engine.resource",org.r + estlet.util;uses:="org.restlet.representation,org.restlet.data,org.rest + let.engine.io,org.restlet,org.restlet.engine.util,org.restlet.routing,o + rg.restlet.service" + com.sun.net.httpserver;resolution:=optional,javax.net.ss + l;resolution:=optional,javax.security.auth.x500;resolution:=optional,ja + vax.xml.parsers;resolution:=optional,org.osgi.framework;resolution:=opt + ional,org.w3c.dom;resolution:=optional,org.w3c.dom.ls;resolution:=optio + nal,org.xml.sax;resolution:=optional,org.xml.sax.helpers;resolution:=op + tional + + + + org.restlet.osgi:org.restlet.ext.servlet:${restlet.version} + true + false + true + + org.restlet.ext.servlet + org.restlet.ext.servlet + ${restlet.version} + org.restlet.ext.servlet;uses:="javax.servlet,org.restlet + .ext.osgi,org.restlet,org.osgi.service.log,org.osgi.service.http,org.re + stlet.representation,org.restlet.ext.servlet.internal,org.restlet.util, + org.restlet.engine,org.restlet.engine.adapter,org.restlet.routing,org.r + estlet.service,org.restlet.data,org.restlet.engine.component,javax.serv + let.http",org.restlet.ext.servlet.internal;uses:="javax.servlet,org.res + tlet.data,org.restlet.engine.io,org.restlet.representation,org.restlet, + org.restlet.util,org.restlet.engine.adapter,javax.servlet.http,org.rest + let.engine.connector,org.restlet.service,org.restlet.engine.local" + javax.servlet;resolution:=optional,javax.servlet.http;re + solution:=optional,org.osgi.service.http;resolution:=optional,org.osgi. + service.log;resolution:=optional,org.restlet;resolution:=optional,org.r + estlet.data;resolution:=optional,org.restlet.engine;resolution:=optiona + l,org.restlet.engine.adapter;resolution:=optional,org.restlet.engine.co + mponent;resolution:=optional,org.restlet.engine.connector;resolution:=o + ptional,org.restlet.engine.io;resolution:=optional,org.restlet.engine.l + ocal;resolution:=optional,org.restlet.ext.osgi;resolution:=optional,org + .restlet.representation;resolution:=optional,org.restlet.routing;resolu + tion:=optional,org.restlet.service;resolution:=optional,org.restlet.uti + l;resolution:=optional + OSGI-INF/*.xml + + org.idempiere.p2.targetplatform - http://download.eclipse.org/eclipse/updates/4.9 - eclipse-photon-201809 - http://download.eclipse.org/tools/orbit/downloads/drops/R20180905201904/repository - orbit-photon-R20180905201904 + http://download.eclipse.org/eclipse/updates/4.10 + eclipse-photon-201810 + http://download.eclipse.org/tools/orbit/downloads/drops/R20181128170323/repository + orbit-photon-R20181128170323 https://raw.githubusercontent.com/idempiere/binary.file/master org.eclipse.equinox.p2.director, org.idempiere.equinox.p2.director.feature.feature.group, org.idempiere.fitnesse.feature.feature.group org.adempiere.server.product @@ -323,44 +322,6 @@ true - - - - org.codehaus.plexus - plexus-utils - 3.1.0 - - - org.codehaus.plexus - plexus-compiler-manager - ${codehaus.plexus} - - - org.codehaus.plexus - plexus-compiler-api - ${codehaus.plexus} - - - 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} - - org.eclipse.tycho @@ -538,8 +499,8 @@ x86_64 - JavaSE-10 - JavaSE-10 + JavaSE-11 + JavaSE-11 diff --git a/org.idempiere.webservices/META-INF/MANIFEST.MF b/org.idempiere.webservices/META-INF/MANIFEST.MF index 4301d2754b..72475ada12 100644 --- a/org.idempiere.webservices/META-INF/MANIFEST.MF +++ b/org.idempiere.webservices/META-INF/MANIFEST.MF @@ -78,7 +78,6 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0", org.apache.cxf.cxf-rt-ws-policy;bundle-version="3.2.6", org.apache.cxf.cxf-rt-databinding-xmlbeans;bundle-version="3.1.17", org.apache.xmlbeans;bundle-version="3.0.1", - javax.ws.rs-api;bundle-version="2.1.99", org.apache.servicemix.bundles.spring-aop, org.apache.servicemix.bundles.spring-beans, org.apache.servicemix.bundles.spring-context, @@ -99,7 +98,8 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0", org.glassfish.hk2.api;bundle-version="2.5.0", org.glassfish.hk2.locator;bundle-version="2.5.0", org.glassfish.hk2.utils;bundle-version="2.5.0", - org.glassfish.jersey.bundles.repackaged.jersey-guava;bundle-version="2.22.1" + org.glassfish.jersey.bundles.repackaged.jersey-guava;bundle-version="2.22.1", + javax.ws.rs-api;bundle-version="2.1.3" Bundle-ClassPath: ., WEB-INF/lib/idempiere-xmlbeans.jar Export-Package: org.compiere.model, diff --git a/org.idempiere.zk-feature/feature.xml b/org.idempiere.zk-feature/feature.xml index 4eb4cc381a..ed142ded2e 100644 --- a/org.idempiere.zk-feature/feature.xml +++ b/org.idempiere.zk-feature/feature.xml @@ -101,4 +101,11 @@ version="0.0.0" unpack="false"/> + + diff --git a/org.idempiere.zk.extra/.classpath b/org.idempiere.zk.extra/.classpath index 85036c7cc4..92d760e60b 100644 --- a/org.idempiere.zk.extra/.classpath +++ b/org.idempiere.zk.extra/.classpath @@ -13,5 +13,6 @@ + diff --git a/org.idempiere.zk.extra/.settings/org.eclipse.jdt.core.prefs b/org.idempiere.zk.extra/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7a8fc9dd10 100644 --- a/org.idempiere.zk.extra/.settings/org.eclipse.jdt.core.prefs +++ b/org.idempiere.zk.extra/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.idempiere.zk.extra/META-INF/MANIFEST.MF b/org.idempiere.zk.extra/META-INF/MANIFEST.MF index abb07d53ed..0f0aa50b81 100644 --- a/org.idempiere.zk.extra/META-INF/MANIFEST.MF +++ b/org.idempiere.zk.extra/META-INF/MANIFEST.MF @@ -10,7 +10,8 @@ Bundle-ClassPath: ., lib/closure-compiler.jar, lib/gmapsz.jar, lib/timelinez.jar, - lib/timeplotz.jar + lib/timeplotz.jar, + lib/iceblue_c.jar Export-Package: com.google.common.annotations, com.google.common.base, com.google.common.cache, @@ -96,15 +97,18 @@ Export-Package: com.google.common.annotations, org.zkoss.gmaps, org.zkoss.gmaps.event, org.zkoss.theme.breeze, + org.zkoss.theme.iceblue_c, org.zkoss.zul.impl, web.breeze.js.zkex.grid.css, web.breeze.js.zkex.inp.css, web.breeze.js.zkex.layout.css, web.breeze.js.zkex.menu.css, + web.breeze.js.zkmax.barscanner.css, web.breeze.js.zkmax.big.css, web.breeze.js.zkmax.inp.css, web.breeze.js.zkmax.inp.ext, web.breeze.js.zkmax.layout.css, + web.breeze.js.zkmax.med.css, web.breeze.js.zkmax.nav.css, web.breeze.js.zkmax.wgt.css, web.breeze.js.zul.box.css, @@ -121,37 +125,48 @@ Export-Package: com.google.common.annotations, web.breeze.zkex.img.colorbox, web.breeze.zkmax.css, web.breeze.zkmax.img.big, - web.breeze.zkmax.img.inp, - web.breeze.zkmax.img.tablet, web.breeze.zkmax.img.tablet.big, web.breeze.zkmax.img.tablet.colorbox, - web.breeze.zkmax.img.tablet.grid, - web.breeze.zkmax.img.tablet.inp, web.breeze.zkmax.img.tablet.layout, - web.breeze.zkmax.img.tablet.menu, - web.breeze.zkmax.img.tablet.paging, - web.breeze.zkmax.img.tablet.popup, - web.breeze.zkmax.img.tablet.tab, - web.breeze.zkmax.img.tablet.tree, - web.breeze.zkmax.img.tablet.wnd, web.breeze.zul.css, web.breeze.zul.img, - web.breeze.zul.img.button, web.breeze.zul.img.common, - web.breeze.zul.img.errbox, web.breeze.zul.img.grid, - web.breeze.zul.img.input, - web.breeze.zul.img.layout, - web.breeze.zul.img.menu, web.breeze.zul.img.misc, web.breeze.zul.img.msgbox, - web.breeze.zul.img.paging, - web.breeze.zul.img.popup, web.breeze.zul.img.slider, - web.breeze.zul.img.splt, - web.breeze.zul.img.tab, - web.breeze.zul.img.tree, - web.breeze.zul.img.wnd, + web.iceblue_c.js.zkex.grid.css, + web.iceblue_c.js.zkex.inp.css, + web.iceblue_c.js.zkex.layout.css, + web.iceblue_c.js.zkex.menu.css, + web.iceblue_c.js.zkmax.barscanner.css, + web.iceblue_c.js.zkmax.big.css, + web.iceblue_c.js.zkmax.inp.css, + web.iceblue_c.js.zkmax.inp.ext, + web.iceblue_c.js.zkmax.layout.css, + web.iceblue_c.js.zkmax.med.css, + web.iceblue_c.js.zkmax.nav.css, + web.iceblue_c.js.zkmax.wgt.css, + web.iceblue_c.js.zul.box.css, + web.iceblue_c.js.zul.db.css, + web.iceblue_c.js.zul.grid.css, + web.iceblue_c.js.zul.inp.css, + web.iceblue_c.js.zul.layout.css, + web.iceblue_c.js.zul.menu.css, + web.iceblue_c.js.zul.mesh.css, + web.iceblue_c.js.zul.sel.css, + web.iceblue_c.js.zul.tab.css, + web.iceblue_c.js.zul.wgt.css, + web.iceblue_c.js.zul.wnd.css, + web.iceblue_c.zkex.img.colorbox, + web.iceblue_c.zkmax.css, + web.iceblue_c.zkmax.img.tablet.layout, + web.iceblue_c.zul.css, + web.iceblue_c.zul.img.common, + web.iceblue_c.zul.img.grid, + web.iceblue_c.zul.img.misc, + web.iceblue_c.zul.img.msgbox, + web.iceblue_c.zul.img.slider, web.js.calendar, web.js.calendar.css, web.js.calendar.img, diff --git a/org.idempiere.zk.extra/build.properties b/org.idempiere.zk.extra/build.properties index 34a18c798b..fdcd8cceab 100644 --- a/org.idempiere.zk.extra/build.properties +++ b/org.idempiere.zk.extra/build.properties @@ -7,4 +7,5 @@ bin.includes = META-INF/,\ lib/closure-compiler.jar,\ lib/gmapsz.jar,\ lib/timelinez.jar,\ - lib/timeplotz.jar + lib/timeplotz.jar,\ + lib/iceblue_c.jar diff --git a/org.idempiere.zk.extra/pom.xml b/org.idempiere.zk.extra/pom.xml index 5ed5129c3f..b41320c124 100644 --- a/org.idempiere.zk.extra/pom.xml +++ b/org.idempiere.zk.extra/pom.xml @@ -27,7 +27,7 @@ org.zkoss.zkforge gmapsz - 3.0.4 + 3.0.5 org.zkoss.zkforge @@ -47,12 +47,17 @@ org.zkoss.theme breeze - 8.5.0 + ${zk.version} + + + org.zkoss.theme + iceblue_c + ${zk.version} com.google.javascript closure-compiler - v20181008 + v20181028 lib