You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by jl...@apache.org on 2014/02/27 03:08:03 UTC

[1/2] git commit: updated refs/heads/4.3-forward to 24dcf29

Repository: cloudstack
Updated Branches:
  refs/heads/4.3-forward 82121a214 -> 24dcf2948


Fix the developer database deploy procedure so it includes the mysql database driver


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

Branch: refs/heads/4.3-forward
Commit: 2c3cd90b5604cde8123968b15ef6c53bad43b5e2
Parents: 82121a2
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Tue Feb 25 11:58:02 2014 +0100
Committer: John Kinsella <jl...@stratosec.co>
Committed: Wed Feb 26 18:07:45 2014 -0800

----------------------------------------------------------------------
 developer/pom.xml | 9 +++++++++
 1 file changed, 9 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2c3cd90b/developer/pom.xml
----------------------------------------------------------------------
diff --git a/developer/pom.xml b/developer/pom.xml
index 7ed6335..5996de7 100644
--- a/developer/pom.xml
+++ b/developer/pom.xml
@@ -114,6 +114,14 @@
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>exec-maven-plugin</artifactId>
             <version>1.2.1</version>
+             <dependencies>
+              <!-- specify the dependent jdbc driver here -->
+              <dependency>
+                <groupId>mysql</groupId>
+                <artifactId>mysql-connector-java</artifactId>
+                <version>${cs.mysql.version}</version>
+              </dependency>
+            </dependencies>
             <executions>
               <execution>
                 <phase>process-resources</phase>
@@ -125,6 +133,7 @@
             </executions>
             <configuration>
               <mainClass>com.cloud.upgrade.DatabaseCreator</mainClass>
+              <includePluginDependencies>true</includePluginDependencies>
               <arguments>
                 <!-- db properties file -->
                 <argument>${basedir}/../utils/conf/db.properties</argument>


[2/2] git commit: updated refs/heads/4.3-forward to 24dcf29

Posted by jl...@apache.org.
Fix jetty:run startup to include the mysql driver as a dependency for developers


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

Branch: refs/heads/4.3-forward
Commit: 24dcf2948c2d4cdd98fcda0f766d82f40eee8be1
Parents: 2c3cd90
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Tue Feb 25 12:13:29 2014 +0100
Committer: John Kinsella <jl...@stratosec.co>
Committed: Wed Feb 26 18:07:49 2014 -0800

----------------------------------------------------------------------
 client/pom.xml | 8 ++++++++
 1 file changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/24dcf294/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index 84df72d..253b358 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -350,6 +350,14 @@
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>maven-jetty-plugin</artifactId>
         <version>6.1.26</version>
+             <dependencies>
+              <!-- specify the dependent jdbc driver here -->
+              <dependency>
+                <groupId>mysql</groupId>
+                <artifactId>mysql-connector-java</artifactId>
+                <version>${cs.mysql.version}</version>
+              </dependency>
+            </dependencies>
         <configuration>
           <scanIntervalSeconds>0</scanIntervalSeconds>
           <stopPort>9966</stopPort>