You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2014/10/25 00:44:16 UTC
svn commit: r1634149 - in /manifoldcf/branches/dev_1x: ./ framework/
framework/api-service/pom.xml framework/authority-service/pom.xml
framework/crawler-ui/pom.xml framework/jetty-runner/pom.xml
Author: kwright
Date: Fri Oct 24 22:44:16 2014
New Revision: 1634149
URL: http://svn.apache.org/r1634149
Log:
Pull up more changes for CONNECTORS-1083 from trunk.
Modified:
manifoldcf/branches/dev_1x/ (props changed)
manifoldcf/branches/dev_1x/framework/ (props changed)
manifoldcf/branches/dev_1x/framework/api-service/pom.xml
manifoldcf/branches/dev_1x/framework/authority-service/pom.xml
manifoldcf/branches/dev_1x/framework/crawler-ui/pom.xml
manifoldcf/branches/dev_1x/framework/jetty-runner/pom.xml
Propchange: manifoldcf/branches/dev_1x/
------------------------------------------------------------------------------
Merged /manifoldcf/trunk:r1634148
Propchange: manifoldcf/branches/dev_1x/framework/
------------------------------------------------------------------------------
Merged /manifoldcf/trunk/framework:r1634148
Modified: manifoldcf/branches/dev_1x/framework/api-service/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/framework/api-service/pom.xml?rev=1634149&r1=1634148&r2=1634149&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/framework/api-service/pom.xml (original)
+++ manifoldcf/branches/dev_1x/framework/api-service/pom.xml Fri Oct 24 22:44:16 2014
@@ -182,6 +182,12 @@
<version>${mysql.version}</version>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.mariadb.jdbc</groupId>
+ <artifactId>mariadb-java-client</artifactId>
+ <version>${mariadb.version}</version>
+ <scope>runtime</scope>
+ </dependency>
<!-- jdbc connector databases -->
<dependency>
Modified: manifoldcf/branches/dev_1x/framework/authority-service/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/framework/authority-service/pom.xml?rev=1634149&r1=1634148&r2=1634149&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/framework/authority-service/pom.xml (original)
+++ manifoldcf/branches/dev_1x/framework/authority-service/pom.xml Fri Oct 24 22:44:16 2014
@@ -182,6 +182,12 @@
<version>${mysql.version}</version>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.mariadb.jdbc</groupId>
+ <artifactId>mariadb-java-client</artifactId>
+ <version>${mariadb.version}</version>
+ <scope>runtime</scope>
+ </dependency>
<!-- jdbc connector databases -->
<dependency>
Modified: manifoldcf/branches/dev_1x/framework/crawler-ui/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/framework/crawler-ui/pom.xml?rev=1634149&r1=1634148&r2=1634149&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/framework/crawler-ui/pom.xml (original)
+++ manifoldcf/branches/dev_1x/framework/crawler-ui/pom.xml Fri Oct 24 22:44:16 2014
@@ -206,6 +206,12 @@
<version>${mysql.version}</version>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.mariadb.jdbc</groupId>
+ <artifactId>mariadb-java-client</artifactId>
+ <version>${mariadb.version}</version>
+ <scope>runtime</scope>
+ </dependency>
<!-- JDBC connector dependencies -->
<dependency>
Modified: manifoldcf/branches/dev_1x/framework/jetty-runner/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/framework/jetty-runner/pom.xml?rev=1634149&r1=1634148&r2=1634149&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/framework/jetty-runner/pom.xml (original)
+++ manifoldcf/branches/dev_1x/framework/jetty-runner/pom.xml Fri Oct 24 22:44:16 2014
@@ -305,6 +305,12 @@
<scope>runtime</scope>
</dependency>
<dependency>
+ <groupId>org.mariadb.jdbc</groupId>
+ <artifactId>mariadb-java-client</artifactId>
+ <version>${mariadb.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>${postgresql.version}</version>