diff --git a/org.adempiere.base-feature/feature.xml b/org.adempiere.base-feature/feature.xml
index 4263bec49d..b5ec28b8ea 100644
--- a/org.adempiere.base-feature/feature.xml
+++ b/org.adempiere.base-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.adempiere.base"
       label="Adempiere Base"
-      version="1.0.0.qualifier">
+      version="2.0.0.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -18,50 +18,50 @@
 
    <includes
          id="org.compiere.db.provider"
-         version="0.0.0"/>
+         version="2.0.0.qualifier"/>
 
    <includes
          id="org.adempiere.payment.processor"
-         version="0.0.0"/>
+         version="2.0.0.qualifier"/>
 
    <includes
          id="org.adempiere.pipo"
-         version="0.0.0"/>
+         version="2.0.0.qualifier"/>
 
    <includes
          id="org.adempiere.replication"
-         version="0.0.0"/>
+         version="2.0.0.qualifier"/>
 
    <includes
          id="org.adempiere.report.jasper"
-         version="0.0.0"/>
+         version="2.0.0.qualifier"/>
 
    <plugin
          id="org.adempiere.base"
          download-size="0"
          install-size="0"
-         version="1.0.0.qualifier"
+         version="2.0.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.adempiere.base.callout"
          download-size="0"
          install-size="0"
-         version="1.0.0.qualifier"
+         version="2.0.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.adempiere.base.process"
          download-size="0"
          install-size="0"
-         version="1.0.0.qualifier"
+         version="2.0.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.adempiere.extend"
          download-size="0"
          install-size="0"
-         version="1.0.0.qualifier"
+         version="2.0.0.qualifier"
          fragment="true"
          unpack="false"/>
 
@@ -69,7 +69,7 @@
          id="org.adempiere.ui"
          download-size="0"
          install-size="0"
-         version="1.0.0.qualifier"
+         version="2.0.0.qualifier"
          unpack="false"/>
 
    <plugin
@@ -98,6 +98,7 @@
          install-size="0"
          version="1.4.5"
          unpack="false"/>
+
    <plugin
          id="com.springsource.javax.activation"
          download-size="0"
@@ -249,7 +250,7 @@
          id="org.adempiere.install"
          download-size="0"
          install-size="0"
-         version="1.0.0.qualifier"/>
+         version="2.0.0.qualifier"/>
 
    <plugin
          id="org.eclipse.osgi.services"
diff --git a/org.adempiere.base.callout/META-INF/MANIFEST.MF b/org.adempiere.base.callout/META-INF/MANIFEST.MF
index c50a9d83e8..3de551ad7b 100644
--- a/org.adempiere.base.callout/META-INF/MANIFEST.MF
+++ b/org.adempiere.base.callout/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Callout
 Bundle-SymbolicName: org.adempiere.base.callout
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.adempiere.base;bundle-version="1.0.0"
+Require-Bundle: org.adempiere.base;bundle-version="2.0.0"
 Eclipse-RegisterBuddy: org.adempiere.base
 Service-Component: OSGI-INF/costadjustmentcalloutfactory.xml
 Bundle-ActivationPolicy: lazy
diff --git a/org.adempiere.base.process/META-INF/MANIFEST.MF b/org.adempiere.base.process/META-INF/MANIFEST.MF
index ca3965e9b8..c56ab2413a 100644
--- a/org.adempiere.base.process/META-INF/MANIFEST.MF
+++ b/org.adempiere.base.process/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Adempiere Processes
 Bundle-SymbolicName: org.adempiere.base.process
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.adempiere.base;bundle-version="1.0.0"
+Require-Bundle: org.adempiere.base;bundle-version="2.0.0"
 Export-Package: org.adempiere.process,
  org.compiere.process,
  org.idempiere.process
diff --git a/org.adempiere.base/META-INF/MANIFEST.MF b/org.adempiere.base/META-INF/MANIFEST.MF
index 2b0853b931..4bb504b556 100644
--- a/org.adempiere.base/META-INF/MANIFEST.MF
+++ b/org.adempiere.base/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.adempiere.base
 Bundle-SymbolicName: org.adempiere.base;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-ClassPath: base.jar,
  bsh-2.0b5.jar,
  bsh-engine.jar,
diff --git a/org.adempiere.bundles.external-feature/feature.xml b/org.adempiere.bundles.external-feature/feature.xml
index b0e2021246..d8cfac5a5e 100644
--- a/org.adempiere.bundles.external-feature/feature.xml
+++ b/org.adempiere.bundles.external-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.adempiere.bundles.external"
       label="External bundles"
-      version="1.0.0.qualifier"
+      version="2.0.0.qualifier"
       provider-name="Adempiere.org">
 
    <description url="http://www.example.com/description">
@@ -134,5 +134,6 @@
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="false"/>  
+         unpack="false"/>
+
 </feature>
diff --git a/org.adempiere.extend/META-INF/MANIFEST.MF b/org.adempiere.extend/META-INF/MANIFEST.MF
index 581b042b01..c6af8b471c 100644
--- a/org.adempiere.extend/META-INF/MANIFEST.MF
+++ b/org.adempiere.extend/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.adempiere.extend
 Bundle-SymbolicName: org.adempiere.extend;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-ClassPath: extend.jar,
  spiffy-with_source-all-0.05.jar
 Eclipse-RegisterBuddy: org.adempiere.tools
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: compiere.model,
  test
-Fragment-Host: org.adempiere.base;bundle-version="0.0.0"
+Fragment-Host: org.adempiere.base;bundle-version="2.0.0"
 Eclipse-PatchFragment: true
 Import-Package: junit.framework;version="3.8.2",
  org.junit;version="4.8.2",
diff --git a/org.adempiere.install/META-INF/MANIFEST.MF b/org.adempiere.install/META-INF/MANIFEST.MF
index 0725c4f438..e903563c72 100644
--- a/org.adempiere.install/META-INF/MANIFEST.MF
+++ b/org.adempiere.install/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: install
 Bundle-SymbolicName: org.adempiere.install;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-ClassPath: install.jar,
  ant-contrib-1.0b3.jar
 Export-Package: org.adempiere.install,
  org.compiere.install
