Skip to content

Commit 9855a84

Browse files
committed
Move the maven wiz stuff to the tools directory and make sure it gets build with the correct version when needed
1 parent 8e704f5 commit 9855a84

4 files changed

Lines changed: 15 additions & 3 deletions

File tree

client/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -749,7 +749,7 @@
749749
<plugin>
750750
<groupId>org.apache.cloudstack</groupId>
751751
<artifactId>Wix-cloudstack-maven-plugin</artifactId>
752-
<version>4.5.0-SNAPSHOT</version>
752+
<version>${project.version}</version>
753753
<executions>
754754
<execution>
755755
<id>wix-cs</id>

pom.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1059,5 +1059,16 @@
10591059
</plugins>
10601060
</build>
10611061
</profile>
1062+
<profile>
1063+
<id>buildw</id>
1064+
<activation>
1065+
<property>
1066+
<name>buildw</name>
1067+
</property>
1068+
</activation>
1069+
<modules>
1070+
<module>tools/wix-cloudstack-maven-plugin</module>
1071+
</modules>
1072+
</profile>
10621073
</profiles>
10631074
</project>
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@
1111
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1212
<modelVersion>4.0.0</modelVersion>
1313
<artifactId>Wix-cloudstack-maven-plugin</artifactId>
14-
<name>Wix-cloudstack-maven-plugin</name>
14+
<name>Apache CloudStack - Wix Maven Plugin</name>
1515
<packaging>maven-plugin</packaging>
1616
<parent>
1717
<groupId>org.apache.cloudstack</groupId>
1818
<artifactId>cloudstack</artifactId>
1919
<version>4.5.0-SNAPSHOT</version>
20+
<relativePath>../../pom.xml</relativePath>
2021
</parent>
2122

2223
<dependencies>
@@ -74,4 +75,4 @@
7475
</plugins>
7576
</pluginManagement>
7677
</build>
77-
</project>
78+
</project>

Wix-cloudstack-maven-plugin/src/org/apache/cloudstack/wix/HeatMojo.java renamed to tools/wix-cloudstack-maven-plugin/src/org/apache/cloudstack/wix/HeatMojo.java

File renamed without changes.

0 commit comments

Comments
 (0)