diff --git a/client/pom.xml b/client/pom.xml
index d8fa433d5be3..b8dffe65d4fb 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -666,16 +666,22 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>ru.concerteza.buildnumber</groupId>
-                <artifactId>maven-jgit-buildnumber-plugin</artifactId>
-                <version>1.2.6</version>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>buildnumber-maven-plugin</artifactId>
+                <version>3.2.0</version>
                 <executions>
                     <execution>
                         <id>git-buildnumber</id>
                         <goals>
-                            <goal>extract-buildnumber</goal>
+                            <goal>create</goal>
                         </goals>
                         <phase>prepare-package</phase>
+                        <configuration>
+                            <doCheck>false</doCheck>
+                            <doUpdate>false</doUpdate>
+                            <getRevisionOnlyOnce>true</getRevisionOnlyOnce>
+                            <revisionOnScmFailure>unknown</revisionOnScmFailure>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>
@@ -688,11 +694,11 @@
                             <mainClass>org.apache.cloudstack.ServerDaemon</mainClass>
                         </manifest>
                         <manifestEntries>
-                            <X-Git-Branch>${git.branch}</X-Git-Branch>
-                            <X-Git-Tag>${git.tag}</X-Git-Tag>
-                            <X-Git-Revision>${git.revision}</X-Git-Revision>
-                            <Implementation-Revision>${git.revision}</Implementation-Revision>
-                            <Implementation-Branch>${git.branch}</Implementation-Branch>
+                            <X-Git-Branch>${scmBranch}</X-Git-Branch>
+                            <X-Git-Tag>${project.version}</X-Git-Tag>
+                            <X-Git-Revision>${buildNumber}</X-Git-Revision>
+                            <Implementation-Revision>${buildNumber}</Implementation-Revision>
+                            <Implementation-Branch>${scmBranch}</Implementation-Branch>
                         </manifestEntries>
                     </archive>
                 </configuration>
diff --git a/engine/storage/snapshot/pom.xml b/engine/storage/snapshot/pom.xml
index 177ab1069d9f..0966082b45ed 100644
--- a/engine/storage/snapshot/pom.xml
+++ b/engine/storage/snapshot/pom.xml
@@ -57,8 +57,8 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/framework/db/pom.xml b/framework/db/pom.xml
index 04d0fcc7e899..ced0f64c663d 100644
--- a/framework/db/pom.xml
+++ b/framework/db/pom.xml
@@ -53,8 +53,8 @@
             <artifactId>commons-pool2</artifactId>
         </dependency>
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.cloudstack</groupId>
diff --git a/plugins/network-elements/globodns/pom.xml b/plugins/network-elements/globodns/pom.xml
index 70bf2287e2ac..11e84d777c15 100644
--- a/plugins/network-elements/globodns/pom.xml
+++ b/plugins/network-elements/globodns/pom.xml
@@ -33,8 +33,8 @@
             <artifactId>globodns-client</artifactId>
         </dependency>
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/plugins/network-elements/tungsten/pom.xml b/plugins/network-elements/tungsten/pom.xml
index eb83c468f0c4..12214afebcb1 100644
--- a/plugins/network-elements/tungsten/pom.xml
+++ b/plugins/network-elements/tungsten/pom.xml
@@ -41,8 +41,8 @@
             <artifactId>reload4j</artifactId>
         </dependency>
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/pom.xml b/pom.xml
index d5b5ba121c94..883e7a4e4db6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -470,8 +470,8 @@
                 <version>${cs.reload4j.version}</version>
             </dependency>
             <dependency>
-                <groupId>mysql</groupId>
-                <artifactId>mysql-connector-java</artifactId>
+                <groupId>com.mysql</groupId>
+                <artifactId>mysql-connector-j</artifactId>
                 <version>${cs.mysql.version}</version>
                 <scope>test</scope>
             </dependency>
@@ -486,12 +486,6 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-            <dependency>
-                <groupId>com.mysql</groupId>
-                <artifactId>mysql-connector-j</artifactId>
-                <version>${cs.mysql.version}</version>
-                <scope>test</scope>
-            </dependency>
             <dependency>
                 <groupId>net.sf.ehcache</groupId>
                 <artifactId>ehcache-core</artifactId>
diff --git a/tools/marvin/README.md b/tools/marvin/README.md
new file mode 100644
index 000000000000..0d43605fc0a3
--- /dev/null
+++ b/tools/marvin/README.md
@@ -0,0 +1,29 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ -->
+# Marvin
+
+Marvin is the Apache CloudStack Python client written for running smoke tests.
+
+## Overview
+
+Marvin provides a Python-based client for Apache CloudStack. It offers utilities for testing and interacting with CloudStack deployments.
+
+## License
+
+Licensed under the Apache License, Version 2.0. See the LICENSE.txt file for details.
diff --git a/tools/marvin/mvn-setup.py b/tools/marvin/mvn-setup.py
index cabcf0dc6596..0eab94955120 100755
--- a/tools/marvin/mvn-setup.py
+++ b/tools/marvin/mvn-setup.py
@@ -33,7 +33,7 @@ def replaceVersion(fname, version):
     """replace VERSION in setup.py"""
     with open(fname, 'r') as f:
         content = f.read()
-    needle = '\nVERSION\s*=\s*[\'"][^\'"]*[\'"]'
+    needle = r'\nVERSION\s*=\s*[\'"][^\'"]*[\'"]'
     # Ensure the version is PEP440 compliant
     version = version.replace('-', '+', 1)
     replacement = '\nVERSION = "%s"' % version
diff --git a/tools/marvin/setup.py b/tools/marvin/setup.py
index 6c9aa087bc7d..4694cecc8a53 100644
--- a/tools/marvin/setup.py
+++ b/tools/marvin/setup.py
@@ -38,7 +38,7 @@
       maintainer_email="dev@cloudstack.apache.org",
       long_description="Marvin is the Apache CloudStack python "
                        "client written around the unittest framework",
-      platforms=("Any",),
+      platforms=["Any"],
       url="https://builds.apache.org/job/cloudstack-marvin/",
       packages=["marvin", "marvin.cloudstackAPI",
                 "marvin.lib", "marvin.config", "marvin.sandbox",