-Require-Bundle: org.adempiere.base;bundle-version="1.0.0"
+Require-Bundle: org.adempiere.base;bundle-version="2.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: javax.mail;version="1.4.5",
  javax.mail.internet;version="1.4.5",
diff --git a/org.adempiere.payment.processor-feature/feature.xml b/org.adempiere.payment.processor-feature/feature.xml
index 10a4df49aa..183b6d2450 100644
--- a/org.adempiere.payment.processor-feature/feature.xml
+++ b/org.adempiere.payment.processor-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.adempiere.payment.processor"
       label="Payment Processor"
-      version="1.0.0.qualifier">
+      version="2.0.0.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -17,14 +17,14 @@
    </license>
 
    <requires>
-      <import feature="org.adempiere.base" version="1.0.0.qualifier"/>
+      <import feature="org.adempiere.base" version="2.0.0.qualifier"/>
    </requires>
 
    <plugin
          id="org.adempiere.payment.processor"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="2.0.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/org.adempiere.payment.processor/META-INF/MANIFEST.MF b/org.adempiere.payment.processor/META-INF/MANIFEST.MF
index 97ed415d56..7fcfd809d1 100644
--- a/org.adempiere.payment.processor/META-INF/MANIFEST.MF
+++ b/org.adempiere.payment.processor/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Processor
 Bundle-SymbolicName: org.adempiere.payment.processor;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.adempiere.base;bundle-version="1.0.0"
+Require-Bundle: org.adempiere.base;bundle-version="2.0.0"
 Bundle-ClassPath: jpayment.jar,
  payflow.jar,
  Verisign.jar,
diff --git a/org.adempiere.pipo-feature/feature.xml b/org.adempiere.pipo-feature/feature.xml
index 2bb3c21d6c..c4ef91aacd 100644
--- a/org.adempiere.pipo-feature/feature.xml
+++ b/org.adempiere.pipo-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.adempiere.pipo"
       label="Pipo-feature"
-      version="1.0.0.qualifier">
+      version="2.0.0.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -17,28 +17,28 @@
    </license>
 
    <requires>
-      <import feature="org.adempiere.base" version="1.0.0.qualifier"/>
+      <import feature="org.adempiere.base" version="2.0.0.qualifier"/>
    </requires>
 
    <plugin
          id="org.adempiere.pipo"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="2.0.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.adempiere.pipo.handlers"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="2.0.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.adempiere.plugin.utils"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="2.0.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF b/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF
index 520af55f6b..bb377b05c1 100644
--- a/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF
+++ b/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: PipoHandlers
 Bundle-SymbolicName: org.adempiere.pipo.handlers;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.adempiere.pipo;bundle-version="1.0.0",
- org.adempiere.base;bundle-version="1.0.0"
+Require-Bundle: org.adempiere.pipo;bundle-version="2.0.0",
+ org.adempiere.base;bundle-version="2.0.0"
diff --git a/org.adempiere.pipo/META-INF/MANIFEST.MF b/org.adempiere.pipo/META-INF/MANIFEST.MF
index b8f40bec8e..12f62f2572 100644
--- a/org.adempiere.pipo/META-INF/MANIFEST.MF
+++ b/org.adempiere.pipo/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: PiPo
 Bundle-SymbolicName: org.adempiere.pipo;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.apache.commons.codec;version="1.3.0",
  org.apache.commons.codec.binary;version="1.3.0",
@@ -13,5 +13,5 @@ Import-Package: org.apache.commons.codec;version="1.3.0",
 Export-Package: org.adempiere.pipo.srv,
  org.adempiere.pipo2,
  org.adempiere.pipo2.exception
-Require-Bundle: org.adempiere.base;bundle-version="1.0.0"
+Require-Bundle: org.adempiere.base;bundle-version="2.0.0"
 Service-Component: OSGI-INF/dictionaryservice.xml
diff --git a/org.adempiere.plugin.utils/META-INF/MANIFEST.MF b/org.adempiere.plugin.utils/META-INF/MANIFEST.MF
index 2e65d7dd48..402749e2af 100644
--- a/org.adempiere.plugin.utils/META-INF/MANIFEST.MF
+++ b/org.adempiere.plugin.utils/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Plugin Utils
 Bundle-SymbolicName: org.adempiere.plugin.utils
-Bundle-Version: 0.0.0.1
+Bundle-Version: 2.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.adempiere.base,
  org.adempiere.util,
diff --git a/org.adempiere.replication-feature/feature.xml b/org.adempiere.replication-feature/feature.xml
index 7a3860a117..bf857bb9f6 100644
--- a/org.adempiere.replication-feature/feature.xml
+++ b/org.adempiere.replication-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.adempiere.replication"
       label="Replication-feature"
-      version="1.0.0.qualifier">
+      version="2.0.0.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -17,14 +17,14 @@
    </license>
 
    <requires>
-      <import feature="org.adempiere.base" version="1.0.0.qualifier"/>
+      <import feature="org.adempiere.base" version="2.0.0.qualifier"/>
    </requires>
 
    <plugin
          id="org.adempiere.replication"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="2.0.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/org.adempiere.replication.server-feature/feature.xml b/org.adempiere.replication.server-feature/feature.xml
index 39b5d11d8e..07f41e7312 100644
--- a/org.adempiere.replication.server-feature/feature.xml
+++ b/org.adempiere.replication.server-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.adempiere.replication.server"
       label="Replication Server-feature"
-      version="1.0.0.qualifier">
+      version="2.0.0.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -17,16 +17,16 @@
    </license>
 
    <requires>
-      <import feature="org.adempiere.base" version="1.0.0.qualifier"/>
-      <import feature="org.adempiere.replication" version="1.0.0.qualifier"/>
-      <import plugin="org.adempiere.server" version="1.0.0" match="greaterOrEqual"/>
+      <import feature="org.adempiere.base" version="2.0.0.qualifier"/>
+      <import feature="org.adempiere.replication" version="2.0.0.qualifier"/>
+      <import plugin="org.adempiere.server" version="2.0.0.qualifier" />
    </requires>
 
    <plugin
          id="org.adempiere.replication.server"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="2.0.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/org.adempiere.replication.server/META-INF/MANIFEST.MF b/org.adempiere.replication.server/META-INF/MANIFEST.MF
