Skip to content

Fix mvn warnings #10909

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vishesh92 wants to merge 5 commits into
base: main
Choose a base branch
from
+41 −30
Open

Fix mvn warnings #10909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4868f0a
Replace maven-jgit-buildnumber-plugin with thread safe buildnumber-ma…
vishesh92 May 22, 2025
5a9ef56
Fix mysql-connector-java warning
vishesh92 May 22, 2025
57e0fe6
Fix thread safe warning for properties-maven-plugin
vishesh92 May 22, 2025
9432849
Fix mvn build - marvin warnings
vishesh92 May 22, 2025
22b48c3
Update tools/marvin/README.md
vishesh92 May 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion developer/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
<version>1.0-alpha-2</version>
<version>1.2.0</version>
<executions>
<execution>
<phase>initialize</phase>
Expand Down
4 changes: 2 additions & 2 deletions engine/storage/snapshot/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions framework/db/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions plugins/network-elements/globodns/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions plugins/network-elements/tungsten/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
10 changes: 2 additions & 8 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,8 +467,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>
Expand All @@ -483,12 +483,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>
Expand Down
2 changes: 1 addition & 1 deletion tools/devcloud-kvm/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
<version>1.0-alpha-2</version>
<version>1.2.0</version>
<executions>
<execution>
<phase>initialize</phase>
Expand Down
2 changes: 1 addition & 1 deletion tools/devcloud4/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
<version>1.0-alpha-2</version>
<version>1.2.0</version>
<executions>
<execution>
<phase>initialize</phase>
Expand Down
11 changes: 11 additions & 0 deletions tools/marvin/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Marvin
Copy link
Contributor

@DaanHoogland DaanHoogland Jan 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# Marvin
<!--
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.
2 changes: 1 addition & 1 deletion tools/marvin/mvn-setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/marvin/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading