cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kous...@apache.org
Subject [24/50] [abbrv] git commit: refs/heads/cisco-vnmc-api-integration - Revert "make the create database work"
Date Wed, 13 Mar 2013 06:25:05 GMT
Revert "make the create database work"

This reverts commit 1c77ae62374f2d1a064726bb7bcf1814a0c0b1ff.


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/357b4e63
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/357b4e63
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/357b4e63

Branch: refs/heads/cisco-vnmc-api-integration
Commit: 357b4e63ac2812b2c7ca420dbc255f95ddde7421
Parents: f5ba913
Author: Rohit Yadav <bhaisaab@apache.org>
Authored: Mon Feb 25 10:56:47 2013 +0530
Committer: Rohit Yadav <bhaisaab@apache.org>
Committed: Mon Feb 25 11:00:56 2013 +0530

----------------------------------------------------------------------
 developer/pom.xml |   24 ++++++++----------------
 1 files changed, 8 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/357b4e63/developer/pom.xml
----------------------------------------------------------------------
diff --git a/developer/pom.xml b/developer/pom.xml
index daaa6e3..a20200f 100644
--- a/developer/pom.xml
+++ b/developer/pom.xml
@@ -27,16 +27,15 @@
       <version>5.1.21</version>
       <scope>runtime</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.cloudstack</groupId>
-      <artifactId>cloud-plugin-hypervisor-simulator</artifactId>
-      <version>${project.version}</version>
-      <scope>compile</scope>
-    </dependency>
+      <dependency>
+          <groupId>org.apache.cloudstack</groupId>
+          <artifactId>cloud-plugin-hypervisor-simulator</artifactId>
+          <version>${project.version}</version>
+          <scope>compile</scope>
+      </dependency>
   </dependencies>
   <build>
     <defaultGoal>install</defaultGoal>
-    <testOutputDirectory>target/db</testOutputDirectory>
   </build>
 
   <profiles>
@@ -133,11 +132,6 @@
                 <artifactId>cloud-server</artifactId>
                 <version>${project.version}</version>
               </dependency>
-              <dependency>
-                <groupId>org.apache.cloudstack</groupId>
-                <artifactId>cloud-server</artifactId>
-                <version>${project.version}</version>
-              </dependency>
             </dependencies>
             <executions>
               <execution>
@@ -149,15 +143,13 @@
               </execution>
             </executions>
             <configuration>
-              <includeProjectDependencies>true</includeProjectDependencies>
+              <includeProjectDependencies>false</includeProjectDependencies>
               <includePluginDependencies>true</includePluginDependencies>
               <executableDependency>
                 <groupId>org.apache.cloudstack</groupId>
                 <artifactId>cloud-server</artifactId>
               </executableDependency>
-
               <mainClass>com.cloud.upgrade.DatabaseCreator</mainClass>
-              <classpathScope>test</classpathScope>
               <arguments>
                 <!-- db properties file -->
                 <argument>${project.parent.basedir}/utils/conf/db.properties</argument>
@@ -178,7 +170,7 @@
                 <argument>${basedir}/target/db/cloudbridge_offering_alter.sql</argument>
                 <!-- Seed the database -->
                 <argument>${basedir}/developer-prefill.sql</argument>
-                <!-- Do database upgrade -->
+                <!-- Do database upgrade-->
                 <argument>com.cloud.upgrade.DatabaseUpgradeChecker</argument>
                 <argument>--database=cloud,usage,awsapi</argument>
                 <argument>--rootpassword=${db.root.password}</argument>


Mime
View raw message