index f5c56cb0d3..57fe6d1942 100644
--- a/org.adempiere.replication.server/META-INF/MANIFEST.MF
+++ b/org.adempiere.replication.server/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Server
 Bundle-SymbolicName: org.adempiere.replication.server;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.adempiere.server;bundle-version="1.0.0",
- org.adempiere.replication;bundle-version="1.0.0",
- org.adempiere.base;bundle-version="1.0.0"
+Require-Bundle: org.adempiere.server;bundle-version="2.0.0",
+ org.adempiere.replication;bundle-version="2.0.0",
+ org.adempiere.base;bundle-version="2.0.0"
 Import-Package: javax.jms;version="1.1.0",
  org.apache.activemq
 Service-Component: OSGI-INF/serverfactory.xml
diff --git a/org.adempiere.replication/META-INF/MANIFEST.MF b/org.adempiere.replication/META-INF/MANIFEST.MF
index 3352fc232b..d9fd41635e 100644
--- a/org.adempiere.replication/META-INF/MANIFEST.MF
+++ b/org.adempiere.replication/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Replication
 Bundle-SymbolicName: org.adempiere.replication;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.adempiere.base;bundle-version="1.0.0"
+Require-Bundle: org.adempiere.base;bundle-version="2.0.0"
 Export-Package: org.adempiere.process.rpl,
  org.adempiere.process.rpl.exp,
  org.adempiere.process.rpl.imp
diff --git a/org.adempiere.report.jasper-feature/feature.xml b/org.adempiere.report.jasper-feature/feature.xml
index e8a63c3176..dddd07f627 100644
--- a/org.adempiere.report.jasper-feature/feature.xml
+++ b/org.adempiere.report.jasper-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.adempiere.report.jasper"
       label="JasperReport-feature"
-      version="1.0.0.qualifier">
+      version="2.0.0.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -17,20 +17,20 @@
    </license>
 
    <requires>
-      <import feature="org.adempiere.base" version="1.0.0.qualifier"/>
+      <import feature="org.adempiere.base" version="2.0.0.qualifier"/>
    </requires>
 
    <plugin
          id="org.adempiere.report.jasper"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>
+         version="2.0.0.qualifier"/>
 
    <plugin
          id="org.adempiere.report.jasper.library"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>
+         version="2.0.0.qualifier"/>
 
    <plugin
          id="org.apache.batik.bridge"
diff --git a/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
index e0ed64dee9..ec6c38aa15 100644
--- a/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: JasperReports Dependency
 Bundle-SymbolicName: org.adempiere.report.jasper.library
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-ClassPath: lib/commons-beanutils-1.8.0.jar,
  lib/commons-digester-2.1.jar,
  lib/jasperreports-5.1.2.jar,
diff --git a/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF
index 4ef137a36e..220e624922 100644
--- a/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: JasperReports Swing Client
 Bundle-SymbolicName: org.adempiere.report.jasper.swing;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.adempiere.base;bundle-version="1.0.0",
- org.adempiere.ui.swing;bundle-version="1.0.0",
- org.adempiere.report.jasper;bundle-version="1.0.0",
- org.adempiere.report.jasper.library;bundle-version="1.0.0"
+Require-Bundle: org.adempiere.base;bundle-version="2.0.0",
+ org.adempiere.ui.swing;bundle-version="2.0.0",
+ org.adempiere.report.jasper;bundle-version="2.0.0",
+ org.adempiere.report.jasper.library;bundle-version="2.0.0"
 Import-Package: org.osgi.framework
 Service-Component: OSGI-INF/jrviewerprovider.xml
 Bundle-ActivationPolicy: lazy
diff --git a/org.adempiere.report.jasper.webapp/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.webapp/META-INF/MANIFEST.MF
index 5ccfc66d6a..03670f85f0 100644
--- a/org.adempiere.report.jasper.webapp/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper.webapp/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Jasper Report Web App
 Bundle-SymbolicName: org.adempiere.report.jasper.webapp;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Require-Bundle: org.adempiere.base;bundle-version="1.0.0"
+Bundle-Version: 2.0.0.qualifier
+Require-Bundle: org.adempiere.base;bundle-version="2.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Web-ContextPath: JasperReportFiles
 Bundle-ClassPath: .
diff --git a/org.adempiere.report.jasper/META-INF/MANIFEST.MF b/org.adempiere.report.jasper/META-INF/MANIFEST.MF
index cf3e7e198c..4b3327de29 100644
--- a/org.adempiere.report.jasper/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: JasperReport integration
 Bundle-SymbolicName: org.adempiere.report.jasper;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-ClassPath: JasperReports.jar
 Export-Package: org.compiere.report,
  org.compiere.utils
-Require-Bundle: org.adempiere.base;bundle-version="1.0.0",
- org.adempiere.report.jasper.library;bundle-version="1.0.0"
+Require-Bundle: org.adempiere.base;bundle-version="2.0.0",
+ org.adempiere.report.jasper.library;bundle-version="2.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.apache.commons.codec;version="1.3.0",
  org.apache.commons.codec.binary;version="1.3.0",
diff --git a/org.adempiere.sdk-feature/feature.xml b/org.adempiere.sdk-feature/feature.xml
index 0d8ae20658..a6ee9bd5aa 100644
--- a/org.adempiere.sdk-feature/feature.xml
+++ b/org.adempiere.sdk-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.adempiere.sdk"
       label="Adempiere SDK"
-      version="1.0.0.qualifier"
+      version="2.0.0.qualifier"
       provider-name="Adempiere.org">
 
    <description url="http://www.example.com/description">
diff --git a/org.adempiere.server-feature/feature.xml b/org.adempiere.server-feature/feature.xml
index c56f21780b..ebaafce5b0 100644
--- a/org.adempiere.server-feature/feature.xml
+++ b/org.adempiere.server-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.adempiere.server"
       label="iDempiere Server-feature"
-      version="1.0.0.qualifier">
+      version="2.0.0.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -18,16 +18,16 @@
 
    <includes
          id="org.adempiere.replication.server"
