Skip to content

Commit 357b4e6

Browse files
committed
Revert "make the create database work"
This reverts commit 1c77ae6.
1 parent f5ba913 commit 357b4e6

1 file changed

Lines changed: 8 additions & 16 deletions

File tree

developer/pom.xml

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,15 @@
2727
<version>5.1.21</version>
2828
<scope>runtime</scope>
2929
</dependency>
30-
<dependency>
31-
<groupId>org.apache.cloudstack</groupId>
32-
<artifactId>cloud-plugin-hypervisor-simulator</artifactId>
33-
<version>${project.version}</version>
34-
<scope>compile</scope>
35-
</dependency>
30+
<dependency>
31+
<groupId>org.apache.cloudstack</groupId>
32+
<artifactId>cloud-plugin-hypervisor-simulator</artifactId>
33+
<version>${project.version}</version>
34+
<scope>compile</scope>
35+
</dependency>
3636
</dependencies>
3737
<build>
3838
<defaultGoal>install</defaultGoal>
39-
<testOutputDirectory>target/db</testOutputDirectory>
4039
</build>
4140

4241
<profiles>
@@ -133,11 +132,6 @@
133132
<artifactId>cloud-server</artifactId>
134133
<version>${project.version}</version>
135134
</dependency>
136-
<dependency>
137-
<groupId>org.apache.cloudstack</groupId>
138-
<artifactId>cloud-server</artifactId>
139-
<version>${project.version}</version>
140-
</dependency>
141135
</dependencies>
142136
<executions>
143137
<execution>
@@ -149,15 +143,13 @@
149143
</execution>
150144
</executions>
151145
<configuration>
152-
<includeProjectDependencies>true</includeProjectDependencies>
146+
<includeProjectDependencies>false</includeProjectDependencies>
153147
<includePluginDependencies>true</includePluginDependencies>
154148
<executableDependency>
155149
<groupId>org.apache.cloudstack</groupId>
156150
<artifactId>cloud-server</artifactId>
157151
</executableDependency>
158-
159152
<mainClass>com.cloud.upgrade.DatabaseCreator</mainClass>
160-
<classpathScope>test</classpathScope>
161153
<arguments>
162154
<!-- db properties file -->
163155
<argument>${project.parent.basedir}/utils/conf/db.properties</argument>
@@ -178,7 +170,7 @@
178170
<argument>${basedir}/target/db/cloudbridge_offering_alter.sql</argument>
179171
<!-- Seed the database -->
180172
<argument>${basedir}/developer-prefill.sql</argument>
181-
<!-- Do database upgrade -->
173+
<!-- Do database upgrade-->
182174
<argument>com.cloud.upgrade.DatabaseUpgradeChecker</argument>
183175
<argument>--database=cloud,usage,awsapi</argument>
184176
<argument>--rootpassword=${db.root.password}</argument>

0 commit comments

Comments
 (0)