diff --git a/ant-bridge.sh b/ant-bridge.sh
index a2f686586..af94fa435 100755
--- a/ant-bridge.sh
+++ b/ant-bridge.sh
@@ -1,6 +1,7 @@
#!/bin/sh
-mvn_args="verify"
+default_args="verify '-Ddisable.shadepackage'"
+mvn_args="${default_args}"
mvn_properties=
mvn_clean=
unknown_args=
@@ -44,22 +45,23 @@ for arg in "${@}" ; do
fi
else
- if [[ "${arg}" != "dist" && "${mvn_args}" != "" && "${mvn_args}" != "verify" ]] ; then
+ if [[ "${arg}" != "dist" && "${mvn_args}" != "" && "${mvn_args}" != "${default_args}" ]] ; then
echo "Sorry, this script does not currently support mixing targets." >&2
exit 1
elif [[ "${arg}" == "dist" ]] ; then
- mvn_args="verify"
+ mvn_args="${default_args}"
elif [[ "${arg}" == "gatk" ]] ; then
- mvn_args="verify '-P!queue'"
+ mvn_args="${default_args} '-P!queue'"
elif [[ "${arg}" == "test.compile" ]] ; then
mvn_args="test-compile"
elif [[ "${arg}" == "gatkdocs" ]] ; then
local_repo="sitetemprepo"
- mvn_args="install -Dmaven.repo.local=${local_repo} -Ddisable.queue && mvn site -Dmaven.repo.local=${local_repo} -Ddisable.queue"
+ mvn_args="install -Dmaven.repo.local=${local_repo} '-P!queue' && mvn site -Dmaven.repo.local=${local_repo} '-P!queue'"
+ mvn_pkg_args=
elif [[ "${arg}" == "package.gatk.full" ]] ; then
mvn_args="package '-P!private,!queue'"
@@ -75,11 +77,11 @@ for arg in "${@}" ; do
# elif [[ "${arg}" == "release.gatk.full" ]] ; then
# mvn_args="package '-P!private,!queue'"
-# post_script=" && private/src/main/scripts/shell/copy_release.sh public/gatk-package/target/GenomeAnalysisTK-*.tar.bz2"
+# post_script=" && private/src/main/scripts/shell/copy_release.sh protected/gatk-package-distribution/target/GenomeAnalysisTK-*.tar.bz2"
# elif [[ "${arg}" == "release.queue.full" ]] ; then
# mvn_args="package '-P!private'"
-# post_script=" && private/src/main/scripts/shell/copy_release.sh public/queue-package/target/Queue-*.tar.bz2"
+# post_script=" && private/src/main/scripts/shell/copy_release.sh protected/gatk-queue-package-distribution/target/Queue-*.tar.bz2"
elif [[ "${arg}" == "build-picard-private" ]] ; then
mvn_args="mvn install -f private/picard-maven/pom.xml"
@@ -113,7 +115,7 @@ for arg in "${@}" ; do
mvn_args="${mvn_args} -Dgatk.queuetests.run=true"
elif [[ "${arg}" == "committests" ]] ; then
- mvn_args="verify -Dgatk.committests.skipped=false"
+ mvn_args="${default_args} -Dgatk.committests.skipped=false"
elif [[ "${arg}" == "test" ]] ; then
mvn_args="test -Dgatk.unittests.skipped=false"
@@ -122,19 +124,19 @@ for arg in "${@}" ; do
mvn_args="test -Dgatk.unittests.skipped=false"
elif [[ "${arg}" == "integrationtest" ]] ; then
- mvn_args="verify -Dgatk.integrationtests.skipped=false"
+ mvn_args="${default_args} -Dgatk.integrationtests.skipped=false"
elif [[ "${arg}" == "largescaletest" ]] ; then
- mvn_args="verify -Dgatk.largescaletests.skipped=false"
+ mvn_args="${default_args} -Dgatk.largescaletests.skipped=false"
elif [[ "${arg}" == "knowledgebasetest" ]] ; then
- mvn_args="verify -Dgatk.knowledgebasetests.skipped=false"
+ mvn_args="${default_args} -Dgatk.knowledgebasetests.skipped=false"
elif [[ "${arg}" == "queuetest" ]] ; then
- mvn_args="verify -Dgatk.queuetests.skipped=false"
+ mvn_args="${default_args} -Dgatk.queuetests.skipped=false"
elif [[ "${arg}" == "queuetestrun" ]] ; then
- mvn_args="verify -Dgatk.queuetests.skipped=false -Dgatk.queuetests.run=true"
+ mvn_args="${default_args} -Dgatk.queuetests.skipped=false -Dgatk.queuetests.run=true"
elif [[ "${arg}" == "fasttest" ]] ; then
mvn_args="verify -Dgatk.committests.skipped=false -pl private/gatk-tools-private -am -Dresource.bundle.skip=true"
diff --git a/pom.xml b/pom.xml
index d573dcc6d..5272f6c55 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,11 +33,14 @@
-build-timestamp "${maven.build.timestamp}"
${gatk.basedir}/public/src/main/scripts/shell
+ ${gatk.basedir}/public/src/main/assembly
package
+ prepare-package
+ package
generate-resources
process-resources
process-test-resources
@@ -66,6 +69,16 @@
${gatk.serialcommittests.skipped}
true
true
+
+
+ ${gatk.basedir}/target/executable
+
+ ${gatk.basedir}/target/package
+
+ ${gatk.basedir}/target
@@ -139,6 +152,17 @@
${resource.bundle.path}
+
+ executable-jar-lib
+
+ copy-dependencies
+
+ none
+
+ ${gatk.executable.directory}/lib
+ runtime
+
+
@@ -319,10 +343,40 @@
org.apache.maven.plugins
maven-jar-plugin
+
+ executable-jar
+
+ jar
+
+ none
+
+ ${project.build.outputDirectory}/ignored_by_executable_jar
+ ${gatk.executable.directory}
+ ${gatk.binary-dist.name}
+
+
+ ${app.main.class}
+ true
+ lib/
+
+
+
+
default-jar
${gatk.jar.phase}
+
+
+ unshaded-default-jar
+
+ jar
+
+ none
+
test-jar
@@ -341,7 +395,7 @@
maven-shade-plugin
- gatk-executable
+ package-jar
shade
@@ -405,7 +459,7 @@
none
- src/main/assembly/binary-dist.xml
+ ${gatk.assembly.directory}/binary-dist.xml
@@ -437,7 +491,7 @@
- link-binary-jar
+ link-executable-jar
link
@@ -445,7 +499,26 @@
- ${gatk.basedir}/target/${gatk.binary-dist.name}.${project.packaging}
+ ${gatk.shortcut.directory}/${gatk.binary-dist.name}.${project.packaging}
+ ${gatk.executable.directory}/${gatk.binary-dist.name}.${project.packaging}
+
+
+
+
+
+ link-package-jar
+
+ link
+
+ none
+
+
+
+ ${gatk.package.directory}/${gatk.binary-dist.name}.${project.packaging}
+ ${project.build.directory}/${project.build.finalName}.${project.packaging}
+
+
+ ${gatk.shortcut.directory}/${gatk.binary-dist.name}.${project.packaging}
${project.build.directory}/${project.build.finalName}.${project.packaging}
@@ -748,6 +821,26 @@
+
+
+
+ fast
+
+
+ disable.shadepackage
+
+
+
+ none
+ none
+
+
+
packagetests-enabled
@@ -761,6 +854,8 @@
true
true
none
+ none
+ none
none
none
none
diff --git a/protected/gatk-package-distribution/pom.xml b/protected/gatk-package-distribution/pom.xml
index 2fd3c3b8f..e44ecc15d 100644
--- a/protected/gatk-package-distribution/pom.xml
+++ b/protected/gatk-package-distribution/pom.xml
@@ -15,8 +15,6 @@
${project.basedir}/../..
- prepare-package
- package
org.broadinstitute.gatk.engine.CommandLineGATK
GenomeAnalysisTK
@@ -169,6 +167,25 @@
+
+ org.apache.maven.plugins
+ maven-jar-plugin
+
+
+ executable-jar
+ ${gatk.jar.phase}
+
+
+ default-jar
+ none
+
+
+ unshaded-default-jar
+ ${gatk.jar.phase}
+
+
+
+
org.apache.maven.plugins
maven-dependency-plugin
@@ -177,6 +194,10 @@
unpack-direct-dependencies
${gatk.unpack.phase}
+
+ executable-jar-lib
+ ${gatk.jar.phase}
+
@@ -185,7 +206,7 @@
maven-shade-plugin
- gatk-executable
+ package-jar
${gatk.shade.phase}
@@ -207,7 +228,11 @@
maven-junction-plugin
- link-binary-jar
+ link-executable-jar
+ ${gatk.jar.phase}
+
+
+ link-package-jar
${gatk.shade.phase}
@@ -236,20 +261,6 @@
-
- packagetests-enabled
-
-
- gatk.packagetests.enabled
- true
-
-
-
- none
- none
- none
-
-
gsadev
diff --git a/protected/gatk-queue-package-distribution/pom.xml b/protected/gatk-queue-package-distribution/pom.xml
index 5a077ef29..2140bf855 100644
--- a/protected/gatk-queue-package-distribution/pom.xml
+++ b/protected/gatk-queue-package-distribution/pom.xml
@@ -15,8 +15,6 @@
${project.basedir}/../..
- prepare-package
- package
Queue
org.broadinstitute.gatk.queue.QCommandLine
@@ -171,6 +169,25 @@
+
+ org.apache.maven.plugins
+ maven-jar-plugin
+
+
+ executable-jar
+ ${gatk.jar.phase}
+
+
+ default-jar
+ none
+
+
+ unshaded-default-jar
+ ${gatk.jar.phase}
+
+
+
+
org.apache.maven.plugins
maven-dependency-plugin
@@ -179,6 +196,10 @@
unpack-direct-dependencies
${gatk.unpack.phase}
+
+ executable-jar-lib
+ ${gatk.jar.phase}
+
@@ -187,7 +208,7 @@
maven-shade-plugin
- gatk-executable
+ package-jar
${gatk.shade.phase}
@@ -209,7 +230,11 @@
maven-junction-plugin
- link-binary-jar
+ link-executable-jar
+ ${gatk.jar.phase}
+
+
+ link-package-jar
${gatk.shade.phase}
@@ -238,20 +263,6 @@
-
- packagetests-enabled
-
-
- gatk.packagetests.enabled
- true
-
-
-
- none
- none
- none
-
-
gsadev
diff --git a/protected/gatk-queue-package-distribution/src/main/assembly/binary-dist.xml b/protected/gatk-queue-package-distribution/src/main/assembly/binary-dist.xml
deleted file mode 100644
index daa974216..000000000
--- a/protected/gatk-queue-package-distribution/src/main/assembly/binary-dist.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
- binary-dist
-
- tar.bz2
-
- false
-
-
-
- org.broadinstitute.gatk:gatk-queue-package-distribution
-
- ${gatk.binary-dist.name}.${artifact.extension}
-
-
- resources
- true
-
- org.broadinstitute.gatk:gatk-engine:tar.bz2:example-resources
- org.broadinstitute.gatk:gatk-queue-extensions-public:tar.bz2:example-resources
-
-
-
-
diff --git a/public/external-example/pom.xml b/public/external-example/pom.xml
index 94406680d..aa4e57cc4 100644
--- a/public/external-example/pom.xml
+++ b/public/external-example/pom.xml
@@ -28,7 +28,7 @@
${gatk.committests.skipped}
- process-resources
+ prepare-package
package
@@ -259,7 +259,28 @@
+
+
+
+
+ fast
+
+
+ disable.shadepackage
+
+
+
+ none
+ none
+
+
+
packagetests-enabled
diff --git a/protected/gatk-package-distribution/src/main/assembly/binary-dist.xml b/public/src/main/assembly/binary-dist.xml
similarity index 82%
rename from protected/gatk-package-distribution/src/main/assembly/binary-dist.xml
rename to public/src/main/assembly/binary-dist.xml
index 11fb98e00..d2248c9db 100644
--- a/protected/gatk-package-distribution/src/main/assembly/binary-dist.xml
+++ b/public/src/main/assembly/binary-dist.xml
@@ -7,7 +7,7 @@
- org.broadinstitute.gatk:gatk-package-distribution
+ ${groupId}:${artifactId}
${gatk.binary-dist.name}.${artifact.extension}
@@ -15,7 +15,7 @@
resources
true
- org.broadinstitute.gatk:gatk-engine:tar.bz2:example-resources
+ org.broadinstitute.gatk:*:tar.bz2:example-resources