diff --git a/event.test/META-INF/MANIFEST.MF b/event.test/META-INF/MANIFEST.MF
index cbf11eeea6..edbfedfe8d 100644
--- a/event.test/META-INF/MANIFEST.MF
+++ b/event.test/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Test
 Bundle-SymbolicName: event.test
-Bundle-Version: 7.1.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Activator: event.test.Activator
-Require-Bundle: org.adempiere.base;bundle-version="7.1.0"
+Require-Bundle: org.adempiere.base;bundle-version="8.1.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.eclipse.equinox.events;version="1.0.0",
diff --git a/org.adempiere.base-feature/feature.xml b/org.adempiere.base-feature/feature.xml
index 1e806143eb..3c039afe87 100644
--- a/org.adempiere.base-feature/feature.xml
+++ b/org.adempiere.base-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.adempiere.base.feature"
       label="Adempiere Base"
-      version="7.1.0.qualifier"
+      version="8.1.0.qualifier"
       provider-name="iDempiere Community">
 
    <description url="http://www.example.com/description">
diff --git a/org.adempiere.base-feature/pom.xml b/org.adempiere.base-feature/pom.xml
index 7843e2d90c..9d85c1a201 100644
--- a/org.adempiere.base-feature/pom.xml
+++ b/org.adempiere.base-feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>8.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.base.feature</artifactId>
diff --git a/org.adempiere.base.callout/META-INF/MANIFEST.MF b/org.adempiere.base.callout/META-INF/MANIFEST.MF
index d1d13f07e3..3a0a87c1f7 100644
--- a/org.adempiere.base.callout/META-INF/MANIFEST.MF
+++ b/org.adempiere.base.callout/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Callout
 Bundle-SymbolicName: org.adempiere.base.callout
-Bundle-Version: 7.1.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
 Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
 Eclipse-RegisterBuddy: org.adempiere.base
diff --git a/org.adempiere.base.callout/pom.xml b/org.adempiere.base.callout/pom.xml
index 5c5a853601..f6e78ec652 100644
--- a/org.adempiere.base.callout/pom.xml
+++ b/org.adempiere.base.callout/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>8.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.base.callout</artifactId>
diff --git a/org.adempiere.base.process/META-INF/MANIFEST.MF b/org.adempiere.base.process/META-INF/MANIFEST.MF
index ac2e9e9f4f..2ea312a327 100644
--- a/org.adempiere.base.process/META-INF/MANIFEST.MF
+++ b/org.adempiere.base.process/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Processes
 Bundle-SymbolicName: org.adempiere.base.process
-Bundle-Version: 7.1.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
 Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
 Export-Package: org.adempiere.process,
diff --git a/org.adempiere.base.process/pom.xml b/org.adempiere.base.process/pom.xml
index 594fc8730d..9065167fd8 100644
--- a/org.adempiere.base.process/pom.xml
+++ b/org.adempiere.base.process/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>8.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.base.process</artifactId>
diff --git a/org.adempiere.base/META-INF/MANIFEST.MF b/org.adempiere.base/META-INF/MANIFEST.MF
index 8c1e25b017..f65feb319f 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: iDempiere Core
 Bundle-SymbolicName: org.adempiere.base;singleton:=true
-Bundle-Version: 7.1.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-ClassPath: .,
  lib/bsh.jar,
  lib/commons-validator.jar,
diff --git a/org.adempiere.base/pom.xml b/org.adempiere.base/pom.xml
index 5ecf2d14c4..387b75cc49 100644
--- a/org.adempiere.base/pom.xml
+++ b/org.adempiere.base/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>8.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.base</artifactId>
diff --git a/org.adempiere.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF b/org.adempiere.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF
index 05eec632ea..bd78063a48 100644
--- a/org.adempiere.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF
+++ b/org.adempiere.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Eclipse-SourceReferences: scm:cvs:pserver:dev.eclipse.org:/cvsroot/rt:
  et;tag=v20100503
 Bundle-Activator: org.adempiere.eclipse.equinox.http.servlet.Activator
 Export-Package: org.adempiere.eclipse.equinox.http.servlet
-Bundle-Version: 7.1.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %providerName
 Bundle-Name: %bundleName
diff --git a/org.adempiere.eclipse.equinox.http.servlet/pom.xml b/org.adempiere.eclipse.equinox.http.servlet/pom.xml
index 112fc189d3..5161b8a706 100644
--- a/org.adempiere.eclipse.equinox.http.servlet/pom.xml
+++ b/org.adempiere.eclipse.equinox.http.servlet/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>8.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.eclipse.equinox.http.servlet</artifactId>
diff --git a/org.adempiere.install/META-INF/MANIFEST.MF b/org.adempiere.install/META-INF/MANIFEST.MF
index 1531806443..85e8757521 100644
--- a/org.adempiere.install/META-INF/MANIFEST.MF
+++ b/org.adempiere.install/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Setup
 Bundle-SymbolicName: org.adempiere.install;singleton:=true
-Bundle-Version: 7.1.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Export-Package: org.adempiere.install,
  org.compiere.install
 Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
diff --git a/org.adempiere.install/pom.xml b/org.adempiere.install/pom.xml
index a1a83283e5..6f8a2ce792 100644
--- a/org.adempiere.install/pom.xml
+++ b/org.adempiere.install/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>8.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.install</artifactId>
diff --git a/org.adempiere.payment.processor-feature/feature.xml b/org.adempiere.payment.processor-feature/feature.xml
index 0a69bfa6fc..262308d07f 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.feature"
       label="Payment Processor"
-      version="7.1.0.qualifier"
+      version="8.1.0.qualifier"
       provider-name="iDempiere Community">
 
    <description url="http://www.example.com/description">
