diff --git a/build-1.5.bat b/build-1.5.bat
deleted file mode 100644
index 3d5d366c..00000000
--- a/build-1.5.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-setlocal
-set JAVA_HOME=%JAVA5_HOME%
-call mvn -X clean install >std 2>err
-endlocal
\ No newline at end of file
diff --git a/ejb/plugin/src/test/java/org/jvnet/hyperjaxb3/ejb/strategy/annotate/tests/CreateXAnnotationsTest.java b/ejb/plugin/src/test/java/org/jvnet/hyperjaxb3/ejb/strategy/annotate/tests/CreateXAnnotationsTest.java
new file mode 100644
index 00000000..389ae73c
--- /dev/null
+++ b/ejb/plugin/src/test/java/org/jvnet/hyperjaxb3/ejb/strategy/annotate/tests/CreateXAnnotationsTest.java
@@ -0,0 +1,31 @@
+package org.jvnet.hyperjaxb3.ejb.strategy.annotate.tests;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.jvnet.hyperjaxb3.ejb.strategy.annotate.CreateXAnnotations;
+
+import com.sun.java.xml.ns.persistence.orm.AttributeOverride;
+import com.sun.java.xml.ns.persistence.orm.Column;
+
+public class CreateXAnnotationsTest {
+
+	private final CreateXAnnotations createXAnnotations = new CreateXAnnotations();
+	
+	@Test
+	public void createsAttributeOverrides()
+	{
+		AttributeOverride ao0 = new AttributeOverride();
+		ao0.setName("a");
+		ao0.setColumn(new Column());
+		ao0.getColumn().setName("column_a");
+		AttributeOverride ao1 = new AttributeOverride();
+		ao1.setName("b");
+		ao1.setColumn(new Column());
+		ao1.getColumn().setName("column_b");
+		List<AttributeOverride> aos = Arrays.asList(ao0, ao1);
+		Assert.assertNotNull(createXAnnotations.createAttributeOverrides(aos));
+	}
+}
diff --git a/ejb/runtime/src/main/java/org/jvnet/hyperjaxb3/xml/XMLConstants.java b/ejb/runtime/src/main/java/org/jvnet/hyperjaxb3/xml/XMLConstants.java
new file mode 100644
index 00000000..6b1cc030
--- /dev/null
+++ b/ejb/runtime/src/main/java/org/jvnet/hyperjaxb3/xml/XMLConstants.java
@@ -0,0 +1,9 @@
+package org.jvnet.hyperjaxb3.xml;
+
+public class XMLConstants {
+
+	private XMLConstants() {
+	}
+
+	public static final String W3C_XML_SCHEMA_NS_URI = "http://www.w3.org/2001/XMLSchema";
+}
diff --git a/ejb/schemas/customizations/.settings/org.eclipse.core.resources.prefs b/ejb/schemas/customizations/.settings/org.eclipse.core.resources.prefs
index 5240b69c..29abf999 100644
--- a/ejb/schemas/customizations/.settings/org.eclipse.core.resources.prefs
+++ b/ejb/schemas/customizations/.settings/org.eclipse.core.resources.prefs
@@ -3,5 +3,4 @@ encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
 encoding//src/test/java=UTF-8
 encoding//src/test/resources=UTF-8
-encoding//target/generated-sources/xjc=UTF-8
 encoding/<project>=UTF-8
diff --git a/ejb/schemas/persistence/.settings/org.eclipse.core.resources.prefs b/ejb/schemas/persistence/.settings/org.eclipse.core.resources.prefs
index 74bee3fd..abdea9ac 100644
--- a/ejb/schemas/persistence/.settings/org.eclipse.core.resources.prefs
+++ b/ejb/schemas/persistence/.settings/org.eclipse.core.resources.prefs
@@ -1,5 +1,4 @@
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
-encoding//target/generated-sources/xjc=UTF-8
 encoding/<project>=UTF-8
diff --git a/ejb/templates/basic/pom.xml b/ejb/templates/basic/pom.xml
index f04971de..227ad29d 100644
--- a/ejb/templates/basic/pom.xml
+++ b/ejb/templates/basic/pom.xml
@@ -56,10 +56,10 @@
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
 				<executions>
-					<execution>
+					<!--execution>
 						<id>ant-assembly</id>
 						<phase>package</phase>
-					</execution>
+					</execution-->
 					<execution>
 						<id>maven-assembly</id>
 						<phase>package</phase>
@@ -69,18 +69,18 @@
 			<plugin>
 				<artifactId>maven-antrun-plugin</artifactId>
 				<executions>
-					<execution>
+					<!--execution>
 						<id>ant-unpack</id>
 						<phase>pre-integration-test</phase>
-					</execution>
+					</execution-->
 					<execution>
 						<id>maven-unpack</id>
 						<phase>pre-integration-test</phase>
 					</execution>
-					<execution>
+					<!--execution>
 						<id>ant-integration-test</id>
 						<phase>integration-test</phase>
-					</execution>
+					</execution-->
 				</executions>
 			</plugin>
 			<plugin>
diff --git a/ejb/templates/basic/project-build.xml b/ejb/templates/basic/project-build.xml
index 1a091136..c0102401 100644
--- a/ejb/templates/basic/project-build.xml
+++ b/ejb/templates/basic/project-build.xml
@@ -4,7 +4,7 @@
 	<property name="version" value="0.5.7-SNAPSHOT"/>
 	<path id="compile.path">
 		<fileset dir="${basedir}/lib">
-			<include name="commons-lang-*.jar"/>
+			<include name="commons-lang3-*.jar"/>
 			<include name="jaxb-api-*.jar"/>
 			<include name="jaxb2-basics-runtime-*.jar"/>
 
@@ -29,7 +29,7 @@
 			<include name="junit-*.jar"/>
 			<include name="jaxb2-basics-testing-*.jar"/>
 			<include name="xmlunit-*.jar"/>
-			<include name="commons-lang-*.jar"/>
+			<include name="commons-lang3-*.jar"/>
 			<include name="commons-logging-*.jar"/>
 
 
@@ -54,7 +54,7 @@
 			<include name="jaxb2-basics-testing-*.jar"/>
 			<include name="xmlunit-*.jar"/>
 			<include name="commons-io-*.jar"/>
-			<include name="commons-lang-*.jar"/>
+			<include name="commons-lang3-*.jar"/>
 			<include name="commons-logging-*.jar"/>
 			<include name="commons-collections-*.jar"/>
 			<include name="dom4j-*.jar"/>
diff --git a/ejb/templates/basic/project-pom.xml b/ejb/templates/basic/project-pom.xml
index d456355e..3914672c 100644
--- a/ejb/templates/basic/project-pom.xml
+++ b/ejb/templates/basic/project-pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.jvnet.hyperjaxb3</groupId>
 	<artifactId>hyperjaxb3-ejb-template-basic-maven</artifactId>
