hg merge experimental (merge experimental into default)

.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$

org.adempiere.base-feature/feature.xml

@@ -93,13 +93,6 @@
          install-size="0"
          version="0.0.0"/>
 
-   <plugin
-         id="com.sun.mail.javax.mail"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="javax.jms"
          download-size="0"
@@ -493,7 +486,42 @@
          unpack="false"/>
 
    <plugin
-         id="javax.activation"
+         id="com.sun.activation.jakarta.activation"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.sun.mail.gimap"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.sun.mail.imap"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.sun.mail.jakarta.mail"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.sun.mail.smtp"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="jakarta.mail.api"
          download-size="0"
          install-size="0"
          version="0.0.0"

org.adempiere.base.process/.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

org.adempiere.base/.settings/org.eclipse.jdt.core.prefs

@@ -10,12 +10,15 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 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.APILeak=warning
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
 org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
 org.eclipse.jdt.core.compiler.problem.deadCode=warning
@@ -24,6 +27,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
@@ -105,3 +109,4 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11

org.adempiere.base/META-INF/MANIFEST.MF

@@ -124,6 +124,6 @@ Require-Bundle: org.eclipse.equinox.app;bundle-version="0.0.0",
  javax.xml;bundle-version="1.3.4",
  org.apache.poi.poi;bundle-version="3.15.0",
  org.apache.poi.poi-ooxml;bundle-version="3.15.0",
- javax.activation;bundle-version="1.1.0"
+ com.sun.activation.jakarta.activation;bundle-version="1.2.1"
 Automatic-Module-Name: org.adempiere.base
 Bundle-Vendor: iDempiere Community

org.adempiere.eclipse.equinox.servletbridge/.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

org.adempiere.install/install.app.launch

@@ -20,14 +20,14 @@
     <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
         <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
     </listAttribute>
-    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-10"/>
+    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
     <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
     <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.compatibility.bootdelegation=true"/>
     <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
     <stringAttribute key="pde.version" value="3.3"/>
     <stringAttribute key="product" value="org.adempiere.server.server_product"/>
-    <stringAttribute key="selected_target_plugins" value="bcpkix@default:default,bcprov@default:default,com.itextpdf@default:default,com.jaspersoft.studio.bundles.barbecue@default:default,com.sun.mail.javax.mail@default:default,groovy@default:default,javax.activation@default:default,javax.annotation-api@default:default,javax.jms@default:default,javax.transaction@default:false,javax.xml@default:default,jaxb-api@default:default,net.sf.supercsv.super-csv@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant*1.9.6.v201510161327@default:default,org.apache.commons.codec*1.6.0.v201305230611@default:default,org.apache.commons.collections@default:default,org.apache.commons.logging*1.2.0.v20180409-1502@default:default,org.apache.commons.net@default:default,org.apache.felix.scr@1:true,org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec@default:default,org.apache.poi.poi-ooxml@default:default,org.apache.poi.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.cryptacular@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.osgi*3.13.100.v20180827-1536@-1:true,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services*3.7.100.v20180827-1536@default:default,org.eclipse.osgi.util*3.5.100.v20180827-1536@default:default,org.hamcrest.core@default:default,org.jfree.chart-osgi@default:default,org.jfree.jcommon-osgi@default:default,org.junit@default:default,org.krysalis.barcode4j@default:default,org.passay@default:default,org.restlet*2.3.2.v20150501-1520@default:default,slf4j.api@default:default,slf4j.jcl@default:false"/>
+    <stringAttribute key="selected_target_plugins" value="bcpkix@default:default,bcprov@default:default,com.itextpdf@default:default,com.jaspersoft.studio.bundles.barbecue@default:default,com.sun.activation.jakarta.activation@default:default,com.sun.mail.gimap@default:default,com.sun.mail.imap@default:default,com.sun.mail.jakarta.mail@default:default,com.sun.mail.smtp@default:default,groovy@default:default,jakarta.mail.api@default:default,javax.annotation-api@default:default,javax.jms@default:default,javax.transaction@default:false,javax.xml@default:default,jaxb-api@default:default,net.sf.supercsv.super-csv@default:default,org.apache.activemq.activemq-core@default:default,org.apache.activemq.kahadb@default:default,org.apache.ant*1.9.6.v201510161327@default:default,org.apache.commons.codec*1.6.0.v201305230611@default:default,org.apache.commons.collections@default:default,org.apache.commons.logging*1.2.0.v20180409-1502@default:default,org.apache.commons.net@default:default,org.apache.felix.scr@1:true,org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec@default:default,org.apache.poi.poi-ooxml@default:default,org.apache.poi.poi@default:default,org.apache.servicemix.bundles.cglib@default:default,org.cryptacular@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jetty.osgi-servlet-api@default:default,org.eclipse.osgi*3.13.200.v20181130-2106@-1:true,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.hamcrest.core@default:default,org.jfree.chart-osgi@default:default,org.jfree.jcommon-osgi@default:default,org.junit@default:default,org.krysalis.barcode4j@default:default,org.passay@default:default,org.restlet*2.4.1@default:default,slf4j.api@default:default,slf4j.jcl@default:false"/>
     <stringAttribute key="selected_workspace_plugins" value="org.adempiere.base@default:default,org.adempiere.extend@default:false,org.adempiere.install@default:true,org.apache.ecs@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default"/>
     <booleanAttribute key="show_selected_only" value="false"/>
     <stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>

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

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

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

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

org.adempiere.server-feature/hazelcast-template.xml

@@ -16,20 +16,27 @@
   -->
 
 <!--
-    The default Hazelcast configuration. This is used when no hazelcast.xml is present.
+  The default Hazelcast configuration.
-    Please see the schema for how to configure Hazelcast at https://hazelcast.com/schema/config/hazelcast-config-3.10.xsd
+
-    or the documentation at https://hazelcast.org/documentation/
+  This XML file is used when no hazelcast.xml is present.
+
+  To learn how to configure Hazelcast, please see the schema at
+  https://hazelcast.com/schema/config/hazelcast-config-3.11.xsd
+  or the Reference Manual at https://hazelcast.org/documentation/
 -->
+
 <!--suppress XmlDefaultAttributeValue -->
 <hazelcast xmlns="http://www.hazelcast.com/schema/config"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-           http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd">
+           http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd">
+
     <group>
         <name>@ADEMPIERE_DB_USER@.@ADEMPIERE_DB_NAME@/@ADEMPIERE_DB_SERVER@</name>
-        <password>@ADEMPIERE_DB_PASSWORD@</password>
+        <!-- https://github.com/hazelcast/hazelcast/issues/11667 -->
     </group>
     <management-center enabled="false">http://localhost:8080/hazelcast-mancenter</management-center>
+    <!-- https://docs.hazelcast.org/docs/3.11/manual/html-single/index.html#time-window-for-split-brain-protection -->
     <properties>
         <property name="hazelcast.discovery.enabled">false</property>
     </properties>
@@ -53,7 +60,39 @@
                     <member>127.0.0.1</member>
                 </member-list>
             </tcp-ip>
-            <aws enabled="false"/>
+            <aws enabled="false">
+                <access-key>my-access-key</access-key>
+                <secret-key>my-secret-key</secret-key>
+                <!--optional, default is us-east-1 -->
+                <region>us-west-1</region>
+                <!--optional, default is ec2.amazonaws.com. If set, region shouldn't be set as it will override this property -->
+                <host-header>ec2.amazonaws.com</host-header>
+                <!-- optional, only instances belonging to this group will be discovered, default will try all running instances -->
+                <security-group-name>hazelcast-sg</security-group-name>
+                <tag-key>type</tag-key>
+                <tag-value>hz-nodes</tag-value>
+            </aws>
+            <gcp enabled="false">
+                <zones>us-east1-b,us-east1-c</zones>
+            </gcp>
+            <azure enabled="false">
+                <client-id>CLIENT_ID</client-id>
+                <client-secret>CLIENT_SECRET</client-secret>
+                <tenant-id>TENANT_ID</tenant-id>
+                <subscription-id>SUB_ID</subscription-id>
+                <cluster-id>HZLCAST001</cluster-id>
+                <group-name>GROUP-NAME</group-name>
+            </azure>
+            <kubernetes enabled="false">
+                <namespace>MY-KUBERNETES-NAMESPACE</namespace>
+                <service-name>MY-SERVICE-NAME</service-name>
+                <service-label-name>MY-SERVICE-LABEL-NAME</service-label-name>
+                <service-label-value>MY-SERVICE-LABEL-VALUE</service-label-value>
+            </kubernetes>
+            <eureka enabled="false">
+                <self-registration>true</self-registration>
+                <namespace>hazelcast</namespace>
+            </eureka>
             <discovery-strategies>
                 <discovery-strategy enabled="false" class="com.hazelcast.aws.AwsDiscoveryStrategy">
                     <properties>
@@ -93,6 +132,9 @@
             <!-- iteration count to use when generating the secret key -->
             <iteration-count>19</iteration-count>
         </symmetric-encryption>
+        <failure-detector>
+            <icmp enabled="false"/>
+        </failure-detector>
     </network>
     <partition-group enabled="false"/>
     <executor-service name="default">
@@ -100,6 +142,9 @@
         <!--Queue capacity. 0 means Integer.MAX_VALUE.-->
         <queue-capacity>0</queue-capacity>
     </executor-service>
+    <security>
+        <client-block-unmapped-actions>true</client-block-unmapped-actions>
+    </security>
     <queue name="default">
         <!--
             Maximum size of the queue. When a JVM's local queue size reaches the maximum,
@@ -114,7 +159,7 @@
             then all entries of the map will be copied to another JVM for
             fail-safety. 0 means no backup.
         -->
-        <backup-count>1</backup-count>
+        <backup-count>0</backup-count>
 
         <!--
             Number of async backups. 0 means no backup.
@@ -122,6 +167,8 @@
         <async-backup-count>0</async-backup-count>
 
         <empty-queue-ttl>-1</empty-queue-ttl>
+
+        <merge-policy batch-size="100">com.hazelcast.spi.merge.PutIfAbsentMergePolicy</merge-policy>
     </queue>
     <map name="default">
         <!--
@@ -138,24 +185,24 @@
             then all entries of the map will be copied to another JVM for
             fail-safety. 0 means no backup.
         -->
-        <backup-count>0</backup-count>
+        <backup-count>1</backup-count>
         <!--
             Number of async backups. 0 means no backup.
         -->
         <async-backup-count>0</async-backup-count>
         <!--
-			Maximum number of seconds for each entry to stay in the map. Entries that are
+            Maximum number of seconds for each entry to stay in the map. Entries that are
-			older than <time-to-live-seconds> and not updated for <time-to-live-seconds>
+            older than <time-to-live-seconds> and not updated for <time-to-live-seconds>
-			will get automatically evicted from the map.
+            will get automatically evicted from the map.
-			Any integer between 0 and Integer.MAX_VALUE. 0 means infinite. Default is 0.
+            Any integer between 0 and Integer.MAX_VALUE. 0 means infinite. Default is 0
-		-->
+        -->
         <time-to-live-seconds>0</time-to-live-seconds>
         <!--
-			Maximum number of seconds for each entry to stay idle in the map. Entries that are
+            Maximum number of seconds for each entry to stay idle in the map. Entries that are
-			idle(not touched) for more than <max-idle-seconds> will get
+            idle(not touched) for more than <max-idle-seconds> will get
-			automatically evicted from the map. Entry is touched if get, put or containsKey is called.
+            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.
+            Any integer between 0 and Integer.MAX_VALUE. 0 means infinite. Default is 0.
-		-->
+        -->
         <max-idle-seconds>1800</max-idle-seconds>
         <!--
             Valid values are:
@@ -201,7 +248,7 @@
             com.hazelcast.map.merge.HigherHitsMapMergePolicy ; entry with the higher hits wins.
             com.hazelcast.map.merge.LatestUpdateMapMergePolicy ; entry with the latest update wins.
         -->
-        <merge-policy>com.hazelcast.map.merge.PutIfAbsentMapMergePolicy</merge-policy>
+        <merge-policy batch-size="100">com.hazelcast.spi.merge.PutIfAbsentMergePolicy</merge-policy>
 
         <!--
            Control caching of de-serialized values. Caching makes query evaluation faster, but it cost memory.
@@ -211,12 +258,11 @@
                         ALWAYS: Always cache deserialized values.
         -->
         <cache-deserialized-values>INDEX-ONLY</cache-deserialized-values>
-
+        
         <near-cache name="localNearCache">
             <in-memory-format>OBJECT</in-memory-format>
             <cache-local-entries>true</cache-local-entries>
         </near-cache>
-
     </map>
 
     <!--
@@ -236,17 +282,38 @@
         <time-to-live-seconds>0</time-to-live-seconds>
     </event-journal>
 
+    <!--
+       Configuration for a merkle tree.
+       The merkle tree is a data structure used for efficient comparison of the
+       difference in the contents of large data structures. The precision of
+       such a comparison mechanism is defined by the depth of the merkle tree.
+    -->
+    <merkle-tree enabled="false">
+        <mapName>mapName</mapName>
+        <depth>10</depth>
+    </merkle-tree>
+
     <multimap name="default">
         <backup-count>1</backup-count>
         <value-collection-type>SET</value-collection-type>
+        <merge-policy batch-size="100">com.hazelcast.spi.merge.PutIfAbsentMergePolicy</merge-policy>
     </multimap>
 
+    <replicatedmap name="default">
+        <in-memory-format>OBJECT</in-memory-format>
+        <async-fillup>true</async-fillup>
+        <statistics-enabled>true</statistics-enabled>
+        <merge-policy batch-size="100">com.hazelcast.spi.merge.PutIfAbsentMergePolicy</merge-policy>
+    </replicatedmap>
+
     <list name="default">
         <backup-count>1</backup-count>
+        <merge-policy batch-size="100">com.hazelcast.spi.merge.PutIfAbsentMergePolicy</merge-policy>
     </list>
 
     <set name="default">
         <backup-count>1</backup-count>
+        <merge-policy batch-size="100">com.hazelcast.spi.merge.PutIfAbsentMergePolicy</merge-policy>
     </set>
 
     <jobtracker name="default">
@@ -277,8 +344,27 @@
         <async-backup-count>0</async-backup-count>
         <time-to-live-seconds>0</time-to-live-seconds>
         <in-memory-format>BINARY</in-memory-format>
+        <merge-policy batch-size="100">com.hazelcast.spi.merge.PutIfAbsentMergePolicy</merge-policy>
     </ringbuffer>
 
+    <flake-id-generator name="default">
+        <prefetch-count>100</prefetch-count>
+        <prefetch-validity-millis>600000</prefetch-validity-millis>
+        <id-offset>0</id-offset>
+        <node-id-offset>0</node-id-offset>
+        <statistics-enabled>true</statistics-enabled>
+    </flake-id-generator>
+
+    <atomic-long name="default">
+        <merge-policy batch-size="100">com.hazelcast.spi.merge.PutIfAbsentMergePolicy</merge-policy>
+    </atomic-long>
+
+    <atomic-reference name="default">
+        <merge-policy batch-size="100">com.hazelcast.spi.merge.PutIfAbsentMergePolicy</merge-policy>
+    </atomic-reference>
+
+    <count-down-latch name="default"/>
+
     <serialization>
         <portable-version>0</portable-version>
     </serialization>
@@ -287,4 +373,26 @@
 
     <lite-member enabled="false"/>
 
+    <cardinality-estimator name="default">
+        <backup-count>1</backup-count>
+        <async-backup-count>0</async-backup-count>
+        <merge-policy batch-size="100">HyperLogLogMergePolicy</merge-policy>
+    </cardinality-estimator>
+
+    <scheduled-executor-service name="default">
+        <capacity>100</capacity>
+        <durability>1</durability>
+        <pool-size>16</pool-size>
+        <merge-policy batch-size="100">com.hazelcast.spi.merge.PutIfAbsentMergePolicy</merge-policy>
+    </scheduled-executor-service>
+
+    <crdt-replication>
+        <replication-period-millis>1000</replication-period-millis>
+        <max-concurrent-replication-targets>1</max-concurrent-replication-targets>
+    </crdt-replication>
+
+    <pn-counter name="default">
+        <replica-count>2147483647</replica-count>
+        <statistics-enabled>true</statistics-enabled>
+    </pn-counter>
 </hazelcast>

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

