diff --git a/ant-bridge.sh b/ant-bridge.sh
index e9af3e749..07498c8f3 100755
--- a/ant-bridge.sh
+++ b/ant-bridge.sh
@@ -153,6 +153,6 @@ if [ "${unknown_args}" != "" ]; then
else
echo "Equivalent maven command"
echo "${mvn_cmd}${mvn_properties}${post_script}"
-# sh -c "${mvn_cmd}${mvn_properties}${post_script}"
+ sh -c "${mvn_cmd}${mvn_properties}${post_script}"
fi
diff --git a/pom.xml b/pom.xml
index 2100556ed..5474b5dfc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,6 +33,7 @@
-build-timestamp "${maven.build.timestamp}"
package
+ none
true
${sting.packagecommittests.skipped}
${sting.packagecommittests.skipped}
@@ -275,6 +276,41 @@
default-jar
${sting.jar.phase}
+
+ test-utils
+
+ jar
+
+ ${sting.test-utils-jar.phase}
+
+ ${project.build.testOutputDirectory}
+ test-utils
+
+
+ **/*UnitTest.class
+ **/*UnitTest$*.class
+ **/*IntegrationTest.class
+ **/*IntegrationTest$*.class
+ **/*PipelineTest.class
+ **/*PipelineTest$*.class
+ **/*LargeScaleTest.class
+ **/*LargeScaleTest.class
+
+
+
@@ -508,9 +544,6 @@
-
package-unittests
@@ -523,7 +556,6 @@
${sting.packageunittests.skipped}
true
- false
${sting.packageunittests.skipped}
@@ -541,7 +573,6 @@
${sting.packageintegrationtests.skipped}
true
- false
${sting.packageintegrationtests.skipped}
@@ -559,7 +590,6 @@
${sting.packagepipelinetests.skipped}
true
- false
${sting.packagepipelinetests.skipped}
@@ -577,7 +607,6 @@
${sting.packagelargescaletests.skipped}
true
- false
${sting.packagelargescaletests.skipped}
diff --git a/protected/gatk-protected/pom.xml b/protected/gatk-protected/pom.xml
index d3e50eec9..14774def7 100644
--- a/protected/gatk-protected/pom.xml
+++ b/protected/gatk-protected/pom.xml
@@ -44,7 +44,7 @@
${project.groupId}
sting-utils
${project.version}
- test-jar
+ test-utils
test
@@ -52,7 +52,7 @@
${project.groupId}
gatk-framework
${project.version}
- test-jar
+ test-utils
test
diff --git a/public/external-example/pom.xml b/public/external-example/pom.xml
index 5aba7ab26..d51e5a6f5 100644
--- a/public/external-example/pom.xml
+++ b/public/external-example/pom.xml
@@ -41,12 +41,15 @@
org.broadinstitute.sting
sting-utils
${sting.version}
- test-jar
+ test-utils
test
@@ -54,7 +57,7 @@
org.broadinstitute.sting
gatk-framework
${sting.version}
- test-jar
+ test-utils
test
diff --git a/public/gatk-framework/pom.xml b/public/gatk-framework/pom.xml
index 1443c7037..e8b2f7c71 100644
--- a/public/gatk-framework/pom.xml
+++ b/public/gatk-framework/pom.xml
@@ -16,6 +16,7 @@
${project.basedir}/../..
gatk-package
+ ${sting.jar.phase}
@@ -29,7 +30,7 @@
${project.groupId}
sting-utils
${project.version}
- test-jar
+ test-utils
test
@@ -77,66 +78,29 @@
+
+-->
org.apache.maven.plugins
maven-invoker-plugin
package-unittests
-
-
- true
-
-
package-integrationtests
-
-
- true
-
-
package-largescaletests
-
-
- true
-
-
package-pipelinetests
-
-
- true
-
-
diff --git a/public/package-tests/pom.xml b/public/package-tests/pom.xml
index 3483f4da3..f10518d7d 100644
--- a/public/package-tests/pom.xml
+++ b/public/package-tests/pom.xml
@@ -47,6 +47,14 @@
cofoja
+
+ ${project.groupId}
+ gatk-framework
+ ${project.version}
+ test-utils
+ test
+
+
org.testng
testng
@@ -65,27 +73,6 @@
-
-
- include-gatk-framework-tests
-
-
- disable.gatk-framework.test.dependency
- false
-
-
-
-
- ${project.groupId}
- gatk-framework
- ${project.version}
- test-jar
- test
-
-
-
unittests
diff --git a/public/queue-framework/pom.xml b/public/queue-framework/pom.xml
index 8ccc7f351..4dd3c188e 100644
--- a/public/queue-framework/pom.xml
+++ b/public/queue-framework/pom.xml
@@ -18,6 +18,7 @@
${project.build.directory}/generated-sources/gatk-extensions
false
queue-package
+ ${sting.jar.phase}
@@ -65,7 +66,7 @@
${project.groupId}
gatk-framework
${project.version}
- test-jar
+ test-utils
test
@@ -170,17 +171,6 @@
-
- org.apache.maven.plugins
- maven-jar-plugin
-
-
-
- test-jar
-
-
-
-
org.apache.maven.plugins
maven-invoker-plugin
diff --git a/public/sting-utils/pom.xml b/public/sting-utils/pom.xml
index 7e68cf740..54734efac 100644
--- a/public/sting-utils/pom.xml
+++ b/public/sting-utils/pom.xml
@@ -17,6 +17,7 @@
${project.basedir}/../..
org/broadinstitute/sting/utils/R
gsalib.tar.gz
+ ${sting.jar.phase}
@@ -154,17 +155,6 @@
-
- org.apache.maven.plugins
- maven-jar-plugin
-
-
-
- test-jar
-
-
-
-