diff --git a/org.adempiere.payment.processor-feature/pom.xml b/org.adempiere.payment.processor-feature/pom.xml
index cd5d145333..37a7b0179b 100644
--- a/org.adempiere.payment.processor-feature/pom.xml
+++ b/org.adempiere.payment.processor-feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>8.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.payment.processor.feature</artifactId>
diff --git a/org.adempiere.payment.processor/META-INF/MANIFEST.MF b/org.adempiere.payment.processor/META-INF/MANIFEST.MF
index 89e555cc71..2dc0913534 100644
--- a/org.adempiere.payment.processor/META-INF/MANIFEST.MF
+++ b/org.adempiere.payment.processor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Payment Processor
 Bundle-SymbolicName: org.adempiere.payment.processor;singleton:=true
-Bundle-Version: 7.1.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
 Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
 Bundle-ClassPath: .,
diff --git a/org.adempiere.payment.processor/pom.xml b/org.adempiere.payment.processor/pom.xml
index db50223d80..c4a6cb54f9 100644
--- a/org.adempiere.payment.processor/pom.xml
+++ b/org.adempiere.payment.processor/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>8.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.payment.processor</artifactId>
diff --git a/org.adempiere.pipo-feature/feature.xml b/org.adempiere.pipo-feature/feature.xml
index 0559e0e020..d75fbacc41 100644
--- a/org.adempiere.pipo-feature/feature.xml
+++ b/org.adempiere.pipo-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.adempiere.pipo.feature"
       label="Pipo-feature"
-      version="7.1.0.qualifier"
+      version="8.1.0.qualifier"
       provider-name="iDempiere Community">
 
    <description url="http://www.example.com/description">
diff --git a/org.adempiere.pipo-feature/pom.xml b/org.adempiere.pipo-feature/pom.xml
index e52a0e5a7b..43bc4d5b4b 100644
--- a/org.adempiere.pipo-feature/pom.xml
+++ b/org.adempiere.pipo-feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>8.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.pipo.feature</artifactId>
diff --git a/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF b/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF
index 9ebb66a985..232863db7d 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: iDempiere 2Pack Handlers
 Bundle-SymbolicName: org.adempiere.pipo.handlers;singleton:=true
-Bundle-Version: 7.1.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
 Require-Bundle: org.adempiere.pipo;bundle-version="0.0.0",
  org.adempiere.base;bundle-version="0.0.0"
diff --git a/org.adempiere.pipo.handlers/pom.xml b/org.adempiere.pipo.handlers/pom.xml
index dd589c07c0..a5d78ae1be 100644
--- a/org.adempiere.pipo.handlers/pom.xml
+++ b/org.adempiere.pipo.handlers/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>8.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.pipo.handlers</artifactId>
diff --git a/org.adempiere.pipo/META-INF/MANIFEST.MF b/org.adempiere.pipo/META-INF/MANIFEST.MF
index a5529edf34..575c3642e5 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: iDempiere 2Pack Core
 Bundle-SymbolicName: org.adempiere.pipo;singleton:=true
-Bundle-Version: 7.1.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
 Import-Package: org.apache.commons.codec,
  org.apache.commons.codec.binary,
diff --git a/org.adempiere.pipo/pom.xml b/org.adempiere.pipo/pom.xml
index 533e57fc3b..552ed6ee06 100644
--- a/org.adempiere.pipo/pom.xml
+++ b/org.adempiere.pipo/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>8.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.pipo</artifactId>
diff --git a/org.adempiere.plugin.utils/META-INF/MANIFEST.MF b/org.adempiere.plugin.utils/META-INF/MANIFEST.MF
index b113b53c93..c8cc17c894 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: iDempiere Plugin Utils
 Bundle-SymbolicName: org.adempiere.plugin.utils
-Bundle-Version: 7.1.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
 Import-Package: org.adempiere.base,
  org.adempiere.util,
diff --git a/org.adempiere.plugin.utils/pom.xml b/org.adempiere.plugin.utils/pom.xml
index c6fdc2dbac..c625b450fe 100644
--- a/org.adempiere.plugin.utils/pom.xml
+++ b/org.adempiere.plugin.utils/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>8.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.plugin.utils</artifactId>
diff --git a/org.adempiere.replication-feature/feature.xml b/org.adempiere.replication-feature/feature.xml
index 746de911e5..15dd53a1bb 100644
--- a/org.adempiere.replication-feature/feature.xml
+++ b/org.adempiere.replication-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.adempiere.replication.feature"
       label="Replication-feature"
-      version="7.1.0.qualifier"
+      version="8.1.0.qualifier"
       provider-name="iDempiere Community">
 
    <description url="http://www.example.com/description">
diff --git a/org.adempiere.replication-feature/pom.xml b/org.adempiere.replication-feature/pom.xml
index 2dff1bc494..0bf77fafb7 100644
--- a/org.adempiere.replication-feature/pom.xml
+++ b/org.adempiere.replication-feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>8.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.replication.feature</artifactId>
diff --git a/org.adempiere.replication.server-feature/feature.xml b/org.adempiere.replication.server-feature/feature.xml
index 8c5407ec76..3c4a6c3cdf 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.feature"
       label="Replication Server-feature"
-      version="7.1.0.qualifier"
+      version="8.1.0.qualifier"
       provider-name="iDempiere Community">
 
    <description url="http://www.example.com/description">
diff --git a/org.adempiere.replication.server-feature/pom.xml b/org.adempiere.replication.server-feature/pom.xml
index 9b4266a644..5fb095375b 100644
--- a/org.adempiere.replication.server-feature/pom.xml
+++ b/org.adempiere.replication.server-feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>8.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.replication.server.feature</artifactId>
diff --git a/org.adempiere.replication.server/META-INF/MANIFEST.MF b/org.adempiere.replication.server/META-INF/MANIFEST.MF
index ff68443c36..f043c03851 100644
--- a/org.adempiere.replication.server/META-INF/MANIFEST.MF
+++ b/org.adempiere.replication.server/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Replication Server
 Bundle-SymbolicName: org.adempiere.replication.server;singleton:=true
