diff --git a/pom.xml b/pom.xml index bb8d73412..3abf73151 100644 --- a/pom.xml +++ b/pom.xml @@ -715,6 +715,14 @@ unlink-public-testdata clean + + link-public-qscript + process-test-resources + + + unlink-public-qscript + clean + @@ -802,6 +810,33 @@ private + + + + + com.pyx4j + maven-junction-plugin + + + link-private-testdata + process-test-resources + + + unlink-private-testdata + clean + + + link-private-qscript + process-test-resources + + + unlink-private-qscript + clean + + + + + diff --git a/protected/gatk-protected/pom.xml b/protected/gatk-protected/pom.xml index 3a7d89f4c..d75c5b056 100644 --- a/protected/gatk-protected/pom.xml +++ b/protected/gatk-protected/pom.xml @@ -31,8 +31,8 @@ - gov.nist - Jama + gov.nist.math + jama diff --git a/public/external-example/pom.xml b/public/external-example/pom.xml index 88229e720..bdfeb099f 100644 --- a/public/external-example/pom.xml +++ b/public/external-example/pom.xml @@ -26,6 +26,9 @@ true ${sting.committests.skipped} ${sting.committests.skipped} + + + package @@ -128,7 +131,7 @@ 2.1 - package + ${sting.shade.phase} shade @@ -246,4 +249,19 @@ + + + packagetests-enabled + + + sting.packagetests.enabled + true + + + + none + + + + diff --git a/public/gatk-package/pom.xml b/public/gatk-package/pom.xml index 881058949..9272cf983 100644 --- a/public/gatk-package/pom.xml +++ b/public/gatk-package/pom.xml @@ -57,6 +57,7 @@ gatk-framework ${project.version} test-jar + test diff --git a/public/queue-framework/pom.xml b/public/queue-framework/pom.xml index 2f3f7b59a..670750fd0 100644 --- a/public/queue-framework/pom.xml +++ b/public/queue-framework/pom.xml @@ -61,6 +61,14 @@ runtime + ${project.groupId} gatk-framework @@ -78,6 +86,9 @@ + org.codehaus.mojo exec-maven-plugin diff --git a/public/queue-package/pom.xml b/public/queue-package/pom.xml index eda2fd98f..27b6fae6d 100644 --- a/public/queue-package/pom.xml +++ b/public/queue-package/pom.xml @@ -88,6 +88,7 @@ queue-framework ${project.version} test-jar + test @@ -95,6 +96,7 @@ gatk-framework ${project.version} test-jar + test diff --git a/public/repo/com/google/code/caliper/caliper/1.0-SNAPSHOT/caliper-1.0-SNAPSHOT.jar b/public/repo/com/google/code/caliper/caliper/1.0-SNAPSHOT/caliper-1.0-SNAPSHOT.jar deleted file mode 100644 index 3f7007457..000000000 Binary files a/public/repo/com/google/code/caliper/caliper/1.0-SNAPSHOT/caliper-1.0-SNAPSHOT.jar and /dev/null differ diff --git a/public/repo/com/google/code/caliper/caliper/1.0-SNAPSHOT/caliper-1.0-SNAPSHOT.pom b/public/repo/com/google/code/caliper/caliper/1.0-SNAPSHOT/caliper-1.0-SNAPSHOT.pom deleted file mode 100644 index 683ac1ae3..000000000 --- a/public/repo/com/google/code/caliper/caliper/1.0-SNAPSHOT/caliper-1.0-SNAPSHOT.pom +++ /dev/null @@ -1,9 +0,0 @@ - - 4.0.0 - com.google.code.caliper - caliper - caliper - 1.0-SNAPSHOT - diff --git a/public/repo/gov/nist/Jama/1.0.2/Jama-1.0.2.jar b/public/repo/gov/nist/Jama/1.0.2/Jama-1.0.2.jar deleted file mode 100644 index 824d13338..000000000 Binary files a/public/repo/gov/nist/Jama/1.0.2/Jama-1.0.2.jar and /dev/null differ diff --git a/public/repo/gov/nist/Jama/1.0.2/Jama-1.0.2.pom b/public/repo/gov/nist/Jama/1.0.2/Jama-1.0.2.pom deleted file mode 100644 index 33d13d1ab..000000000 --- a/public/repo/gov/nist/Jama/1.0.2/Jama-1.0.2.pom +++ /dev/null @@ -1,9 +0,0 @@ - - 4.0.0 - gov.nist - Jama - Jama - 1.0.2 - diff --git a/public/repo/net/sf/gridscheduler/drmaa/6.2u5p2/drmaa-6.2u5p2.jar b/public/repo/net/sf/gridscheduler/drmaa/6.2u5p2/drmaa-6.2u5p2.jar deleted file mode 100644 index f267be4b5..000000000 Binary files a/public/repo/net/sf/gridscheduler/drmaa/6.2u5p2/drmaa-6.2u5p2.jar and /dev/null differ diff --git a/public/repo/net/sf/gridscheduler/drmaa/6.2u5p2/drmaa-6.2u5p2.pom b/public/repo/net/sf/gridscheduler/drmaa/6.2u5p2/drmaa-6.2u5p2.pom deleted file mode 100644 index 921635c84..000000000 --- a/public/repo/net/sf/gridscheduler/drmaa/6.2u5p2/drmaa-6.2u5p2.pom +++ /dev/null @@ -1,9 +0,0 @@ - - 4.0.0 - net.sf.gridscheduler - drmaa - drmaa - 6.2u5p2 - diff --git a/public/sting-root/pom.xml b/public/sting-root/pom.xml index a57beefde..84edd9be5 100644 --- a/public/sting-root/pom.xml +++ b/public/sting-root/pom.xml @@ -141,8 +141,8 @@ 1.6.1 - gov.nist - Jama + gov.nist.math + jama 1.0.2 @@ -201,9 +201,9 @@ 0.8.1 - net.sf.gridscheduler - drmaa - 6.2u5p2 + us.levk + drmaa-gridengine + 6.2u5 net.sf.snpeff @@ -531,6 +531,7 @@ true git.version + exported diff --git a/public/sting-utils/pom.xml b/public/sting-utils/pom.xml index f30d02736..7d7ae87b4 100644 --- a/public/sting-utils/pom.xml +++ b/public/sting-utils/pom.xml @@ -93,8 +93,8 @@ jets3t - net.sf.gridscheduler - drmaa + us.levk + drmaa-gridengine com.google.code.gson diff --git a/settings/repository/net.sf.gridscheduler/drmaa-6.2u5p2-sources.jar b/settings/repository/net.sf.gridscheduler/drmaa-6.2u5p2-sources.jar deleted file mode 100644 index dc77c7d33..000000000 Binary files a/settings/repository/net.sf.gridscheduler/drmaa-6.2u5p2-sources.jar and /dev/null differ