-         version="0.0.0"
+         version="2.0.0.qualifier"
          optional="true"/>
 
    <includes
          id="org.adempiere.ui.zk"
-         version="0.0.0"/>
+         version="2.0.0.qualifier"/>
 
    <includes
          id="org.adempiere.webstore"
-         version="0.0.0"
+         version="2.0.0.qualifier"
          optional="true"/>
 
    <includes
@@ -36,10 +36,10 @@
 
    <includes
          id="org.idempiere.felix.webconsole"
-         version="0.0.0"/>
+         version="2.0.0.qualifier"/>
 
    <requires>
-      <import feature="org.adempiere.base" version="1.0.0" match="compatible"/>
+      <import feature="org.adempiere.base" version="2.0.0" match="compatible"/>
    </requires>
 
    <plugin
@@ -132,21 +132,21 @@
          id="org.adempiere.report.jasper.webapp"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="2.0.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.adempiere.server"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="2.0.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.adempiere.tomcat.config"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="2.0.0"
          fragment="true"/>
 
    <plugin
@@ -282,7 +282,7 @@
          id="org.adempiere.install"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>
+         version="2.0.0.qualifier"/>
 
    <plugin
          id="org.adempiere.eclipse.equinox.http.servlet"
@@ -316,7 +316,7 @@
          id="org.idempiere.webservices"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="2.0.0.qualifier"
          unpack="false"/>
 
    <plugin
diff --git a/org.adempiere.server-feature/server.product b/org.adempiere.server-feature/server.product
index 5abc489f10..d4c6ecc2a8 100644
--- a/org.adempiere.server-feature/server.product
+++ b/org.adempiere.server-feature/server.product
@@ -1,73 +1,69 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?>
-
-<product name="iDempiere Server" uid="org.adempiere.server.product" id="org.adempiere.server.server_product" application="org.adempiere.server.application" version="1.0.0" useFeatures="true" includeLaunchers="true">
-
-
-   <configIni use="default">
-   </configIni>
-
-   <launcherArgs>
-      <programArgs>-console 12612 --launcher.XXMaxPermSize 192m</programArgs>
-      <vmArgs>-Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dosgi.compatibility.bootdelegation=true</vmArgs>
-      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
-   </launcherArgs>
-
-   <windowImages/>
-
-
-   <launcher name="idempiere">
-      <solaris/>
-      <win useIco="false">
-         <bmp/>
-      </win>
-   </launcher>
-
-
-   <vm>
-   </vm>
-
-
-   <plugins>
-   </plugins>
-
-   <features>
-      <feature id="org.adempiere.base" version="1.0.0.qualifier"/>
-      <feature id="org.adempiere.server" version="1.0.0.qualifier"/>
-      <feature id="org.idempiere.hazelcast.service" version="1.0.0.qualifier"/>
-      <feature id="org.adempiere.pipo" version="1.0.0.qualifier"/>
-   </features>
-
-   <configurations>
-      <plugin id="org.adempiere.base" autoStart="true" startLevel="4" />
-      <plugin id="org.adempiere.eclipse.equinox.http.servlet" autoStart="true" startLevel="4" />
-      <plugin id="org.adempiere.eclipse.equinox.http.servletbridge" autoStart="true" startLevel="4" />
-      <plugin id="org.adempiere.eclipse.equinox.servletbridge" autoStart="true" startLevel="4" />
-      <plugin id="org.adempiere.install" autoStart="true" startLevel="4" />
-      <plugin id="org.adempiere.pipo" autoStart="true" startLevel="0" />
-      <plugin id="org.adempiere.pipo.handlers" autoStart="true" startLevel="0" />
-      <plugin id="org.adempiere.replication.server" autoStart="true" startLevel="4" />
-      <plugin id="org.adempiere.report.jasper.webapp" autoStart="true" startLevel="4" />
-      <plugin id="org.adempiere.server" autoStart="true" startLevel="4" />
-      <plugin id="org.adempiere.ui.zk" autoStart="true" startLevel="4" />
-      <plugin id="org.adempiere.webstore" autoStart="true" startLevel="4" />
-      <plugin id="org.apache.felix.webconsole" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
-      <plugin id="org.eclipse.equinox.cm" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="3" />
-      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="3" />
-      <plugin id="org.eclipse.equinox.http.registry" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.equinox.metatype" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.gemini.web.core" autoStart="true" startLevel="4" />
-      <plugin id="org.eclipse.gemini.web.extender" autoStart="true" startLevel="4" />
-      <plugin id="org.eclipse.gemini.web.tomcat" autoStart="true" startLevel="4" />
-      <plugin id="org.eclipse.osgi.services" autoStart="true" startLevel="3" />
-      <plugin id="org.idempiere.felix.webconsole" autoStart="true" startLevel="0" />
-      <plugin id="org.idempiere.hazelcast.service" autoStart="true" startLevel="0" />
-      <plugin id="org.idempiere.webservices" autoStart="true" startLevel="0" />
-      <plugin id="org.restlet" autoStart="true" startLevel="3" />
-      <property name="org.eclipse.update.reconcile" value="false" />
-   </configurations>
-
-</product>
+<?xml version="1.0" encoding="UTF-8"?>
+<?pde version="3.5"?>
+
+<product name="iDempiere Server" uid="org.adempiere.server.product" id="org.adempiere.server.server_product" application="org.adempiere.server.application" version="2.0.0" useFeatures="true" includeLaunchers="true">
+
+   <configIni use="default">
+   </configIni>
+
+   <launcherArgs>
+      <programArgs>-console 12612 --launcher.XXMaxPermSize 192m</programArgs>
+      <vmArgs>-Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dosgi.compatibility.bootdelegation=true</vmArgs>
+      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
+   </launcherArgs>
+
+   <windowImages/>
+
+   <launcher name="idempiere">
+      <solaris/>
+      <win useIco="false">
+         <bmp/>
+      </win>
+   </launcher>
+
+   <vm>
+   </vm>
+
+   <plugins>
+   </plugins>
+
+   <features>
+      <feature id="org.adempiere.base" version="2.0.0.qualifier"/>
+      <feature id="org.adempiere.server" version="2.0.0.qualifier"/>
+      <feature id="org.idempiere.hazelcast.service" version="2.0.0.qualifier"/>
+      <feature id="org.adempiere.pipo" version="2.0.0.qualifier"/>
+   </features>
+
+   <configurations>
+      <plugin id="org.adempiere.base" autoStart="true" startLevel="4" />
+      <plugin id="org.adempiere.eclipse.equinox.http.servlet" autoStart="true" startLevel="4" />
+      <plugin id="org.adempiere.eclipse.equinox.http.servletbridge" autoStart="true" startLevel="4" />
+      <plugin id="org.adempiere.eclipse.equinox.servletbridge" autoStart="true" startLevel="4" />
+      <plugin id="org.adempiere.install" autoStart="true" startLevel="4" />
+      <plugin id="org.adempiere.pipo" autoStart="true" startLevel="0" />
+      <plugin id="org.adempiere.pipo.handlers" autoStart="true" startLevel="0" />
+      <plugin id="org.adempiere.replication.server" autoStart="true" startLevel="4" />
+      <plugin id="org.adempiere.report.jasper.webapp" autoStart="true" startLevel="4" />
+      <plugin id="org.adempiere.server" autoStart="true" startLevel="4" />
+      <plugin id="org.adempiere.ui.zk" autoStart="true" startLevel="4" />
+      <plugin id="org.adempiere.webstore" autoStart="true" startLevel="4" />
+      <plugin id="org.apache.felix.webconsole" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
+      <plugin id="org.eclipse.equinox.cm" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="3" />
+      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="3" />
+      <plugin id="org.eclipse.equinox.http.registry" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.equinox.metatype" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.gemini.web.core" autoStart="true" startLevel="4" />
+      <plugin id="org.eclipse.gemini.web.extender" autoStart="true" startLevel="4" />
+      <plugin id="org.eclipse.gemini.web.tomcat" autoStart="true" startLevel="4" />
+      <plugin id="org.eclipse.osgi.services" autoStart="true" startLevel="3" />
+      <plugin id="org.idempiere.felix.webconsole" autoStart="true" startLevel="0" />
+      <plugin id="org.idempiere.hazelcast.service" autoStart="true" startLevel="0" />
+      <plugin id="org.idempiere.webservices" autoStart="true" startLevel="0" />
+      <plugin id="org.restlet" autoStart="true" startLevel="3" />
+      <property name="org.eclipse.update.reconcile" value="false" />
+   </configurations>
+
+</product>
diff --git a/org.adempiere.server/META-INF/MANIFEST.MF b/org.adempiere.server/META-INF/MANIFEST.MF
index e2c9fac0f2..642d429654 100644
--- a/org.adempiere.server/META-INF/MANIFEST.MF
+++ b/org.adempiere.server/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.adempiere.server
 Bundle-SymbolicName: org.adempiere.server;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Require-Bundle: org.adempiere.base;bundle-version="1.0.0",
