It's now buildtype responsability to invoke the build sequence behind high level targets such as publish-local, publish-shared and release
git-svn-id: https://svn.apache.org/repos/asf/incubator/easyant/buildtypes/trunk@1414014 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/build-std-ant-plugin/src/main/resources/build-std-ant-plugin.ant b/build-std-ant-plugin/src/main/resources/build-std-ant-plugin.ant
index 1822c6e..a1643d4 100644
--- a/build-std-ant-plugin/src/main/resources/build-std-ant-plugin.ant
+++ b/build-std-ant-plugin/src/main/resources/build-std-ant-plugin.ant
@@ -35,9 +35,12 @@
<bindtargets targets="clean-std:clean" extensionPoint="clean" />
<bindtargets targets="abstract-test:test-run" extensionPoint="test" />
<bindtargets targets="abstract-test:integration-test-run" extensionPoint="integration-test" />
- <bindtargets targets="ivy-publication:publish-local" extensionPoint="publish-local" />
- <bindtargets targets="ivy-publication:publish-shared" extensionPoint="publish-shared" />
- <bindtargets targets="ivy-publication:release" extensionPoint="release" />
+ <bindtargets targets="ivy-publication:generate-local-version,dist,ivy-publication:publish-local"
+ extensionPoint="publish-local" />
+ <bindtargets targets="ivy-publication:generate-shared-version,dist,ivy-publication:publish-shared"
+ extensionPoint="publish-shared" />
+ <bindtargets targets="ivy-publication:generate-release-version,verify,ivy-publication:release"
+ extensionPoint="release" />
<bindtargets targets="antunit:run" extensionPoint="test" />
diff --git a/build-std-groovy/src/main/resources/build-std-groovy.ant b/build-std-groovy/src/main/resources/build-std-groovy.ant
index 03481d2..3f9e799 100644
--- a/build-std-groovy/src/main/resources/build-std-groovy.ant
+++ b/build-std-groovy/src/main/resources/build-std-groovy.ant
@@ -43,13 +43,16 @@
<bindtargets targets="abstract-test:test-run" extensionPoint="test" />
<bindtargets targets="abstract-test:integration-test-run" extensionPoint="integration-test" />
<bindtargets targets="abstract-package:package" extensionPoint="package" />
- <bindtargets targets="ivy-publication:publish-local" extensionPoint="publish-local" />
- <bindtargets targets="ivy-publication:publish-shared" extensionPoint="publish-shared" />
- <bindtargets targets="ivy-publication:release" extensionPoint="release" />
-
+ <bindtargets targets="ivy-publication:generate-local-version,package,ivy-publication:publish-local"
+ extensionPoint="publish-local" />
+ <bindtargets targets="ivy-publication:generate-shared-version,package,ivy-publication:publish-shared"
+ extensionPoint="publish-shared" />
+ <bindtargets targets="ivy-publication:generate-release-version,verify,ivy-publication:release"
+ extensionPoint="release" />
+
<!-- additionnal friendtly target names -->
<target name="dist" depends="ivy-publication:publish-ready" description="Produce every artifact to be distributed" />
<target name="install" depends="ivy-publication:publish-local" description="Install the artifacts into local repository" />
- <ea:configure-project defaulttarget="dist"/>
+ <ea:configure-project defaulttarget="dist" />
</project>
\ No newline at end of file
diff --git a/build-std-java/src/main/resources/build-std-java.ant b/build-std-java/src/main/resources/build-std-java.ant
index ed38698..20c8bfe 100644
--- a/build-std-java/src/main/resources/build-std-java.ant
+++ b/build-std-java/src/main/resources/build-std-java.ant
@@ -43,9 +43,9 @@
<bindtargets targets="abstract-test:test-run" extensionPoint="test" />
<bindtargets targets="abstract-test:integration-test-run" extensionPoint="integration-test" />
<bindtargets targets="abstract-package:package" extensionPoint="package" />
- <bindtargets targets="ivy-publication:publish-local" extensionPoint="publish-local" />
- <bindtargets targets="ivy-publication:publish-shared" extensionPoint="publish-shared" />
- <bindtargets targets="ivy-publication:release" extensionPoint="release" />
+ <bindtargets targets="ivy-publication:generate-local-version,package,ivy-publication:publish-local" extensionPoint="publish-local" />
+ <bindtargets targets="ivy-publication:generate-shared-version,package,ivy-publication:publish-shared" extensionPoint="publish-shared" />
+ <bindtargets targets="ivy-publication:generate-release-version,verify,ivy-publication:release" extensionPoint="release" />
<!-- additionnal friendtly target names -->
<target name="dist" depends="ivy-publication:publish-ready" description="Produce every artifact to be distributed" />
diff --git a/build-std-scala/src/main/resources/build-std-scala.ant b/build-std-scala/src/main/resources/build-std-scala.ant
index bac26d4..47ced1c 100644
--- a/build-std-scala/src/main/resources/build-std-scala.ant
+++ b/build-std-scala/src/main/resources/build-std-scala.ant
@@ -43,13 +43,16 @@
<bindtargets targets="abstract-test:test-run" extensionPoint="test" />
<bindtargets targets="abstract-test:integration-test-run" extensionPoint="integration-test" />
<bindtargets targets="abstract-package:package" extensionPoint="package" />
- <bindtargets targets="ivy-publication:publish-local" extensionPoint="publish-local" />
- <bindtargets targets="ivy-publication:publish-shared" extensionPoint="publish-shared" />
- <bindtargets targets="ivy-publication:release" extensionPoint="release" />
-
+ <bindtargets targets="ivy-publication:generate-local-version,package,ivy-publication:publish-local"
+ extensionPoint="publish-local" />
+ <bindtargets targets="ivy-publication:generate-shared-version,package,ivy-publication:publish-shared"
+ extensionPoint="publish-shared" />
+ <bindtargets targets="ivy-publication:generate-release-version,verify,ivy-publication:release"
+ extensionPoint="release" />
+
<!-- additionnal friendtly target names -->
<target name="dist" depends="ivy-publication:publish-ready" description="Produce every artifact to be distributed" />
<target name="install" depends="ivy-publication:publish-local" description="Install the artifacts into local repository" />
- <ea:configure-project defaulttarget="dist"/>
+ <ea:configure-project defaulttarget="dist" />
</project>
\ No newline at end of file
diff --git a/build-std-skeleton/src/main/resources/build-std-skeleton.ant b/build-std-skeleton/src/main/resources/build-std-skeleton.ant
index d76b64d..11272c6 100644
--- a/build-std-skeleton/src/main/resources/build-std-skeleton.ant
+++ b/build-std-skeleton/src/main/resources/build-std-skeleton.ant
@@ -33,9 +33,12 @@
<bindtargets targets="clean-std:clean" extensionPoint="clean" />
<bindtargets targets="abstract-test:test-run" extensionPoint="test" />
<bindtargets targets="abstract-test:integration-test-run" extensionPoint="integration-test" />
- <bindtargets targets="ivy-publication:publish-local" extensionPoint="publish-local" />
- <bindtargets targets="ivy-publication:publish-shared" extensionPoint="publish-shared" />
- <bindtargets targets="ivy-publication:release" extensionPoint="release" />
+ <bindtargets targets="ivy-publication:generate-local-version,dist,ivy-publication:publish-local"
+ extensionPoint="publish-local" />
+ <bindtargets targets="ivy-publication:generate-shared-version,dist,ivy-publication:publish-shared"
+ extensionPoint="publish-shared" />
+ <bindtargets targets="ivy-publication:generate-release-version,verify,ivy-publication:release"
+ extensionPoint="release" />
<bindtargets targets="antunit:run" extensionPoint="test" />
<!-- additionnal friendtly target names -->
diff --git a/build-webapp-java/src/main/resources/build-webapp-java.ant b/build-webapp-java/src/main/resources/build-webapp-java.ant
index 6b9ae15..95feba1 100644
--- a/build-webapp-java/src/main/resources/build-webapp-java.ant
+++ b/build-webapp-java/src/main/resources/build-webapp-java.ant
@@ -43,13 +43,16 @@
<bindtargets targets="abstract-test:test-run" extensionPoint="test" />
<bindtargets targets="abstract-test:integration-test-run" extensionPoint="integration-test" />
<bindtargets targets="abstract-package:package" extensionPoint="package" />
- <bindtargets targets="ivy-publication:publish-local" extensionPoint="publish-local" />
- <bindtargets targets="ivy-publication:publish-shared" extensionPoint="publish-shared" />
- <bindtargets targets="ivy-publication:release" extensionPoint="release" />
-
+ <bindtargets targets="ivy-publication:generate-local-version,package,ivy-publication:publish-local"
+ extensionPoint="publish-local" />
+ <bindtargets targets="ivy-publication:generate-shared-version,package,ivy-publication:publish-shared"
+ extensionPoint="publish-shared" />
+ <bindtargets targets="ivy-publication:generate-release-version,verify,ivy-publication:release"
+ extensionPoint="release" />
+
<!-- additionnal friendtly target names -->
<target name="dist" depends="ivy-publication:publish-ready" description="Produce every artifact to be distributed" />
<target name="install" depends="ivy-publication:publish-local" description="Install the artifacts into local repository" />
- <ea:configure-project defaulttarget="dist"/>
+ <ea:configure-project defaulttarget="dist" />
</project>
\ No newline at end of file