-Bundle-Version: 7.1.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
 Require-Bundle: org.adempiere.server;bundle-version="0.0.0",
  org.adempiere.replication;bundle-version="0.0.0",
diff --git a/org.adempiere.replication.server/pom.xml b/org.adempiere.replication.server/pom.xml
index 982a228dfd..abc7367d06 100644
--- a/org.adempiere.replication.server/pom.xml
+++ b/org.adempiere.replication.server/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>8.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.replication.server</artifactId>
diff --git a/org.adempiere.replication/META-INF/MANIFEST.MF b/org.adempiere.replication/META-INF/MANIFEST.MF
index 4540cec411..fac9c4f68e 100644
--- a/org.adempiere.replication/META-INF/MANIFEST.MF
+++ b/org.adempiere.replication/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Replication
 Bundle-SymbolicName: org.adempiere.replication;singleton:=true
-Bundle-Version: 7.1.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
 Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
 Export-Package: org.adempiere.process.rpl,
diff --git a/org.adempiere.replication/pom.xml b/org.adempiere.replication/pom.xml
index a956c3332a..33146ebd77 100644
--- a/org.adempiere.replication/pom.xml
+++ b/org.adempiere.replication/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>8.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.replication</artifactId>
diff --git a/org.adempiere.report.jasper-feature/feature.xml b/org.adempiere.report.jasper-feature/feature.xml
index c274934dae..7240626a8c 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.feature"
       label="JasperReport-feature"
-      version="7.1.0.qualifier"
+      version="8.1.0.qualifier"
       provider-name="iDempiere Community">
 
    <description url="http://www.example.com/description">
@@ -21,13 +21,13 @@
          id="org.adempiere.report.jasper"
          download-size="0"
          install-size="0"
-         version="7.1.0.qualifier"/>
+         version="8.1.0.qualifier"/>
 
    <plugin
          id="org.adempiere.report.jasper.library"
          download-size="0"
          install-size="0"
-         version="7.1.0.qualifier"
+         version="8.1.0.qualifier"
          fragment="true"/>
 
    <plugin
diff --git a/org.adempiere.report.jasper-feature/pom.xml b/org.adempiere.report.jasper-feature/pom.xml
index 6bc26c5b91..87b073df4e 100644
--- a/org.adempiere.report.jasper-feature/pom.xml
+++ b/org.adempiere.report.jasper-feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>8.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.report.jasper.feature</artifactId>
diff --git a/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
index 32556f68b4..2eebba86c4 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: Library
 Bundle-SymbolicName: org.adempiere.report.jasper.library;singleton:=true
-Bundle-Version: 7.1.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
 Fragment-Host: net.sf.jasperreports.engine;bundle-version="6.11.0"
 Bundle-ClassPath: .,
diff --git a/org.adempiere.report.jasper.library/pom.xml b/org.adempiere.report.jasper.library/pom.xml
index b1b14c1ac6..a0fcc5ef92 100644
--- a/org.adempiere.report.jasper.library/pom.xml
+++ b/org.adempiere.report.jasper.library/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>8.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.report.jasper.library</artifactId>
diff --git a/org.adempiere.report.jasper/META-INF/MANIFEST.MF b/org.adempiere.report.jasper/META-INF/MANIFEST.MF
index 29d47988e6..4d048b0f5d 100644
--- a/org.adempiere.report.jasper/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere JasperReport integration
 Bundle-SymbolicName: org.adempiere.report.jasper;singleton:=true
-Bundle-Version: 7.1.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
 Import-Package: net.sourceforge.barbecue,
  org.apache.commons.codec,
diff --git a/org.adempiere.report.jasper/pom.xml b/org.adempiere.report.jasper/pom.xml
index 3d66d48909..bed41b2e6f 100644
--- a/org.adempiere.report.jasper/pom.xml
+++ b/org.adempiere.report.jasper/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>8.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.report.jasper</artifactId>
diff --git a/org.adempiere.server-feature/feature.xml b/org.adempiere.server-feature/feature.xml
index 7ab35a27e6..6b2829fb50 100644
--- a/org.adempiere.server-feature/feature.xml
+++ b/org.adempiere.server-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.adempiere.server.feature"
       label="iDempiere Server-feature"
-      version="7.1.0.qualifier"
+      version="8.1.0.qualifier"
       provider-name="iDempiere Community">
 
    <description url="http://www.example.com/description">
diff --git a/org.adempiere.server-feature/pom.xml b/org.adempiere.server-feature/pom.xml
index 9905c1dd74..6f76986556 100644
--- a/org.adempiere.server-feature/pom.xml
+++ b/org.adempiere.server-feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>8.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.server.feature</artifactId>
diff --git a/org.adempiere.server-feature/server.product b/org.adempiere.server-feature/server.product
index aa7df4e0d8..954c5b5acf 100644
--- a/org.adempiere.server-feature/server.product
+++ b/org.adempiere.server-feature/server.product
@@ -1,7 +1,7 @@
 <?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="7.1.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="iDempiere Server" uid="org.adempiere.server.product" id="org.adempiere.server.server_product" application="org.adempiere.server.application" version="8.1.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
diff --git a/org.adempiere.server/META-INF/MANIFEST.MF b/org.adempiere.server/META-INF/MANIFEST.MF
index 1b60969ffc..0282b89938 100644
--- a/org.adempiere.server/META-INF/MANIFEST.MF
+++ b/org.adempiere.server/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Server
 Bundle-SymbolicName: org.adempiere.server;singleton:=true
