Skip to content

Commit 0c2ad03

Browse files
ke4qqqke4qqq
committed
fixing the mysql client libraries dependency problem
1 parent 0203435 commit 0c2ad03

11 files changed

Lines changed: 12 additions & 27 deletions

File tree

‎awsapi/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,11 @@
275275
<version>1.45</version>
276276
<scope>runtime</scope>
277277
</dependency>
278+
<dependency>
279+
<groupId>mysql</groupId>
280+
<artifactId>mysql-connector-java</artifactId>
281+
<scope>provided</scope>
282+
</dependency>
278283
<dependency>
279284
<groupId>mysql</groupId>
280285
<artifactId>mysql-connector-java</artifactId>

‎client/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -206,11 +206,6 @@
206206
<artifactId>cloud-mom-rabbitmq</artifactId>
207207
<version>${project.version}</version>
208208
</dependency>
209-
<dependency>
210-
<groupId>mysql</groupId>
211-
<artifactId>mysql-connector-java</artifactId>
212-
<scope>runtime</scope>
213-
</dependency>
214209
<dependency>
215210
<groupId>org.apache.cloudstack</groupId>
216211
<artifactId>cloud-framework-ipc</artifactId>

‎client/tomcatconf/catalina.properties.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,org.apache
4444
# "foo/*.jar": Add all the JARs of the specified folder as class
4545
# repositories
4646
# "foo/bar.jar": Add bar.jar as a class repository
47-
common.loader=${catalina.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar
47+
common.loader=${catalina.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar,/usr/share/java/mysql-connector-java.jar
4848

4949
#
5050
# List of comma-separated paths defining the contents of the "server"

‎debian/changelog‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
cloudstack (4.3.0) unstable; urgency=low
22

3-
* Update the version to 4.3.0
3+
* Update the version to 4.3.0
44

5-
-- David Nalley <[email protected]> Sat 2o2 Feb 2014 00:00:00 -0400
5+
-- David Nalley <[email protected]> Sat, 22 Feb 2014 00:00:00 -0400
66

77
cloudstack (4.3.0-snapshot) unstable; urgency=low
88
* Update the version to 4.3.0.snapshot

‎engine/storage/integration-test/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,6 @@
123123
<version>4.2.2</version>
124124
<scope>compile</scope>
125125
</dependency>
126-
<dependency>
127-
<groupId>mysql</groupId>
128-
<artifactId>mysql-connector-java</artifactId>
129-
<scope>provided</scope>
130-
</dependency>
131126
<dependency>
132127
<groupId>org.testng</groupId>
133128
<artifactId>testng</artifactId>

‎framework/db/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<dependency>
4848
<groupId>mysql</groupId>
4949
<artifactId>mysql-connector-java</artifactId>
50-
<scope>compile</scope>
50+
<scope>provided</scope>
5151
</dependency>
5252
</dependencies>
5353
<build>

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@
185185
<groupId>mysql</groupId>
186186
<artifactId>mysql-connector-java</artifactId>
187187
<version>${cs.mysql.version}</version>
188-
<scope>provided,test</scope>
188+
<scope>provided</scope>
189189
</dependency>
190190
<dependency>
191191
<groupId>log4j</groupId>

‎tools/devcloud-kvm/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<dependency>
2525
<groupId>mysql</groupId>
2626
<artifactId>mysql-connector-java</artifactId>
27-
<scope>runtime</scope>
27+
<scope>provided</scope>
2828
</dependency>
2929
<dependency>
3030
<groupId>org.apache.cloudstack</groupId>

‎tools/devcloud/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<dependency>
2525
<groupId>mysql</groupId>
2626
<artifactId>mysql-connector-java</artifactId>
27-
<scope>runtime</scope>
27+
<scope>provided</scope>
2828
</dependency>
2929
<dependency>
3030
<groupId>org.apache.cloudstack</groupId>

‎usage/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,6 @@
3535
<artifactId>cloud-engine-schema</artifactId>
3636
<version>${project.version}</version>
3737
</dependency>
38-
<dependency>
39-
<groupId>mysql</groupId>
40-
<artifactId>mysql-connector-java</artifactId>
41-
<scope>runtime</scope>
42-
</dependency>
4338
<dependency>
4439
<groupId>commons-daemon</groupId>
4540
<artifactId>commons-daemon</artifactId>

0 commit comments

Comments
 (0)