-	<version>0.5.7-SNAPSHOT</version>
+	<version>${project.version}</version>
 	<packaging>jar</packaging>
 	<name>Hyperjaxb3 Samples [po-initial:maven]</name>
 	<dependencies>
@@ -16,12 +16,12 @@
 		<dependency>
 			<groupId>com.sun.xml.bind</groupId>
 			<artifactId>jaxb-impl</artifactId>
-			<version>2.2.4-1</version>
+			<version>2.2.7</version>
 		</dependency>
 		<dependency>
 			<groupId>org.jvnet.hyperjaxb3</groupId>
 			<artifactId>hyperjaxb3-ejb-runtime</artifactId>
-			<version>0.5.7-SNAPSHOT</version>
+			<version>${project.version}</version>
 		</dependency>
 
 		<!-- Test dependencies -->
@@ -35,7 +35,7 @@
 		<dependency>
 			<groupId>org.jvnet.hyperjaxb3</groupId>
 			<artifactId>hyperjaxb3-ejb-roundtrip</artifactId>
-			<version>0.5.7-SNAPSHOT</version>
+			<version>${project.version}</version>
 		</dependency>
 
 		<!-- Hibernate Dependencies -->
@@ -49,7 +49,7 @@
 		<dependency>
 			<groupId>hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>1.8.0.7</version>