-Bundle-Version: 7.1.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
  org.eclipse.equinox.app;bundle-version="0.0.0",
  org.eclipse.jetty.apache-jsp;bundle-version="0.0.0"
diff --git a/org.adempiere.server/pom.xml b/org.adempiere.server/pom.xml
index c3de11d86e..6afbefe2af 100644
--- a/org.adempiere.server/pom.xml
+++ b/org.adempiere.server/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>8.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.server</artifactId>
diff --git a/org.adempiere.ui.zk-feature/feature.xml b/org.adempiere.ui.zk-feature/feature.xml
index 72204c9677..63e47976b2 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.feature"
       label="Zk Client-feature"
-      version="7.1.0.qualifier"
+      version="8.1.0.qualifier"
       provider-name="iDempiere Community">
 
    <description url="http://www.example.com/description">
@@ -25,7 +25,7 @@
          id="org.adempiere.ui.zk"
          download-size="0"
          install-size="0"
-         version="7.1.0.qualifier"/>
+         version="8.1.0.qualifier"/>
 
    <plugin
          id="org.atmosphere.runtime"
diff --git a/org.adempiere.ui.zk-feature/pom.xml b/org.adempiere.ui.zk-feature/pom.xml
index bfdd8943e9..2bff028b58 100644
--- a/org.adempiere.ui.zk-feature/pom.xml
+++ b/org.adempiere.ui.zk-feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>8.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.ui.zk.feature</artifactId>
diff --git a/org.adempiere.ui.zk/.classpath b/org.adempiere.ui.zk/.classpath
index db2f0ec452..5a48a285c6 100644
--- a/org.adempiere.ui.zk/.classpath
+++ b/org.adempiere.ui.zk/.classpath
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="lib/ckez.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/daisydiff.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/owasp-java-html-sanitizer.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
 			<attribute name="module" value="true"/>
@@ -10,5 +7,8 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="WEB-INF/src/"/>
+	<classpathentry exported="true" kind="lib" path="lib/ckez.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/daisydiff.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/owasp-java-html-sanitizer.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.adempiere.ui.zk/META-INF/MANIFEST.MF b/org.adempiere.ui.zk/META-INF/MANIFEST.MF
index e07c791678..7f2d2660ec 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: iDempiere Web Client
 Bundle-SymbolicName: org.adempiere.ui.zk;singleton:=true
-Bundle-Version: 7.1.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
 Import-Package: groovy.transform.stc;version="2.4.7",
  javax.annotation,
diff --git a/org.adempiere.ui.zk/pom.xml b/org.adempiere.ui.zk/pom.xml
index 03bd89e692..5ca5b5864d 100644
--- a/org.adempiere.ui.zk/pom.xml
+++ b/org.adempiere.ui.zk/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>8.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.ui.zk</artifactId>
diff --git a/org.adempiere.ui/META-INF/MANIFEST.MF b/org.adempiere.ui/META-INF/MANIFEST.MF
index 80bb75ca88..2d2eef735c 100644
--- a/org.adempiere.ui/META-INF/MANIFEST.MF
+++ b/org.adempiere.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere UI base
 Bundle-SymbolicName: org.adempiere.ui;singleton:=true
-Bundle-Version: 7.1.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
 Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
  org.apache.servicemix.bundles.xerces;bundle-version="0.0.0",
diff --git a/org.adempiere.ui/pom.xml b/org.adempiere.ui/pom.xml
index 573d0a9c47..58c73f2cbf 100644
--- a/org.adempiere.ui/pom.xml
+++ b/org.adempiere.ui/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>8.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.adempiere.ui</artifactId>
diff --git a/org.apache.ecs/META-INF/MANIFEST.MF b/org.apache.ecs/META-INF/MANIFEST.MF
index 6667e0ed4f..b6378b2aa8 100644
--- a/org.apache.ecs/META-INF/MANIFEST.MF
+++ b/org.apache.ecs/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Apache ECS Library
 Bundle-SymbolicName: org.apache.ecs
-Bundle-Version: 7.1.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Activator: org.apache.ecs.Activator
 Bundle-ActivationPolicy: lazy
 Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
diff --git a/org.apache.ecs/pom.xml b/org.apache.ecs/pom.xml
index a327c63f77..b8fc565459 100644
--- a/org.apache.ecs/pom.xml
+++ b/org.apache.ecs/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>8.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.apache.ecs</artifactId>
diff --git a/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF b/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF
index 6af98d889b..3b03974e4b 100644
--- a/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF
+++ b/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Oracle Provider
 Bundle-SymbolicName: org.compiere.db.oracle.provider;singleton:=true
-Bundle-Version: 7.1.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
 Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
  org.adempiere.install;bundle-version="0.0.0"
diff --git a/org.compiere.db.oracle.provider/pom.xml b/org.compiere.db.oracle.provider/pom.xml
index 102ce03824..8b29732da6 100644
--- a/org.compiere.db.oracle.provider/pom.xml
+++ b/org.compiere.db.oracle.provider/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>8.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.compiere.db.oracle.provider</artifactId>
diff --git a/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF b/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF
index 67a3e9180a..3b0c1bfb00 100644
--- a/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF
+++ b/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Postgresql Provider
 Bundle-SymbolicName: org.compiere.db.postgresql.provider;singleton:=true
-Bundle-Version: 7.1.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
 Bundle-ClassPath: .,
  lib/c3p0.jar,
diff --git a/org.compiere.db.postgresql.provider/pom.xml b/org.compiere.db.postgresql.provider/pom.xml
index 4dbc1cec06..049a73164b 100644
--- a/org.compiere.db.postgresql.provider/pom.xml
+++ b/org.compiere.db.postgresql.provider/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>8.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.compiere.db.postgresql.provider</artifactId>
diff --git a/org.compiere.db.provider-feature/feature.xml b/org.compiere.db.provider-feature/feature.xml
index 7965edb6fc..705f3d985f 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.feature"
       label="Database Provider-feature"
