Skip to content

Commit 9bb5411

Browse files
vishesh92DaanHoogland
authored and
dhslove
committed
Fix mvn warnings (apache#10909)
* Replace maven-jgit-buildnumber-plugin with thread safe buildnumber-maven-plugin * Fix mysql-connector-java warning * Fix thread safe warning for properties-maven-plugin * Fix mvn build - marvin warnings * Update tools/marvin/README.md * Update tools/marvin/README.md Co-authored-by: dahn <daan.hoogland@gmail.com> --------- Co-authored-by: dahn <daan.hoogland@gmail.com>
1 parent 979767b commit 9bb5411

9 files changed

Lines changed: 56 additions & 27 deletions

File tree

‎client/pom.xml‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -696,16 +696,22 @@
696696
<build>
697697
<plugins>
698698
<plugin>
699-
<groupId>ru.concerteza.buildnumber</groupId>
700-
<artifactId>maven-jgit-buildnumber-plugin</artifactId>
701-
<version>1.2.6</version>
699+
<groupId>org.codehaus.mojo</groupId>
700+
<artifactId>buildnumber-maven-plugin</artifactId>
701+
<version>3.2.0</version>
702702
<executions>
703703
<execution>
704704
<id>git-buildnumber</id>
705705
<goals>
706-
<goal>extract-buildnumber</goal>
706+
<goal>create</goal>
707707
</goals>
708708
<phase>prepare-package</phase>
709+
<configuration>
710+
<doCheck>false</doCheck>
711+
<doUpdate>false</doUpdate>
712+
<getRevisionOnlyOnce>true</getRevisionOnlyOnce>
713+
<revisionOnScmFailure>unknown</revisionOnScmFailure>
714+
</configuration>
709715
</execution>
710716
</executions>
711717
</plugin>
@@ -718,11 +724,11 @@
718724
<mainClass>org.apache.cloudstack.ServerDaemon</mainClass>
719725
</manifest>
720726
<manifestEntries>
721-
<X-Git-Branch>${git.branch}</X-Git-Branch>
722-
<X-Git-Tag>${git.tag}</X-Git-Tag>
723-
<X-Git-Revision>${git.revision}</X-Git-Revision>
724-
<Implementation-Revision>${git.revision}</Implementation-Revision>
725-
<Implementation-Branch>${git.branch}</Implementation-Branch>
727+
<X-Git-Branch>${scmBranch}</X-Git-Branch>
728+
<X-Git-Tag>${project.version}</X-Git-Tag>
729+
<X-Git-Revision>${buildNumber}</X-Git-Revision>
730+
<Implementation-Revision>${buildNumber}</Implementation-Revision>
731+
<Implementation-Branch>${scmBranch}</Implementation-Branch>
726732
</manifestEntries>
727733
</archive>
728734
</configuration>

‎engine/storage/snapshot/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@
5757
<scope>compile</scope>
5858
</dependency>
5959
<dependency>
60-
<groupId>mysql</groupId>
61-
<artifactId>mysql-connector-java</artifactId>
60+
<groupId>com.mysql</groupId>
61+
<artifactId>mysql-connector-j</artifactId>
6262
<scope>test</scope>
6363
</dependency>
6464
</dependencies>

‎framework/db/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
<artifactId>commons-pool2</artifactId>
5454
</dependency>
5555
<dependency>
56-
<groupId>mysql</groupId>
57-
<artifactId>mysql-connector-java</artifactId>
56+
<groupId>com.mysql</groupId>
57+
<artifactId>mysql-connector-j</artifactId>
5858
</dependency>
5959
<dependency>
6060
<groupId>org.apache.cloudstack</groupId>

‎plugins/network-elements/globodns/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
<artifactId>globodns-client</artifactId>
3434
</dependency>
3535
<dependency>
36-
<groupId>mysql</groupId>
37-
<artifactId>mysql-connector-java</artifactId>
36+
<groupId>com.mysql</groupId>
37+
<artifactId>mysql-connector-j</artifactId>
3838
<scope>test</scope>
3939
</dependency>
4040
</dependencies>

‎plugins/network-elements/tungsten/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
<artifactId>reload4j</artifactId>
4242
</dependency>
4343
<dependency>
44-
<groupId>mysql</groupId>
45-
<artifactId>mysql-connector-java</artifactId>
44+
<groupId>com.mysql</groupId>
45+
<artifactId>mysql-connector-j</artifactId>
4646
<scope>test</scope>
4747
</dependency>
4848
</dependencies>

‎pom.xml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -471,8 +471,8 @@
471471
<version>${cs.reload4j.version}</version>
472472
</dependency>
473473
<dependency>
474-
<groupId>mysql</groupId>
475-
<artifactId>mysql-connector-java</artifactId>
474+
<groupId>com.mysql</groupId>
475+
<artifactId>mysql-connector-j</artifactId>
476476
<version>${cs.mysql.version}</version>
477477
<scope>test</scope>
478478
</dependency>
@@ -487,12 +487,6 @@
487487
</exclusion>
488488
</exclusions>
489489
</dependency>
490-
<dependency>
491-
<groupId>com.mysql</groupId>
492-
<artifactId>mysql-connector-j</artifactId>
493-
<version>${cs.mysql.version}</version>
494-
<scope>test</scope>
495-
</dependency>
496490
<dependency>
497491
<groupId>net.sf.ehcache</groupId>
498492
<artifactId>ehcache-core</artifactId>

‎tools/marvin/README.md‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<!--
2+
Licensed to the Apache Software Foundation (ASF) under one
3+
or more contributor license agreements. See the NOTICE file
4+
distributed with this work for additional information
5+
regarding copyright ownership. The ASF licenses this file
6+
to you under the Apache License, Version 2.0 (the
7+
"License"); you may not use this file except in compliance
8+
with the License. You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing,
13+
software distributed under the License is distributed on an
14+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
KIND, either express or implied. See the License for the
16+
specific language governing permissions and limitations
17+
under the License.
18+
-->
19+
# Marvin
20+
21+
Marvin is the Apache CloudStack Python client written for running smoke tests.
22+
23+
## Overview
24+
25+
Marvin provides a Python-based client for Apache CloudStack. It offers utilities for testing and interacting with CloudStack deployments.
26+
27+
## License
28+
29+
Licensed under the Apache License, Version 2.0. See the LICENSE.txt file for details.

‎tools/marvin/mvn-setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def replaceVersion(fname, version):
3333
"""replace VERSION in setup.py"""
3434
with open(fname, 'r') as f:
3535
content = f.read()
36-
needle = '\nVERSION\s*=\s*[\'"][^\'"]*[\'"]'
36+
needle = r'\nVERSION\s*=\s*[\'"][^\'"]*[\'"]'
3737
# Ensure the version is PEP440 compliant
3838
version = version.replace('-', '+', 1)
3939
replacement = '\nVERSION = "%s"' % version

‎tools/marvin/setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
maintainer_email="dev@cloudstack.apache.org",
3939
long_description="Marvin is the Apache CloudStack python "
4040
"client written around the unittest framework",
41-
platforms=("Any",),
41+
platforms=["Any"],
4242
url="https://builds.apache.org/job/cloudstack-marvin/",
4343
packages=["marvin", "marvin.cloudstackAPI",
4444
"marvin.lib", "marvin.config", "marvin.sandbox",

0 commit comments

Comments
 (0)