jvanzyl 02/04/22 13:25:06
Modified: src/templates/build build-maven.xml build.init.target
build.xml
Log:
Removing the update-jars logic and replacing with project-verify which does
what update-jars did except it does it transparently.
Revision Changes Path
1.35 +0 -42 jakarta-turbine-maven/src/templates/build/build-maven.xml
Index: build-maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/build/build-maven.xml,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- build-maven.xml 22 Apr 2002 15:01:53 -0000 1.34
+++ build-maven.xml 22 Apr 2002 20:25:06 -0000 1.35
@@ -40,48 +40,6 @@
</target>
<!-- ================================================================== -->
- <!-- U P D A T E J A R S -->
- <!-- ================================================================== -->
-
- <target
- name="update-jars"
- description="o Update JARs required for building"
- depends="local-init,update-jars-proxy,update-jars-noproxy">
- </target>
-
- <target
- name="prepare.httpget">
-
- <taskdef
- name="httpget"
- className="org.apache.maven.UpdateResources">
- <classpath refid="maven-classpath"/>
- </taskdef>
- </target>
-
- <target
- name="update-jars-noproxy"
- unless="proxy.host"
- depends="prepare.httpget">
-
- <httpget
- projectDescriptor="project.xml"
- baseUrl="${maven.repo.remote}"
- dest="${lib.repo}"
- />
- </target>
-
- <target name="update-jars-proxy" if="proxy.host" depends="prepare.httpget">
- <httpget
- projectDescriptor="project.xml"
- baseUrl="http://jakarta.apache.org/turbine/jars/";
- dest="${lib.repo}"
- proxyHost="${proxy.host}"
- proxyPort="${proxy.port}"
- />
- </target>
-
- <!-- ================================================================== -->
<!-- U P D A T E M A V E N -->
<!-- ================================================================== -->
1.20 +73 -2 jakarta-turbine-maven/src/templates/build/build.init.target
Index: build.init.target
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/build/build.init.target,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- build.init.target 22 Apr 2002 15:01:53 -0000 1.19
+++ build.init.target 22 Apr 2002 20:25:06 -0000 1.20
@@ -29,14 +29,77 @@
<!-- ================================================================== -->
<target
- name="init"
- depends="project-properties">
+ name="load-default-properties">
<!-- Set default values for the build -->
<property file="${maven.home}/default.properties" />
</target>
+ <target
+ name="init"
+ depends="load-default-properties,verify-project,project-properties">
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- V E R I F Y P R O J E C T -->
+ <!-- ================================================================== -->
+
+ <target
+ name="verify-project"
+ description="o Update JARs required for building"
+ depends="verify-project-proxy,verify-project-noproxy"
+ if="verificationFailed">
+
+ <fail message="">
+
+ You are missing JARs that must be downloaded manually
+ before continuing with the build.
+
+ </fail>
+
+ </target>
+
+ <target
+ name="prepare.httpget">
+
+ <taskdef
+ name="verify-project"
+ className="org.apache.maven.ProjectVerifier">
+ <classpath refid="maven-classpath"/>
+ </taskdef>
+ </target>
+
+ <target
+ name="verify-project-noproxy"
+ unless="proxy.host"
+ depends="prepare.httpget">
+
+ <verify-project
+ projectDescriptor="project.xml"
+ mavenLocalRepo="${maven.repo.local}"
+ mavenRemoteRepo="${maven.repo.remote}"
+ />
+ </target>
+
+ <target
+ name="verify-project-proxy"
+ if="proxy.host"
+ depends="prepare.httpget">
+
+ <verify-project
+ projectDescriptor="project.xml"
+ mavenLocalRepo="${maven.repo.local}"
+ mavenRemoteRepo="${maven.repo.remote}"
+ proxyHost="${proxy.host}"
+ proxyPort="${proxy.port}"
+ />
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- P R O J E C T P R O P E R T I E S -->
+ <!-- ================================================================== -->
+
<!-- We can't do this until Ant 1.5 because references aren't forwarded
in <ant> calls until then.
@@ -44,6 +107,14 @@
name="project-properties"
unless="pomLoaded">
+ <taskdef
+ name="project-properties"
+ classname="org.apache.maven.ProjectProperties">
+ <classpath refid="maven-classpath"/>
+ </taskdef>
+
+ </target>
+
-->
<target
1.30 +5 -4 jakarta-turbine-maven/src/templates/build/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/build/build.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- build.xml 20 Apr 2002 05:19:48 -0000 1.29
+++ build.xml 22 Apr 2002 20:25:06 -0000 1.30
@@ -106,10 +106,6 @@
<ant antfile="$mavenDirectory/build-maven.xml" target="check-source"/>
</target>
- <target name="maven:update-jars">
- <ant antfile="$mavenDirectory/build-maven.xml" target="update-jars"/>
- </target>
-
<target name="maven:announce">
<ant antfile="$mavenDirectory/build-maven.xml" target="announce"/>
</target>
@@ -129,6 +125,11 @@
<target
name="maven:generate-reactor">
<ant antfile="$mavenDirectory/build-reactor.xml" target="generate-reactor"/>
+ </target>
+
+ <target
+ name="maven:verify-project">
+ <ant antfile="$mavenDirectory/build-maven.xml" target="verify-project"/>
</target>
<!-- maven:end -->