+			<version>${hsqldb18.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
@@ -59,7 +59,7 @@
 			<plugin>
 				<groupId>org.jvnet.hyperjaxb3</groupId>
 				<artifactId>maven-hyperjaxb3-plugin</artifactId>
-				<version>0.5.7-SNAPSHOT</version>
+				<version>${project.version}</version>
 				<executions>
 					<execution>
 						<goals>
diff --git a/ejb/templates/pom.xml b/ejb/templates/pom.xml
index db17eb30..656a7b2a 100644
--- a/ejb/templates/pom.xml
+++ b/ejb/templates/pom.xml
@@ -2,32 +2,14 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.jvnet.hyperjaxb3</groupId>
 	<artifactId>hyperjaxb3-ejb-templates</artifactId>
 	<packaging>pom</packaging>
 	<name>Hyperjaxb3 EJB Templates</name>
-	<version>0.5.7-SNAPSHOT</version>
 	<parent>
 		<groupId>org.jvnet.hyperjaxb3</groupId>
 		<artifactId>hyperjaxb3-ejb</artifactId>
 		<version>0.5.7-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
 	</parent>
-	<distributionManagement>
-		<repository>
-			<uniqueVersion>false</uniqueVersion>
-			<id>org.highsource.repository.maven2.releases</id>
-			<url>${sftp.repository.highsource.org}/maven2/releases</url>
-		</repository>
-		<snapshotRepository>
-			<uniqueVersion>false</uniqueVersion>
-			<id>org.highsource.repository.maven2.snapshots</id>
-			<url>${sftp.repository.highsource.org}/maven2/snapshots</url>
-		</snapshotRepository>
-		<site>
-			<url>${sftp.static.highsource.org}/hyperjaxb3/hyperjaxb-ejb/hyperjaxb-ejb-templates</url>
-		</site>
-	</distributionManagement>
 	<modules>
 		<module>basic</module>
 	</modules>
@@ -80,18 +62,18 @@
 						<configuration>
 							<tasks>
 								<mkdir dir="target/test-maven-repository" />
-								<unzip src="target/${pom.artifactId}-${pom.version}-maven-src.zip" dest="${basedir}/target/test-maven-assembly" />
-								<copy todir="${basedir}/target/test-maven-assembly/${pom.artifactId}-${pom.version}/src/main/java">
+								<unzip src="target/${project.artifactId}-${project.version}-maven-src.zip" dest="${basedir}/target/test-maven-assembly" />
+								<copy todir="${basedir}/target/test-maven-assembly/${project.artifactId}-${project.version}/src/main/java">
 									<fileset dir="src/it/java">
 										<include name="**/*.*"/>
 									</fileset>
 								</copy>
-								<copy todir="${basedir}/target/test-maven-assembly/${pom.artifactId}-${pom.version}/src/main/resources">
+								<copy todir="${basedir}/target/test-maven-assembly/${project.artifactId}-${project.version}/src/main/resources">
 									<fileset dir="src/it/resources">
 										<include name="**/*.*"/>
 									</fileset>
 								</copy>
-								<copy todir="${basedir}/target/test-maven-assembly/${pom.artifactId}-${pom.version}/src/test/samples">
+								<copy todir="${basedir}/target/test-maven-assembly/${project.artifactId}-${project.version}/src/test/samples">
 									<fileset dir="src/it/samples">
 										<include name="**/*.*"/>
 									</fileset>
@@ -108,18 +90,18 @@
 						<phase>none</phase>
 						<configuration>
 							<tasks>
-								<unzip src="${basedir}/target/${pom.artifactId}-${pom.version}-ant-src.zip" dest="${basedir}/target/test-ant-assembly"/>
-								<copy todir="${basedir}/target/test-ant-assembly/${pom.artifactId}-${pom.version}/src/main/java">
+								<unzip src="${basedir}/target/${project.artifactId}-${project.version}-ant-src.zip" dest="${basedir}/target/test-ant-assembly"/>
+								<copy todir="${basedir}/target/test-ant-assembly/${project.artifactId}-${project.version}/src/main/java">
 									<fileset dir="src/it/java">
 										<include name="**/*.*"/>
 									</fileset>
 								</copy>
-								<copy todir="${basedir}/target/test-ant-assembly/${pom.artifactId}-${pom.version}/src/main/resources">
+								<copy todir="${basedir}/target/test-ant-assembly/${project.artifactId}-${project.version}/src/main/resources">
 									<fileset dir="src/it/resources">
 										<include name="**/*.*"/>
 									</fileset>
 								</copy>
-								<copy todir="${basedir}/target/test-ant-assembly/${pom.artifactId}-${pom.version}/src/test/samples">
+								<copy todir="${basedir}/target/test-ant-assembly/${project.artifactId}-${project.version}/src/test/samples">
 									<fileset dir="src/it/samples">
 										<include name="**/*.*"/>
 									</fileset>
@@ -136,7 +118,7 @@
 						<phase>none</phase>
 						<configuration>
 							<tasks>
-								<ant dir="${basedir}/target/test-ant-assembly/${pom.artifactId}-${pom.version}" target="package"/>
+								<ant dir="${basedir}/target/test-ant-assembly/${project.artifactId}-${project.version}" target="package"/>
 							</tasks>
 						</configuration>
 						<goals>
@@ -164,6 +146,13 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 </project>
\ No newline at end of file
diff --git a/ejb/templates/src/main/assembly/maven-src.xml b/ejb/templates/src/main/assembly/maven-src.xml
index 3b8f1166..198b59f2 100644
--- a/ejb/templates/src/main/assembly/maven-src.xml
+++ b/ejb/templates/src/main/assembly/maven-src.xml
@@ -23,6 +23,7 @@
 		<file>
 			<source>${basedir}/project-pom.xml</source>
 			<destName>pom.xml</destName>
+			<filtered>true</filtered>
 		</file>
 	</files>
 </assembly>
diff --git a/ejb/tests/.gitignore b/ejb/tests/.gitignore
new file mode 100644
index 00000000..53fd8f50
--- /dev/null
+++ b/ejb/tests/.gitignore
@@ -0,0 +1,2 @@
+/err
+/std
diff --git a/ejb/tests/addressbook/pom.xml b/ejb/tests/addressbook/pom.xml
index 8e98aa70..4005c839 100644
--- a/ejb/tests/addressbook/pom.xml
+++ b/ejb/tests/addressbook/pom.xml
@@ -20,7 +20,6 @@
 		<dependency>
 			<groupId>hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>1.8.0.7</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/ejb/tests/ak/pom.xml b/ejb/tests/ak/pom.xml
index 9bac7909..575c2831 100644
--- a/ejb/tests/ak/pom.xml
+++ b/ejb/tests/ak/pom.xml
@@ -20,7 +20,6 @@
 		<dependency>
 			<groupId>hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>1.8.0.7</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/ejb/tests/annox/pom.xml b/ejb/tests/annox/pom.xml
index de4c0194..c8fc3383 100644
--- a/ejb/tests/annox/pom.xml
+++ b/ejb/tests/annox/pom.xml
@@ -30,7 +30,7 @@
 		<dependency>
 			<groupId>hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>1.7.3.3</version>
+			<version>${hsqldb17.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/ejb/tests/any/.gitignore b/ejb/tests/any/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/ejb/tests/any/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/any/pom.xml b/ejb/tests/any/pom.xml
index ac92bcaa..b8b3cb47 100644
--- a/ejb/tests/any/pom.xml
+++ b/ejb/tests/any/pom.xml
@@ -30,7 +30,6 @@
 			<plugin>
 				<groupId>org.jvnet.hyperjaxb3</groupId>
 				<artifactId>maven-hyperjaxb3-plugin</artifactId>
-				<version>0.5.7-SNAPSHOT</version>
 				<configuration>
 					<roundtripTestClassName>org.jvnet.hyperjaxb3.ejb.tests.any.tests.RoundtripTest</roundtripTestClassName>
 					<generateTransientId>true</generateTransientId>
diff --git a/ejb/tests/bibtexml/.gitignore b/ejb/tests/bibtexml/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/ejb/tests/bibtexml/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/build-a-n-1.6.bat b/ejb/tests/build-a-n-1.6.bat
new file mode 100644
index 00000000..6f8ffa3d
--- /dev/null
+++ b/ejb/tests/build-a-n-1.6.bat
@@ -0,0 +1,4 @@
+setlocal
+set JAVA_HOME=%JAVA6_HOME%
+call mvn -X -Ptests-a-n clean install >std 2>err
+endlocal
\ No newline at end of file
diff --git a/ejb/tests/build-full-1.5.bat b/ejb/tests/build-full-1.5.bat
deleted file mode 100644
index 2133f97f..00000000
--- a/ejb/tests/build-full-1.5.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-setlocal
-set JAVA_HOME=%JAVA5_HOME%
-call mvn -X -Ptests-a-n,tests-o-z clean install >std 2>err
-endlocal
\ No newline at end of file
diff --git a/ejb/tests/build-full-1.6.bat b/ejb/tests/build-full-1.6.bat
index c18ee088..685d23ea 100644
--- a/ejb/tests/build-full-1.6.bat
+++ b/ejb/tests/build-full-1.6.bat
@@ -1,4 +1,4 @@
 setlocal
 set JAVA_HOME=%JAVA6_HOME%
-call mvn -X -Ptests-a-n,tests-o-z clean install >std 2>err
+call mvn -X -Ptests-a-n,tests-o-p,tests-r-z clean install >std 2>err
 endlocal
\ No newline at end of file
diff --git a/ejb/tests/build-o-p-1.6.bat b/ejb/tests/build-o-p-1.6.bat
new file mode 100644
index 00000000..b9bbd04a
--- /dev/null
+++ b/ejb/tests/build-o-p-1.6.bat
@@ -0,0 +1,4 @@
+setlocal
+set JAVA_HOME=%JAVA6_HOME%
+call mvn -X -Ptests-o-p clean install >std 2>err
+endlocal
\ No newline at end of file
diff --git a/ejb/tests/build-r-z-1.6.bat b/ejb/tests/build-r-z-1.6.bat
new file mode 100644
index 00000000..12eff6c4
--- /dev/null
+++ b/ejb/tests/build-r-z-1.6.bat
@@ -0,0 +1,4 @@
+setlocal
+set JAVA_HOME=%JAVA6_HOME%
+call mvn -X -Ptests-r-z clean install >std 2>err
+endlocal
\ No newline at end of file
diff --git a/ejb/tests/build-short-1.5.bat b/ejb/tests/build-short-1.5.bat
deleted file mode 100644
index 3d5d366c..00000000
--- a/ejb/tests/build-short-1.5.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-setlocal
-set JAVA_HOME=%JAVA5_HOME%
-call mvn -X clean install >std 2>err
-endlocal
\ No newline at end of file
diff --git a/ejb/tests/cda/pom.xml b/ejb/tests/cda/pom.xml
index 5a8c20f9..1e120559 100644
--- a/ejb/tests/cda/pom.xml
+++ b/ejb/tests/cda/pom.xml
@@ -26,7 +26,7 @@
 		<dependency>
 			<groupId>hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>1.7.3.3</version>
+			<version>${hsqldb17.version}</version>
 			<scope>test</scope>
 		</dependency>
 
diff --git a/ejb/tests/cu-one/.gitignore b/ejb/tests/cu-one/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/ejb/tests/cu-one/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/cu-one/pom.xml b/ejb/tests/cu-one/pom.xml
index 6be99243..fe11cbc3 100644
--- a/ejb/tests/cu-one/pom.xml
+++ b/ejb/tests/cu-one/pom.xml
@@ -30,7 +30,7 @@
 		<dependency>
 			<groupId>hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>1.7.3.3</version>
+			<version>${hsqldb17.version}</version>
 			<scope>test</scope>
 		</dependency>
 
diff --git a/ejb/tests/custom-naming/schema/pom.xml b/ejb/tests/custom-naming/schema/pom.xml
index d7969c30..51115734 100644
--- a/ejb/tests/custom-naming/schema/pom.xml
+++ b/ejb/tests/custom-naming/schema/pom.xml
@@ -27,7 +27,7 @@
 		<dependency>
 			<groupId>hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>1.7.3.3</version>
+			<version>${hsqldb17.version}</version>
 			<scope>test</scope>
 		</dependency>
 		
@@ -52,7 +52,7 @@
 					<dependency>
 						<groupId>org.jvnet.hyperjaxb3</groupId>
 						<artifactId>hyperjaxb3-ejb-tests-custom-naming-extension</artifactId>
-						<version>0.5.7-SNAPSHOT</version>
+						<version>${project.version}</version>
 					</dependency>
 				</dependencies>
 			</plugin>
diff --git a/ejb/tests/dc/.gitignore b/ejb/tests/dc/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/ejb/tests/dc/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/derby/.gitignore b/ejb/tests/derby/.gitignore
new file mode 100644
index 00000000..f9a81fec
--- /dev/null
+++ b/ejb/tests/derby/.gitignore
@@ -0,0 +1,2 @@
+/target
+/derby.log
diff --git a/ejb/tests/device/.gitignore b/ejb/tests/device/.gitignore
new file mode 100644
index 00000000..f9a81fec
--- /dev/null
+++ b/ejb/tests/device/.gitignore
@@ -0,0 +1,2 @@
+/target
+/derby.log
diff --git a/ejb/tests/dl/pom.xml b/ejb/tests/dl/pom.xml
index 4a2bbacf..2502be5e 100644
--- a/ejb/tests/dl/pom.xml
+++ b/ejb/tests/dl/pom.xml
@@ -21,7 +21,7 @@
 		<dependency>
 			<groupId>hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>1.7.3.3</version>
+			<version>${hsqldb17.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/ejb/tests/dom/.gitignore b/ejb/tests/dom/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/ejb/tests/dom/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/dy/.gitignore b/ejb/tests/dy/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/ejb/tests/dy/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/dy/pom.xml b/ejb/tests/dy/pom.xml
index a95253d7..c6eebb96 100644
--- a/ejb/tests/dy/pom.xml
+++ b/ejb/tests/dy/pom.xml
@@ -20,7 +20,7 @@
 		<dependency>
 			<groupId>hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>1.7.3.3</version>
+			<version>${hsqldb17.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/ejb/tests/ebxmlrr/.gitignore b/ejb/tests/ebxmlrr/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/ejb/tests/ebxmlrr/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/ek/.gitignore b/ejb/tests/ek/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/ejb/tests/ek/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/embeddable-jpa2/.gitignore b/ejb/tests/embeddable-jpa2/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/ejb/tests/embeddable-jpa2/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/embeddable-jpa2/pom.xml b/ejb/tests/embeddable-jpa2/pom.xml
index 99fe0e5f..1fa27a2b 100644
--- a/ejb/tests/embeddable-jpa2/pom.xml
+++ b/ejb/tests/embeddable-jpa2/pom.xml
@@ -20,7 +20,7 @@
 		<dependency>
 			<groupId>hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>1.7.3.3</version>
+			<version>${hsqldb17.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/ejb/tests/embeddable/.gitignore b/ejb/tests/embeddable/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/ejb/tests/embeddable/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/embeddable/pom.xml b/ejb/tests/embeddable/pom.xml
index a41269c7..15e86c38 100644
--- a/ejb/tests/embeddable/pom.xml
+++ b/ejb/tests/embeddable/pom.xml
@@ -20,7 +20,7 @@
 		<dependency>
 			<groupId>hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>1.7.3.3</version>
+			<version>${hsqldb17.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/ejb/tests/eminq/.gitignore b/ejb/tests/eminq/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/ejb/tests/eminq/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/eminq/pom.xml b/ejb/tests/eminq/pom.xml
index f94d1299..28642ed5 100644
--- a/ejb/tests/eminq/pom.xml
+++ b/ejb/tests/eminq/pom.xml
@@ -20,7 +20,7 @@
 		<dependency>
 			<groupId>hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>1.7.3.3</version>
+			<version>${hsqldb17.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/ejb/tests/enum/.gitignore b/ejb/tests/enum/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/ejb/tests/enum/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/enum/pom.xml b/ejb/tests/enum/pom.xml
index a2d46e65..ac19ed97 100644
--- a/ejb/tests/enum/pom.xml
+++ b/ejb/tests/enum/pom.xml
@@ -20,7 +20,7 @@
 		<dependency>
 			<groupId>hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>1.7.3.3</version>
+			<version>${hsqldb17.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/ejb/tests/episodes/a/.gitignore b/ejb/tests/episodes/a/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/ejb/tests/episodes/a/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/episodes/b/.gitignore b/ejb/tests/episodes/b/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/ejb/tests/episodes/b/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/equals-builder/builder/.gitignore b/ejb/tests/equals-builder/builder/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/ejb/tests/equals-builder/builder/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/equals-builder/schema/.gitignore b/ejb/tests/equals-builder/schema/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/ejb/tests/equals-builder/schema/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/equals-builder/schema/pom.xml b/ejb/tests/equals-builder/schema/pom.xml
index ad82c5b2..8554d6cd 100644
--- a/ejb/tests/equals-builder/schema/pom.xml
+++ b/ejb/tests/equals-builder/schema/pom.xml
@@ -26,7 +26,7 @@
 		<dependency>
 			<groupId>hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>1.7.3.3</version>
+			<version>${hsqldb17.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/ejb/tests/fpml-pretrade/.gitignore b/ejb/tests/fpml-pretrade/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/ejb/tests/fpml-pretrade/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/ids/.gitignore b/ejb/tests/ids/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/ejb/tests/ids/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/ids/pom.xml b/ejb/tests/ids/pom.xml
index 7d08ecc1..eb8ea97c 100644
--- a/ejb/tests/ids/pom.xml
+++ b/ejb/tests/ids/pom.xml
@@ -20,7 +20,7 @@
 		<dependency>
 			<groupId>hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>1.7.3.3</version>
+			<version>${hsqldb17.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/ejb/tests/ims-eportfolio/pom.xml b/ejb/tests/ims-eportfolio/pom.xml
index 5b9619b9..8a73eb6e 100644
--- a/ejb/tests/ims-eportfolio/pom.xml
+++ b/ejb/tests/ims-eportfolio/pom.xml
@@ -21,7 +21,7 @@
 		<dependency>
 			<groupId>hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>1.7.3.3</version>
+			<version>${hsqldb17.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/ejb/tests/ims-lip/.gitignore b/ejb/tests/ims-lip/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/ejb/tests/ims-lip/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/install.bat b/ejb/tests/install.bat
deleted file mode 100644
index ec44c554..00000000
--- a/ejb/tests/install.bat
+++ /dev/null
@@ -1 +0,0 @@
-mvn -P samples,templates,tests clean install
\ No newline at end of file
diff --git a/ejb/tests/ioda/.gitignore b/ejb/tests/ioda/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/ejb/tests/ioda/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/ioda/pom.xml b/ejb/tests/ioda/pom.xml
index 32a65c4f..bdcf1dc5 100644
--- a/ejb/tests/ioda/pom.xml
+++ b/ejb/tests/ioda/pom.xml
@@ -20,7 +20,7 @@
 		<dependency>
 			<groupId>hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>1.7.3.3</version>
+			<version>${hsqldb17.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/ejb/tests/issues-el/.gitignore b/ejb/tests/issues-el/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/ejb/tests/issues-el/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/issues-el/pom.xml b/ejb/tests/issues-el/pom.xml
index c2ceb505..fbac649a 100644
--- a/ejb/tests/issues-el/pom.xml
+++ b/ejb/tests/issues-el/pom.xml
@@ -9,25 +9,18 @@
 	</parent>
 	<artifactId>hyperjaxb3-ejb-tests-issues-el</artifactId>
 	<packaging>jar</packaging>
-	<name>Hyperjaxb3 EJB Test [issues]</name>
-	<repositories>
-		<repository>
-			<id>EclipseLink Repo</id>
-			<url>http://download.eclipse.org/rt/eclipselink/maven.repo</url>
-		</repository>    
-	</repositories>
+	<name>Hyperjaxb3 EJB Test [issues-el]</name>
 	<dependencies>
 		<!-- Test -->
 		<dependency>
 			<groupId>org.eclipse.persistence</groupId>
 			<artifactId>eclipselink</artifactId>
-			<version>2.4.0-M2</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>1.7.3.3</version>
+			<version>${hsqldb17.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/ejb/tests/issues-jpa2/.gitignore b/ejb/tests/issues-jpa2/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/ejb/tests/issues-jpa2/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/issues-jpa2/pom.xml b/ejb/tests/issues-jpa2/pom.xml
index f464d1a6..17c337cb 100644
--- a/ejb/tests/issues-jpa2/pom.xml
+++ b/ejb/tests/issues-jpa2/pom.xml
@@ -20,7 +20,7 @@
 		<dependency>
 			<groupId>hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>1.7.3.3</version>
+			<version>${hsqldb17.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/ejb/tests/issues-pre/.gitignore b/ejb/tests/issues-pre/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/ejb/tests/issues-pre/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/issues-pre/pom.xml b/ejb/tests/issues-pre/pom.xml
index ab13d3a9..cb9f0eec 100644
--- a/ejb/tests/issues-pre/pom.xml
+++ b/ejb/tests/issues-pre/pom.xml
@@ -9,7 +9,7 @@
 	</parent>
 	<artifactId>hyperjaxb3-ejb-tests-issues-pre</artifactId>
 	<packaging>jar</packaging>
-	<name>Hyperjaxb3 EJB Test [issues]</name>
+	<name>Hyperjaxb3 EJB Test [issues-pre]</name>
 	<dependencies>
 		<!-- Test -->
 		<dependency>
diff --git a/ejb/tests/issues/.gitignore b/ejb/tests/issues/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/ejb/tests/issues/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/issues/pom.xml b/ejb/tests/issues/pom.xml
index 55ed6860..1050fc8f 100644
--- a/ejb/tests/issues/pom.xml
+++ b/ejb/tests/issues/pom.xml
@@ -20,19 +20,19 @@
 		<dependency>
 			<groupId>hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>1.7.3.3</version>
+			<version>${hsqldb17.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.jvnet.hyperjaxb3</groupId>
 			<artifactId>hyperjaxb3-ejb-tests-po</artifactId>
-			<version>0.5.7-SNAPSHOT</version>
+			<version>${project.version}</version>
 			<scope>runtime</scope>
 		</dependency>	
 		<dependency>
 			<groupId>org.jvnet.hyperjaxb3</groupId>
 			<artifactId>hyperjaxb3-ejb-tests-issues-pre</artifactId>
-			<version>0.5.7-SNAPSHOT</version>
+			<version>${project.version}</version>
 			<scope>compile</scope>
 		</dependency>	
 	</dependencies>
diff --git a/ejb/tests/nml/.gitignore b/ejb/tests/nml/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/ejb/tests/nml/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/nokis/.gitignore b/ejb/tests/nokis/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/ejb/tests/nokis/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/one/.gitignore b/ejb/tests/one/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/ejb/tests/one/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/onix30/.gitignore b/ejb/tests/onix30/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/ejb/tests/onix30/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/ota/.gitignore b/ejb/tests/ota/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/ejb/tests/ota/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/ows/pom.xml b/ejb/tests/ows/pom.xml
index c69981f8..a3c9a02d 100644
--- a/ejb/tests/ows/pom.xml
+++ b/ejb/tests/ows/pom.xml
@@ -20,7 +20,7 @@
 		<dependency>
 			<groupId>hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>1.7.3.3</version>
+			<version>${hsqldb17.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/ejb/tests/pesc/.gitignore b/ejb/tests/pesc/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/ejb/tests/pesc/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/plmxml/pom.xml b/ejb/tests/plmxml/pom.xml
index 529a9dbf..35aef160 100644
--- a/ejb/tests/plmxml/pom.xml
+++ b/ejb/tests/plmxml/pom.xml
@@ -26,7 +26,7 @@
 		<dependency>
 			<groupId>hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>1.7.3.3</version>
+			<version>${hsqldb17.version}</version>
 			<scope>test</scope>
 		</dependency>
 
diff --git a/ejb/tests/po-customized/.gitignore b/ejb/tests/po-customized/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/ejb/tests/po-customized/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/po-customized/pom.xml b/ejb/tests/po-customized/pom.xml
index 2e41ed29..d7aff47b 100644
--- a/ejb/tests/po-customized/pom.xml
+++ b/ejb/tests/po-customized/pom.xml
@@ -21,7 +21,7 @@
 		<dependency>
 			<groupId>hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>1.7.3.3</version>
+			<version>${hsqldb17.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/ejb/tests/po-el-customized/.gitignore b/ejb/tests/po-el-customized/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/ejb/tests/po-el-customized/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/po-el-customized/pom.xml b/ejb/tests/po-el-customized/pom.xml
index c29c9ad1..2c9803c6 100644
--- a/ejb/tests/po-el-customized/pom.xml
+++ b/ejb/tests/po-el-customized/pom.xml
@@ -10,30 +10,17 @@
 	<artifactId>hyperjaxb3-ejb-tests-po-el-customized</artifactId>
 	<packaging>jar</packaging>
 	<name>Hyperjaxb3 EJB Test [po-el-customized]</name>
-
-	<repositories>
-		<repository>
-			<id>EclipseLink Repo</id>
-			<url>http://www.eclipse.org/downloads/download.php?r=1&amp;nf=1&amp;file=/rt/eclipselink/maven.repo</url>
-		</repository>    
-	</repositories> 
 	<dependencies>
 		<!-- Test -->
-		<!--dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-entitymanager</artifactId>
-			<scope>test</scope>
-		</dependency-->
 		<dependency>
 			<groupId>org.eclipse.persistence</groupId>
 			<artifactId>eclipselink</artifactId>
-			<version>1.1.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>1.7.3.3</version>
+			<version>${hsqldb17.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/ejb/tests/po-jaxb/.gitignore b/ejb/tests/po-jaxb/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/ejb/tests/po-jaxb/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/po-jaxb/pom.xml b/ejb/tests/po-jaxb/pom.xml
index f21a490f..9b2d5b6d 100644
--- a/ejb/tests/po-jaxb/pom.xml
+++ b/ejb/tests/po-jaxb/pom.xml
@@ -21,7 +21,7 @@
 		<dependency>
 			<groupId>hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>1.7.3.3</version>
+			<version>${hsqldb17.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/ejb/tests/po-tl-customized/.gitignore b/ejb/tests/po-tl-customized/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/ejb/tests/po-tl-customized/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/po-tl-customized/pom.xml b/ejb/tests/po-tl-customized/pom.xml
index b688857e..790be05f 100644
--- a/ejb/tests/po-tl-customized/pom.xml
+++ b/ejb/tests/po-tl-customized/pom.xml
@@ -21,13 +21,12 @@
 		<dependency>
 			<groupId>toplink.essentials</groupId>
 			<artifactId>toplink-essentials</artifactId>
-			<version>2.0.1-04</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>1.7.3.3</version>
+			<version>${hsqldb17.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/ejb/tests/po/pom.xml b/ejb/tests/po/pom.xml
index 6c901c5c..a7f99d44 100644
--- a/ejb/tests/po/pom.xml
+++ b/ejb/tests/po/pom.xml
@@ -21,7 +21,7 @@
 		<dependency>
 			<groupId>hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>1.7.3.3</version>
+			<version>${hsqldb17.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/ejb/tests/polyform/.gitignore b/ejb/tests/polyform/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/ejb/tests/polyform/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/polyform/pom.xml b/ejb/tests/polyform/pom.xml
index 45b0a6c9..d60690a9 100644
--- a/ejb/tests/polyform/pom.xml
+++ b/ejb/tests/polyform/pom.xml
@@ -20,7 +20,7 @@
 		<dependency>
 			<groupId>hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>1.7.3.3</version>
+			<version>${hsqldb17.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/ejb/tests/pom.xml b/ejb/tests/pom.xml
index aeeed439..5e851e12 100644
--- a/ejb/tests/pom.xml
+++ b/ejb/tests/pom.xml
@@ -10,21 +10,6 @@
 	<artifactId>hyperjaxb3-ejb-tests</artifactId>
 	<packaging>pom</packaging>
 	<name>Hyperjaxb3 EJB Tests</name>
-	<distributionManagement>
-		<repository>
-			<uniqueVersion>false</uniqueVersion>
-			<id>org.highsource.repository.maven2.releases</id>
-			<url>${sftp.repository.highsource.org}/maven2/releases</url>
-		</repository>
-		<snapshotRepository>
-			<uniqueVersion>false</uniqueVersion>
-			<id>org.highsource.repository.maven2.snapshots</id>
-			<url>${sftp.repository.highsource.org}/maven2/snapshots</url>
-		</snapshotRepository>
-		<site>
-			<url>${sftp.static.highsource.org}/hyperjaxb3/hyperjaxb-ejb/hyperjaxb-ejb-tests</url>
-		</site>
-	</distributionManagement>
 	<modules>
 		<module>any</module>
 		<module>episodes</module>
@@ -70,16 +55,16 @@
 				<module>enum</module>
 				<module>episodes</module>
 				<module>equals-builder</module>
-				<module>fpml-pretrade</module>
+				<!-- TODO module>fpml-pretrade</module-->
 				<!--module>idSymbolSpace</module-->
 				<module>ids</module>
 				<!-- *** Duplicate definition module>ims-eportfolio</module -->
-				<module>ims-lip</module>
+				<!-- TODO module>ims-lip</module-->
 				<module>ioda</module>
 				<module>issues</module>
 				<module>issues-el</module>
 				<module>issues-jpa2</module>
-				<module>nml</module>
+				<!-- TODO module>nml</module-->
 				<module>nokis</module>
 			</modules>
 		</profile>
@@ -107,12 +92,12 @@
 			<id>tests-r-z</id>
 			<modules>
 				<module>regrep</module>
-				<module>rim</module>
+				<!-- TODO module>rim</module-->
 				<module>sbml</module>
 				<module>sepa</module>
 				<module>service</module>
 				<module>simple</module>
-				<module>sml</module>
+				<!-- TODO module>sml</module-->
 				<module>st</module>
 				<!-- *** module>star</module -->
 				<module>tp</module>
@@ -166,7 +151,7 @@
 				<plugin>
 					<groupId>org.jvnet.hyperjaxb3</groupId>
 					<artifactId>maven-hyperjaxb3-plugin</artifactId>
-					<version>0.5.7-SNAPSHOT</version>
+					<version>${project.version}</version>
 					<executions>
 						<execution>
 							<goals>
@@ -203,7 +188,7 @@
 						<dependency>
 							<groupId>org.jvnet.hyperjaxb3</groupId>
 							<artifactId>hyperjaxb3-tools</artifactId>
-							<version>${pom.version}</version>
+							<version>${project.version}</version>
 						</dependency>
 					</dependencies-->
 					<executions>
@@ -229,5 +214,14 @@
 				</plugin> 
 			</plugins>
 		</pluginManagement>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+		</plugins>
 	</build>
 </project>
\ No newline at end of file
diff --git a/ejb/tests/punit/core/.gitignore b/ejb/tests/punit/core/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/ejb/tests/punit/core/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/punit/ext/.gitignore b/ejb/tests/punit/ext/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/ejb/tests/punit/ext/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/px/.gitignore b/ejb/tests/px/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/ejb/tests/px/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/regrep/.gitignore b/ejb/tests/regrep/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/ejb/tests/regrep/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/rim/.gitignore b/ejb/tests/rim/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/ejb/tests/rim/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/sbml/.gitignore b/ejb/tests/sbml/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/ejb/tests/sbml/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/sepa/.gitignore b/ejb/tests/sepa/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/ejb/tests/sepa/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/sepa/pom.xml b/ejb/tests/sepa/pom.xml
index ecd0b9fa..4c80de4e 100644
--- a/ejb/tests/sepa/pom.xml
+++ b/ejb/tests/sepa/pom.xml
@@ -21,7 +21,7 @@
 		<dependency>
 			<groupId>hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>1.7.3.3</version>
+			<version>${hsqldb17.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/ejb/tests/service/.gitignore b/ejb/tests/service/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/ejb/tests/service/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/simple/.gitignore b/ejb/tests/simple/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/ejb/tests/simple/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/sml/.gitignore b/ejb/tests/sml/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/ejb/tests/sml/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/sml/pom.xml b/ejb/tests/sml/pom.xml
index ab502ee1..16fc486b 100644
--- a/ejb/tests/sml/pom.xml
+++ b/ejb/tests/sml/pom.xml
@@ -20,7 +20,7 @@
 		<dependency>
 			<groupId>hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>1.7.3.3</version>
+			<version>${hsqldb17.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/ejb/tests/st/.gitignore b/ejb/tests/st/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/ejb/tests/st/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/st/pom.xml b/ejb/tests/st/pom.xml
index 33a1f2fe..8a90841c 100644
--- a/ejb/tests/st/pom.xml
+++ b/ejb/tests/st/pom.xml
@@ -21,7 +21,7 @@
 		<dependency>
 			<groupId>hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>1.7.3.3</version>
+			<version>${hsqldb17.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/ejb/tests/star/pom.xml b/ejb/tests/star/pom.xml
index 92ab6dd8..9c0cef7f 100644
--- a/ejb/tests/star/pom.xml
+++ b/ejb/tests/star/pom.xml
@@ -27,7 +27,7 @@
 		<dependency>
 			<groupId>hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>1.7.3.3</version>
+			<version>${hsqldb17.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/ejb/tests/tp/.gitignore b/ejb/tests/tp/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/ejb/tests/tp/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/tp/pom.xml b/ejb/tests/tp/pom.xml
index 0398f4c3..423cc604 100644
--- a/ejb/tests/tp/pom.xml
+++ b/ejb/tests/tp/pom.xml
@@ -21,7 +21,7 @@
 		<dependency>
 			<groupId>hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>1.7.3.3</version>
+			<version>${hsqldb17.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/ejb/tests/transient-ids/.gitignore b/ejb/tests/transient-ids/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/ejb/tests/transient-ids/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/transient-ids/pom.xml b/ejb/tests/transient-ids/pom.xml
index 0ef83e73..e1ab80ab 100644
--- a/ejb/tests/transient-ids/pom.xml
+++ b/ejb/tests/transient-ids/pom.xml
@@ -21,7 +21,7 @@
 		<dependency>
 			<groupId>hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>1.7.3.3</version>
+			<version>${hsqldb17.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/ejb/tests/uniprot/.gitignore b/ejb/tests/uniprot/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/ejb/tests/uniprot/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/uniprot/pom.xml b/ejb/tests/uniprot/pom.xml
index 37f1fc75..9d54cb9d 100644
--- a/ejb/tests/uniprot/pom.xml
+++ b/ejb/tests/uniprot/pom.xml
@@ -21,7 +21,7 @@
 		<dependency>
 			<groupId>hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>1.7.3.3</version>
+			<version>${hsqldb17.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/ejb/tests/web/.gitignore b/ejb/tests/web/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/ejb/tests/web/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/xacml/.gitignore b/ejb/tests/xacml/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/ejb/tests/xacml/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/xmldsig/.gitignore b/ejb/tests/xmldsig/.gitignore
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/ejb/tests/xmldsig/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/ejb/tests/xmldsig/pom.xml b/ejb/tests/xmldsig/pom.xml
index 23beb6c1..102168d6 100644
--- a/ejb/tests/xmldsig/pom.xml
+++ b/ejb/tests/xmldsig/pom.xml
@@ -21,7 +21,7 @@
 		<dependency>
 			<groupId>hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>1.7.3.3</version>
+			<version>${hsqldb17.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/fullTests.bat b/fullTests.bat
deleted file mode 100644
index ffea8089..00000000
--- a/fullTests.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-setlocal
-set JAVA_HOME=%JAVA5_HOME%
-mvn -DcontinuousIntegrationInstall clean install >std 2>err
-endlocal
\ No newline at end of file
diff --git a/issues.txt b/issues.txt
deleted file mode 100644
index 3551b888..00000000
--- a/issues.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-HJIII-9
-HJIII-11
-
-137
diff --git a/pom.xml b/pom.xml
index 74835785..11d98212 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<packaging>pom</packaging>
 	<version>0.5.7-SNAPSHOT</version>
 	<name>Hyperjaxb3</name>
-	<url>http://confluence.highsource.org/display/HJ3/Home</url>
+	<url>https://github.com/highsource/hyperjaxb3</url>
 	<description>Hyperjaxb3 is an open source project which provides relational persistence for JAXB objects.</description>
 	<parent>
 		<groupId>org.sonatype.oss</groupId>
@@ -64,39 +64,17 @@
 
 	<properties>
 		<maven.version>2.0.9</maven.version>
-		<annox.version>1.0.0</annox.version>
-		<jaxb2-basics.version>0.8.1</jaxb2-basics.version>
-		<maven-jaxb2-plugin.version>0.9.0</maven-jaxb2-plugin.version>
+		<annox.version>1.0.1</annox.version>
+		<jaxb2-basics.version>0.8.2</jaxb2-basics.version>
+		<maven-jaxb2-plugin.version>0.9.1</maven-jaxb2-plugin.version>
 		<jaxb.version>2.2.7</jaxb.version>
+		<jaxb-api.version>${jaxb.version}</jaxb-api.version>
 		<maven.plugin.testing.version>2.1</maven.plugin.testing.version>
 		<maven.plugin.plugin.version>3.2</maven.plugin.plugin.version>
 		<jaxb2-basics-annotate.version>1.0.1</jaxb2-basics-annotate.version>
+		<hsqldb17.version>1.7.3.3</hsqldb17.version>
+		<hsqldb18.version>1.8.0.7</hsqldb18.version>
 	</properties>
-
-	<!--repositories>
-		<repository>
-			<id>org.highsource.repository.maven2.releases</id>
-			<name>http://repository.highsource.org/maven2/releases/</name>
-			<url>http://repository.highsource.org/maven2/releases/</url>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>org.highsource.repository.maven2.snapshots</id>
-			<name>http://repository.highsource.org/maven2/snapshots/</name>
-			<url>http://repository.highsource.org/maven2/snapshots/</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-	</repositories-->
 	<profiles>
 		<profile>
 			<id>java-home-parent-lib-tools-jar</id>
@@ -297,6 +275,31 @@
 						</execution>
 					</executions>
 				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-javadoc-plugin</artifactId>
+					<version>2.9.1</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-source-plugin</artifactId>
+					<version>2.3</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-deploy-plugin</artifactId>
+					<version>2.8.1</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-jar-plugin</artifactId>
+					<version>2.5</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-invoker-plugin</artifactId>
+					<version>1.9</version>
+				</plugin>
 			</plugins>
 		</pluginManagement>
 	</build>
@@ -409,7 +412,7 @@
 			<dependency>
 				<groupId>javax.xml.bind</groupId>
 				<artifactId>jaxb-api</artifactId>
-				<version>2.1</version>
+				<version>${jaxb-api.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>com.sun.xml.bind</groupId>
@@ -529,6 +532,23 @@
 				<artifactId>hibernate-jpa-2.0-api</artifactId>
 				<version>1.0.0.Final</version>
 			</dependency>
+			<dependency>
+				<groupId>javax.transaction</groupId>
+				<artifactId>jta</artifactId>
+				<version>1.1</version>
+			</dependency>
+			<!-- EclispeLink -->
+			<dependency>
+				<groupId>org.eclipse.persistence</groupId>
+				<artifactId>eclipselink</artifactId>
+				<version>2.5.1</version>
+			</dependency>
+			<!-- TopLink -->
+			<dependency>
+				<groupId>toplink.essentials</groupId>
+				<artifactId>toplink-essentials</artifactId>
+				<version>2.1-60f</version>
+			</dependency>
 			<!-- Spring -->
 			<dependency>
 				<groupId>org.springframework</groupId>
@@ -538,7 +558,7 @@
 			<dependency>
 				<groupId>hsqldb</groupId>
 				<artifactId>hsqldb</artifactId>
-				<version>1.8.0.7</version>
+				<version>${hsqldb18.version}</version>
 			</dependency>
 			<!-- Saxon -->
 			<dependency>
diff --git a/qrelease.bat b/qrelease.bat
new file mode 100644
index 00000000..563424ba
--- /dev/null
+++ b/qrelease.bat
@@ -0,0 +1,98 @@
+setlocal
+echo Setting JAVA_HOME to %JAVA6_HOME%.
+set JAVA_HOME=%JAVA6_HOME%
+
+echo Performing a short clean build.
+rem pause
+call mvn clean install -DperformRelease
+echo Short clean build completed.
+rem pause
+
+echo Performing a full clean build.
+rem pause
+call mvn clean install -DperformRelease -Ptests,samples,tutorials,templates
+echo Full clean build completed.
+rem pause
+
+echo Setting new version to %1.
+rem pause
+call mvn versions:set -Ptests,samples,tutorials,templates -DnewVersion=%1
+echo Version was set to %1.
+rem pause
+call mvn versions:commit -Ptests,samples,tutorials,templates
+echo Version %1 committed.
+rem pause
+
+echo Performing a short clean build.
+rem pause
+call mvn clean install -DperformRelease
+echo Short clean build completed.
+rem pause
+
+echo Performing a full clean build.
+rem pause
+call mvn clean install -Ptests,samples,tutorials,templates -DperformRelease
+echo Full clean build completed.
+rem pause
+
+echo Checking in version %1.
+rem pause
+git commit -a -m "Version %1"
+echo Version %1 was checked in.
+rem pause
+
+echo Tagging version %1.
+rem pause
+git tag -a %1 -m "Version %1"
+echo Version %1 was tagged.
+rem pause
+
+echo Pushing version %1.
+rem pause
+git push origin master
+git push --tags origin master
+echo Version %1 was pushed.
+rem pause
+
+echo Performing full clean deploy.
+rem pause
+call mvn -DperformRelease -Psonatype-oss-release,tests,samples,tutorials,templates clean deploy
+echo Full clean deploy done.
+rem pause
+
+echo Setting new version to %2.
+rem pause
+call mvn versions:set -Ptests,samples,tutorials,templates -DnewVersion=%2
+echo Version was set to %2.
+rem pause
+call mvn versions:commit -Ptests,samples,tutorials,templates
+echo Version %2 was committed.
+rem pause
+
+echo Performing a short clean build.
+rem pause
+call mvn clean install -DperformRelease
+echo Short clean build completed.
+rem pause
+
+echo Performing a full clean build.
+rem pause
+call mvn clean install -DperformRelease -Ptests,samples,tutorials,templates
+echo Full clean build completed.
+rem pause
+
+
+echo Checking in version %2.
+rem pause
+git commit -a -m "Version %2"
+echo Version %2 was checked in.
+rem pause
+
+echo Pushing version %2.
+rem pause
+git push origin master
+git push --tags origin master
+echo Version %2 was pushed.
+rem pause
+
+endlocal
\ No newline at end of file
diff --git a/release.bat b/release.bat
index 0ee3420e..1cd5b32e 100644
--- a/release.bat
+++ b/release.bat
@@ -1,18 +1,98 @@
-rem update versions
-rem call mvn clean install
-rem call mvn clean install -Psamples
-rem call mvn clean install -Ptests
-rem call mvn clean install -Ptemplates
-rem call mvn clean install -Ptutorials
-rem call mvn clean install -Ptests
-rem call mvn clean install -Psamples
-rem call mvn clean install -Ptemplates
-rem call mvn clean install -Ptutorials
-rem mvn scm:tag -Dtag=%1
-rem mvn -Psamples -Ptests -DperformRelease -Psonatype-oss-release clean deploy
-rem update versions
-call mvn -DperformRelease -Psonatype-oss-release clean deploy
-call mvn -Ptests -DperformRelease -Psonatype-oss-release clean deploy
-call mvn -Psamples -DperformRelease -Psonatype-oss-release clean deploy
-call mvn -Ptemplates -DperformRelease -Psonatype-oss-release clean deploy
-call mvn -Ptutorials -DperformRelease -Psonatype-oss-release clean deploy
+setlocal
+echo Setting JAVA_HOME to %JAVA6_HOME%.
+set JAVA_HOME=%JAVA6_HOME%
+
+echo Performing a short clean build.
+pause
+call mvn clean install -DperformRelease
+echo Short clean build completed.
+pause
+
+echo Performing a full clean build.
+pause
+call mvn clean install -DperformRelease -Ptests,samples,tutorials,templates
+echo Full clean build completed.
+pause
+
+echo Setting new version to %1.
+pause
+call mvn versions:set -Ptests,samples,tutorials,templates -DnewVersion=%1
+echo Version was set to %1.
+pause
+call mvn versions:commit -Ptests,samples,tutorials,templates
+echo Version %1 committed.
+pause
+
+echo Performing a short clean build.
+pause
+call mvn clean install -DperformRelease
+echo Short clean build completed.
+pause
+
+echo Performing a full clean build.
+pause
+call mvn clean install -Ptests,samples,tutorials,templates -DperformRelease
+echo Full clean build completed.
+pause
+
+echo Checking in version %1.
+pause
+git commit -a -m "Version %1"
+echo Version %1 was checked in.
+pause
+
+echo Tagging version %1.
+pause
+git tag -a %1 -m "Version %1"
+echo Version %1 was tagged.
+pause
+
+echo Pushing version %1.
+pause
+git push origin master
+git push --tags origin master
+echo Version %1 was pushed.
+pause
+
+echo Performing full clean deploy.
+pause
+call mvn -DperformRelease -Psonatype-oss-release,tests,samples,tutorials,templates clean deploy
+echo Full clean deploy done.
+pause
+
+echo Setting new version to %2.
+pause
+call mvn versions:set -Ptests,samples,tutorials,templates -DnewVersion=%2
+echo Version was set to %2.
+pause
+call mvn versions:commit -Ptests,samples,tutorials,templates
+echo Version %2 was committed.
+pause
+
+echo Performing a short clean build.
+pause
+call mvn clean install -DperformRelease
+echo Short clean build completed.
+pause
+
+echo Performing a full clean build.
+pause
+call mvn clean install -DperformRelease -Ptests,samples,tutorials,templates
+echo Full clean build completed.
+pause
+
+
+echo Checking in version %2.
+pause
+git commit -a -m "Version %2"
+echo Version %2 was checked in.
+pause
+
+echo Pushing version %2.
+pause
+git push origin master
+git push --tags origin master
+echo Version %2 was pushed.
+pause
+
+endlocal
\ No newline at end of file