You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ke...@apache.org on 2014/02/23 04:56:16 UTC
[2/2] git commit: updated refs/heads/4.3 to 0c2ad03
fixing the mysql client libraries dependency problem
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0c2ad033
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0c2ad033
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0c2ad033
Branch: refs/heads/4.3
Commit: 0c2ad0338e34f6117cecc24ec00c7746dd481465
Parents: 0203435
Author: David Nalley <da...@gnsa.us>
Authored: Sun Feb 23 02:33:09 2014 +0000
Committer: David Nalley <da...@gnsa.us>
Committed: Sun Feb 23 02:33:09 2014 +0000
----------------------------------------------------------------------
awsapi/pom.xml | 5 +++++
client/pom.xml | 5 -----
client/tomcatconf/catalina.properties.in | 2 +-
debian/changelog | 4 ++--
engine/storage/integration-test/pom.xml | 5 -----
framework/db/pom.xml | 2 +-
pom.xml | 2 +-
tools/devcloud-kvm/pom.xml | 2 +-
tools/devcloud/pom.xml | 2 +-
usage/pom.xml | 5 -----
utils/pom.xml | 5 -----
11 files changed, 12 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0c2ad033/awsapi/pom.xml
----------------------------------------------------------------------
diff --git a/awsapi/pom.xml b/awsapi/pom.xml
index d1d8698..9d67b2b 100644
--- a/awsapi/pom.xml
+++ b/awsapi/pom.xml
@@ -278,6 +278,11 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0c2ad033/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index 84df72d..1d9f03e 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -207,11 +207,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-framework-ipc</artifactId>
<version>${project.version}</version>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0c2ad033/client/tomcatconf/catalina.properties.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/catalina.properties.in b/client/tomcatconf/catalina.properties.in
index dc2db35..ce03ff6 100644
--- a/client/tomcatconf/catalina.properties.in
+++ b/client/tomcatconf/catalina.properties.in
@@ -44,7 +44,7 @@ package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,org.apache
# "foo/*.jar": Add all the JARs of the specified folder as class
# repositories
# "foo/bar.jar": Add bar.jar as a class repository
-common.loader=${catalina.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar
+common.loader=${catalina.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar,/usr/share/java/mysql-connector-java.jar
#
# List of comma-separated paths defining the contents of the "server"
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0c2ad033/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index b0b06ee..2d2b238 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
cloudstack (4.3.0) unstable; urgency=low
- * Update the version to 4.3.0
+ * Update the version to 4.3.0
- -- David Nalley <da...@gnsa.us> Sat 2o2 Feb 2014 00:00:00 -0400
+ -- David Nalley <da...@gnsa.us> Sat, 22 Feb 2014 00:00:00 -0400
cloudstack (4.3.0-snapshot) unstable; urgency=low
* Update the version to 4.3.0.snapshot
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0c2ad033/engine/storage/integration-test/pom.xml
----------------------------------------------------------------------
diff --git a/engine/storage/integration-test/pom.xml b/engine/storage/integration-test/pom.xml
index 81dc863..2236649 100644
--- a/engine/storage/integration-test/pom.xml
+++ b/engine/storage/integration-test/pom.xml
@@ -124,11 +124,6 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>6.1.1</version>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0c2ad033/framework/db/pom.xml
----------------------------------------------------------------------
diff --git a/framework/db/pom.xml b/framework/db/pom.xml
index 7347115..2a8f310 100644
--- a/framework/db/pom.xml
+++ b/framework/db/pom.xml
@@ -47,7 +47,7 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0c2ad033/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7af7139..ac89c31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -185,7 +185,7 @@
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${cs.mysql.version}</version>
- <scope>provided,test</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0c2ad033/tools/devcloud-kvm/pom.xml
----------------------------------------------------------------------
diff --git a/tools/devcloud-kvm/pom.xml b/tools/devcloud-kvm/pom.xml
index 31f7f5b..bc0bda1 100644
--- a/tools/devcloud-kvm/pom.xml
+++ b/tools/devcloud-kvm/pom.xml
@@ -24,7 +24,7 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <scope>runtime</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.cloudstack</groupId>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0c2ad033/tools/devcloud/pom.xml
----------------------------------------------------------------------
diff --git a/tools/devcloud/pom.xml b/tools/devcloud/pom.xml
index d4eefc5..bef5639 100644
--- a/tools/devcloud/pom.xml
+++ b/tools/devcloud/pom.xml
@@ -24,7 +24,7 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <scope>runtime</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.cloudstack</groupId>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0c2ad033/usage/pom.xml
----------------------------------------------------------------------
diff --git a/usage/pom.xml b/usage/pom.xml
index 9713cd4..c56a766 100644
--- a/usage/pom.xml
+++ b/usage/pom.xml
@@ -36,11 +36,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
<groupId>commons-daemon</groupId>
<artifactId>commons-daemon</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0c2ad033/utils/pom.xml
----------------------------------------------------------------------
diff --git a/utils/pom.xml b/utils/pom.xml
index 72bec23..ecd62c8 100755
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -99,11 +99,6 @@
</dependency>
<!-- Test dependency in mysql for db tests -->
<dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<scope>provided</scope>