-      version="7.1.0.qualifier"
+      version="8.1.0.qualifier"
       provider-name="iDempiere Community">
 
    <description url="http://www.example.com/description">
diff --git a/org.compiere.db.provider-feature/pom.xml b/org.compiere.db.provider-feature/pom.xml
index 45c07d2da5..f574c745e3 100644
--- a/org.compiere.db.provider-feature/pom.xml
+++ b/org.compiere.db.provider-feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>8.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.compiere.db.provider.feature</artifactId>
diff --git a/org.idempiere.eclipse.platform-feature/feature.xml b/org.idempiere.eclipse.platform-feature/feature.xml
index 20176bf33d..0e1cbe2245 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.feature"
       label="Eclipse Platform for iDempiere"
-      version="7.1.0.qualifier"
+      version="8.1.0.qualifier"
       provider-name="www.idempiere.org">
 
    <description url="http://www.example.com/description">
diff --git a/org.idempiere.eclipse.platform-feature/pom.xml b/org.idempiere.eclipse.platform-feature/pom.xml
index ab7a3b89c4..d13fe5c9d3 100644
--- a/org.idempiere.eclipse.platform-feature/pom.xml
+++ b/org.idempiere.eclipse.platform-feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>8.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.idempiere.eclipse.platform.feature</artifactId>
diff --git a/org.idempiere.equinox.p2.director-feature/feature.xml b/org.idempiere.equinox.p2.director-feature/feature.xml
index df2c6bea0a..88f8f4e98a 100644
--- a/org.idempiere.equinox.p2.director-feature/feature.xml
+++ b/org.idempiere.equinox.p2.director-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.idempiere.equinox.p2.director.feature"
       label="Idempiere P2 Director"
-      version="7.1.0.qualifier"
+      version="8.1.0.qualifier"
       provider-name="www.idempiere.org">
 
    <description url="http://www.example.com/description">
diff --git a/org.idempiere.equinox.p2.director-feature/pom.xml b/org.idempiere.equinox.p2.director-feature/pom.xml
index d4092b6986..fb89c61b7c 100644
--- a/org.idempiere.equinox.p2.director-feature/pom.xml
+++ b/org.idempiere.equinox.p2.director-feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>8.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.idempiere.equinox.p2.director.feature</artifactId>
diff --git a/org.idempiere.felix.webconsole-feature/feature.xml b/org.idempiere.felix.webconsole-feature/feature.xml
index 8d2f3635c1..e222058200 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.feature"
       label="Felix Web Console Feature"
-      version="7.1.0.qualifier"
+      version="8.1.0.qualifier"
       provider-name="iDempiere Community">
 
    <description url="http://www.example.com/description">
diff --git a/org.idempiere.felix.webconsole-feature/pom.xml b/org.idempiere.felix.webconsole-feature/pom.xml
index 3023034602..ce0dce9cda 100644
--- a/org.idempiere.felix.webconsole-feature/pom.xml
+++ b/org.idempiere.felix.webconsole-feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>8.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.idempiere.felix.webconsole.feature</artifactId>
diff --git a/org.idempiere.felix.webconsole/META-INF/MANIFEST.MF b/org.idempiere.felix.webconsole/META-INF/MANIFEST.MF
index 38efe65219..165da56483 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: iDempiere Felix Web Console
 Bundle-SymbolicName: org.idempiere.felix.webconsole
-Bundle-Version: 7.1.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Activator: org.idempiere.felix.webconsole.Activator
 Bundle-ActivationPolicy: lazy
 Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
diff --git a/org.idempiere.felix.webconsole/pom.xml b/org.idempiere.felix.webconsole/pom.xml
index f8bc94b2ba..e5254244ff 100644
--- a/org.idempiere.felix.webconsole/pom.xml
+++ b/org.idempiere.felix.webconsole/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>8.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.idempiere.felix.webconsole</artifactId>
diff --git a/org.idempiere.hazelcast.service-feature/feature.xml b/org.idempiere.hazelcast.service-feature/feature.xml
index b94f300285..0a19821920 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.feature"
       label="Hazelcast Service Feature"
-      version="7.1.0.qualifier"
+      version="8.1.0.qualifier"
       provider-name="iDempiere Community">
 
    <description url="http://www.example.com/description">
diff --git a/org.idempiere.hazelcast.service-feature/pom.xml b/org.idempiere.hazelcast.service-feature/pom.xml
index e669159ff5..d4e743d6d7 100644
--- a/org.idempiere.hazelcast.service-feature/pom.xml
+++ b/org.idempiere.hazelcast.service-feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>8.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.idempiere.hazelcast.service.feature</artifactId>
diff --git a/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF b/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF
index ff21dac968..5b55172014 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: 7.1.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Activator: org.idempiere.hazelcast.service.Activator
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.crypto,
diff --git a/org.idempiere.hazelcast.service/pom.xml b/org.idempiere.hazelcast.service/pom.xml
index 3fc7e16b46..355b5669d9 100644
--- a/org.idempiere.hazelcast.service/pom.xml
+++ b/org.idempiere.hazelcast.service/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>8.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.idempiere.hazelcast.service</artifactId>
diff --git a/org.idempiere.javadoc/META-INF/MANIFEST.MF b/org.idempiere.javadoc/META-INF/MANIFEST.MF
index b8774e5e21..73905da40c 100644
--- a/org.idempiere.javadoc/META-INF/MANIFEST.MF
+++ b/org.idempiere.javadoc/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Javadoc Generator
 Bundle-SymbolicName: org.idempiere.javadoc;singleton:=true
-Bundle-Version: 7.1.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: iDempiere Community
 Automatic-Module-Name: org.idempiere.javadoc