+Bundle-Version: 2.0.0.qualifier
+Require-Bundle: org.adempiere.base;bundle-version="2.0.0",
  org.eclipse.equinox.app;bundle-version="1.3.0",
- org.adempiere.report.jasper;bundle-version="1.0.0",
- org.adempiere.report.jasper.library;bundle-version="1.0.0"
+ org.adempiere.report.jasper;bundle-version="2.0.0",
+ org.adempiere.report.jasper.library;bundle-version="2.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Web-ContextPath: /
 Bundle-ClassPath: WEB-INF/lib/jardiff.jar,
diff --git a/org.adempiere.target.platform-feature/feature.xml b/org.adempiere.target.platform-feature/feature.xml
index 857b81d0e4..841a153869 100644
--- a/org.adempiere.target.platform-feature/feature.xml
+++ b/org.adempiere.target.platform-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.adempiere.target.platform"
       label="Adempiere Target Platform"
-      version="1.0.0.qualifier"
+      version="2.0.0.qualifier"
       provider-name="Adempiere.org">
 
    <description url="http://www.example.com/description">
@@ -34,7 +34,7 @@
 
    <includes
          id="org.adempiere.bundles.external"
-         version="0.0.0"/>
+         version="2.0.0.qualifier"/>
 
    <includes
          id="org.eclipse.gemini.web.feature"
diff --git a/org.adempiere.tomcat.config/META-INF/MANIFEST.MF b/org.adempiere.tomcat.config/META-INF/MANIFEST.MF
index ea2f764c2f..7487cd511a 100644
--- a/org.adempiere.tomcat.config/META-INF/MANIFEST.MF
+++ b/org.adempiere.tomcat.config/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: TomcatConfig
 Bundle-SymbolicName: org.adempiere.tomcat.config
-Bundle-Version: 1.0.0
+Bundle-Version: 2.0.0
 Fragment-Host: org.eclipse.gemini.web.tomcat;bundle-version="1.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/org.adempiere.ui.swing-feature/feature.xml b/org.adempiere.ui.swing-feature/feature.xml
index 89f7197338..aa38807b2f 100644
--- a/org.adempiere.ui.swing-feature/feature.xml
+++ b/org.adempiere.ui.swing-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.adempiere.ui.swing"
       label="Swing Client-feature"
-      version="1.0.0.qualifier">
+      version="2.0.0.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -17,21 +17,21 @@
    </license>
 
    <requires>
-      <import feature="org.adempiere.base" version="1.0.0.qualifier"/>
+      <import feature="org.adempiere.base" version="2.0.0.qualifier"/>
    </requires>
 
    <plugin
          id="org.adempiere.report.jasper.swing"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="2.0.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.adempiere.ui.swing"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>
+         version="2.0.0.qualifier"/>
 
    <plugin
          id="org.restlet.ext.net"
diff --git a/org.adempiere.ui.swing-feature/swingclient.product b/org.adempiere.ui.swing-feature/swingclient.product
index 418b99fa71..c5d8d909c6 100644
--- a/org.adempiere.ui.swing-feature/swingclient.product
+++ b/org.adempiere.ui.swing-feature/swingclient.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Adempiere Swing Client" uid="org.adempiere.ui.swing.product" id="org.adempiere.ui.swing.client_product" application="org.adempiere.ui.swing.client" version="1.0.0" useFeatures="true" includeLaunchers="true">
+<product name="Adempiere Swing Client" uid="org.adempiere.ui.swing.product" id="org.adempiere.ui.swing.client_product" application="org.adempiere.ui.swing.client" version="2.0.0" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
@@ -26,10 +26,10 @@
    </plugins>
 
    <features>
