XE-1239: Upgrade to HSQLDB 2.2.9

pom.xml

@@ -40,6 +40,8 @@
     <platform.version>${commons.version}</platform.version>
     <!-- Versions of XWiki dependencies used in Platform modules -->
     <rendering.version>${platform.version}</rendering.version>
+    <!-- Version of HSQLDB that we use in Platform when import XARs for creating functional test environments -->
+    <hsqldb.version>2.2.9</hsqldb.version>
   </properties>
   <scm>
     <connection>scm:git:git://github.com/xwiki/xwiki-platform.git</connection>

xwiki-platform-tools/xwiki-platform-tool-packager-plugin/pom.xml

@@ -100,10 +100,14 @@
       <artifactId>xwiki-commons-environment-standard</artifactId>
       <version>${commons.version}</version>
     </dependency>
+    <!-- By default we import/export using HSQLDB. We could have let users of this plugin define which version to use
+         but it makes it simpler to use the plugin to define it here as a default which can be overridden by users
+         of the plugin if they wishes. -->
     <dependency>
       <groupId>org.hsqldb</groupId>
       <artifactId>hsqldb</artifactId>
-      <version>2.2.9</version>
+      <version>${hsqldb.version}</version>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.xwiki.commons</groupId>

xwiki-platform-tools/xwiki-platform-tool-packager-plugin/src/it/basic-import-export/pom.xml

@@ -69,19 +69,6 @@
         <configuration>
           <hibernateConfig>${project.build.directory}/maven-shared-archive-resources/hibernate.cfg.xml</hibernateConfig>
         </configuration>
-        <dependencies>
-          <dependency>
-            <groupId>org.hsqldb</groupId>
-            <artifactId>hsqldb</artifactId>
-            <version>2.2.9</version>
-          </dependency>
-          <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.4</version>
-            <scope>runtime</scope>
-          </dependency>
-        </dependencies>
         <executions>
           <execution>
             <id>import</id>