diff --git a/org.idempiere.javadoc/pom.xml b/org.idempiere.javadoc/pom.xml
index 9af777c542..ae86cbaa3b 100644
--- a/org.idempiere.javadoc/pom.xml
+++ b/org.idempiere.javadoc/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>8.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 
diff --git a/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml b/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml
index 322d601030..0f189ee38a 100644
--- a/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml
+++ b/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>8.1.0-SNAPSHOT</version>
 		<relativePath>../../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/org.idempiere.maven.to.p2/pom.xml b/org.idempiere.maven.to.p2/pom.xml
index c5f9213b05..299f5e8ba7 100644
--- a/org.idempiere.maven.to.p2/pom.xml
+++ b/org.idempiere.maven.to.p2/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>8.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<modules>
diff --git a/org.idempiere.p2.targetplatform/pom.xml b/org.idempiere.p2.targetplatform/pom.xml
index e4e28501a9..e4b6d2671d 100644
--- a/org.idempiere.p2.targetplatform/pom.xml
+++ b/org.idempiere.p2.targetplatform/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>8.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.idempiere.p2.targetplatform</artifactId>
diff --git a/org.idempiere.p2/category.xml b/org.idempiere.p2/category.xml
index 45e77f689c..d461cb340f 100644
--- a/org.idempiere.p2/category.xml
+++ b/org.idempiere.p2/category.xml
@@ -1,48 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/org.adempiere.base.feature_7.1.0.qualifier.jar" id="org.adempiere.base.feature" version="7.1.0.qualifier">
+   <feature url="features/org.adempiere.base.feature_8.1.0.qualifier.jar" id="org.adempiere.base.feature" version="8.1.0.qualifier">
       <category name="idempiere.server"/>
    </feature>
-   <feature url="features/org.adempiere.payment.processor.feature_7.1.0.qualifier.jar" id="org.adempiere.payment.processor.feature" version="7.1.0.qualifier">
+   <feature url="features/org.adempiere.payment.processor.feature_8.1.0.qualifier.jar" id="org.adempiere.payment.processor.feature" version="8.1.0.qualifier">
       <category name="idempiere.server"/>
    </feature>
-   <feature url="features/org.adempiere.pipo.feature_7.1.0.qualifier.jar" id="org.adempiere.pipo.feature" version="7.1.0.qualifier">
+   <feature url="features/org.adempiere.pipo.feature_8.1.0.qualifier.jar" id="org.adempiere.pipo.feature" version="8.1.0.qualifier">
       <category name="idempiere.server"/>
    </feature>
-   <feature url="features/org.adempiere.replication.feature_7.1.0.qualifier.jar" id="org.adempiere.replication.feature" version="7.1.0.qualifier">
+   <feature url="features/org.adempiere.replication.feature_8.1.0.qualifier.jar" id="org.adempiere.replication.feature" version="8.1.0.qualifier">
       <category name="idempiere.server"/>
    </feature>
-   <feature url="features/org.adempiere.replication.server.feature_7.1.0.qualifier.jar" id="org.adempiere.replication.server.feature" version="7.1.0.qualifier">
+   <feature url="features/org.adempiere.replication.server.feature_8.1.0.qualifier.jar" id="org.adempiere.replication.server.feature" version="8.1.0.qualifier">
       <category name="idempiere.server"/>
    </feature>
-   <feature url="features/org.adempiere.report.jasper.feature_7.1.0.qualifier.jar" id="org.adempiere.report.jasper.feature" version="7.1.0.qualifier">
+   <feature url="features/org.adempiere.report.jasper.feature_8.1.0.qualifier.jar" id="org.adempiere.report.jasper.feature" version="8.1.0.qualifier">
       <category name="idempiere.server"/>
    </feature>
-   <feature url="features/org.adempiere.server.feature_7.1.0.qualifier.jar" id="org.adempiere.server.feature" version="7.1.0.qualifier">
+   <feature url="features/org.adempiere.server.feature_8.1.0.qualifier.jar" id="org.adempiere.server.feature" version="8.1.0.qualifier">
       <category name="idempiere.server"/>
    </feature>
-   <feature url="features/org.adempiere.ui.zk.feature_7.1.0.qualifier.jar" id="org.adempiere.ui.zk.feature" version="7.1.0.qualifier">
+   <feature url="features/org.adempiere.ui.zk.feature_8.1.0.qualifier.jar" id="org.adempiere.ui.zk.feature" version="8.1.0.qualifier">
       <category name="idempiere.server"/>
    </feature>
-   <feature url="features/org.compiere.db.provider.feature_7.1.0.qualifier.jar" id="org.compiere.db.provider.feature" version="7.1.0.qualifier">
+   <feature url="features/org.compiere.db.provider.feature_8.1.0.qualifier.jar" id="org.compiere.db.provider.feature" version="8.1.0.qualifier">
       <category name="idempiere.server"/>
    </feature>
-   <feature url="features/org.idempiere.eclipse.platform.feature_7.1.0.qualifier.jar" id="org.idempiere.eclipse.platform.feature" version="7.1.0.qualifier">
+   <feature url="features/org.idempiere.eclipse.platform.feature_8.1.0.qualifier.jar" id="org.idempiere.eclipse.platform.feature" version="8.1.0.qualifier">
       <category name="idempiere.server"/>
    </feature>
-   <feature url="features/org.idempiere.equinox.p2.director.feature_7.1.0.qualifier.jar" id="org.idempiere.equinox.p2.director.feature" version="7.1.0.qualifier">
+   <feature url="features/org.idempiere.equinox.p2.director.feature_8.1.0.qualifier.jar" id="org.idempiere.equinox.p2.director.feature" version="8.1.0.qualifier">
       <category name="idempiere.server"/>
    </feature>