-      <feature id="org.adempiere.base" version="1.0.0.qualifier"/>
-      <feature id="org.adempiere.ui.swing" version="1.0.0.qualifier"/>
-      <feature id="org.idempiere.hazelcast.service" version="1.0.0.qualifier"/>
-      <feature id="org.adempiere.pipo" version="1.0.0.qualifier"/>
+      <feature id="org.adempiere.base" version="2.0.0.qualifier"/>
+      <feature id="org.adempiere.ui.swing" version="2.0.0.qualifier"/>
+      <feature id="org.idempiere.hazelcast.service" version="2.0.0.qualifier"/>
+      <feature id="org.adempiere.pipo" version="2.0.0.qualifier"/>
    </features>
 
    <configurations>
diff --git a/org.adempiere.ui.swing/META-INF/MANIFEST.MF b/org.adempiere.ui.swing/META-INF/MANIFEST.MF
index 144a81a347..8564bbb6a4 100644
--- a/org.adempiere.ui.swing/META-INF/MANIFEST.MF
+++ b/org.adempiere.ui.swing/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Swing Client
 Bundle-SymbolicName: org.adempiere.ui.swing;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-ClassPath: client.jar,
  swingx-1.6.jar,
  looks-2.0.4.jar,
@@ -67,10 +67,10 @@ Export-Package: com.jgoodies.looks,
  org.jdesktop.swingx.tree,
  org.jdesktop.swingx.treetable,
  org.jdesktop.swingx.util
-Require-Bundle: org.adempiere.base;bundle-version="1.0.0",
- org.adempiere.ui;bundle-version="1.0.0",
- org.adempiere.report.jasper;bundle-version="1.0.0",
- org.adempiere.report.jasper.library;bundle-version="1.0.0",
+Require-Bundle: org.adempiere.base;bundle-version="2.0.0",
+ org.adempiere.ui;bundle-version="2.0.0",
+ org.adempiere.report.jasper;bundle-version="2.0.0",
+ org.adempiere.report.jasper.library;bundle-version="2.0.0",
  org.restlet;bundle-version="2.1.0",
  org.restlet.ext.net;bundle-version="2.1.0",
  org.restlet.ext.servlet;bundle-version="2.1.0",
diff --git a/org.adempiere.ui.zk-feature/feature.xml b/org.adempiere.ui.zk-feature/feature.xml
index 2ac09a8995..a4a0b0ed76 100644
--- a/org.adempiere.ui.zk-feature/feature.xml
+++ b/org.adempiere.ui.zk-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.adempiere.ui.zk"
       label="Zk Client-feature"
-      version="1.0.0.qualifier">
+      version="2.0.0.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -17,20 +17,20 @@
    </license>
 
    <requires>
-      <import feature="org.adempiere.base" version="1.0.0.qualifier"/>
+      <import feature="org.adempiere.base" version="2.0.0.qualifier"/>
    </requires>
 
    <plugin
          id="org.adempiere.ui.zk"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>
+         version="2.0.0.qualifier"/>
 
    <plugin
          id="org.zkoss.zk.library"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="6.0.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/org.adempiere.ui.zk/META-INF/MANIFEST.MF b/org.adempiere.ui.zk/META-INF/MANIFEST.MF
index c0fa3f75e2..ce53c62b71 100644
--- a/org.adempiere.ui.zk/META-INF/MANIFEST.MF
+++ b/org.adempiere.ui.zk/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Zk Web Client
 Bundle-SymbolicName: org.adempiere.ui.zk;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: javax.activation;version="1.1.1",
  javax.servlet,
@@ -76,10 +76,10 @@ Export-Package: fi.jawsy.jawwa.zk.atmosphere,
  web.js.jawwa.atmosphere,
  web.js.zkforge,
  web.js.zkforge.mold
-Require-Bundle: org.adempiere.report.jasper;bundle-version="1.0.0",
- org.adempiere.base;bundle-version="1.0.0",
- org.adempiere.report.jasper.library;bundle-version="1.0.0",
- org.adempiere.ui;bundle-version="1.0.0",
+Require-Bundle: org.adempiere.report.jasper;bundle-version="2.0.0",
+ org.adempiere.base;bundle-version="2.0.0",
+ org.adempiere.report.jasper.library;bundle-version="2.0.0",
+ org.adempiere.ui;bundle-version="2.0.0",
  org.zkoss.zk.library;bundle-version="6.0.0"
 Bundle-Activator: org.adempiere.webui.WebUIActivator
 Eclipse-ExtensibleAPI: true
diff --git a/org.adempiere.ui/META-INF/MANIFEST.MF b/org.adempiere.ui/META-INF/MANIFEST.MF
index 14da27cc86..d99ef4f659 100644
--- a/org.adempiere.ui/META-INF/MANIFEST.MF
+++ b/org.adempiere.ui/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: UI base
 Bundle-SymbolicName: org.adempiere.ui;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.adempiere.base;bundle-version="1.0.0"
+Require-Bundle: org.adempiere.base;bundle-version="2.0.0"
 Export-Package: org.compiere.apps,
  org.compiere.apps.form,
  org.compiere.apps.wf,
diff --git a/org.adempiere.webstore-feature/feature.xml b/org.adempiere.webstore-feature/feature.xml
index 00560cc368..423e78b050 100644
--- a/org.adempiere.webstore-feature/feature.xml
+++ b/org.adempiere.webstore-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.adempiere.webstore"
       label="Webstore-feature"
-      version="1.0.0.qualifier">
+      version="2.0.0.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -17,8 +17,8 @@
    </license>
 
    <requires>
-      <import feature="org.adempiere.base" version="1.0.0.qualifier"/>
-      <import plugin="org.adempiere.report.jasper.webapp" version="1.0.0" match="greaterOrEqual"/>
+      <import feature="org.adempiere.base" version="2.0.0.qualifier"/>
+      <import plugin="org.adempiere.report.jasper.webapp" version="2.0.0.qualifer"/>
       <import plugin="javax.servlet.jsp"/>
       <import plugin="javax.servlet.jsp.jstl"/>
    </requires>
