Index: pom.xml
===================================================================
--- pom.xml	(revision 3784)
+++ pom.xml	(working copy)
@@ -82,22 +82,27 @@
       </plugins>
     </pluginManagement>
   </build>
+  
+  <dependencies>
+    <dependency>
+      <groupId>${xwiki.db.jdbc.groupId}</groupId>
+      <artifactId>${xwiki.db.jdbc.artifactId}</artifactId>
+      <version>${xwiki.db.jdbc.version}</version>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
+  
   <profiles>
     <profile>
       <id>hsqldb</id>
       <activation>
         <activeByDefault>true</activeByDefault>
       </activation>
-      <dependencies>
-        <dependency>
-          <groupId>hsqldb</groupId>
-          <artifactId>hsqldb</artifactId>
-          <version>1.8.0.1</version>
-          <scope>runtime</scope>
-        </dependency>
-      </dependencies>
       <properties>
         <xwiki.db>hsqldb</xwiki.db>
+        <xwiki.db.jdbc.groupId>hsqldb</xwiki.db.jdbc.groupId>
+        <xwiki.db.jdbc.artifactId>hsqldb</xwiki.db.jdbc.artifactId>
+        <xwiki.db.jdbc.version>1.8.0.1</xwiki.db.jdbc.version>
         <xwiki.db.connection.url>jdbc:hsqldb:file:database/xwiki_db;shutdown=true</xwiki.db.connection.url>
         <xwiki.db.connection.username>sa</xwiki.db.connection.username>
         <xwiki.db.connection.password></xwiki.db.connection.password>
@@ -109,16 +114,11 @@
     </profile>
     <profile>
       <id>mysql</id>
-      <dependencies>
-        <dependency>
-          <groupId>mysql</groupId>
-          <artifactId>mysql-connector-java</artifactId>
-          <version>5.0.4</version>
-          <scope>runtime</scope>
-        </dependency>
-      </dependencies>
       <properties>
         <xwiki.db>mysql</xwiki.db>
+        <xwiki.db.jdbc.groupId>mysql</xwiki.db.jdbc.groupId>
+        <xwiki.db.jdbc.artifactId>mysql-connector-java</xwiki.db.jdbc.artifactId>
+        <xwiki.db.jdbc.version>5.0.4</xwiki.db.jdbc.version>
         <xwiki.db.connection.url>jdbc:mysql://localhost/xwiki?useServerPrepStmts=false</xwiki.db.connection.url>
         <xwiki.db.connection.username>xwiki</xwiki.db.connection.username>
         <xwiki.db.connection.password>xwiki</xwiki.db.connection.password>
@@ -130,16 +130,11 @@
     </profile>
     <profile>
       <id>pgsql</id>
-      <dependencies>
-        <dependency>
-          <groupId>postgresql</groupId>
-          <artifactId>postgresql</artifactId>
-          <version>8.2-504.jdbc4</version>
-          <scope>runtime</scope>
-        </dependency>
-      </dependencies>
       <properties>
         <xwiki.db>pgsql</xwiki.db>
+        <xwiki.db.jdbc.groupId>postgresql</xwiki.db.jdbc.groupId>
+        <xwiki.db.jdbc.artifactId>postgresql</xwiki.db.jdbc.artifactId>
+        <xwiki.db.jdbc.version>8.2-504.jdbc4</xwiki.db.jdbc.version>
         <xwiki.db.connection.url>jdbc:postgresql:xwiki</xwiki.db.connection.url>
         <xwiki.db.connection.username>xwiki</xwiki.db.connection.username>
         <xwiki.db.connection.password>xwiki</xwiki.db.connection.password>
@@ -151,16 +146,11 @@
     </profile>
     <profile>
       <id>derby</id>
-      <dependencies>
-        <dependency>
-          <groupId>org.apache.derby</groupId>
-          <artifactId>derby</artifactId>
-          <version>10.2.2.0</version>
-          <scope>runtime</scope>
-        </dependency>
-      </dependencies>
       <properties>
         <xwiki.db>derby</xwiki.db>
+        <xwiki.db.jdbc.groupId>org.apache.derby</xwiki.db.jdbc.groupId>
+        <xwiki.db.jdbc.artifactId>derby</xwiki.db.jdbc.artifactId>
+        <xwiki.db.jdbc.version>10.2.2.0</xwiki.db.jdbc.version>
         <xwiki.db.connection.url>jdbc:derby:database;create=true</xwiki.db.connection.url>
         <xwiki.db.connection.driver_class>org.apache.derby.jdbc.EmbeddedDriver</xwiki.db.connection.driver_class>
         <xwiki.db.dialect>org.hibernate.dialect.DerbyDialect</xwiki.db.dialect>
@@ -210,4 +200,4 @@
     </pluginRepository>
   </pluginRepositories>
 </project>
-        
+