-   <feature url="features/org.idempiere.felix.webconsole.feature_7.1.0.qualifier.jar" id="org.idempiere.felix.webconsole.feature" version="7.1.0.qualifier">
+   <feature url="features/org.idempiere.felix.webconsole.feature_8.1.0.qualifier.jar" id="org.idempiere.felix.webconsole.feature" version="8.1.0.qualifier">
       <category name="idempiere.server"/>
    </feature>
-   <feature url="features/org.idempiere.hazelcast.service.feature_7.1.0.qualifier.jar" id="org.idempiere.hazelcast.service.feature" version="7.1.0.qualifier">
+   <feature url="features/org.idempiere.hazelcast.service.feature_8.1.0.qualifier.jar" id="org.idempiere.hazelcast.service.feature" version="8.1.0.qualifier">
       <category name="idempiere.server"/>
    </feature>
-   <feature url="features/org.idempiere.zk.feature_7.1.0.qualifier.jar" id="org.idempiere.zk.feature" version="7.1.0.qualifier">
+   <feature url="features/org.idempiere.zk.feature_8.1.0.qualifier.jar" id="org.idempiere.zk.feature" version="8.1.0.qualifier">
       <category name="idempiere.server"/>
    </feature>
-   <feature url="features/org.idempiere.webservices.feature_7.1.0.qualifier.jar" id="org.idempiere.webservices.feature" version="7.1.0.qualifier">
+   <feature url="features/org.idempiere.webservices.feature_8.1.0.qualifier.jar" id="org.idempiere.webservices.feature" version="8.1.0.qualifier">
       <category name="idempiere.server"/>
    </feature>
    <feature url="features/org.eclipse.equinox.executable_3.8.900.v20200819-0940.jar" id="org.eclipse.equinox.executable" version="3.8.900.v20200819-0940">
diff --git a/org.idempiere.p2/pom.xml b/org.idempiere.p2/pom.xml
index a6ff7dc5d5..992f877091 100644
--- a/org.idempiere.p2/pom.xml
+++ b/org.idempiere.p2/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>8.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.idempiere.p2</artifactId>
diff --git a/org.idempiere.p2/server.product b/org.idempiere.p2/server.product
index 7e34544851..aef1c131db 100644
--- a/org.idempiere.p2/server.product
+++ b/org.idempiere.p2/server.product
@@ -1,7 +1,7 @@
 <?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="7.1.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="iDempiere Server" uid="org.adempiere.server.product" id="org.adempiere.server.server_product" application="org.adempiere.server.application" version="8.1.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
diff --git a/org.idempiere.parent/pom.xml b/org.idempiere.parent/pom.xml
index a898900fcc..71fd0fb354 100644
--- a/org.idempiere.parent/pom.xml
+++ b/org.idempiere.parent/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.idempiere</groupId>
 	<artifactId>org.idempiere.parent</artifactId>
-	<version>7.1.0-SNAPSHOT</version>
+	<version>8.1.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Maven parent project for idempiere</name>
 
@@ -536,7 +536,7 @@
 				            <artifact>
 					            <groupId>org.idempiere</groupId>
 					            <artifactId>${idempiere.target}</artifactId>
-					            <version>7.1.0-SNAPSHOT</version>
+					            <version>8.1.0-SNAPSHOT</version>
 				            </artifact>
 			            </target>
 
diff --git a/org.idempiere.test-feature/feature.xml b/org.idempiere.test-feature/feature.xml
index 013a6a51ea..1e3cc515ae 100644
--- a/org.idempiere.test-feature/feature.xml
+++ b/org.idempiere.test-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.idempiere.test.feature"
       label="Require bundle for org.idempiere.test"
-      version="7.1.0.qualifier"
+      version="8.1.0.qualifier"
       provider-name="iDempiere Community">
 
    <description url="http://www.example.com/description">
diff --git a/org.idempiere.test-feature/pom.xml b/org.idempiere.test-feature/pom.xml
index 3c8fefbb7a..e17f761cf7 100644
--- a/org.idempiere.test-feature/pom.xml
+++ b/org.idempiere.test-feature/pom.xml
@@ -3,7 +3,7 @@
   <parent>
 	<groupId>org.idempiere</groupId>
 	<artifactId>org.idempiere.parent</artifactId>
-	<version>7.1.0-SNAPSHOT</version>
+	<version>8.1.0-SNAPSHOT</version>
 	<relativePath>../org.idempiere.parent/pom.xml</relativePath>
   </parent>
   <artifactId>org.idempiere.test.feature</artifactId>
diff --git a/org.idempiere.test/META-INF/MANIFEST.MF b/org.idempiere.test/META-INF/MANIFEST.MF
index b5b6817550..7699d53c6f 100644
--- a/org.idempiere.test/META-INF/MANIFEST.MF
+++ b/org.idempiere.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Unit Testing
 Bundle-SymbolicName: org.idempiere.test
-Bundle-Version: 7.1.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Vendor: iDempiere
 Automatic-Module-Name: org.idempiere.test
 Import-Package: org.junit.jupiter.api;version="5.6.0",
@@ -18,9 +18,9 @@ Import-Package: org.junit.jupiter.api;version="5.6.0",
  org.junit.jupiter.params.provider;version="5.6.0",
  org.junit.jupiter.params.support;version="5.6.0",
  org.osgi.framework;version="1.9.0"
