Update build-std-java binding git-svn-id: https://svn.apache.org/repos/asf/incubator/easyant/buildtypes/trunk@1373450 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/build-std-java/module.ivy b/build-std-java/module.ivy index 3960b2b..0a9b7a3 100644 --- a/build-std-java/module.ivy +++ b/build-std-java/module.ivy
@@ -17,7 +17,7 @@ <ivy-module version="2.0" xmlns:ea="http://www.easyant.org"> <info organisation="org.apache.easyant.buildtypes" module="build-std-java" revision="0.9"> <description>A standard build for simple java modules, relying on standard phases, and providing compilation, execution and unit tests</description> - <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.9"/> + <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/> </info> <configurations> <conf name="default" description="runtime dependencies artifact can be used with this conf"/>
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 8ea1578..e735834 100644 --- a/build-std-java/src/main/resources/build-std-java.ant +++ b/build-std-java/src/main/resources/build-std-java.ant
@@ -22,6 +22,7 @@ <property file="${org.apache.easyant.buildtypes#build-std-java.properties.file}" /> + <ea:import mrid="org.apache.easyant.plugins#phases-std;0.9" /> <ea:import mrid="org.apache.easyant.plugins#clean-std;0.9" /> <ea:import mrid="org.apache.easyant.plugins#ivy-provisioning;0.9" /> <ea:import mrid="org.apache.easyant.plugins#default-version-strategy;0.9" /> @@ -32,19 +33,24 @@ <ea:import mrid="org.apache.easyant.plugins#test-junit;0.9" /> <ea:import mrid="org.apache.easyant.plugins#manifest;0.9" /> <ea:import mrid="org.apache.easyant.plugins#package-jar;0.9" /> - <ea:import mrid="org.apache.easyant.plugins#source-jar;0.9" /> <ea:import mrid="org.apache.easyant.plugins#ivy-utils;0.9" /> <!-- plugin binding --> - <bindtargets targets="compile-java:compile,manifest:manifest,manifest:manifest-runnable,resources-std:copy-resources" extensionPoint="package-jar:jar-ready" /> + <bindtargets targets="manifest:manifest-runnable,resources-std:copy-resources" extensionPoint="abstract-package:package-ready" /> <bindtargets targets="compile-test-java:compile,resources-std:copy-test-resources" extensionPoint="abstract-test:test-ready" /> - <bindtargets targets="package-jar:jar,source-jar:main" extensionPoint="ivy-publication:publish-ready" /> + <bindtargets targets="package-jar:jar" extensionPoint="ivy-publication:publish-ready" /> - <!-- friendly target names --> - <target name="clean" depends="clean-std:clean" description="Clean the project" /> - <target name="compile" depends="compile-java:compile" description="Compile the project" /> - <target name="test" depends="test-junit:run" description="Launch the unit tests" /> + <!-- bind high level targets --> + <bindtargets targets="clean-std:clean" extensionPoint="clean"/> + <bindtargets targets="abstract-compile:compile-finished" extensionPoint="compile"/> + <bindtargets targets="abstract-test:test-run" extensionPoint="test"/> + <bindtargets targets="abstract-package:package-finished" 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"/> + + <!-- 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 the repository" /> + <target name="install" depends="ivy-publication:publish-local" description="Install the artifacts into local repository" /> </project>