org.adempiere.server-feature/server.product

@@ -9,7 +9,7 @@
    <launcherArgs>
       <programArgs>-console
       </programArgs>
-      <vmArgs>--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
+      <vmArgs>--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
       </vmArgs>
       <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
       </vmArgsMac>

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

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,\
+ com.sun.mail.gimap,\
- javax.activation,\
+ 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,\

org.adempiere.target.platform-feature/feature.xml

@@ -314,13 +314,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="javax.ws.rs-api"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.apache.servicemix.bundles.spring-beans"
          download-size="0"
@@ -460,4 +453,11 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="javax.ws.rs-api"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>

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

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

org.adempiere.ui.zk/WEB-INF/zk.xml

@@ -98,7 +98,7 @@
 	</library-property>	
 	<!-- turn off borderlayout animation -->	
 	<library-property>
-    	<name>org.zkoss.zul.borderlayout.animation.disabed</name>
+    	<name>org.zkoss.zul.borderlayout.animation.disabled</name>
     	<value>true</value>
 	</library-property>
 	<library-property>

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

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

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

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

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

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

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,\

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

org.idempiere.hazelcast.service.config/hazelcast.xml

@@ -16,23 +16,26 @@
   -->
 
 <!--
-    The default Hazelcast configuration. This is used when no hazelcast.xml is present.
+  The default Hazelcast configuration.
-    Please see the schema for how to configure Hazelcast at https://hazelcast.com/schema/config/hazelcast-config-3.10.xsd
+
-    or the documentation at https://hazelcast.org/documentation/
+  This XML file is used when no hazelcast.xml is present.
+
+  To learn how to configure Hazelcast, please see the schema at
+  https://hazelcast.com/schema/config/hazelcast-config-3.11.xsd
+  or the Reference Manual at https://hazelcast.org/documentation/
 -->
+
 <!--suppress XmlDefaultAttributeValue -->
 <hazelcast xmlns="http://www.hazelcast.com/schema/config"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-           http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd">
+           http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd">
+
     <group>
         <name>dev</name>
         <password>dev-pass</password>
     </group>
     <management-center enabled="false">http://localhost:8080/hazelcast-mancenter</management-center>
-    <properties>
-        <property name="hazelcast.discovery.enabled">false</property>
-    </properties>
     <network>
         <port auto-increment="true" port-count="100">5701</port>
         <outbound-ports>
@@ -43,7 +46,7 @@
             <ports>0</ports>
         </outbound-ports>
         <join>
-            <multicast enabled="false">
+            <multicast enabled="true">
                 <multicast-group>224.2.2.3</multicast-group>
                 <multicast-port>54327</multicast-port>
             </multicast>
@@ -53,22 +56,40 @@
                     <member>127.0.0.1</member>
                 </member-list>
             </tcp-ip>
-            <aws enabled="false"/>
+            <aws enabled="false">
+                <access-key>my-access-key</access-key>
+                <secret-key>my-secret-key</secret-key>
+                <!--optional, default is us-east-1 -->
+                <region>us-west-1</region>
+                <!--optional, default is ec2.amazonaws.com. If set, region shouldn't be set as it will override this property -->
+                <host-header>ec2.amazonaws.com</host-header>
+                <!-- optional, only instances belonging to this group will be discovered, default will try all running instances -->
+                <security-group-name>hazelcast-sg</security-group-name>
+                <tag-key>type</tag-key>
+                <tag-value>hz-nodes</tag-value>
+            </aws>
+            <gcp enabled="false">
+                <zones>us-east1-b,us-east1-c</zones>
+            </gcp>
+            <azure enabled="false">
+                <client-id>CLIENT_ID</client-id>
+                <client-secret>CLIENT_SECRET</client-secret>
+                <tenant-id>TENANT_ID</tenant-id>
+                <subscription-id>SUB_ID</subscription-id>
+                <cluster-id>HZLCAST001</cluster-id>
+                <group-name>GROUP-NAME</group-name>
+            </azure>
+            <kubernetes enabled="false">
+                <namespace>MY-KUBERNETES-NAMESPACE</namespace>
+                <service-name>MY-SERVICE-NAME</service-name>
+                <service-label-name>MY-SERVICE-LABEL-NAME</service-label-name>
+                <service-label-value>MY-SERVICE-LABEL-VALUE</service-label-value>
+            </kubernetes>
+            <eureka enabled="false">
+                <self-registration>true</self-registration>
+                <namespace>hazelcast</namespace>
+            </eureka>
             <discovery-strategies>
-                <discovery-strategy enabled="false" class="com.hazelcast.aws.AwsDiscoveryStrategy">
-                    <properties>
-                       <property name="access-key">my-access-key</property>
-                       <property name="secret-key">my-secret-key</property>
-                       <!--optional, default is us-east-1 -->
-                       <property name="region">us-east-1</property>
-                       <property name="host-header">ec2.amazonaws.com</property>
-                       <!-- optional, only instances belonging to this group will be discovered, default will try all running instances -->
-                       <property name="security-group-name">hazelcast-sg</property>
-                       <property name="tag-key">type</property>
-                       <property name="tag-value">hz-nodes</property>
-                       <property name="connection-timeout-seconds">30</property>
-                    </properties>
-                </discovery-strategy>
             </discovery-strategies>
         </join>
         <interfaces enabled="false">
@@ -93,6 +114,9 @@
             <!-- iteration count to use when generating the secret key -->
             <iteration-count>19</iteration-count>
         </symmetric-encryption>
+        <failure-detector>
+            <icmp enabled="false"/>
+        </failure-detector>
     </network>
     <partition-group enabled="false"/>
     <executor-service name="default">
@@ -100,6 +124,9 @@
         <!--Queue capacity. 0 means Integer.MAX_VALUE.-->
         <queue-capacity>0</queue-capacity>
     </executor-service>
+    <security>
+        <client-block-unmapped-actions>true</client-block-unmapped-actions>
+    </security>
     <queue name="default">
         <!--
             Maximum size of the queue. When a JVM's local queue size reaches the maximum,
@@ -122,6 +149,8 @@
         <async-backup-count>0</async-backup-count>
 
         <empty-queue-ttl>-1</empty-queue-ttl>
+
+        <merge-policy batch-size="100">com.hazelcast.spi.merge.PutIfAbsentMergePolicy</merge-policy>
     </queue>
     <map name="default">
         <!--
@@ -138,25 +167,25 @@
             then all entries of the map will be copied to another JVM for
             fail-safety. 0 means no backup.
         -->
-        <backup-count>0</backup-count>
+        <backup-count>1</backup-count>
         <!--
             Number of async backups. 0 means no backup.
         -->
         <async-backup-count>0</async-backup-count>
         <!--
-			Maximum number of seconds for each entry to stay in the map. Entries that are
+            Maximum number of seconds for each entry to stay in the map. Entries that are
-			older than <time-to-live-seconds> and not updated for <time-to-live-seconds>
+            older than <time-to-live-seconds> and not updated for <time-to-live-seconds>
-			will get automatically evicted from the map.
+            will get automatically evicted from the map.
-			Any integer between 0 and Integer.MAX_VALUE. 0 means infinite. Default is 0.
+            Any integer between 0 and Integer.MAX_VALUE. 0 means infinite. Default is 0
-		-->
+        -->
         <time-to-live-seconds>0</time-to-live-seconds>
         <!--
-			Maximum number of seconds for each entry to stay idle in the map. Entries that are
+            Maximum number of seconds for each entry to stay idle in the map. Entries that are
-			idle(not touched) for more than <max-idle-seconds> will get
+            idle(not touched) for more than <max-idle-seconds> will get
-			automatically evicted from the map. Entry is touched if get, put or containsKey is called.
+            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.
+            Any integer between 0 and Integer.MAX_VALUE. 0 means infinite. Default is 0.
-		-->
+        -->
-        <max-idle-seconds>1800</max-idle-seconds>
+        <max-idle-seconds>0</max-idle-seconds>
         <!--
             Valid values are:
             NONE (no eviction),
@@ -164,14 +193,14 @@
             LFU (Least Frequently Used).
             NONE is the default.
         -->
-        <eviction-policy>LRU</eviction-policy>
+        <eviction-policy>NONE</eviction-policy>
         <!--
             Maximum size of the map. When max size is reached,
             map is evicted based on the policy defined.
             Any integer between 0 and Integer.MAX_VALUE. 0 means
             Integer.MAX_VALUE. Default is 0.
         -->
-        <max-size policy="PER_NODE">1000</max-size>
+        <max-size policy="PER_NODE">0</max-size>
         <!--
             `eviction-percentage` property is deprecated and will be ignored when it is set.
 
@@ -201,7 +230,7 @@
             com.hazelcast.map.merge.HigherHitsMapMergePolicy ; entry with the higher hits wins.
             com.hazelcast.map.merge.LatestUpdateMapMergePolicy ; entry with the latest update wins.
         -->
-        <merge-policy>com.hazelcast.map.merge.PutIfAbsentMapMergePolicy</merge-policy>
+        <merge-policy batch-size="100">com.hazelcast.spi.merge.PutIfAbsentMergePolicy</merge-policy>
 
         <!--
            Control caching of de-serialized values. Caching makes query evaluation faster, but it cost memory.
@@ -212,11 +241,6 @@
         -->
         <cache-deserialized-values>INDEX-ONLY</cache-deserialized-values>
 
-        <near-cache name="localNearCache">
-            <in-memory-format>OBJECT</in-memory-format>
-            <cache-local-entries>true</cache-local-entries>
-        </near-cache>
-
     </map>
 
     <!--
@@ -236,17 +260,38 @@
         <time-to-live-seconds>0</time-to-live-seconds>
     </event-journal>
 
+    <!--
+       Configuration for a merkle tree.
+       The merkle tree is a data structure used for efficient comparison of the
+       difference in the contents of large data structures. The precision of
+       such a comparison mechanism is defined by the depth of the merkle tree.
+    -->
+    <merkle-tree enabled="false">
+        <mapName>mapName</mapName>
+        <depth>10</depth>
+    </merkle-tree>
+
     <multimap name="default">
         <backup-count>1</backup-count>
         <value-collection-type>SET</value-collection-type>
+        <merge-policy batch-size="100">com.hazelcast.spi.merge.PutIfAbsentMergePolicy</merge-policy>
     </multimap>
 
+    <replicatedmap name="default">
+        <in-memory-format>OBJECT</in-memory-format>
+        <async-fillup>true</async-fillup>
+        <statistics-enabled>true</statistics-enabled>
+        <merge-policy batch-size="100">com.hazelcast.spi.merge.PutIfAbsentMergePolicy</merge-policy>
+    </replicatedmap>
+
     <list name="default">
         <backup-count>1</backup-count>
+        <merge-policy batch-size="100">com.hazelcast.spi.merge.PutIfAbsentMergePolicy</merge-policy>
     </list>
 
     <set name="default">
         <backup-count>1</backup-count>
+        <merge-policy batch-size="100">com.hazelcast.spi.merge.PutIfAbsentMergePolicy</merge-policy>
     </set>
 
     <jobtracker name="default">
@@ -277,8 +322,27 @@
         <async-backup-count>0</async-backup-count>
         <time-to-live-seconds>0</time-to-live-seconds>
         <in-memory-format>BINARY</in-memory-format>
+        <merge-policy batch-size="100">com.hazelcast.spi.merge.PutIfAbsentMergePolicy</merge-policy>
     </ringbuffer>
 
+    <flake-id-generator name="default">
+        <prefetch-count>100</prefetch-count>
+        <prefetch-validity-millis>600000</prefetch-validity-millis>
+        <id-offset>0</id-offset>
+        <node-id-offset>0</node-id-offset>
+        <statistics-enabled>true</statistics-enabled>
+    </flake-id-generator>
+
+    <atomic-long name="default">
+        <merge-policy batch-size="100">com.hazelcast.spi.merge.PutIfAbsentMergePolicy</merge-policy>
+    </atomic-long>
+
+    <atomic-reference name="default">
+        <merge-policy batch-size="100">com.hazelcast.spi.merge.PutIfAbsentMergePolicy</merge-policy>
+    </atomic-reference>
+
+    <count-down-latch name="default"/>
+
     <serialization>
         <portable-version>0</portable-version>
     </serialization>
@@ -287,4 +351,26 @@
 
     <lite-member enabled="false"/>
 
+    <cardinality-estimator name="default">
+        <backup-count>1</backup-count>
+        <async-backup-count>0</async-backup-count>
+        <merge-policy batch-size="100">HyperLogLogMergePolicy</merge-policy>
+    </cardinality-estimator>
+
+    <scheduled-executor-service name="default">
+        <capacity>100</capacity>
+        <durability>1</durability>
+        <pool-size>16</pool-size>
+        <merge-policy batch-size="100">com.hazelcast.spi.merge.PutIfAbsentMergePolicy</merge-policy>
+    </scheduled-executor-service>
+
+    <crdt-replication>
+        <replication-period-millis>1000</replication-period-millis>
+        <max-concurrent-replication-targets>1</max-concurrent-replication-targets>
+    </crdt-replication>
+
+    <pn-counter name="default">
+        <replica-count>2147483647</replica-count>
+        <statistics-enabled>true</statistics-enabled>
+    </pn-counter>
 </hazelcast>

org.idempiere.hazelcast.service/pom.xml

@@ -26,7 +26,7 @@
 								<artifactItem>
 									<groupId>com.hazelcast</groupId>
 									<artifactId>hazelcast</artifactId>
-									<version>3.10.6</version>
+									<version>3.11</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>com.hazelcast</groupId>

org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml

@@ -10,17 +10,18 @@
 	<artifactId>org.idempiere.maven.to.p2</artifactId>
 	<packaging>pom</packaging>
 	<properties>
-		<zk-osgi-zip-file>https://sourceforge.net/projects/zk1/files/ZK/zk-8.5.0/zk-bin-osgi-8.5.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 -->
+		<jetty.version>9.4.14.v20181114</jetty.version>
 		<jetty.alpn.api.version>1.1.3.v20160715</jetty.alpn.api.version>
-		<jetty.jsp.version>8.5.33</jetty.jsp.version>
+		<jetty.jsp.version>8.5.33.1</jetty.jsp.version>
 		<jetty.conscrypt.version>8.1.12.v20180117</jetty.conscrypt.version>
 		<jetty.osgi.servlet.api.version>3.1.0.M3</jetty.osgi.servlet.api.version>
 		<org.apache.taglibs.version>1.2.5</org.apache.taglibs.version>
 		<groovy.version>2.5.3</groovy.version>
 		<org.bouncycastle.version>1.60</org.bouncycastle.version>
 		<jetty.conscrypt.openjdk.uber.version>1.4.0</jetty.conscrypt.openjdk.uber.version>
-        <jackson.version>2.9.5</jackson.version> <!--it up to version of jasperreport engine-->
+        <jackson.version>2.9.7</jackson.version> <!--it up to version of jasperreport engine-->
         <stax2.api.version>3.1.4</stax2.api.version> <!--it up to version of jasperreport engine-->
         <validation.api.version>1.1.0.Final</validation.api.version> <!--it up to version of jasperreport engine-->
         <woodstox.core.version>5.0.3</woodstox.core.version> <!--it up to version of jasperreport engine-->
@@ -30,8 +31,11 @@
 		<xml.ws.export.version>2.4</xml.ws.export.version>
 		<apache.cxf.version>3.2.6</apache.cxf.version>
 		<apache.cxf.databinding.version>3.1.17</apache.cxf.databinding.version>
-		<activation.version>1.2.0</activation.version>
+		<activation.version>1.2.1</activation.version>
-		<annotation.version>1.3.2</annotation.version>
+		<annotation.version>1.3.3</annotation.version>
+		<asm.version>7.0</asm.version>
+		<restlet.version>2.4.1</restlet.version>
+		<javamail.version>1.6.3</javamail.version>
 	</properties>
 	
     <repositories>
@@ -49,6 +53,14 @@
 	        <url>https://sourceforge.net/projects/jasperstudio/files/updatesite/6.6.0</url>
             <layout>p2</layout>
         </repository>