@@ -27,14 +27,14 @@
          id="org.adempiere.webstore"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="2.0.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.adempiere.webstore.resource"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="2.0.0.qualifier"
          fragment="true"
          unpack="false"/>
 
@@ -42,7 +42,7 @@
          id="org.adempiere.webstore.servlet"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="2.0.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/org.adempiere.webstore.resource/META-INF/MANIFEST.MF b/org.adempiere.webstore.resource/META-INF/MANIFEST.MF
index fc1899c54d..6ca476b538 100644
--- a/org.adempiere.webstore.resource/META-INF/MANIFEST.MF
+++ b/org.adempiere.webstore.resource/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Webstore Resource
 Bundle-SymbolicName: org.adempiere.webstore.resource
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Adempiere.org
-Fragment-Host: org.adempiere.webstore;bundle-version="1.0.0"
+Fragment-Host: org.adempiere.webstore;bundle-version="2.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.compiere.wstore
diff --git a/org.adempiere.webstore.servlet/META-INF/MANIFEST.MF b/org.adempiere.webstore.servlet/META-INF/MANIFEST.MF
index d1563eb784..c2cf4d9431 100644
--- a/org.adempiere.webstore.servlet/META-INF/MANIFEST.MF
+++ b/org.adempiere.webstore.servlet/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Servlet
 Bundle-SymbolicName: org.adempiere.webstore.servlet;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Adempiere.org
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.compiere.wstore
-Require-Bundle: org.adempiere.base;bundle-version="1.0.0",
+Require-Bundle: org.adempiere.base;bundle-version="2.0.0",
  org.eclipse.equinox.http.registry
 Import-Package: javax.servlet,
  javax.servlet.http,
diff --git a/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF b/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF
index 74c9f0972b..232e613ffd 100644
--- a/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF
+++ b/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: OracleProvider
 Bundle-SymbolicName: org.compiere.db.oracle.provider;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.adempiere.base;bundle-version="1.0.0",
- org.adempiere.install;bundle-version="1.0.0"
+Require-Bundle: org.adempiere.base;bundle-version="2.0.0",
+ org.adempiere.install;bundle-version="2.0.0"
 Bundle-ClassPath: .,
  ojdbc6.jar,
  c3p0-0.9.2.jar,
diff --git a/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF b/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF
index 9280909704..69d2a7518f 100644
--- a/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF
+++ b/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: PostgresqlProvider
 Bundle-SymbolicName: org.compiere.db.postgresql.provider;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ClassPath: .,
  postgresql-9.2-1004.jdbc4.jar,
  c3p0-0.9.2.jar,
  mchange-commons-java-0.2.3.3.jar
-Require-Bundle: org.adempiere.base;bundle-version="1.0.0",
- org.adempiere.install;bundle-version="1.0.0"
+Require-Bundle: org.adempiere.base;bundle-version="2.0.0",
+ org.adempiere.install;bundle-version="2.0.0"
 Import-Package: junit.framework;version="3.8.2",
  org.junit;version="4.8.1",
  org.osgi.framework
diff --git a/org.compiere.db.provider-feature/feature.xml b/org.compiere.db.provider-feature/feature.xml
index 8f97935cb6..ed5bc9b406 100644
--- a/org.compiere.db.provider-feature/feature.xml
+++ b/org.compiere.db.provider-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.compiere.db.provider"
       label="Database Provider-feature"
-      version="1.0.0.qualifier">
+      version="2.0.0.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -17,21 +17,21 @@
    </license>
 
    <requires>
-      <import feature="org.adempiere.base" version="1.0.0.qualifier"/>
+      <import feature="org.adempiere.base" version="2.0.0.qualifier"/>
    </requires>
 
    <plugin
          id="org.compiere.db.oracle.provider"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="2.0.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.compiere.db.postgresql.provider"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="2.0.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/org.idempiere.eclipse.platform-feature/feature.xml b/org.idempiere.eclipse.platform-feature/feature.xml
index d35ed2ebae..3f2e907d01 100644
--- a/org.idempiere.eclipse.platform-feature/feature.xml
+++ b/org.idempiere.eclipse.platform-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.idempiere.eclipse.platform"
       label="Eclipse Platform for iDempiere"
-      version="1.0.0.qualifier"
+      version="2.0.0.qualifier"
       provider-name="www.idempiere.org">
 
    <description url="http://www.example.com/description">
@@ -77,14 +77,14 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-         
-	<plugin
+
+   <plugin
          id="org.eclipse.core.net"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-         
+
    <plugin
          id="org.eclipse.equinox.launcher"
          os="linux,macosx,win32"
@@ -100,5 +100,6 @@
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="false"/>                  
+         unpack="false"/>
+
 </feature>
diff --git a/org.idempiere.felix.webconsole-feature/feature.xml b/org.idempiere.felix.webconsole-feature/feature.xml
index 2f1bc80dbd..1da425cb74 100644
--- a/org.idempiere.felix.webconsole-feature/feature.xml
+++ b/org.idempiere.felix.webconsole-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.idempiere.felix.webconsole"
       label="Felix Web Console Feature"
-      version="1.0.0.qualifier">
+      version="2.0.0.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
diff --git a/org.idempiere.felix.webconsole/META-INF/MANIFEST.MF b/org.idempiere.felix.webconsole/META-INF/MANIFEST.MF
index 68a87c4cdc..7fec536b0f 100644
--- a/org.idempiere.felix.webconsole/META-INF/MANIFEST.MF
+++ b/org.idempiere.felix.webconsole/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Web Console
 Bundle-SymbolicName: org.idempiere.felix.webconsole
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.idempiere.felix.webconsole.Activator
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/org.idempiere.fitnesse-feature/feature.xml b/org.idempiere.fitnesse-feature/feature.xml
index 0ae2311729..5acf324e31 100644
--- a/org.idempiere.fitnesse-feature/feature.xml
+++ b/org.idempiere.fitnesse-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.idempiere.fitnesse"
       label="Fitnesse Feature"