-Require-Bundle: org.adempiere.base;bundle-version="7.1.0",
- org.adempiere.base.callout;bundle-version="7.1.0",
- org.adempiere.base.process;bundle-version="7.1.0",
- org.adempiere.payment.processor;bundle-version="7.1.0"
+Require-Bundle: org.adempiere.base;bundle-version="8.1.0",
+ org.adempiere.base.callout;bundle-version="8.1.0",
+ org.adempiere.base.process;bundle-version="8.1.0",
+ org.adempiere.payment.processor;bundle-version="8.1.0"
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.idempiere.test.TestActivator
diff --git a/org.idempiere.test/pom.xml b/org.idempiere.test/pom.xml
index 432838b7ba..4b520b36ba 100644
--- a/org.idempiere.test/pom.xml
+++ b/org.idempiere.test/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>8.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.idempiere.test</artifactId>
diff --git a/org.idempiere.webservices-feature/feature.xml b/org.idempiere.webservices-feature/feature.xml
index 22af640c9f..9adbd698bc 100644
--- a/org.idempiere.webservices-feature/feature.xml
+++ b/org.idempiere.webservices-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.idempiere.webservices.feature"
       label="Web Service Feature"
-      version="7.1.0.qualifier"
+      version="8.1.0.qualifier"
       provider-name="iDempiere">
 
    <description url="http://www.example.com/description">
diff --git a/org.idempiere.webservices-feature/pom.xml b/org.idempiere.webservices-feature/pom.xml
index bee522fc5b..742d63945b 100644
--- a/org.idempiere.webservices-feature/pom.xml
+++ b/org.idempiere.webservices-feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>8.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.idempiere.webservices.feature</artifactId>
diff --git a/org.idempiere.webservices.client-feature/feature.xml b/org.idempiere.webservices.client-feature/feature.xml
index f4d9b52275..20573849f4 100644
--- a/org.idempiere.webservices.client-feature/feature.xml
+++ b/org.idempiere.webservices.client-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.idempiere.webservices.client.feature"
       label="Webservices Client Library"
-      version="7.1.0.qualifier"
+      version="8.1.0.qualifier"
       provider-name="www.idempiere.org">
 
    <description url="http://www.example.com/description">
diff --git a/org.idempiere.webservices.client-feature/pom.xml b/org.idempiere.webservices.client-feature/pom.xml
index 3a12a786e6..692ea516a3 100644
--- a/org.idempiere.webservices.client-feature/pom.xml
+++ b/org.idempiere.webservices.client-feature/pom.xml
@@ -3,7 +3,7 @@
   <parent>
 	<groupId>org.idempiere</groupId>
 	<artifactId>org.idempiere.parent</artifactId>
-	<version>7.1.0-SNAPSHOT</version>
+	<version>8.1.0-SNAPSHOT</version>
 	<relativePath>../org.idempiere.parent/pom.xml</relativePath>
   </parent>
   <artifactId>org.idempiere.webservices.client.feature</artifactId>
diff --git a/org.idempiere.webservices/.classpath b/org.idempiere.webservices/.classpath
index bd7bf76a21..781b689605 100644
--- a/org.idempiere.webservices/.classpath
+++ b/org.idempiere.webservices/.classpath
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="lib/idempiere-xmlbeans.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
 			<attribute name="module" value="true"/>
@@ -8,5 +7,6 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="WEB-INF/src/"/>
+	<classpathentry exported="true" kind="lib" path="lib/idempiere-xmlbeans.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.idempiere.webservices/META-INF/MANIFEST.MF b/org.idempiere.webservices/META-INF/MANIFEST.MF
index 5b7b2159bd..378748fac3 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: iDempiere Webservices
 Bundle-SymbolicName: org.idempiere.webservices;singleton:=true
-Bundle-Version: 7.1.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Bundle-Activator: org.idempiere.webservices.Activator
 Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
 Service-Component: OSGI-INF/*.xml
diff --git a/org.idempiere.webservices/pom.xml b/org.idempiere.webservices/pom.xml
index d98946f4b0..86d53b3e43 100644
--- a/org.idempiere.webservices/pom.xml
+++ b/org.idempiere.webservices/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>8.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.idempiere.webservices</artifactId>
diff --git a/org.idempiere.zk-feature/feature.xml b/org.idempiere.zk-feature/feature.xml
index 2ea8c02ae9..c5228889d5 100644
--- a/org.idempiere.zk-feature/feature.xml
+++ b/org.idempiere.zk-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.idempiere.zk.feature"
       label="Materialize zk osgi libary"
-      version="7.1.0.qualifier"
+      version="8.1.0.qualifier"
       provider-name="iDempiere Community">
 
    <description url="http://www.example.com/description">
diff --git a/org.idempiere.zk-feature/pom.xml b/org.idempiere.zk-feature/pom.xml
index 76bec79423..d17769372d 100644
--- a/org.idempiere.zk-feature/pom.xml
+++ b/org.idempiere.zk-feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>8.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.idempiere.zk.feature</artifactId>
diff --git a/org.idempiere.zk.extra/META-INF/MANIFEST.MF b/org.idempiere.zk.extra/META-INF/MANIFEST.MF
index 124f610674..1837730717 100644
--- a/org.idempiere.zk.extra/META-INF/MANIFEST.MF
+++ b/org.idempiere.zk.extra/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: extra zk library
 Bundle-SymbolicName: org.idempiere.zk.extra
-Bundle-Version: 7.1.0.qualifier
+Bundle-Version: 8.1.0.qualifier
 Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
 Bundle-ClassPath: .,
  lib/breeze.jar,
diff --git a/org.idempiere.zk.extra/pom.xml b/org.idempiere.zk.extra/pom.xml
index a184610178..01549aeb2e 100644
--- a/org.idempiere.zk.extra/pom.xml
+++ b/org.idempiere.zk.extra/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>8.1.0-SNAPSHOT</version>
 		<relativePath>../org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 
diff --git a/pom.xml b/pom.xml
index 1171c4eb6c..fa69f8ba09 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.idempiere</groupId>
 		<artifactId>org.idempiere.parent</artifactId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>8.1.0-SNAPSHOT</version>
 		<relativePath>org.idempiere.parent/pom.xml</relativePath>
 	</parent>
 	<modules>