+        <repository>
+            <id>zkoss</id>
+            <url>http://mavensync.zkoss.org/maven2</url>
+        </repository>
+        <repository>
+	        <id>restlet-maven</id>
+	        <url>http://maven.restlet.com</url>
+        </repository>
     </repositories>
 
 	<build>
@@ -116,21 +128,35 @@
 											<transitive>false</transitive>
 										</artifact>
 										<artifact>
-											<id>javax.annotation:javax.annotation-api:jar:${annotation.version}</id>
+											<id>jakarta.annotation:jakarta.annotation-api:jar:${annotation.version}</id>
 											<source>true</source>
 											<transitive>false</transitive>
 										</artifact>
 										<artifact>
-<!--consider to move to javax.mail:javax.mail-api:jar less dependency, but not sure full function-->
+											<id>com.sun.mail:jakarta.mail:jar:${javamail.version}</id>
-											<id>com.sun.mail:javax.mail:jar:1.6.2</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>com.sun.mail:smtp:jar:${javamail.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>com.sun.mail:mailapi:jar:${javamail.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>com.sun.mail:imap:jar:${javamail.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>com.sun.mail:gimap:jar:${javamail.version}</id>
 											<source>true</source>
 											<transitive>false</transitive>
 										</artifact>
-										<!-- <artifact> <id>org.ow2.asm:asm-commons:jar:6.0</id> <source>true</source> 
-											<transitive>false</transitive> </artifact> <artifact> <id>org.ow2.asm:asm-tree:jar:6.0</id> 
-											<source>true</source> <transitive>false</transitive> </artifact> <artifact> 
-											<id>org.ow2.asm:asm:jar:6.0</id> <source>true</source> <transitive>false</transitive> 
-											</artifact> -->
 										<artifact>
 											<id>org.apache.taglibs:taglibs-standard-impl:jar:${org.apache.taglibs.version}</id>
 											<source>true</source>
@@ -147,7 +173,7 @@
 											<transitive>false</transitive>
 										</artifact>
 										<artifact>
-											<id>org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:jar:1.0.14</id>
+											<id>org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:jar:1.2</id>
 											<source>true</source>
 											<transitive>false</transitive>
 										</artifact>
@@ -408,7 +434,7 @@
 										</artifact>
 										<artifact>
 											<!-- better javax.activation:javax.activation-api because include extra package -->
-											<id>com.sun.activation:javax.activation:jar:${activation.version}</id>
+											<id>com.sun.activation:jakarta.activation:jar:${activation.version}</id>
 											<source>true</source>
 											<transitive>false</transitive>
 										</artifact>
@@ -613,7 +639,7 @@
 											<transitive>false</transitive>
 										</artifact>
 										<artifact>
-											<id>javax.ws.rs:javax.ws.rs-api:jar:2.1.1</id>
+											<id>jakarta.ws.rs:jakarta.ws.rs-api:jar:2.1.3</id>
 											<source>true</source>
 											<transitive>false</transitive>
 										</artifact>
@@ -628,7 +654,12 @@
 											<transitive>false</transitive>
 										</artifact>
 										<artifact>
-											<id>javax.xml.rpc:javax.xml.rpc-api:jar:1.1.1</id>
+											<id>jakarta.xml.rpc:jakarta.xml.rpc-api:jar:1.1.3</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>jakarta.persistence:jakarta.persistence-api:jar:2.2.1</id>
 											<source>true</source>
 											<transitive>false</transitive>
 										</artifact>
@@ -774,284 +805,6 @@
 											<id>org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-web:jar:${springframework.version}</id>
 											<source>false</source>
 											<transitive>false</transitive>
-											<override>true</override>
-											<instructions>
-<!--export keep same original, copy here because tool will remake it-->
-											    <Export-Package>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"</Export-Package>
-<!--refe: note 1-->
-											    <Import-Package>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
-											    </Import-Package>
 <!-- 
 note 1: about javax.activity,javax.jws and javax.xml.ws
 javax.jws is depricate package, so need replace with javax.jws-api
@@ -1069,7 +822,6 @@ same for javax.xml.ws.*
 it also resolve issue confilic between eclipse runtime and tycho build
 
 -->
-											</instructions>
 										</artifact>
 										<artifact>
 											<id>org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-context-support:jar:sources:${springframework.version}</id>
@@ -1098,6 +850,129 @@ it also resolve issue confilic between eclipse runtime and tycho build
 											<source>true</source>
 											<transitive>false</transitive>
 										</artifact>
+										<artifact>
+		                                    <id>org.restlet.osgi:org.restlet:${restlet.version}</id>
+		                                    <source>true</source>
+											<transitive>false</transitive>
+		                                    <override>true</override>
+		                                    <!-- manefest isn't complete, so take from release of 2.3.12
+		                                    	https://github.com/restlet/restlet-framework-java/issues/1321-->
+											<instructions>
+												<Bundle-Activator>org.restlet.engine.internal.Activator</Bundle-Activator>
+												<Bundle-Name>org.restlet</Bundle-Name>
+												<Bundle-SymbolicName>org.restlet</Bundle-SymbolicName>
+												<Bundle-Version>${restlet.version}</Bundle-Version>
+												<Export-Package>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"</Export-Package>
+		 <Import-Package>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</Import-Package>
+											</instructions>
+		                                </artifact>
+		                                <artifact>
+		                                    <id>org.restlet.osgi:org.restlet.ext.servlet:${restlet.version}</id>
+		                                    <source>true</source>
+											<transitive>false</transitive>
+		                                    <override>true</override>
+											<instructions>
+												<Bundle-Name>org.restlet.ext.servlet</Bundle-Name>
+												<Bundle-SymbolicName>org.restlet.ext.servlet</Bundle-SymbolicName>
+												<Bundle-Version>${restlet.version}</Bundle-Version>
+												<Export-Package>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"</Export-Package>
+		 										<Import-Package>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</Import-Package>
+												<Service-Component>OSGI-INF/*.xml</Service-Component>
+											</instructions>
+		                                </artifact>
 									</artifacts>
 								</feature>
 								<!-- zk public zk osgi on zip format download from sourceforge, so 
@@ -1193,6 +1068,16 @@ it also resolve issue confilic between eclipse runtime and tycho build
 												<Bundle-Name>zcommon.source</Bundle-Name>
 											</instructions>
 										</artifact>
+										<artifact>
+											<id>org.zkoss.zk:zkwebfragment:jar:sources:${zk.version}</id>
+											<source>false</source>
+											<transitive>false</transitive>
+											<instructions>
+												<Eclipse-SourceBundle>zkwebfragment;version="${zk.version}";roots:="."</Eclipse-SourceBundle>
+												<Bundle-SymbolicName>zkwebfragment</Bundle-SymbolicName>
+												<Bundle-Name>zkwebfragment.source</Bundle-Name>
+											</instructions>
+										</artifact>
 										<artifact>
 											<id>org.javassist:javassist:jar:sources:${zk.javassist.src.version}</id>
 											<source>false</source>
@@ -1289,6 +1174,15 @@ it also resolve issue confilic between eclipse runtime and tycho build
 												<Bundle-Name>zcommon</Bundle-Name>
 											</instructions>
 										</artifact>
+										<artifact>
+											<id>org.zkoss.zk:zkwebfragment:${zk.version}</id>
+											<source>false</source>
+											<transitive>false</transitive>
+											<instructions>
+												<Bundle-SymbolicName>zkwebfragment</Bundle-SymbolicName>
+												<Bundle-Name>zkwebfragment</Bundle-Name>
+											</instructions>
+										</artifact>
 									</artifacts>
 								</feature>
 								<feature>
@@ -1455,6 +1349,302 @@ it also resolve issue confilic between eclipse runtime and tycho build
 										</artifact>
 									</artifacts>
 								</feature>
+								<feature>
+									<id>org.idempiere.asm.feature</id>
+									<version>${asm.version}</version>
+									<label>Idempiere asm ${asm.version} feature</label>
+									<providerName>Idempiere</providerName>
+									<description>feature group asm osgi bundle get from maven</description>
+									<copyright>Idempiere</copyright>
+									<license>GPL v2.1</license>
+									<generateSourceFeature>true</generateSourceFeature>
+
+									<artifacts>
+										<artifact>
+											<id>org.ow2.asm:asm-commons:jar:${asm.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.ow2.asm:asm-tree:jar:${asm.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.ow2.asm:asm:jar:${asm.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.ow2.asm:asm-analysis:jar:${asm.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.ow2.asm:asm-util:jar:${asm.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+									</artifacts>
+								</feature>
+
+								<feature>
+									<id>org.idempiere.apache.feature</id>
+									<version>${project.version}</version>
+									<label>Idempiere apache util feature</label>
+									<providerName>Idempiere</providerName>
+									<description>feature group apache util osgi bundle get from maven</description>
+									<copyright>Idempiere</copyright>
+									<license>GPL v2.1</license>
+									<generateSourceFeature>true</generateSourceFeature>
+
+									<artifacts>
+										<artifact>
+											<id>commons-io:commons-io:jar:2.6</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>commons-fileupload:commons-fileupload:jar:1.3.3</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.apache.httpcomponents:httpclient-osgi:jar:4.5.6</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+									</artifacts>
+								</feature>
+
+								<feature>
+									<id>org.idempiere.jetty.feature</id>
+									<version>${jetty.version}</version>
+									<label>Idempiere jetty ${jetty.version} feature</label>
+									<providerName>Idempiere</providerName>
+									<description>feature group jetty osgi bundle get from maven</description>
+									<copyright>Idempiere</copyright>
+									<license>GPL v2.1</license>
+									<generateSourceFeature>true</generateSourceFeature>
+
+									<artifacts>
+										<artifact>
+											<id>org.eclipse.jetty:jetty-alpn-conscrypt-server:jar:${jetty.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.eclipse.jetty:jetty-alpn-openjdk8-server:jar:${jetty.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.eclipse.jetty:jetty-alpn-server:jar:${jetty.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.eclipse.jetty:jetty-alpn-client:jar:${jetty.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.eclipse.jetty:jetty-annotations:jar:${jetty.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.eclipse.jetty:apache-jsp:jar:${jetty.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.eclipse.jetty:jetty-client:jar:${jetty.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.eclipse.jetty:jetty-continuation:jar:${jetty.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.eclipse.jetty:jetty-deploy:jar:${jetty.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.eclipse.jetty:jetty-http:jar:${jetty.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.eclipse.jetty.http2:http2-client:jar:${jetty.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.eclipse.jetty.http2:http2-server:jar:${jetty.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.eclipse.jetty.http2:http2-common:jar:${jetty.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.eclipse.jetty.http2:http2-hpack:jar:${jetty.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.eclipse.jetty.http2:http2-http-client-transport:jar:${jetty.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.eclipse.jetty:jetty-io:jar:${jetty.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.eclipse.jetty:jetty-jaas:jar:${jetty.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.eclipse.jetty:jetty-jmx:jar:${jetty.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.eclipse.jetty:jetty-jndi:jar:${jetty.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.eclipse.jetty.osgi:jetty-osgi-boot:jar:${jetty.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.eclipse.jetty.osgi:jetty-osgi-alpn:jar:${jetty.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.eclipse.jetty.osgi:jetty-osgi-boot-jsp:jar:${jetty.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.eclipse.jetty.osgi:jetty-osgi-boot-warurl:jar:${jetty.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.eclipse.jetty.osgi:jetty-httpservice:jar:${jetty.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.eclipse.jetty:jetty-plus:jar:${jetty.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.eclipse.jetty:jetty-proxy:jar:${jetty.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.eclipse.jetty:jetty-rewrite:jar:${jetty.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.eclipse.jetty:jetty-security:jar:${jetty.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.eclipse.jetty:jetty-jaspi:jar:${jetty.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.eclipse.jetty:jetty-server:jar:${jetty.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.eclipse.jetty:jetty-servlet:jar:${jetty.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.eclipse.jetty:jetty-servlets:jar:${jetty.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.eclipse.jetty:jetty-util:jar:${jetty.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.eclipse.jetty:jetty-util-ajax:jar:${jetty.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.eclipse.jetty:jetty-webapp:jar:${jetty.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.eclipse.jetty:jetty-xml:jar:${jetty.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.eclipse.jetty.websocket:websocket-api:jar:${jetty.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.eclipse.jetty.websocket:websocket-client:jar:${jetty.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.eclipse.jetty.websocket:websocket-common:jar:${jetty.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.eclipse.jetty.websocket:websocket-server:jar:${jetty.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.eclipse.jetty.websocket:websocket-servlet:jar:${jetty.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.eclipse.jetty.websocket:javax-websocket-server-impl:jar:${jetty.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.eclipse.jetty.websocket:javax-websocket-client-impl:jar:${jetty.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+									</artifacts>
+								</feature>
 							</featureDefinitions>
 							<artifacts>
 								<artifact>
@@ -1624,6 +1814,10 @@ it also resolve issue confilic between eclipse runtime and tycho build
 									<sourceFile>${project.build.directory}/zk-bin-osgi-${zk.version}/dist/lib/zweb.osgi.jar</sourceFile>
 									<destinationFile>${project.build.directory}/repository/plugins/zweb_${zk.version}.jar</destinationFile>
 								</fileSet>
+								<fileSet>
+									<sourceFile>${project.build.directory}/zk-bin-osgi-${zk.version}/dist/lib/zkwebfragment.osgi.jar</sourceFile>
+									<destinationFile>${project.build.directory}/repository/plugins/zkwebfragment_${zk.version}.jar</destinationFile>
+								</fileSet>
 							</fileSets>
 						</configuration>
 					</execution>

org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target

@@ -1,73 +1,31 @@
-<?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>
-<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.restlet.example.feature.group" version="2.3.2.v20150501-1520"/>
-<unit id="org.restlet.ext.apispark.feature.group" version="2.3.2.v20150501-1520"/>
-<unit id="org.restlet.ext.atom.feature.group" version="2.3.2.v20150501-1520"/>
-<unit id="org.restlet.ext.crypto.feature.group" version="2.3.2.v20150501-1520"/>
-<unit id="org.restlet.ext.e4.feature.group" version="2.3.2.v20150501-1520"/>
-<unit id="org.restlet.ext.emf.feature.group" version="2.3.2.v20150501-1520"/>
-<unit id="org.restlet.ext.fileupload.feature.group" version="2.3.2.v20150501-1520"/>
-<unit id="org.restlet.ext.freemarker.feature.group" version="2.3.2.v20150501-1520"/>
-<unit id="org.restlet.ext.gson.feature.group" version="2.3.2.v20150501-1520"/>
-<unit id="org.restlet.ext.guice.feature.group" version="2.3.2.v20150501-1520"/>
-<unit id="org.restlet.ext.gwt.feature.group" version="2.3.2.v20150501-1520"/>
-<unit id="org.restlet.ext.html.feature.group" version="2.3.2.v20150501-1520"/>
-<unit id="org.restlet.ext.httpclient.feature.group" version="2.3.2.v20150501-1520"/>
-<unit id="org.restlet.ext.jaas.feature.group" version="2.3.2.v20150501-1520"/>
-<unit id="org.restlet.ext.jackson.feature.group" version="2.3.2.v20150501-1520"/>
-<unit id="org.restlet.ext.javamail.feature.group" version="2.3.2.v20150501-1520"/>
-<unit id="org.restlet.ext.jaxb.feature.group" version="2.3.2.v20150501-1520"/>
-<unit id="org.restlet.ext.jaxrs.feature.group" version="2.3.2.v20150501-1520"/>
-<unit id="org.restlet.ext.jetty.feature.group" version="2.3.2.v20150501-1520"/>
-<unit id="org.restlet.ext.jibx.feature.group" version="2.3.2.v20150501-1520"/>
-<unit id="org.restlet.ext.json.feature.group" version="2.3.2.v20150501-1520"/>
-<unit id="org.restlet.ext.jsslutils.feature.group" version="2.3.2.v20150501-1520"/>
-<unit id="org.restlet.ext.lucene.feature.group" version="2.3.2.v20150501-1520"/>
-<unit id="org.restlet.ext.nio.feature.group" version="2.3.2.v20150501-1520"/>
-<unit id="org.restlet.ext.oauth.feature.group" version="2.3.2.v20150501-1520"/>
-<unit id="org.restlet.ext.odata.feature.group" version="2.3.2.v20150501-1520"/>
-<unit id="org.restlet.ext.openid.feature.group" version="2.3.2.v20150501-1520"/>
-<unit id="org.restlet.ext.osgi.feature.group" version="2.3.2.v20150501-1520"/>
-<unit id="org.restlet.ext.raml.feature.group" version="2.3.2.v20150501-1520"/>
-<unit id="org.restlet.ext.rdf.feature.group" version="2.3.2.v20150501-1520"/>
-<unit id="org.restlet.ext.rome.feature.group" version="2.3.2.v20150501-1520"/>
-<unit id="org.restlet.ext.sdc.feature.group" version="2.3.2.v20150501-1520"/>
-<unit id="org.restlet.ext.servlet.feature.group" version="2.3.2.v20150501-1520"/>
-<unit id="org.restlet.ext.simple.feature.group" version="2.3.2.v20150501-1520"/>
-<unit id="org.restlet.ext.sip.feature.group" version="2.3.2.v20150501-1520"/>
-<unit id="org.restlet.ext.slf4j.feature.group" version="2.3.2.v20150501-1520"/>
-<unit id="org.restlet.ext.spring.feature.group" version="2.3.2.v20150501-1520"/>
-<unit id="org.restlet.ext.swagger.feature.group" version="2.3.2.v20150501-1520"/>
-<unit id="org.restlet.ext.thymeleaf.feature.group" version="2.3.2.v20150501-1520"/>
-<unit id="org.restlet.ext.velocity.feature.group" version="2.3.2.v20150501-1520"/>
-<unit id="org.restlet.ext.wadl.feature.group" version="2.3.2.v20150501-1520"/>
-<unit id="org.restlet.ext.xdb.feature.group" version="2.3.2.v20150501-1520"/>
-<unit id="org.restlet.ext.xml.feature.group" version="2.3.2.v20150501-1520"/>
-<unit id="org.restlet.ext.xstream.feature.group" version="2.3.2.v20150501-1520"/>
-<unit id="org.restlet.feature.group" version="2.3.2.v20150501-1520"/>
-<repository location="http://p2.restlet.com/2.3"/>
-</location>
 	<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-		<unit id="org.eclipse.e4.core.tools.feature.source.feature.group" version="4.9.0.v20180823-1503"/>
+		<unit id="org.eclipse.e4.core.tools.feature.source.feature.group" version="4.10.0.v20181116-0958"/>
-		<unit id="org.eclipse.equinox.sdk.feature.group" version="3.15.0.v20180904-1442"/>
+		<unit id="org.eclipse.equinox.sdk.feature.group" version="3.16.0.v20181130-2106"/>
 		<unit id="org.eclipse.pde.api.tools.ee.feature.feature.group" version="1.0.400.v20180829-0709"/>
-		<unit id="org.eclipse.pde.feature.group" version="3.13.200.v20180906-0745"/>
+		<unit id="org.eclipse.pde.feature.group" version="3.13.300.v20181206-0815"/>
-		<unit id="org.eclipse.pde.source.feature.group" version="3.13.200.v20180906-0745"/>
+		<unit id="org.eclipse.pde.source.feature.group" version="3.13.300.v20181206-0815"/>
-		<unit id="org.eclipse.platform.ide" version="4.9.0.I20180906-0745"/>
+		<unit id="org.eclipse.platform.ide" version="4.10.0.I20181206-0815"/>
-		<unit id="org.eclipse.releng.tools.feature.group" version="3.10.100.v20180822-0818"/>
+		<unit id="org.eclipse.releng.tools.feature.group" version="3.10.200.v20181114-1053"/>
-		<unit id="org.eclipse.sdk.examples.source.feature.group" version="3.6.200.v20180906-0745"/>
+		<unit id="org.eclipse.sdk.examples.source.feature.group" version="3.6.300.v20181206-0815"/>
-		<unit id="org.eclipse.sdk.ide" version="4.9.0.I20180906-0745"/>
+		<unit id="org.eclipse.sdk.ide" version="4.10.0.I20181206-0815"/>
-		<unit id="org.eclipse.sdk.tests.feature.group" version="4.9.0.v20180906-0745"/>
+		<unit id="org.eclipse.sdk.tests.feature.group" version="4.10.0.v20181206-1038"/>
-		<unit id="org.eclipse.swt.tools.feature.feature.group" version="3.107.100.v20180821-0933"/>
+		<unit id="org.eclipse.swt.tools.feature.feature.group" version="3.107.200.v20181122-0742"/>
-		<unit id="org.eclipse.test.feature.group" version="3.7.400.v20180822-0818"/>
+		<unit id="org.eclipse.test.feature.group" version="3.7.500.v20181114-1814"/>
-		<repository location="http://download.eclipse.org/eclipse/updates/4.9"/>
+		<repository location="http://download.eclipse.org/eclipse/updates/4.10"/>
-		<unit id="org.eclipse.ecf.core.feature.feature.group" version="1.5.1.v20180810-0833"/>
+		<unit id="org.eclipse.ecf.core.feature.feature.group" version="1.5.3.v20181012-2020"/>
+		<unit id="org.eclipse.ecf.core.feature.source.feature.group" version="1.5.3.v20181012-2020"/>
 		<unit id="org.eclipse.ecf.core.ssl.feature.feature.group" version="1.1.100.v20180301-0201"/>
-		<unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="3.14.2.v20180801-2237"/>
+		<unit id="org.eclipse.ecf.core.ssl.feature.source.feature.group" version="1.1.100.v20180301-0201"/>
-		<unit id="org.eclipse.ecf.filetransfer.httpclient4.feature.feature.group" version="3.14.2.v20180801-2237"/>
+		<unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="3.14.4.v20181013-2146"/>
+		<unit id="org.eclipse.ecf.filetransfer.feature.source.feature.group" version="3.14.4.v20181013-2146"/>
+		<unit id="org.eclipse.ecf.filetransfer.httpclient4.feature.feature.group" version="3.14.4.v20181013-2146"/>
+		<unit id="org.eclipse.ecf.filetransfer.httpclient4.feature.source.feature.group" version="3.14.4.v20181013-2146"/>
 		<unit id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature.feature.group" version="1.1.100.v20180301-0132"/>
+		<unit id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature.source.feature.group" version="1.1.100.v20180301-0132"/>
 		<unit id="org.eclipse.ecf.filetransfer.ssl.feature.feature.group" version="1.1.100.v20180301-0132"/>
+		<unit id="org.eclipse.ecf.filetransfer.ssl.feature.source.feature.group" version="1.1.100.v20180301-0132"/>
 	</location>
 	<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
 		<unit id="ca.odell.glazedlists" version="1.9.0.v201303080712"/>
@@ -129,13 +87,13 @@
 		<unit id="com.google.gerrit.reviewdb" version="2.1.5.v201112241444"/>
 		<unit id="com.google.gerrit.reviewdb.source" version="2.1.5.v201112241444"/>
 		<unit id="com.google.gson" version="2.2.4.v201311231704"/>
-		<unit id="com.google.gson" version="2.8.2.v20180104-1110"/>
+		<unit id="com.google.gson" version="2.7.0.v20170129-0911"/>
 		<unit id="com.google.gson.source" version="2.2.4.v201311231704"/>
-		<unit id="com.google.gson.source" version="2.8.2.v20180104-1110"/>
+		<unit id="com.google.gson.source" version="2.7.0.v20170129-0911"/>
 		<unit id="com.google.guava" version="15.0.0.v201403281430"/>
-		<unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
+		<unit id="com.google.guava" version="18.0.0.v20161115-1643"/>
 		<unit id="com.google.guava.source" version="15.0.0.v201403281430"/>
-		<unit id="com.google.guava.source" version="21.0.0.v20170206-1425"/>
+		<unit id="com.google.guava.source" version="18.0.0.v20161115-1643"/>
 		<unit id="com.google.gwt.servlet" version="2.1.0.v201111291940"/>
 		<unit id="com.google.gwt.servlet.source" version="2.1.0.v201111291940"/>
 		<unit id="com.google.gwt.user" version="2.1.0.v201505121915"/>
@@ -167,10 +125,10 @@
 		<unit id="com.sun.grid.drmaa" version="1.0.0.v20170818-1553"/>
 		<unit id="com.sun.jersey" version="1.17.0.v201503170330"/>
 		<unit id="com.sun.jersey.source" version="1.17.0.v201503170330"/>
-		<unit id="com.sun.jna" version="4.5.1.v20180403-1933"/>
+		<unit id="com.sun.jna" version="4.1.0.v20170410-1117"/>
-		<unit id="com.sun.jna.platform" version="4.5.1.v20180403-1933"/>
+		<unit id="com.sun.jna.platform" version="4.1.0.v20170410-1117"/>
-		<unit id="com.sun.jna.platform.source" version="4.5.1.v20180403-1933"/>
+		<unit id="com.sun.jna.platform.source" version="4.1.0.v20170410-1117"/>
-		<unit id="com.sun.jna.source" version="4.5.1.v20180403-1933"/>
+		<unit id="com.sun.jna.source" version="4.1.0.v20170410-1117"/>
 		<unit id="com.sun.syndication" version="0.9.0.v200803061811"/>
 		<unit id="com.sun.syndication.source" version="0.9.0.v200803061811"/>
 		<unit id="com.sun.xml.bind" version="2.2.0.v201505121915"/>
@@ -254,10 +212,6 @@
 		<unit id="lpg.runtime.java.source" version="2.0.17.v201004271640"/>
 		<unit id="me.prettyprint.hector" version="0.7.0.0022_v20110412-1025"/>
 		<unit id="me.prettyprint.hector.source" version="0.7.0.0022_v20110412-1025"/>
-		<unit id="net.bytebuddy.byte-buddy" version="1.7.9.v20180420-1519"/>
-		<unit id="net.bytebuddy.byte-buddy-agent" version="1.7.9.v20180420-1519"/>
-		<unit id="net.bytebuddy.byte-buddy-agent.source" version="1.7.9.v20180420-1519"/>
-		<unit id="net.bytebuddy.byte-buddy.source" version="1.7.9.v20180420-1519"/>
 		<unit id="net.miginfocom.layout" version="3.7.1.v200911230030"/>
 		<unit id="net.miginfocom.layout.source" version="3.7.1.v200911230030"/>
 		<unit id="net.miginfocom.layout.swing" version="3.7.1.v200911230030"/>
@@ -271,9 +225,7 @@
 		<unit id="net.sourceforge.nattable.core" version="2.1.0.v201102231538"/>
 		<unit id="net.sourceforge.nattable.core.source" version="2.1.0.v201102070845"/>
 		<unit id="org.antlr.runtime" version="4.3.0.v201502022030"/>
-		<unit id="org.antlr.runtime" version="4.5.1.v20160210-1233"/>
 		<unit id="org.antlr.runtime.source" version="4.3.0.v201502022030"/>
-		<unit id="org.antlr.runtime.source" version="4.5.1.v20160210-1233"/>
 		<unit id="org.aopalliance" version="1.0.0.v201105210816"/>
 		<unit id="org.apache.ant" version="1.9.6.v201510161327"/>
 		<unit id="org.apache.ant.source" version="1.9.6.v201510161327"/>
@@ -297,15 +249,13 @@
 		<unit id="org.apache.commons.cli" version="1.2.0.v201404270220"/>
 		<unit id="org.apache.commons.cli.source" version="1.2.0.v201404270220"/>
 		<unit id="org.apache.commons.codec" version="1.6.0.v201305230611"/>
-		<unit id="org.apache.commons.codec" version="1.10.0.v20180409-1845"/>
+		<unit id="org.apache.commons.codec" version="1.9.0.v20180919-1350"/>
 		<unit id="org.apache.commons.codec.source" version="1.6.0.v201305230611"/>
-		<unit id="org.apache.commons.codec.source" version="1.10.0.v20180409-1845"/>
+		<unit id="org.apache.commons.codec.source" version="1.9.0.v20180919-1350"/>
 		<unit id="org.apache.commons.collections" version="3.2.2.v201511171945"/>
 		<unit id="org.apache.commons.collections.source" version="3.2.2.v201511171945"/>
 		<unit id="org.apache.commons.compress" version="1.6.0.v201310281400"/>
-		<unit id="org.apache.commons.compress" version="1.15.0.v20180119-1613"/>
 		<unit id="org.apache.commons.compress.source" version="1.6.0.v201310281400"/>
-		<unit id="org.apache.commons.compress.source" version="1.15.0.v20180119-1613"/>
 		<unit id="org.apache.commons.daemon" version="1.0.5.v20121125-0905"/>
 		<unit id="org.apache.commons.daemon.source" version="1.0.5.v20121125-0905"/>
 		<unit id="org.apache.commons.dbcp" version="1.4.0.v201204271417"/>
@@ -366,17 +316,17 @@
 		<unit id="org.apache.hadoop.zookeeper" version="3.4.5.v20121214-1350"/>
 		<unit id="org.apache.hadoop.zookeeper.source" version="3.4.5.v20121214-1350"/>
 		<unit id="org.apache.httpcomponents.httpclient" version="4.3.6.v201511171540"/>
-		<unit id="org.apache.httpcomponents.httpclient" version="4.5.5.v20180409-1525"/>
+		<unit id="org.apache.httpcomponents.httpclient" version="4.5.2.v20180410-1551"/>
 		<unit id="org.apache.httpcomponents.httpclient.source" version="4.3.6.v201511171540"/>
-		<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.5.v20180409-1525"/>
+		<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.2.v20180410-1551"/>
-		<unit id="org.apache.httpcomponents.httpclient.win" version="4.5.5.v20180409-1525"/>
+		<unit id="org.apache.httpcomponents.httpclient.win" version="4.5.2.v20180410-2006"/>
-		<unit id="org.apache.httpcomponents.httpclient.win.source" version="4.5.5.v20180409-1525"/>
+		<unit id="org.apache.httpcomponents.httpclient.win.source" version="4.5.2.v20180410-2006"/>
 		<unit id="org.apache.httpcomponents.httpcore" version="4.3.3.v201411290715"/>
-		<unit id="org.apache.httpcomponents.httpcore" version="4.4.9.v20180409-1525"/>
+		<unit id="org.apache.httpcomponents.httpcore" version="4.4.6.v20170210-0925"/>
 		<unit id="org.apache.httpcomponents.httpcore.nio" version="4.1.0.v201101201700"/>
 		<unit id="org.apache.httpcomponents.httpcore.nio.source" version="4.1.0.v201101201700"/>
 		<unit id="org.apache.httpcomponents.httpcore.source" version="4.3.3.v201411290715"/>
-		<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.9.v20180409-1525"/>
+		<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.6.v20170210-0925"/>
 		<unit id="org.apache.jasper" version="7.0.56.v201412180755"/>
 		<unit id="org.apache.jasper.glassfish" version="2.2.2.v201501141630"/>
 		<unit id="org.apache.jasper.glassfish.source" version="2.2.2.v201501141630"/>
@@ -401,8 +351,6 @@
 		<unit id="org.apache.jclouds.jclouds-blobstore.source" version="1.8.0.v20160301-1110"/>
 		<unit id="org.apache.jclouds.jclouds-compute" version="1.8.0.v20160301-1110"/>
 		<unit id="org.apache.jclouds.jclouds-compute.source" version="1.8.0.v20160301-1110"/>
-		<unit id="org.apache.jclouds.jclouds-core" version="1.8.0.v20160301-1110"/>
-		<unit id="org.apache.jclouds.jclouds-core.source" version="1.8.0.v20160301-1110"/>
 		<unit id="org.apache.jclouds.jclouds-scriptbuilder" version="1.8.0.v20160301-1110"/>
 		<unit id="org.apache.jclouds.jclouds-scriptbuilder.source" version="1.8.0.v20160301-1110"/>
 		<unit id="org.apache.jclouds.labs.docker" version="1.8.0.v20160301-1110"/>
@@ -416,14 +364,8 @@
 		<unit id="org.apache.lucene" version="3.5.0.v20120725-1805"/>
 		<unit id="org.apache.lucene.analysis" version="3.5.0.v20120725-1805"/>
 		<unit id="org.apache.lucene.analysis.source" version="3.5.0.v20120725-1805"/>
-		<unit id="org.apache.lucene.analyzers-common" version="7.1.0.v20180122-2126"/>
-		<unit id="org.apache.lucene.analyzers-common.source" version="7.1.0.v20180122-2126"/>
-		<unit id="org.apache.lucene.analyzers-smartcn" version="7.1.0.v20180122-2126"/>
-		<unit id="org.apache.lucene.analyzers-smartcn.source" version="7.1.0.v20180122-2126"/>
 		<unit id="org.apache.lucene.core" version="3.5.0.v20120725-1805"/>
-		<unit id="org.apache.lucene.core" version="7.1.0.v20171214-1510"/>
 		<unit id="org.apache.lucene.core.source" version="3.5.0.v20120725-1805"/>
-		<unit id="org.apache.lucene.core.source" version="7.1.0.v20171214-1510"/>
 		<unit id="org.apache.lucene.grouping" version="3.5.0.v20120725-1805"/>
 		<unit id="org.apache.lucene.grouping.source" version="3.5.0.v20120725-1805"/>
 		<unit id="org.apache.lucene.highlighter" version="3.5.0.v20121015-1317"/>
@@ -431,9 +373,7 @@
 		<unit id="org.apache.lucene.memory" version="3.5.0.v20120725-1805"/>
 		<unit id="org.apache.lucene.memory.source" version="3.5.0.v20120725-1805"/>
 		<unit id="org.apache.lucene.misc" version="3.5.0.v20120725-1805"/>
-		<unit id="org.apache.lucene.misc" version="7.1.0.v20180220-1923"/>
 		<unit id="org.apache.lucene.misc.source" version="3.5.0.v20120725-1805"/>
-		<unit id="org.apache.lucene.misc.source" version="7.1.0.v20180220-1923"/>
 		<unit id="org.apache.lucene.queries" version="3.5.0.v20120725-1805"/>
 		<unit id="org.apache.lucene.queries" version="5.2.1.v20160926-1534"/>
 		<unit id="org.apache.lucene.queries.source" version="3.5.0.v20120725-1805"/>
@@ -491,12 +431,6 @@
 		<unit id="org.apache.openwebbeans.web.source" version="1.1.7.v201304201405"/>
 		<unit id="org.apache.oro" version="2.0.8.v201005080400"/>
 		<unit id="org.apache.oro.source" version="2.0.8.v201005080400"/>
-		<unit id="org.apache.poi" version="3.9.0.v201405241750"/>
-		<unit id="org.apache.poi.ooxml" version="3.9.0.v201405241905"/>
-		<unit id="org.apache.poi.ooxml.schemas" version="3.9.0.v201405241750"/>
-		<unit id="org.apache.poi.ooxml.schemas.source" version="3.9.0.v201405241750"/>
-		<unit id="org.apache.poi.ooxml.source" version="3.9.0.v201405241905"/>
-		<unit id="org.apache.poi.source" version="3.9.0.v201405241750"/>
 		<unit id="org.apache.solr.client.solrj" version="3.5.0.v20150506-0844"/>
 		<unit id="org.apache.solr.client.solrj.source" version="3.5.0.v20150506-0844"/>
 		<unit id="org.apache.solr.core" version="3.5.0.v20150506-0844"/>
@@ -542,20 +476,8 @@
 		<unit id="org.apache.xmlrpc" version="3.0.0.v20100427-1100"/>
 		<unit id="org.apache.xmlrpc.client" version="3.1.3.v20160817-1930"/>
 		<unit id="org.apache.xmlrpc.client.source" version="3.1.3.v20160817-1930"/>
-		<unit id="org.apache.xmlrpc.common" version="3.1.3.v20160817-1930"/>
-		<unit id="org.apache.xmlrpc.common.source" version="3.1.3.v20160817-1930"/>
-		<unit id="org.apache.xmlrpc.server" version="3.1.3.v20180410-1551"/>
-		<unit id="org.apache.xmlrpc.server.source" version="3.1.3.v20180410-1551"/>
-		<unit id="org.apiguardian" version="1.0.0.v20180327-1502"/>
-		<unit id="org.apiguardian.source" version="1.0.0.v20180327-1502"/>
 		<unit id="org.assertj" version="1.7.1.v20170413-2026"/>
 		<unit id="org.assertj.source" version="1.7.1.v20170413-2026"/>
-		<unit id="org.bouncycastle.bcpg" version="1.59.0.v20180326-2325"/>
-		<unit id="org.bouncycastle.bcpg.source" version="1.59.0.v20180326-2325"/>
-		<unit id="org.bouncycastle.bcpkix" version="1.59.0.v20180326-2325"/>
-		<unit id="org.bouncycastle.bcpkix.source" version="1.59.0.v20180326-2325"/>
-		<unit id="org.bouncycastle.bcprov" version="1.59.0.v20180328-2148"/>
-		<unit id="org.bouncycastle.bcprov.source" version="1.59.0.v20180328-2148"/>
 		<unit id="org.ccil.cowan.tagsoup" version="1.2.0.v201202211000"/>
 		<unit id="org.cliffc.high_scale_lib" version="1.1.2.v20110412-1025"/>
 		<unit id="org.cliffc.high_scale_lib.source" version="1.1.2.v20110412-1025"/>
@@ -572,17 +494,10 @@
 		<unit id="org.custommonkey.xmlunit" version="1.3.0.v201605172130"/>
 		<unit id="org.custommonkey.xmlunit.source" version="1.3.0.v201605172130"/>
 		<unit id="org.cyberneko.html" version="1.9.14.v201105210654"/>
-		<unit id="org.dom4j" version="1.6.1.v20170815-1500"/>
-		<unit id="org.dom4j.source" version="1.6.1.v20170815-1500"/>
 		<unit id="org.easymock" version="2.4.0.v20090202-0900"/>
 		<unit id="org.easymock.source" version="2.4.0.v20090202-0900"/>
 		<unit id="org.eclipse.orbit.mongodb" version="2.10.1.v20130422-1135"/>
-		<unit id="org.eclipse.orbit.mongodb" version="3.2.2.v20170222-2110"/>
 		<unit id="org.eclipse.orbit.mongodb.source" version="2.10.1.v20130422-1135"/>
-		<unit id="org.eclipse.orbit.mongodb.source" version="3.2.2.v20170222-2110"/>
-		<unit id="org.eclipse.osgi" version="3.13.0.v20180409-1500"/>
-		<unit id="org.eclipse.osgi.services" version="3.7.0.v20180223-1712"/>
-		<unit id="org.eclipse.osgi.util" version="3.5.0.v20180219-1511"/>
 		<unit id="org.freemarker" version="2.3.22.v20160210-1233"/>
 		<unit id="org.freemarker.source" version="2.3.22.v20160210-1233"/>
 		<unit id="org.ggf.drmaa" version="1.0.0.v20170818-1553"/>
@@ -608,12 +523,6 @@
 		<unit id="org.glassfish.jersey.containers.servlet.source" version="2.22.1.v20161103-0227"/>
 		<unit id="org.glassfish.jersey.core.jersey-client" version="2.22.1.v20161103-1916"/>
 		<unit id="org.glassfish.jersey.core.jersey-client.source" version="2.22.1.v20161103-1916"/>
-		<unit id="org.glassfish.jersey.core.jersey-common" version="2.22.1.v20161103-1916"/>
-		<unit id="org.glassfish.jersey.core.jersey-common.source" version="2.22.1.v20161103-1916"/>
-		<unit id="org.glassfish.jersey.core.jersey-server" version="2.22.1.v20161103-1916"/>
-		<unit id="org.glassfish.jersey.core.jersey-server.source" version="2.22.1.v20161103-1916"/>
-		<unit id="org.glassfish.jersey.ext.entityfiltering" version="2.22.1.v20161103-0227"/>
-		<unit id="org.glassfish.jersey.ext.entityfiltering.source" version="2.22.1.v20161103-0227"/>
 		<unit id="org.glassfish.jersey.media.jersey-media-json-jackson" version="2.22.1.v20161117-2005"/>
 		<unit id="org.glassfish.jersey.media.jersey-media-json-jackson.source" version="2.22.1.v20161117-2005"/>
 		<unit id="org.h2" version="1.3.168.v201212121212"/>
@@ -640,35 +549,13 @@
 		<unit id="org.jsoup" version="1.7.2.v201411291515"/>
 		<unit id="org.jsoup.source" version="1.7.2.v201411291515"/>
 		<unit id="org.junit" version="4.12.0.v201504281640"/>
-		<unit id="org.junit.jupiter.api" version="5.1.0.v20180327-1502"/>
-		<unit id="org.junit.jupiter.api.source" version="5.1.0.v20180327-1502"/>
-		<unit id="org.junit.jupiter.engine" version="5.1.0.v20180327-1502"/>
-		<unit id="org.junit.jupiter.engine.source" version="5.1.0.v20180327-1502"/>
-		<unit id="org.junit.jupiter.migrationsupport" version="5.1.0.v20180327-1502"/>
-		<unit id="org.junit.jupiter.migrationsupport.source" version="5.1.0.v20180327-1502"/>
-		<unit id="org.junit.jupiter.params" version="5.1.0.v20180327-1502"/>
-		<unit id="org.junit.jupiter.params.source" version="5.1.0.v20180327-1502"/>
-		<unit id="org.junit.platform.commons" version="1.1.0.v20180327-1502"/>
-		<unit id="org.junit.platform.commons.source" version="1.1.0.v20180327-1502"/>
-		<unit id="org.junit.platform.engine" version="1.1.0.v20180327-1502"/>
-		<unit id="org.junit.platform.engine.source" version="1.1.0.v20180327-1502"/>
-		<unit id="org.junit.platform.launcher" version="1.1.0.v20180327-1502"/>
-		<unit id="org.junit.platform.launcher.source" version="1.1.0.v20180327-1502"/>
-		<unit id="org.junit.platform.runner" version="1.1.0.v20180327-1502"/>
-		<unit id="org.junit.platform.runner.source" version="1.1.0.v20180327-1502"/>
-		<unit id="org.junit.platform.suite.api" version="1.1.0.v20180327-1502"/>
-		<unit id="org.junit.platform.suite.api.source" version="1.1.0.v20180327-1502"/>
 		<unit id="org.junit.source" version="4.12.0.v201504281640"/>
-		<unit id="org.junit.vintage.engine" version="5.1.0.v20180327-1502"/>
-		<unit id="org.junit.vintage.engine.source" version="5.1.0.v20180327-1502"/>
 		<unit id="org.kohsuke.args4j" version="2.0.21.v201301150030"/>
 		<unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
 		<unit id="org.kohsuke.args4j.source" version="2.0.21.v201301150030"/>
 		<unit id="org.kohsuke.args4j.source" version="2.33.0.v20160323-2218"/>
 		<unit id="org.mockito" version="1.9.5.v201605172210"/>
-		<unit id="org.mockito" version="2.13.0.v20180426-1843"/>
 		<unit id="org.mockito.source" version="1.9.5.v201605172210"/>
-		<unit id="org.mockito.source" version="2.13.0.v20180426-1843"/>
 		<unit id="org.mozilla.javascript" version="1.7.5.v201504281450"/>
 		<unit id="org.mozilla.javascript.source" version="1.7.5.v201504281450"/>
 		<unit id="org.objenesis" version="1.0.0.v201505121915"/>
@@ -677,8 +564,6 @@
 		<unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/>
 		<unit id="org.openid4java" version="0.9.5.v201105210655"/>
 		<unit id="org.opensaml" version="1.1.0.v201105210827"/>
-		<unit id="org.opentest4j" version="1.0.0.v20180327-1502"/>
-		<unit id="org.opentest4j.source" version="1.0.0.v20180327-1502"/>
 		<unit id="org.ow2.jotm.jotm-core" version="2.1.9.v201204271116"/>
 		<unit id="org.ow2.jotm.jotm-core.source" version="2.1.9.v201204271116"/>
 		<unit id="org.prefuse" version="0.1.0.v20100514-1000"/>
@@ -708,9 +593,7 @@
 		<unit id="org.slf4j.bridge.jul" version="1.7.10.v20160208-0839"/>
 		<unit id="org.slf4j.bridge.jul.source" version="1.7.10.v20160208-0839"/>
 		<unit id="org.slf4j.ext" version="1.7.2.v20121108-1250"/>
-		<unit id="org.slf4j.ext" version="1.7.10.v20170224-1220"/>
 		<unit id="org.slf4j.ext.source" version="1.7.2.v20121108-1250"/>
-		<unit id="org.slf4j.ext.source" version="1.7.10.v20170224-1220"/>
 		<unit id="org.slf4j.impl.log4j12" version="1.7.2.v20131105-2200"/>
 		<unit id="org.slf4j.impl.log4j12.source" version="1.7.2.v20131105-2200"/>
 		<unit id="org.slf4j.jcl" version="1.7.2.v20130115-1340"/>
@@ -724,9 +607,9 @@
 		<unit id="org.swtchart" version="0.10.0.v201605200358"/>
 		<unit id="org.swtchart.source" version="0.10.0.v201605200358"/>
 		<unit id="org.tukaani.xz" version="1.3.0.v201308270617"/>
-		<unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
+		<unit id="org.tukaani.xz" version="1.5.0.v20170111-1717"/>
 		<unit id="org.tukaani.xz.source" version="1.3.0.v201308270617"/>
-		<unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
+		<unit id="org.tukaani.xz.source" version="1.5.0.v20170111-1717"/>
 		<unit id="org.uddi4j" version="2.0.5.v200805270300"/>
 		<unit id="org.w3c.css.sac" version="1.3.1.v200903091627"/>
 		<unit id="org.w3c.css.sac.source" version="1.3.1.v200903091627"/>
@@ -744,24 +627,257 @@
 		<unit id="osgi.enterprise.source" version="4.2.0.v201108120515"/>
 		<unit id="scannotation" version="1.0.2.v201205170710"/>
 		<unit id="scannotation.source" version="1.0.2.v201205170710"/>
-		<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20180905201904/repository"/>
+		<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20181128170323/repository"/>
-		<unit id="org.objectweb.asm" version="6.2.1.v20180823-1831"/>
+		<unit id="com.google.gson" version="2.8.2.v20180104-1110"/>
-		<unit id="org.objectweb.asm.analysis" version="6.2.1.v20180823-1831"/>
+		<unit id="com.google.gson.source" version="2.8.2.v20180104-1110"/>
-		<unit id="org.objectweb.asm.analysis.source" version="6.2.1.v20180823-1831"/>
+		<unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
-		<unit id="org.objectweb.asm.commons" version="6.2.1.v20180823-1831"/>
+		<unit id="com.google.guava.source" version="21.0.0.v20170206-1425"/>
-		<unit id="org.objectweb.asm.commons.source" version="6.2.1.v20180823-1831"/>
+		<unit id="com.graphql.java" version="11.0.0.v20181120-0810"/>
-		<unit id="org.objectweb.asm.source" version="6.2.1.v20180823-1831"/>
+		<unit id="com.graphql.java.dataloader" version="2.1.1.v20181120-0809"/>
-		<unit id="org.objectweb.asm.tree" version="6.2.1.v20180823-1831"/>
+		<unit id="com.graphql.java.dataloader.source" version="2.1.1.v20181120-0809"/>
-		<unit id="org.objectweb.asm.tree.source" version="6.2.1.v20180823-1831"/>
+		<unit id="com.graphql.java.source" version="11.0.0.v20181120-0810"/>
-		<unit id="org.objectweb.asm.util" version="6.2.1.v20180823-1831"/>
+		<unit id="com.ibm.icu" version="58.2.0.v20181010-1334"/>
-		<unit id="org.objectweb.asm.util.source" version="6.2.1.v20180823-1831"/>
+		<unit id="com.ibm.icu" version="62.1.0.v20180727-1652"/>
-		<unit id="org.objectweb.asm.xml" version="6.2.1.v20180823-1831"/>
+		<unit id="com.ibm.icu" version="63.1.0.v20181030-1705"/>
-		<unit id="org.objectweb.asm.xml.source" version="6.2.1.v20180823-1831"/>
+		<unit id="com.ibm.icu.base" version="58.2.0.v20181010-1334"/>
-	</location>
+		<unit id="com.ibm.icu.base.source" version="58.2.0.v20181010-1334"/>
-	<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+		<unit id="com.ibm.icu.source" version="58.2.0.v20181010-1334"/>
-		<unit id="org.eclipse.jetty.bundles.f.feature.group" version="9.4.12.v20180830"/>
+		<unit id="com.ibm.icu.source" version="62.1.0.v20180727-1652"/>
-		<unit id="org.eclipse.jetty.bundles.f.source.feature.group" version="9.4.12.v20180830"/>
+		<unit id="com.ibm.icu.source" version="63.1.0.v20181030-1705"/>
-		<repository location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.12.v20180830"/>
+		<unit id="com.spotify.docker.client" version="8.11.7.v20180731-1413"/>
+		<unit id="com.spotify.docker.client.source" version="8.11.7.v20180731-1413"/>
+		<unit id="com.sun.jna" version="4.5.1.v20180403-1933"/>
+		<unit id="com.sun.jna.platform" version="4.5.1.v20180403-1933"/>
+		<unit id="com.sun.jna.platform.source" version="4.5.1.v20180403-1933"/>
+		<unit id="com.sun.jna.source" version="4.5.1.v20180403-1933"/>
+		<unit id="net.bytebuddy.byte-buddy" version="1.7.9.v20180420-1519"/>
+		<unit id="net.bytebuddy.byte-buddy" version="1.9.0.v20181107-1410"/>
+		<unit id="net.bytebuddy.byte-buddy-agent" version="1.7.9.v20180420-1519"/>
+		<unit id="net.bytebuddy.byte-buddy-agent" version="1.9.0.v20181106-1534"/>
+		<unit id="net.bytebuddy.byte-buddy-agent.source" version="1.7.9.v20180420-1519"/>
+		<unit id="net.bytebuddy.byte-buddy-agent.source" version="1.9.0.v20181106-1534"/>
+		<unit id="net.bytebuddy.byte-buddy.source" version="1.7.9.v20180420-1519"/>
+		<unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/>
+		<unit id="net.i2p.crypto.eddsa" version="0.3.0.v20181102-1323"/>
+		<unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20181102-1323"/>
+		<unit id="org.antlr.runtime" version="4.5.1.v20160210-1233"/>
+		<unit id="org.antlr.runtime" version="4.7.1.v20181120-0808"/>
+		<unit id="org.antlr.runtime.source" version="4.5.1.v20160210-1233"/>
+		<unit id="org.antlr.runtime.source" version="4.7.1.v20181120-0808"/>
+		<unit id="org.apache.ant" version="1.10.5.v20180808-0324"/>
+		<unit id="org.apache.ant.source" version="1.10.5.v20180808-0324"/>
+		<unit id="org.apache.batik.anim" version="1.9.1.v20181015-1528"/>
+		<unit id="org.apache.batik.anim.source" version="1.9.1.v20181015-1528"/>
+		<unit id="org.apache.batik.bridge" version="1.9.1.v20181015-1528"/>
+		<unit id="org.apache.batik.bridge.source" version="1.9.1.v20181015-1528"/>
+		<unit id="org.apache.batik.codec" version="1.9.1.v20180313-1559"/>
+		<unit id="org.apache.batik.codec.source" version="1.9.1.v20180313-1559"/>
+		<unit id="org.apache.batik.constants" version="1.9.1.v20180227-1645"/>
+		<unit id="org.apache.batik.constants" version="1.10.0.v20180703-1553"/>
+		<unit id="org.apache.batik.constants.source" version="1.9.1.v20180227-1645"/>
+		<unit id="org.apache.batik.constants.source" version="1.10.0.v20180703-1553"/>
+		<unit id="org.apache.batik.css" version="1.9.1.v20181015-1528"/>
+		<unit id="org.apache.batik.css" version="1.10.0.v20180703-1553"/>
+		<unit id="org.apache.batik.css.source" version="1.9.1.v20181015-1528"/>
+		<unit id="org.apache.batik.css.source" version="1.10.0.v20180703-1553"/>
+		<unit id="org.apache.batik.dom" version="1.9.1.v20181015-1528"/>
+		<unit id="org.apache.batik.dom.source" version="1.9.1.v20181015-1528"/>
+		<unit id="org.apache.batik.dom.svg" version="1.9.1.v20181015-1528"/>
+		<unit id="org.apache.batik.dom.svg.source" version="1.9.1.v20181015-1528"/>
+		<unit id="org.apache.batik.ext.awt" version="1.9.1.v20180227-1645"/>
+		<unit id="org.apache.batik.ext.awt.source" version="1.9.1.v20180227-1645"/>
+		<unit id="org.apache.batik.extension" version="1.9.1.v20180313-1559"/>
+		<unit id="org.apache.batik.extension.source" version="1.9.1.v20180313-1559"/>
+		<unit id="org.apache.batik.gvt" version="1.9.1.v20180227-1645"/>
+		<unit id="org.apache.batik.gvt.source" version="1.9.1.v20180227-1645"/>
+		<unit id="org.apache.batik.i18n" version="1.9.1.v20180227-1645"/>
+		<unit id="org.apache.batik.i18n" version="1.10.0.v20180703-1553"/>
+		<unit id="org.apache.batik.i18n.source" version="1.9.1.v20180227-1645"/>
+		<unit id="org.apache.batik.i18n.source" version="1.10.0.v20180703-1553"/>
+		<unit id="org.apache.batik.parser" version="1.9.1.v20180313-1559"/>
+		<unit id="org.apache.batik.parser.source" version="1.9.1.v20180313-1559"/>
+		<unit id="org.apache.batik.pdf" version="1.9.1.v20180417-1407"/>
+		<unit id="org.apache.batik.script" version="1.9.1.v20180313-1559"/>
+		<unit id="org.apache.batik.script.source" version="1.9.1.v20180313-1559"/>
+		<unit id="org.apache.batik.svggen" version="1.9.1.v20180313-1559"/>
+		<unit id="org.apache.batik.svggen.source" version="1.9.1.v20180313-1559"/>
+		<unit id="org.apache.batik.swing" version="1.9.1.v20181015-1528"/>
+		<unit id="org.apache.batik.swing.source" version="1.9.1.v20181015-1528"/>
+		<unit id="org.apache.batik.transcoder" version="1.9.1.v20181015-1528"/>
+		<unit id="org.apache.batik.transcoder.source" version="1.9.1.v20181015-1528"/>
+		<unit id="org.apache.batik.util" version="1.9.1.v20180703-1553"/>
+		<unit id="org.apache.batik.util" version="1.10.0.v20180703-1553"/>
+		<unit id="org.apache.batik.util.gui" version="1.9.1.v20180227-1645"/>
+		<unit id="org.apache.batik.util.gui.source" version="1.9.1.v20180227-1645"/>
+		<unit id="org.apache.batik.util.source" version="1.9.1.v20180703-1553"/>
+		<unit id="org.apache.batik.util.source" version="1.10.0.v20180703-1553"/>
+		<unit id="org.apache.batik.xml" version="1.9.1.v20180227-1645"/>
+		<unit id="org.apache.batik.xml.source" version="1.9.1.v20180227-1645"/>
+		<unit id="org.apache.commons.codec" version="1.10.0.v20180409-1845"/>
+		<unit id="org.apache.commons.codec.source" version="1.10.0.v20180409-1845"/>
+		<unit id="org.apache.commons.compress" version="1.15.0.v20180119-1613"/>
+		<unit id="org.apache.commons.compress" version="1.18.0.v20181121-2221"/>
+		<unit id="org.apache.commons.compress.source" version="1.15.0.v20180119-1613"/>
+		<unit id="org.apache.commons.compress.source" version="1.18.0.v20181121-2221"/>
+		<unit id="org.apache.felix.gogo.runtime" version="1.1.0.v20180713-1646"/>
+		<unit id="org.apache.felix.gogo.runtime.source" version="1.1.0.v20180713-1646"/>
+		<unit id="org.apache.felix.gogo.shell" version="1.1.0.v20180713-1646"/>
+		<unit id="org.apache.felix.gogo.shell.source" version="1.1.0.v20180713-1646"/>
+		<unit id="org.apache.felix.scr" version="2.0.14.v20180822-1822"/>
+		<unit id="org.apache.felix.scr.source" version="2.0.14.v20180822-1822"/>
+		<unit id="org.apache.httpcomponents.httpclient" version="4.5.5.v20180409-1525"/>
+		<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.5.v20180409-1525"/>
+		<unit id="org.apache.httpcomponents.httpclient.win" version="4.5.5.v20180409-1525"/>
+		<unit id="org.apache.httpcomponents.httpclient.win.source" version="4.5.5.v20180409-1525"/>
+		<unit id="org.apache.httpcomponents.httpcore" version="4.4.9.v20180409-1525"/>
+		<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.9.v20180409-1525"/>
+		<unit id="org.apache.jclouds.jclouds-core" version="1.8.0.v20181004-1955"/>
+		<unit id="org.apache.jclouds.jclouds-core.source" version="1.8.0.v20181004-1955"/>
+		<unit id="org.apache.lucene.analyzers-common" version="5.2.1.v20160301-1110"/>
+		<unit id="org.apache.lucene.analyzers-common" version="6.1.0.v20161115-1612"/>
+		<unit id="org.apache.lucene.analyzers-common" version="7.1.0.v20180122-2126"/>
+		<unit id="org.apache.lucene.analyzers-common" version="7.5.0.v20181003-1532"/>
+		<unit id="org.apache.lucene.analyzers-common.source" version="5.2.1.v20160301-1110"/>
+		<unit id="org.apache.lucene.analyzers-common.source" version="6.1.0.v20161115-1612"/>
+		<unit id="org.apache.lucene.analyzers-common.source" version="7.1.0.v20180122-2126"/>
+		<unit id="org.apache.lucene.analyzers-common.source" version="7.5.0.v20181003-1532"/>
+		<unit id="org.apache.lucene.analyzers-smartcn" version="5.2.1.v20160301-1110"/>
+		<unit id="org.apache.lucene.analyzers-smartcn" version="6.1.0.v20161115-1612"/>
+		<unit id="org.apache.lucene.analyzers-smartcn" version="7.1.0.v20180122-2126"/>
+		<unit id="org.apache.lucene.analyzers-smartcn" version="7.5.0.v20181003-1532"/>
+		<unit id="org.apache.lucene.analyzers-smartcn.source" version="5.2.1.v20160301-1110"/>
+		<unit id="org.apache.lucene.analyzers-smartcn.source" version="6.1.0.v20161115-1612"/>
+		<unit id="org.apache.lucene.analyzers-smartcn.source" version="7.1.0.v20180122-2126"/>
+		<unit id="org.apache.lucene.analyzers-smartcn.source" version="7.5.0.v20181003-1532"/>
+		<unit id="org.apache.lucene.core" version="5.2.1.v20170814-1820"/>
+		<unit id="org.apache.lucene.core" version="6.1.0.v20170814-1820"/>
+		<unit id="org.apache.lucene.core" version="7.1.0.v20171214-1510"/>
+		<unit id="org.apache.lucene.core" version="7.5.0.v20181003-1532"/>
+		<unit id="org.apache.lucene.core.source" version="5.2.1.v20170814-1820"/>
+		<unit id="org.apache.lucene.core.source" version="6.1.0.v20170814-1820"/>
+		<unit id="org.apache.lucene.core.source" version="7.1.0.v20171214-1510"/>
+		<unit id="org.apache.lucene.core.source" version="7.5.0.v20181003-1532"/>
+		<unit id="org.apache.lucene.misc" version="6.1.0.v20180207-1730"/>
+		<unit id="org.apache.lucene.misc" version="7.1.0.v20180220-1923"/>
+		<unit id="org.apache.lucene.misc" version="7.5.0.v20181003-1532"/>
+		<unit id="org.apache.lucene.misc.source" version="6.1.0.v20180207-1730"/>
+		<unit id="org.apache.lucene.misc.source" version="7.1.0.v20180220-1923"/>
+		<unit id="org.apache.lucene.misc.source" version="7.5.0.v20181003-1532"/>
+		<unit id="org.apache.lucene.queryparser" version="5.2.1.v20160926-1534"/>
+		<unit id="org.apache.lucene.queryparser" version="6.1.0.v20161115-1612"/>
+		<unit id="org.apache.lucene.queryparser" version="7.1.0.v20180905-1540"/>
+		<unit id="org.apache.lucene.queryparser" version="7.5.0.v20181003-1532"/>
+		<unit id="org.apache.lucene.queryparser.source" version="5.2.1.v20160926-1534"/>
+		<unit id="org.apache.lucene.queryparser.source" version="6.1.0.v20161115-1612"/>
+		<unit id="org.apache.lucene.queryparser.source" version="7.1.0.v20180905-1540"/>
+		<unit id="org.apache.lucene.queryparser.source" version="7.5.0.v20181003-1532"/>
+		<unit id="org.apache.sshd.core" version="2.0.0.v20181102-1323"/>
+		<unit id="org.apache.sshd.core.source" version="2.0.0.v20181102-1323"/>
+		<unit id="org.apache.sshd.sftp" version="2.0.0.v20181102-1323"/>
+		<unit id="org.apache.sshd.sftp.source" version="2.0.0.v20181102-1323"/>
+		<unit id="org.apache.xmlgraphics" version="2.2.0.v20180809-1640"/>
+		<unit id="org.apache.xmlgraphics.source" version="2.2.0.v20180809-1640"/>
+		<unit id="org.apache.xmlrpc.common" version="3.1.3.v20181004-1955"/>
+		<unit id="org.apache.xmlrpc.common.source" version="3.1.3.v20181004-1955"/>
+		<unit id="org.apache.xmlrpc.server" version="3.1.3.v20181004-1955"/>
+		<unit id="org.apache.xmlrpc.server.source" version="3.1.3.v20181004-1955"/>
+		<unit id="org.apiguardian" version="1.0.0.v20181005-1442"/>
+		<unit id="org.apiguardian.source" version="1.0.0.v20181005-1442"/>
+		<unit id="org.bouncycastle.bcpg" version="1.52.0.v20161004-1854"/>
+		<unit id="org.bouncycastle.bcpg" version="1.59.0.v20180326-2325"/>
+		<unit id="org.bouncycastle.bcpg" version="1.60.0.v20181107-1520"/>
+		<unit id="org.bouncycastle.bcpg.source" version="1.52.0.v20161004-1854"/>
+		<unit id="org.bouncycastle.bcpg.source" version="1.59.0.v20180326-2325"/>
+		<unit id="org.bouncycastle.bcpg.source" version="1.60.0.v20181107-1520"/>
+		<unit id="org.bouncycastle.bcpkix" version="1.52.0.v20161004-1854"/>
+		<unit id="org.bouncycastle.bcpkix" version="1.59.0.v20180326-2325"/>
+		<unit id="org.bouncycastle.bcpkix" version="1.60.0.v20181107-1520"/>
+		<unit id="org.bouncycastle.bcpkix.source" version="1.52.0.v20161004-1854"/>
+		<unit id="org.bouncycastle.bcpkix.source" version="1.59.0.v20180326-2325"/>
+		<unit id="org.bouncycastle.bcpkix.source" version="1.60.0.v20181107-1520"/>
+		<unit id="org.bouncycastle.bcprov" version="1.52.0.v20180328-2148"/>
+		<unit id="org.bouncycastle.bcprov" version="1.59.0.v20180328-2148"/>
+		<unit id="org.bouncycastle.bcprov" version="1.60.0.v20181107-1520"/>
+		<unit id="org.bouncycastle.bcprov.source" version="1.52.0.v20180328-2148"/>
+		<unit id="org.bouncycastle.bcprov.source" version="1.59.0.v20180328-2148"/>
+		<unit id="org.bouncycastle.bcprov.source" version="1.60.0.v20181107-1520"/>
+		<unit id="org.dom4j" version="1.6.1.v20181004-1955"/>
+		<unit id="org.dom4j.source" version="1.6.1.v20181004-1955"/>
+		<unit id="org.eclipse.orbit.mongodb" version="3.2.2.v20181004-1955"/>
+		<unit id="org.eclipse.orbit.mongodb.source" version="3.2.2.v20181004-1955"/>
+		<unit id="org.eclipse.osgi" version="3.13.200.v20181116-1621"/>
+		<unit id="org.eclipse.osgi.services" version="3.7.100.v20180827-1536"/>
+		<unit id="org.eclipse.osgi.util" version="3.5.100.v20180827-1536"/>
+		<unit id="org.glassfish.jersey.core.jersey-common" version="2.22.1.v20181004-1955"/>
+		<unit id="org.glassfish.jersey.core.jersey-common.source" version="2.22.1.v20181004-1955"/>
+		<unit id="org.glassfish.jersey.core.jersey-server" version="2.22.1.v20181004-1955"/>
+		<unit id="org.glassfish.jersey.core.jersey-server.source" version="2.22.1.v20181004-1955"/>
+		<unit id="org.glassfish.jersey.ext.entityfiltering" version="2.22.1.v20181004-1955"/>
+		<unit id="org.glassfish.jersey.ext.entityfiltering.source" version="2.22.1.v20181004-1955"/>
+		<unit id="org.jacoco.agent" version="0.8.2.v20180823-1901"/>
+		<unit id="org.jacoco.agent.source" version="0.8.2.v20180823-1901"/>
+		<unit id="org.jacoco.core" version="0.8.2.v20180823-1901"/>
+		<unit id="org.jacoco.core.source" version="0.8.2.v20180823-1901"/>
+		<unit id="org.jacoco.report" version="0.8.2.v20180823-1901"/>
+		<unit id="org.jacoco.report.source" version="0.8.2.v20180823-1901"/>
+		<unit id="org.jsoup" version="1.8.3.v20181012-1713"/>
+		<unit id="org.jsoup.source" version="1.8.3.v20181012-1713"/>
+		<unit id="org.junit.jupiter.api" version="5.3.1.v20181005-1442"/>
+		<unit id="org.junit.jupiter.api.source" version="5.3.1.v20181005-1442"/>
+		<unit id="org.junit.jupiter.engine" version="5.3.1.v20181005-1442"/>
+		<unit id="org.junit.jupiter.engine.source" version="5.3.1.v20181005-1442"/>
+		<unit id="org.junit.jupiter.migrationsupport" version="5.3.1.v20181005-1442"/>
+		<unit id="org.junit.jupiter.migrationsupport.source" version="5.3.1.v20181005-1442"/>
+		<unit id="org.junit.jupiter.params" version="5.3.1.v20181005-1442"/>
+		<unit id="org.junit.jupiter.params.source" version="5.3.1.v20181005-1442"/>
+		<unit id="org.junit.platform.commons" version="1.3.1.v20181005-1442"/>
+		<unit id="org.junit.platform.commons.source" version="1.3.1.v20181005-1442"/>
+		<unit id="org.junit.platform.engine" version="1.3.1.v20181005-1442"/>
+		<unit id="org.junit.platform.engine.source" version="1.3.1.v20181005-1442"/>
+		<unit id="org.junit.platform.launcher" version="1.3.1.v20181005-1442"/>
+		<unit id="org.junit.platform.launcher.source" version="1.3.1.v20181005-1442"/>
+		<unit id="org.junit.platform.runner" version="1.3.1.v20181005-1442"/>
+		<unit id="org.junit.platform.runner.source" version="1.3.1.v20181005-1442"/>
+		<unit id="org.junit.platform.suite.api" version="1.3.1.v20181005-1442"/>
+		<unit id="org.junit.platform.suite.api.source" version="1.3.1.v20181005-1442"/>
+		<unit id="org.junit.vintage.engine" version="5.3.1.v20181005-1442"/>
+		<unit id="org.junit.vintage.engine.source" version="5.3.1.v20181005-1442"/>
+		<unit id="org.mockito" version="2.13.0.v20180426-1843"/>
+		<unit id="org.mockito" version="2.23.0.v20181106-1534"/>
+		<unit id="org.mockito.source" version="2.13.0.v20180426-1843"/>
+		<unit id="org.mockito.source" version="2.23.0.v20181106-1534"/>
+		<unit id="org.objectweb.asm" version="6.2.1.v20181030-2244"/>
+		<unit id="org.objectweb.asm" version="7.0.0.v20181030-2244"/>
+		<unit id="org.objectweb.asm.analysis" version="6.2.1.v20181030-2244"/>
+		<unit id="org.objectweb.asm.analysis" version="7.0.0.v20181030-2244"/>
+		<unit id="org.objectweb.asm.analysis.source" version="6.2.1.v20181030-2244"/>
+		<unit id="org.objectweb.asm.analysis.source" version="7.0.0.v20181030-2244"/>
+		<unit id="org.objectweb.asm.commons" version="6.2.1.v20181030-2244"/>
+		<unit id="org.objectweb.asm.commons" version="7.0.0.v20181030-2244"/>
+		<unit id="org.objectweb.asm.commons.source" version="6.2.1.v20181030-2244"/>
+		<unit id="org.objectweb.asm.commons.source" version="7.0.0.v20181030-2244"/>
+		<unit id="org.objectweb.asm.source" version="6.2.1.v20181030-2244"/>
+		<unit id="org.objectweb.asm.source" version="7.0.0.v20181030-2244"/>
+		<unit id="org.objectweb.asm.tree" version="6.2.1.v20181030-2244"/>
+		<unit id="org.objectweb.asm.tree" version="7.0.0.v20181030-2244"/>
+		<unit id="org.objectweb.asm.tree.source" version="6.2.1.v20181030-2244"/>
+		<unit id="org.objectweb.asm.tree.source" version="7.0.0.v20181030-2244"/>
+		<unit id="org.objectweb.asm.util" version="6.2.1.v20181030-2244"/>
+		<unit id="org.objectweb.asm.util" version="7.0.0.v20181030-2244"/>
+		<unit id="org.objectweb.asm.util.source" version="6.2.1.v20181030-2244"/>
+		<unit id="org.objectweb.asm.util.source" version="7.0.0.v20181030-2244"/>
+		<unit id="org.objectweb.asm.xml" version="6.2.1.v20181030-2244"/>
+		<unit id="org.objectweb.asm.xml.source" version="6.2.1.v20181030-2244"/>
+		<unit id="org.opentest4j" version="1.1.1.v20181005-1442"/>
+		<unit id="org.opentest4j.source" version="1.1.1.v20181005-1442"/>
+		<unit id="org.reactivestreams" version="1.0.2.v20181120-0809"/>
+		<unit id="org.reactivestreams.source" version="1.0.2.v20181120-0809"/>
+		<unit id="org.slf4j.ext" version="1.7.10.v20180919-1350"/>
+		<unit id="org.slf4j.ext.source" version="1.7.10.v20180919-1350"/>
+		<unit id="org.tukaani.xz" version="1.6.0.v20170629-1752"/>
+		<unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
+		<unit id="org.tukaani.xz.source" version="1.6.0.v20170629-1752"/>
+		<unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
 	</location>
 	<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
 		<unit id="bcmail" version="1.60.0"/>
@@ -772,30 +888,30 @@
 		<unit id="bcprov.source" version="1.60.0"/>
 		<unit id="bctsp" version="1.46.0"/>
 		<unit id="bctsp.source" version="1.46.0"/>
-		<unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.9.5"/>
+		<unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.9.7"/>
-		<unit id="com.fasterxml.jackson.core.jackson-annotations.source" version="2.9.5"/>
+		<unit id="com.fasterxml.jackson.core.jackson-annotations.source" version="2.9.7"/>
-		<unit id="com.fasterxml.jackson.core.jackson-core" version="2.9.5"/>
+		<unit id="com.fasterxml.jackson.core.jackson-core" version="2.9.7"/>
-		<unit id="com.fasterxml.jackson.core.jackson-core.source" version="2.9.5"/>
+		<unit id="com.fasterxml.jackson.core.jackson-core.source" version="2.9.7"/>
-		<unit id="com.fasterxml.jackson.core.jackson-databind" version="2.9.5"/>
+		<unit id="com.fasterxml.jackson.core.jackson-databind" version="2.9.7"/>
-		<unit id="com.fasterxml.jackson.core.jackson-databind.source" version="2.9.5"/>
+		<unit id="com.fasterxml.jackson.core.jackson-databind.source" version="2.9.7"/>
-		<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-xml" version="2.9.5"/>
+		<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-xml" version="2.9.7"/>
-		<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-xml.source" version="2.9.5"/>
+		<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-xml.source" version="2.9.7"/>
-		<unit id="com.fasterxml.jackson.datatype.jackson-datatype-guava" version="2.9.5"/>
+		<unit id="com.fasterxml.jackson.datatype.jackson-datatype-guava" version="2.9.7"/>
-		<unit id="com.fasterxml.jackson.datatype.jackson-datatype-guava.source" version="2.9.5"/>
+		<unit id="com.fasterxml.jackson.datatype.jackson-datatype-guava.source" version="2.9.7"/>
-		<unit id="com.fasterxml.jackson.datatype.jackson-datatype-joda" version="2.9.5"/>
+		<unit id="com.fasterxml.jackson.datatype.jackson-datatype-joda" version="2.9.7"/>
-		<unit id="com.fasterxml.jackson.datatype.jackson-datatype-joda.source" version="2.9.5"/>
+		<unit id="com.fasterxml.jackson.datatype.jackson-datatype-joda.source" version="2.9.7"/>
-		<unit id="com.fasterxml.jackson.datatype.jackson-datatype-json-org" version="2.9.5"/>
+		<unit id="com.fasterxml.jackson.datatype.jackson-datatype-json-org" version="2.9.7"/>
-		<unit id="com.fasterxml.jackson.datatype.jackson-datatype-json-org.source" version="2.9.5"/>
+		<unit id="com.fasterxml.jackson.datatype.jackson-datatype-json-org.source" version="2.9.7"/>
-		<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base" version="2.9.5"/>
+		<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base" version="2.9.7"/>
-		<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base.source" version="2.9.5"/>
+		<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base.source" version="2.9.7"/>
-		<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" version="2.9.5"/>
+		<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" version="2.9.7"/>
-		<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider.source" version="2.9.5"/>
+		<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider.source" version="2.9.7"/>
-		<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-xml-provider" version="2.9.5"/>
+		<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-xml-provider" version="2.9.7"/>
-		<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-xml-provider.source" version="2.9.5"/>
+		<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-xml-provider.source" version="2.9.7"/>
-		<unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations" version="2.9.5"/>
+		<unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations" version="2.9.7"/>
-		<unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations.source" version="2.9.5"/>
+		<unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations.source" version="2.9.7"/>
-		<unit id="com.fasterxml.jackson.module.jackson-module-jsonSchema" version="2.9.5"/>
+		<unit id="com.fasterxml.jackson.module.jackson-module-jsonSchema" version="2.9.7"/>
-		<unit id="com.fasterxml.jackson.module.jackson-module-jsonSchema.source" version="2.9.5"/>
+		<unit id="com.fasterxml.jackson.module.jackson-module-jsonSchema.source" version="2.9.7"/>
 		<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.google.zxing.core" version="3.2.1"/>
@@ -806,10 +922,16 @@
 		<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.itext" version="2.1.7.js6_b02"/>
-		<unit id="com.sun.activation.javax.activation" version="1.2.0"/>
+		<unit id="com.sun.activation.jakarta.activation" version="1.2.1"/>
-		<unit id="com.sun.activation.javax.activation.source" version="1.2.0"/>
+		<unit id="com.sun.activation.jakarta.activation.source" version="1.2.1"/>
-		<unit id="com.sun.mail.javax.mail" version="1.6.2"/>
+		<unit id="com.sun.mail.gimap" version="1.6.3"/>
-		<unit id="com.sun.mail.javax.mail.source" version="1.6.2"/>
+		<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.source" version="2.3.0.1"/>
 		<unit id="com.sun.xml.bind.jaxb-impl" version="2.3.1"/>
@@ -852,26 +974,30 @@
 		<unit id="groovy-xml" version="2.5.3"/>
 		<unit id="groovy-xml.source" version="2.5.3"/>
 		<unit id="groovy.source" version="2.5.3"/>
-		<unit id="javax.annotation-api" version="1.3.2"/>
+		<unit id="jakarta.mail.api" version="1.6.3"/>
-		<unit id="javax.annotation-api.source" version="1.3.2"/>
+		<unit id="jakarta.mail.api.source" version="1.6.3"/>
+		<unit id="javax.annotation-api" 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.source" version="2.0.0.SP1"/>
 		<unit id="javax.interceptor-api" 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.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.source" version="1.3.0"/>
 		<unit id="javax.validation.api" version="1.1.0.Final"/>
 		<unit id="javax.validation.api.source" version="1.1.0.Final"/>
 		<unit id="javax.websocket-api" version="1.1.0"/>
 		<unit id="javax.websocket-api.source" version="1.1.0"/>
-		<unit id="javax.ws.rs-api" version="2.1.99.b01"/>
+		<unit id="javax.ws.rs-api" version="2.1.3"/>
-		<unit id="javax.ws.rs-api.source" version="2.1.99.b01"/>
+		<unit id="javax.ws.rs-api.source" version="2.1.3"/>
 		<unit id="javax.ws.rs.jsr311-api" version="1.1.1"/>
 		<unit id="javax.ws.rs.jsr311-api.source" version="1.1.1"/>
-		<unit id="javax.xml.rpc-api" version="1.1.1"/>
+		<unit id="javax.xml.rpc-api" version="1.1.3"/>
-		<unit id="javax.xml.rpc-api.source" version="1.1.1"/>
+		<unit id="javax.xml.rpc-api.source" version="1.1.3"/>
 		<unit id="javax.xml.soap-api" version="1.4.0"/>
 		<unit id="javax.xml.soap-api.source" version="1.4.0"/>
 		<unit id="jaxb-api" version="2.3.1"/>
@@ -890,8 +1016,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.0.14"/>
+		<unit id="org.apache.aries.spifly.dynamic.bundle" version="1.2.0"/>
-		<unit id="org.apache.aries.spifly.dynamic.bundle.source" version="1.0.14"/>
+		<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.source" version="1.1.3"/>
 		<unit id="org.apache.batik.anim" version="1.9.1.v20180528-1434"/>
@@ -922,6 +1048,10 @@
 		<unit id="org.apache.commons.digester.source" version="2.1.0"/>
 		<unit id="org.apache.commons.discovery" version="0.5.0"/>
 		<unit id="org.apache.commons.discovery.source" version="0.5.0"/>
+		<unit id="org.apache.commons.fileupload" version="1.3.3"/>
+		<unit id="org.apache.commons.fileupload.source" version="1.3.3"/>
+		<unit id="org.apache.commons.io" version="2.6.0"/>
+		<unit id="org.apache.commons.io.source" version="2.6.0"/>
 		<unit id="org.apache.commons.javaflow" version="1590792.0.0"/>
 		<unit id="org.apache.commons.javaflow.source" version="1590792.0.0"/>
 		<unit id="org.apache.cxf.cxf-core" version="3.2.6"/>
@@ -976,6 +1106,8 @@
 		<unit id="org.apache.felix.webconsole.source" version="4.3.8"/>
 		<unit id="org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec" version="1.0.1"/>
 		<unit id="org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec.source" version="1.0.1"/>
+		<unit id="org.apache.httpcomponents.httpclient" version="4.5.6"/>
+		<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.6"/>
 		<unit id="org.apache.neethi" version="3.1.1"/>
 		<unit id="org.apache.neethi.source" version="3.1.1"/>
 		<unit id="org.apache.poi.poi" version="3.15.0"/>
@@ -1024,14 +1156,94 @@
 		<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.source" version="1.1.3.v20160715"/>
-		<unit id="org.eclipse.jetty.alpn.conscrypt.server" version="9.4.12.v20180830"/>
+		<unit id="org.eclipse.jetty.alpn.client" version="9.4.14.v20181114"/>
-		<unit id="org.eclipse.jetty.alpn.conscrypt.server.source" version="9.4.12.v20180830"/>
+		<unit id="org.eclipse.jetty.alpn.client.source" version="9.4.14.v20181114"/>
-		<unit id="org.eclipse.jetty.alpn.openjdk8.server" version="9.4.12.v20180830"/>
+		<unit id="org.eclipse.jetty.alpn.conscrypt.server" version="9.4.14.v20181114"/>
-		<unit id="org.eclipse.jetty.alpn.openjdk8.server.source" version="9.4.12.v20180830"/>
+		<unit id="org.eclipse.jetty.alpn.conscrypt.server.source" version="9.4.14.v20181114"/>
-		<unit id="org.eclipse.jetty.continuation" version="9.4.12.v20180830"/>
+		<unit id="org.eclipse.jetty.alpn.openjdk8.server" version="9.4.14.v20181114"/>
-		<unit id="org.eclipse.jetty.continuation.source" version="9.4.12.v20180830"/>
+		<unit id="org.eclipse.jetty.alpn.openjdk8.server.source" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.alpn.server" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.alpn.server.source" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.annotations" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.annotations.source" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.apache-jsp" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.apache-jsp.source" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.client" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.client.source" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.continuation" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.continuation.source" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.deploy" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.deploy.source" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.http" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.http.source" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.http2.client" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.http2.client.http" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.http2.client.http.source" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.http2.client.source" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.http2.common" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.http2.common.source" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.http2.hpack" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.http2.hpack.source" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.http2.server" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.http2.server.source" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.io" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.io.source" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.jaas" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.jaas.source" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.jmx" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.jmx.source" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.jndi" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.jndi.source" version="9.4.14.v20181114"/>
 		<unit id="org.eclipse.jetty.osgi-servlet-api" version="3.1.0.M3"/>
 		<unit id="org.eclipse.jetty.osgi-servlet-api.source" version="3.1.0.M3"/>
+		<unit id="org.eclipse.jetty.osgi.alpn.fragment" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.osgi.alpn.fragment.source" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.osgi.boot" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.osgi.boot.jsp" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.osgi.boot.jsp.source" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.osgi.boot.source" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.osgi.boot.warurl" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.osgi.boot.warurl.source" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.osgi.httpservice" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.osgi.httpservice.source" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.plus" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.plus.source" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.proxy" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.proxy.source" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.rewrite" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.rewrite.source" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.security" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.security.jaspi" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.security.jaspi.source" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.security.source" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.server" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.server.source" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.servlet" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.servlet.source" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.servlets" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.servlets.source" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.util" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.util.ajax" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.util.ajax.source" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.util.source" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.webapp" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.webapp.source" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.websocket.api" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.websocket.api.source" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.websocket.client" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.websocket.client.source" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.websocket.common" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.websocket.common.source" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.websocket.javax.websocket" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.websocket.javax.websocket.server" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.websocket.javax.websocket.server.source" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.websocket.javax.websocket.source" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.websocket.server" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.websocket.server.source" version="9.4.14.v20181114"/>
+		<unit id="org.eclipse.jetty.websocket.servlet" 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.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.source" version="1.4.0"/>
 		<unit id="org.jfree.chart-osgi" version="1.0.19"/>
@@ -1040,8 +1252,22 @@
 		<unit id="org.mortbay.jasper.apache-el" version="8.5.33"/>
 		<unit id="org.mortbay.jasper.apache-el.source" version="8.5.33"/>
 		<unit id="org.mortbay.jasper.apache-jsp" version="8.5.33"/>
+		<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.passay" version="1.3.1"/>
 		<unit id="org.passay.source" version="1.3.1"/>
+		<unit id="org.restlet" version="2.4.1"/>
+		<unit id="org.restlet.ext.servlet" version="2.4.1"/>
+		<unit id="org.restlet.ext.servlet.source" version="2.4.1"/>
+		<unit id="org.restlet.source" version="2.4.1"/>
 		<unit id="org.springframework.spring-jcl" version="5.1.1.RELEASE"/>
 		<unit id="org.springframework.spring-jcl.source" version="5.1.1.RELEASE"/>
 		<unit id="org.w3c.dom.svg.patch" version="1.1.0.b02"/>
@@ -1055,25 +1281,27 @@
 		<unit id="stax2-api" version="4.1.0"/>
 		<unit id="stax2-api.source" version="3.1.4"/>
 		<unit id="stax2-api.source" version="4.1.0"/>
-		<unit id="zcommon" version="8.5.0"/>
+		<unit id="zcommon" version="8.6.0.1"/>
-		<unit id="zcommon.sources" version="8.5.0"/>
+		<unit id="zcommon.sources" version="8.6.0.1"/>
-		<unit id="zel" version="8.5.0"/>
+		<unit id="zel" version="8.6.0.1"/>
-		<unit id="zel.sources" version="8.5.0"/>
+		<unit id="zel.sources" version="8.6.0.1"/>
-		<unit id="zhtml" version="8.5.0"/>
+		<unit id="zhtml" version="8.6.0.1"/>
-		<unit id="zhtml.sources" version="8.5.0"/>
+		<unit id="zhtml.sources" version="8.6.0.1"/>
-		<unit id="zjavassist" version="8.5.0"/>
+		<unit id="zjavassist" version="8.6.0.1"/>
-		<unit id="zjavassist.sources" version="8.5.0"/>
+		<unit id="zjavassist.sources" version="8.6.0.1"/>
-		<unit id="zk" version="8.5.0"/>
+		<unit id="zk" version="8.6.0.1"/>
-		<unit id="zk.sources" version="8.5.0"/>
+		<unit id="zk.sources" version="8.6.0.1"/>
-		<unit id="zkbind" version="8.5.0"/>
+		<unit id="zkbind" version="8.6.0.1"/>
-		<unit id="zkbind.sources" version="8.5.0"/>
+		<unit id="zkbind.sources" version="8.6.0.1"/>
-		<unit id="zkplus" version="8.5.0"/>
+		<unit id="zkplus" version="8.6.0.1"/>
-		<unit id="zkplus.sources" version="8.5.0"/>
+		<unit id="zkplus.sources" version="8.6.0.1"/>
-		<unit id="zul" version="8.5.0"/>
+		<unit id="zkwebfragment" version="8.6.0.1"/>
-		<unit id="zul.sources" version="8.5.0"/>
+		<unit id="zkwebfragment.sources" version="8.6.0.1"/>
-		<unit id="zweb" version="8.5.0"/>
+		<unit id="zul" version="8.6.0.1"/>
-		<unit id="zweb.sources" version="8.5.0"/>
+		<unit id="zul.sources" version="8.6.0.1"/>
-		<repository location="https://raw.githubusercontent.com/idempiere/binary.file/master/p2.maven/maven-p2-R20181031"/>
+		<unit id="zweb" 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-R20181223"/>
 	</location>
 </locations>
 <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-10"/>

org.idempiere.p2/category.xml

@@ -63,22 +63,22 @@
    <feature url="features/org.eclipse.ecf.filetransfer.ssl.feature_1.1.100.v20180301-0132.jar" id="org.eclipse.ecf.filetransfer.ssl.feature" version="1.1.100.v20180301-0132">
       <category name="idempiere.core"/>
    </feature>
-   <feature url="features/org.eclipse.ecf.core.feature_1.5.1.v20180810-0833.jar" id="org.eclipse.ecf.core.feature" version="1.5.1.v20180810-0833">
+   <feature url="features/org.eclipse.ecf.core.feature_1.5.3.v20181012-2020.jar" id="org.eclipse.ecf.core.feature" version="1.5.3.v20181012-2020">
       <category name="idempiere.core"/>
    </feature>
-   <feature url="features/org.eclipse.ecf.filetransfer.feature_3.14.2.v20180801-2237.jar" id="org.eclipse.ecf.filetransfer.feature" version="3.14.2.v20180801-2237">
+   <feature url="features/org.eclipse.ecf.filetransfer.feature_3.14.4.v20181013-2146.jar" id="org.eclipse.ecf.filetransfer.feature" version="3.14.4.v20181013-2146">
       <category name="idempiere.core"/>
    </feature>
-   <feature url="features/org.eclipse.ecf.filetransfer.httpclient4.feature_3.14.2.v20180801-2237.jar" id="org.eclipse.ecf.filetransfer.httpclient4.feature" version="3.14.2.v20180801-2237">
+   <feature url="features/org.eclipse.ecf.filetransfer.httpclient4.feature_3.14.4.v20181013-2146.jar" id="org.eclipse.ecf.filetransfer.httpclient4.feature" version="3.14.4.v20181013-2146">
       <category name="idempiere.core"/>
    </feature>
-   <feature url="features/org.eclipse.equinox.executable_3.8.100.v20180827-1352.jar" id="org.eclipse.equinox.executable" version="3.8.100.v20180827-1352">
+   <feature url="features/org.eclipse.equinox.executable_3.8.200.v20180922-1751.jar" id="org.eclipse.equinox.executable" version="3.8.200.v20180922-1751">
       <category name="idempiere.core"/>
    </feature>
-   <feature url="features/org.eclipse.equinox.server.core_1.7.0.v20180903-1546.jar" id="org.eclipse.equinox.server.core" version="1.7.0.v20180903-1546">
+   <feature url="features/org.eclipse.equinox.server.core_1.8.0.v20181130-2106.jar" id="org.eclipse.equinox.server.core" version="1.8.0.v20181130-2106">
       <category name="idempiere.core"/>
    </feature>
-   <feature url="features/org.eclipse.equinox.server.p2_1.5.0.v20180827-1235.jar" id="org.eclipse.equinox.server.p2" version="1.5.0.v20180827-1235">
+   <feature url="features/org.eclipse.equinox.server.p2_1.6.0.v20181123-1405.jar" id="org.eclipse.equinox.server.p2" version="1.6.0.v20181123-1405">
       <category name="idempiere.core"/>
    </feature>
    <category-def name="idempiere.core" label="idempiere core"/>

org.idempiere.p2/server.product

@@ -9,7 +9,7 @@
    <launcherArgs>
       <programArgs>-console
       </programArgs>
-      <vmArgs>--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
+      <vmArgs>--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
       </vmArgs>
       <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
       </vmArgsMac>
@@ -17,7 +17,6 @@
 
    <windowImages/>
 
-
    <launcher name="idempiere">
       <win useIco="false">
          <bmp/>

org.idempiere.parent/pom.xml

@@ -10,12 +10,11 @@
 	<name>Maven parent project for idempiere</name>
 
 	<properties>
-		<tycho.version>1.2.0</tycho.version>
+		<tycho.version>1.3.0</tycho.version>
 		<tycho.extras.version>${tycho.version}</tycho.extras.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<jetty.version>9.4.12.v20180830</jetty.version>
 		<jp.version>6.7.0</jp.version>
-		<zk.version>8.5.0</zk.version>
+		<zk.version>8.6.0.1</zk.version>
 		<zk.javassist.src.version>3.23.1-GA</zk.javassist.src.version>
 		<maven.dependency.version>3.1.1</maven.dependency.version>
 		<download.maven.version>1.4.1</download.maven.version>
@@ -26,10 +25,10 @@
 		<netbeans.lib.version>RELEASE731</netbeans.lib.version>
 		<!-- default value of properties, use when run without profile -->
 		<idempiere.target>org.idempiere.p2.targetplatform</idempiere.target>
-		<idempiere-equinox-url>http://download.eclipse.org/eclipse/updates/4.9</idempiere-equinox-url>
+		<idempiere-equinox-url>http://download.eclipse.org/eclipse/updates/4.10</idempiere-equinox-url>
-		<idempiere-equinox-repository-id>eclipse-photon-201809</idempiere-equinox-repository-id>
+		<idempiere-equinox-repository-id>eclipse-photon-201810</idempiere-equinox-repository-id>
-		<idempiere-orbit-url>http://download.eclipse.org/tools/orbit/downloads/drops/R20180905201904/repository</idempiere-orbit-url>
+		<idempiere-orbit-url>http://download.eclipse.org/tools/orbit/downloads/drops/R20181128170323/repository</idempiere-orbit-url>
-		<idempiere-orbit-repository-id>orbit-photon-R20180905201904</idempiere-orbit-repository-id>
+		<idempiere-orbit-repository-id>orbit-photon-R20181128170323</idempiere-orbit-repository-id>
 		<url.file.srv>https://raw.githubusercontent.com/idempiere/binary.file/master</url.file.srv>
 		<extra.ui.install>org.eclipse.equinox.p2.director, org.idempiere.equinox.p2.director.feature.feature.group, org.idempiere.fitnesse.feature.feature.group</extra.ui.install>
 		<idempiere.product.id>org.adempiere.server.product</idempiere.product.id>
@@ -323,44 +322,6 @@
                     <configuration>
                         <verbose>true</verbose>
                     </configuration>
-				        <dependencies>
-                            <!-- overrider tycho to get latest for compiler ~/.m2/repository/org/eclipse/tycho/tycho-compiler-jdt/1.2.0/tycho-compiler-jdt-1.2.0.pom-->
-		                    <dependency>
-			                    <groupId>org.codehaus.plexus</groupId>
-			                    <artifactId>plexus-utils</artifactId>
-					            <version>3.1.0</version>
-		                    </dependency>
-		                    <dependency>
-			                    <groupId>org.codehaus.plexus</groupId>
-			                    <artifactId>plexus-compiler-manager</artifactId>
-					            <version>${codehaus.plexus}</version>
-		                    </dependency>
-		                    <dependency>
-			                    <groupId>org.codehaus.plexus</groupId>
-			                    <artifactId>plexus-compiler-api</artifactId>
-					            <version>${codehaus.plexus}</version>
-		                    </dependency>
-		                    <dependency>
-		                        <groupId>org.apache.commons</groupId>
-		                        <artifactId>commons-exec</artifactId>
-					            <version>1.3</version>
-		                    </dependency>
-		                    <dependency>
-		                    	<groupId>org.eclipse.jdt</groupId>
-		                    	<artifactId>org.eclipse.jdt.compiler.tool</artifactId>
-		                    	<version>1.2.300</version>
-		                    </dependency>
-		                    <dependency>
-		                    	<groupId>org.eclipse.jdt</groupId>
-		                    	<artifactId>org.eclipse.jdt.core</artifactId>
-		                    	<version>${jdtVersion}</version>
-		                    </dependency>
-		                    <dependency>
-		                    	<groupId>org.eclipse.jdt</groupId>
-		                    	<artifactId>org.eclipse.jdt.compiler.apt</artifactId>
-		                    	<version>${jdtAptVersion}</version>
-		                    </dependency>
-				        </dependencies>
 				</plugin>
 				<plugin>
 					<groupId>org.eclipse.tycho</groupId>
@@ -538,8 +499,8 @@
 						            <arch>x86_64</arch>
 					            </environment>
 				            </environments>
-                            <executionEnvironmentDefault>JavaSE-10</executionEnvironmentDefault>
+                            <executionEnvironmentDefault>JavaSE-11</executionEnvironmentDefault>
-                            <executionEnvironment>JavaSE-10</executionEnvironment>
+                            <executionEnvironment>JavaSE-11</executionEnvironment>
 			            </configuration>
 		            </plugin>
                 </plugins>

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,

org.idempiere.zk-feature/feature.xml

@@ -101,4 +101,11 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="zkwebfragment"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>

org.idempiere.zk.extra/.classpath

@@ -13,5 +13,6 @@
 	<classpathentry exported="true" kind="lib" path="lib/gmapsz.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/timelinez.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/timeplotz.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/iceblue_c.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

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

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.iceblue_c.js.zkex.grid.css,
- web.breeze.zul.img.tab,
+ web.iceblue_c.js.zkex.inp.css,
- web.breeze.zul.img.tree,
+ web.iceblue_c.js.zkex.layout.css,
- web.breeze.zul.img.wnd,
+ 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,

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

org.idempiere.zk.extra/pom.xml

@@ -27,7 +27,7 @@
 								<artifactItem>
 									<groupId>org.zkoss.zkforge</groupId>
 									<artifactId>gmapsz</artifactId>
-									<version>3.0.4</version>
+									<version>3.0.5</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>org.zkoss.zkforge</groupId>
@@ -47,12 +47,17 @@
 								<artifactItem>
 									<groupId>org.zkoss.theme</groupId>
 									<artifactId>breeze</artifactId>
-									<version>8.5.0</version>
+									<version>${zk.version}</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>org.zkoss.theme</groupId>
+									<artifactId>iceblue_c</artifactId>
+									<version>${zk.version}</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>com.google.javascript</groupId>
 									<artifactId>closure-compiler</artifactId>
-									<version>v20181008</version>
+									<version>v20181028</version>
 								</artifactItem>
 							</artifactItems>
 							<outputDirectory>lib</outputDirectory>