-      version="1.0.0.qualifier">
+      version="2.0.0.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -20,28 +20,28 @@
          id="org.idempiere.fitnesse.fixture"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="2.0.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.idempiere.fitnesse.server"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="2.0.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.idempiere.ui.zk.selenium"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="2.0.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.idempiere.fitrecorder"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="2.0.0.qualifier"
          unpack="false"/>
 
 </feature>
diff --git a/org.idempiere.fitnesse.fixture/META-INF/MANIFEST.MF b/org.idempiere.fitnesse.fixture/META-INF/MANIFEST.MF
index 438a592de7..3099d40d7f 100644
--- a/org.idempiere.fitnesse.fixture/META-INF/MANIFEST.MF
+++ b/org.idempiere.fitnesse.fixture/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Fixture
 Bundle-SymbolicName: org.idempiere.fitnesse.fixture
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.idempiere.fitnesse.fixture.Activator
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/org.idempiere.fitnesse.server/META-INF/MANIFEST.MF b/org.idempiere.fitnesse.server/META-INF/MANIFEST.MF
index a64e0a4432..5794140128 100644
--- a/org.idempiere.fitnesse.server/META-INF/MANIFEST.MF
+++ b/org.idempiere.fitnesse.server/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Fitnesse Server
 Bundle-SymbolicName: org.idempiere.fitnesse.server
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.idempiere.fitnesse.server.Activator
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/org.idempiere.fitrecorder/META-INF/MANIFEST.MF b/org.idempiere.fitrecorder/META-INF/MANIFEST.MF
index 550b27252b..6cf1c5b608 100644
--- a/org.idempiere.fitrecorder/META-INF/MANIFEST.MF
+++ b/org.idempiere.fitrecorder/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Fitrecorder
 Bundle-SymbolicName: org.idempiere.fitrecorder;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.adempiere.plugin.utils.AdempiereActivator
 Import-Package: org.adempiere.base,
  org.adempiere.plugin.utils,
@@ -10,4 +10,4 @@ Import-Package: org.adempiere.base,
  org.osgi.framework;version="1.3.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Service-Component: plugin.xml
-Require-Bundle: org.adempiere.base
+Require-Bundle: org.adempiere.base;bundle-version="2.0.0"
diff --git a/org.idempiere.fitrecorder/bin/MANIFEST.MF b/org.idempiere.fitrecorder/bin/MANIFEST.MF
deleted file mode 100644
index 550b27252b..0000000000
--- a/org.idempiere.fitrecorder/bin/MANIFEST.MF
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Fitrecorder
-Bundle-SymbolicName: org.idempiere.fitrecorder;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.adempiere.plugin.utils.AdempiereActivator
-Import-Package: org.adempiere.base,
- org.adempiere.plugin.utils,
- org.compiere.model,
- org.osgi.framework;version="1.3.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Service-Component: plugin.xml
-Require-Bundle: org.adempiere.base
diff --git a/org.idempiere.hazelcast.service-feature/feature.xml b/org.idempiere.hazelcast.service-feature/feature.xml
index ef5e144f2e..c02f3c994c 100644
--- a/org.idempiere.hazelcast.service-feature/feature.xml
+++ b/org.idempiere.hazelcast.service-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.idempiere.hazelcast.service"
       label="Hazelcast Service Feature"
-      version="1.0.0.qualifier">
+      version="2.0.0.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -20,7 +20,7 @@
          id="org.idempiere.hazelcast.service"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="2.0.0.qualifier"
          unpack="false"/>
 
    <plugin
@@ -42,7 +42,7 @@
          id="org.idempiere.hazelcast.service.config"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="2.0.0"
          fragment="true"/>
 
 </feature>
diff --git a/org.idempiere.hazelcast.service.config/META-INF/MANIFEST.MF b/org.idempiere.hazelcast.service.config/META-INF/MANIFEST.MF
index db55a3114f..a590584389 100644
--- a/org.idempiere.hazelcast.service.config/META-INF/MANIFEST.MF
+++ b/org.idempiere.hazelcast.service.config/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Hazelcast Service Configuration
 Bundle-SymbolicName: org.idempiere.hazelcast.service.config
-Bundle-Version: 1.0.0
-Fragment-Host: org.idempiere.hazelcast.service;bundle-version="1.0.0"
+Bundle-Version: 2.0.0
+Fragment-Host: org.idempiere.hazelcast.service;bundle-version="2.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF b/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF
index 9854dbee51..b2a2fa22ae 100644
--- a/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF
+++ b/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Hazelcast Service
 Bundle-SymbolicName: org.idempiere.hazelcast.service
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.idempiere.hazelcast.service.Activator
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.crypto,
diff --git a/org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF b/org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF
index 71fc8d6085..6530f90c65 100644
--- a/org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF
+++ b/org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Zk Selenium
 Bundle-SymbolicName: org.idempiere.ui.zk.selenium
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.idempiere.ui.zk.selenium.fitnesse.Activator
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/org.idempiere.webservices/META-INF/MANIFEST.MF b/org.idempiere.webservices/META-INF/MANIFEST.MF
index 65a502b98d..5e220afd19 100644
--- a/org.idempiere.webservices/META-INF/MANIFEST.MF
+++ b/org.idempiere.webservices/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Webservices
 Bundle-SymbolicName: org.idempiere.webservices;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.idempiere.webservices.Activator
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: javax.activation;version="1.1.1",
@@ -55,9 +55,9 @@ Import-Package: javax.activation;version="1.1.1",
  org.apache.xerces.xs.datatypes;version="2.9.0",
  org.apache.xml.serialize;version="2.9.0",
  org.osgi.framework;version="1.6.0"
-Require-Bundle: org.adempiere.base;bundle-version="1.0.0",
- org.adempiere.report.jasper.library;bundle-version="1.0.0",
- org.adempiere.ui;bundle-version="1.0.0",
+Require-Bundle: org.adempiere.base;bundle-version="2.0.0",
+ org.adempiere.report.jasper.library;bundle-version="2.0.0",
+ org.adempiere.ui;bundle-version="2.0.0",
  org.apache.ecs;bundle-version="1.0.0"
 Bundle-ClassPath: .,
  WEB-INF/lib/spring-osgi-extender-1.2.1.jar,