diff --git a/awsapi/pom.xml b/awsapi/pom.xml index d1d8698dbfd..9d67b2b86e6 100644 --- a/awsapi/pom.xml +++ b/awsapi/pom.xml @@ -275,6 +275,11 @@ 1.45 runtime + + mysql + mysql-connector-java + provided + mysql mysql-connector-java diff --git a/client/pom.xml b/client/pom.xml index 84df72d86ca..1d9f03ec56d 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -206,11 +206,6 @@ cloud-mom-rabbitmq ${project.version} - - mysql - mysql-connector-java - runtime - org.apache.cloudstack cloud-framework-ipc diff --git a/client/tomcatconf/catalina.properties.in b/client/tomcatconf/catalina.properties.in index dc2db354920..ce03ff6390b 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" diff --git a/debian/changelog b/debian/changelog index b0b06eedf86..2d2b23802a1 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 Sat 2o2 Feb 2014 00:00:00 -0400 + -- David Nalley Sat, 22 Feb 2014 00:00:00 -0400 cloudstack (4.3.0-snapshot) unstable; urgency=low * Update the version to 4.3.0.snapshot diff --git a/engine/storage/integration-test/pom.xml b/engine/storage/integration-test/pom.xml index 81dc863bb84..2236649e55f 100644 --- a/engine/storage/integration-test/pom.xml +++ b/engine/storage/integration-test/pom.xml @@ -123,11 +123,6 @@ 4.2.2 compile - - mysql - mysql-connector-java - provided - org.testng testng diff --git a/framework/db/pom.xml b/framework/db/pom.xml index 7347115fe4d..2a8f310b3ce 100644 --- a/framework/db/pom.xml +++ b/framework/db/pom.xml @@ -47,7 +47,7 @@ mysql mysql-connector-java - compile + provided diff --git a/pom.xml b/pom.xml index 7af713970a0..ac89c313132 100644 --- a/pom.xml +++ b/pom.xml @@ -185,7 +185,7 @@ mysql mysql-connector-java ${cs.mysql.version} - provided,test + provided log4j diff --git a/tools/devcloud-kvm/pom.xml b/tools/devcloud-kvm/pom.xml index 31f7f5bca93..bc0bda1b37a 100644 --- a/tools/devcloud-kvm/pom.xml +++ b/tools/devcloud-kvm/pom.xml @@ -24,7 +24,7 @@ mysql mysql-connector-java - runtime + provided org.apache.cloudstack diff --git a/tools/devcloud/pom.xml b/tools/devcloud/pom.xml index d4eefc5acf3..bef56396f93 100644 --- a/tools/devcloud/pom.xml +++ b/tools/devcloud/pom.xml @@ -24,7 +24,7 @@ mysql mysql-connector-java - runtime + provided org.apache.cloudstack diff --git a/usage/pom.xml b/usage/pom.xml index 9713cd45d26..c56a76675a6 100644 --- a/usage/pom.xml +++ b/usage/pom.xml @@ -35,11 +35,6 @@ cloud-engine-schema ${project.version} - - mysql - mysql-connector-java - runtime - commons-daemon commons-daemon diff --git a/utils/pom.xml b/utils/pom.xml index 72bec235c0e..ecd62c833ef 100755 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -98,11 +98,6 @@ commons-configuration - - mysql - mysql-connector-java - test - commons-io commons-io