mirror of https://github.com/apache/cloudstack.git
Merge aa9c6e4802 into 9bbd32a8ef
This commit is contained in:
commit
4c0fa38e15
|
|
@ -948,7 +948,6 @@
|
|||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-shade-plugin</artifactId>
|
||||
<version>3.0.0</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>rebuild-war</id>
|
||||
|
|
|
|||
4
pom.xml
4
pom.xml
|
|
@ -23,7 +23,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache</groupId>
|
||||
<artifactId>apache</artifactId>
|
||||
<version>11</version>
|
||||
<version>27</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
|
||||
|
|
@ -47,6 +47,7 @@
|
|||
|
||||
<properties>
|
||||
<!-- keep in alphabetic order -->
|
||||
<project.build.outputTimestamp>10</project.build.outputTimestamp>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||
<project.systemvm.template.location>https://download.cloudstack.org/systemvm</project.systemvm.template.location>
|
||||
|
|
@ -918,7 +919,6 @@
|
|||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-release-plugin</artifactId>
|
||||
<version>${cs.release-plugin.version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>default</id>
|
||||
|
|
|
|||
|
|
@ -25,12 +25,18 @@
|
|||
<version>4.23.0.0-SNAPSHOT</version>
|
||||
|
||||
<properties>
|
||||
<project.build.outputTimestamp>10</project.build.outputTimestamp>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||
</properties>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-jar-plugin</artifactId>
|
||||
<version>3.2.2</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-site-plugin</artifactId>
|
||||
|
|
|
|||
Loading…
Reference in New Issue