You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by we...@apache.org on 2023/08/11 06:30:21 UTC
[cloudstack] branch main updated (9bc0dd7a690 -> 540dcc1040a)
This is an automated email from the ASF dual-hosted git repository.
weizhou pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from 9bc0dd7a690 pre-commit fix line ending (#7851)
add d9319e645c7 storpool: fix pom.xml which caused docker image build failures (#7845)
add 29c7b3167eb cloudstack: bump to use 4.18.1.0 systemvmtemplate (#7828)
new 540dcc1040a Merge remote-tracking branch 'apache/4.18'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
plugins/storage/volume/storpool/pom.xml | 26 ++++++++++++++++++++++
pom.xml | 2 +-
.../scripts/configure_systemvm_services.sh | 2 +-
tools/appliance/systemvmtemplate/template.json | 2 +-
4 files changed, 29 insertions(+), 3 deletions(-)
[cloudstack] 01/01: Merge remote-tracking branch 'apache/4.18'
Posted by we...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
weizhou pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 540dcc1040a041fec68dd42064b1c8b7c8925212
Merge: 9bc0dd7a690 29c7b3167eb
Author: Wei Zhou <we...@apache.org>
AuthorDate: Fri Aug 11 08:30:07 2023 +0200
Merge remote-tracking branch 'apache/4.18'
plugins/storage/volume/storpool/pom.xml | 26 ++++++++++++++++++++++
pom.xml | 2 +-
.../scripts/configure_systemvm_services.sh | 2 +-
tools/appliance/systemvmtemplate/template.json | 2 +-
4 files changed, 29 insertions(+), 3 deletions(-)
diff --cc plugins/storage/volume/storpool/pom.xml
index 0914a4df262,058f3e678ed..f0a3972d3e5
--- a/plugins/storage/volume/storpool/pom.xml
+++ b/plugins/storage/volume/storpool/pom.xml
@@@ -69,8 -69,36 +69,33 @@@
</dependencies>
<build>
<plugins>
+ <plugin>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>gmaven-plugin</artifactId>
+ <version>1.5</version>
+ <executions>
+ <execution>
+ <id>set-properties</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <providerSelection>1.7</providerSelection>
+ <source>
+ File git = new File("./.git")
+ if (!git.exists()) {
+ pom.properties['storpool.skip.git.properties'] = 'true'
+ } else {
+ pom.properties['storpool.skip.git.properties'] = 'false'
+ }
+ </source>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>true</skipTests>
- </configuration>
<executions>
<execution>
<phase>integration-test</phase>