diff --git a/public/external-example/pom.xml b/public/external-example/pom.xml
index a26b7134b..87375c843 100644
--- a/public/external-example/pom.xml
+++ b/public/external-example/pom.xml
@@ -146,13 +146,7 @@
- org.broad:tribble
-
- **
-
-
-
- org.broadinstitute:variant
+ samtools:htsjdk
**
diff --git a/public/gatk-framework/src/main/java/htsjdk/samtools/GATKBAMFileSpan.java b/public/gatk-framework/src/main/java/htsjdk/samtools/GATKBAMFileSpan.java
index dc36e83c2..35388dc65 100644
--- a/public/gatk-framework/src/main/java/htsjdk/samtools/GATKBAMFileSpan.java
+++ b/public/gatk-framework/src/main/java/htsjdk/samtools/GATKBAMFileSpan.java
@@ -23,7 +23,7 @@
* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-package net.sf.samtools;
+package htsjdk.samtools;
import net.sf.picard.util.PeekableIterator;
import org.broadinstitute.sting.utils.exceptions.ReviewedStingException;
diff --git a/public/gatk-framework/src/main/java/htsjdk/samtools/GATKBin.java b/public/gatk-framework/src/main/java/htsjdk/samtools/GATKBin.java
index 463707252..d1e689d63 100644
--- a/public/gatk-framework/src/main/java/htsjdk/samtools/GATKBin.java
+++ b/public/gatk-framework/src/main/java/htsjdk/samtools/GATKBin.java
@@ -23,7 +23,7 @@
* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-package net.sf.samtools;
+package htsjdk.samtools;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/public/gatk-framework/src/main/java/htsjdk/samtools/GATKChunk.java b/public/gatk-framework/src/main/java/htsjdk/samtools/GATKChunk.java
index db52402a4..6d695f43c 100644
--- a/public/gatk-framework/src/main/java/htsjdk/samtools/GATKChunk.java
+++ b/public/gatk-framework/src/main/java/htsjdk/samtools/GATKChunk.java
@@ -23,7 +23,7 @@
* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-package net.sf.samtools;
+package htsjdk.samtools;
/**
* A temporary solution to work around Java access rights issues:
diff --git a/public/gatk-framework/src/main/java/htsjdk/samtools/PicardNamespaceUtils.java b/public/gatk-framework/src/main/java/htsjdk/samtools/PicardNamespaceUtils.java
index 131793268..00f65e54c 100644
--- a/public/gatk-framework/src/main/java/htsjdk/samtools/PicardNamespaceUtils.java
+++ b/public/gatk-framework/src/main/java/htsjdk/samtools/PicardNamespaceUtils.java
@@ -23,7 +23,7 @@
* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-package net.sf.samtools;
+package htsjdk.samtools;
/**
* Utils that insist on being in the same package as Picard.
diff --git a/public/gatk-framework/src/test/java/htsjdk/samtools/GATKBAMFileSpanUnitTest.java b/public/gatk-framework/src/test/java/htsjdk/samtools/GATKBAMFileSpanUnitTest.java
index d03c6e006..aaa20c0e5 100644
--- a/public/gatk-framework/src/test/java/htsjdk/samtools/GATKBAMFileSpanUnitTest.java
+++ b/public/gatk-framework/src/test/java/htsjdk/samtools/GATKBAMFileSpanUnitTest.java
@@ -23,7 +23,7 @@
* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-package net.sf.samtools;
+package htsjdk.samtools;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/public/gatk-framework/src/test/java/htsjdk/samtools/GATKChunkUnitTest.java b/public/gatk-framework/src/test/java/htsjdk/samtools/GATKChunkUnitTest.java
index 09a87d311..2b08fc4d4 100644
--- a/public/gatk-framework/src/test/java/htsjdk/samtools/GATKChunkUnitTest.java
+++ b/public/gatk-framework/src/test/java/htsjdk/samtools/GATKChunkUnitTest.java
@@ -23,7 +23,7 @@
* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-package net.sf.samtools;
+package htsjdk.samtools;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/public/gatk-package/pom.xml b/public/gatk-package/pom.xml
index 9e06dce73..a8500815c 100644
--- a/public/gatk-package/pom.xml
+++ b/public/gatk-package/pom.xml
@@ -28,15 +28,10 @@
gatk-framework
${project.version}
-
+
- org.broad
- tribble
-
-
-
- org.broadinstitute
- variant
+ samtools
+ htsjdk
diff --git a/public/queue-package/pom.xml b/public/queue-package/pom.xml
index cb75a6891..3a266236c 100644
--- a/public/queue-package/pom.xml
+++ b/public/queue-package/pom.xml
@@ -44,7 +44,7 @@
- net.sf
+ picard
picard
diff --git a/public/sting-root/pom.xml b/public/sting-root/pom.xml
index fe807da50..38078312f 100644
--- a/public/sting-root/pom.xml
+++ b/public/sting-root/pom.xml
@@ -42,12 +42,9 @@
10
-Xmx${test.maxmemory} -XX:+UseParallelOldGC -XX:ParallelGCThreads=${java.gc.threads} -XX:GCTimeLimit=${java.gc.timeLimit} -XX:GCHeapFreeLimit=${java.gc.heapFreeLimit}
-
- 1.111.1920
- ${picard.public.version}
- ${picard.public.version}
- ${picard.public.version}
- ${picard.public.version}
+
+ 1.112.1452
+ 1.112.1452
@@ -69,9 +66,9 @@
1.0-r139
- net.sf
- sam
- ${sam.version}
+ samtools
+ htsjdk
+ ${htsjdk.version}
org.testng
@@ -80,20 +77,10 @@
- net.sf
+ picard
picard
${picard.version}
-
- org.broad
- tribble
- ${tribble.version}
-
-
- org.broadinstitute
- variant
- ${variant.version}
-
log4j
log4j
diff --git a/public/sting-utils/pom.xml b/public/sting-utils/pom.xml
index fddd43946..ab4b7e1b7 100644
--- a/public/sting-utils/pom.xml
+++ b/public/sting-utils/pom.xml
@@ -21,21 +21,13 @@
- net.sf
- sam
+ samtools
+ htsjdk
- net.sf
+ picard
picard
-
- org.broad
- tribble
-
-
- org.broadinstitute
- variant
-
log4j
log4j