jvanzyl 02/05/30 09:48:11
Modified: . project.xml
src/java/org/apache/maven ProjectProperties.java
src/templates/build/plugins/core build.xml
Log:
- Fixing any remaining xo references
- Changing the dist back to the way it originally worked which is to
take a distid from the POM in order to get the <tag> required for
checkout out sources to use in a dist build. I think xo was broken
which might have been what prevented this from working.
Revision Changes Path
1.85 +0 -8 jakarta-turbine-maven/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/project.xml,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- project.xml 29 May 2002 13:41:53 -0000 1.84
+++ project.xml 30 May 2002 16:48:11 -0000 1.85
@@ -204,14 +204,6 @@
</dependency>
<dependency>
- <name>commons-xo</name>
- <version>0.8</version>
- <!--
- <url>http://jakarta.apache.org/commons/xo/</url>
- -->
- </dependency>
-
- <dependency>
<name>commons-betwixt</name>
<version>1.0-dev</version>
</dependency>
1.37 +15 -3
jakarta-turbine-maven/src/java/org/apache/maven/ProjectProperties.java
Index: ProjectProperties.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/ProjectProperties.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ProjectProperties.java 27 May 2002 12:19:51 -0000 1.36
+++ ProjectProperties.java 30 May 2002 16:48:11 -0000 1.37
@@ -82,7 +82,7 @@
*
* @author <a href="[EMAIL PROTECTED]">Jason van Zyl</a>
* @author <a href="[EMAIL PROTECTED]">Vincent Massol</a>
- * @version $Id: ProjectProperties.java,v 1.36 2002/05/27 12:19:51 dion Exp $
+ * @version $Id: ProjectProperties.java,v 1.37 2002/05/30 16:48:11 jvanzyl Exp $
*/
public class ProjectProperties
extends ProjectExecutor
@@ -345,14 +345,26 @@
}
}
- /** Create properties relating to the distribution build */
+ /**
+ * Create properties relating to the distribution build
+ */
private void createDistProperties()
{
- String id = getProject().getProperty("distid");
+ String id = getProject().getProperty("maven.distid");
+
if (id != null)
{
Distribution d = (Distribution)
getMavenProject().getDistributionsMap().get(id);
+
+ // Now if the <tag> for this distribution is HEAD then
+ // we will make a special snapshot JAR.
+ if (d.getTag().equals("HEAD"))
+ {
+ // We now need to push our YYMMDD-HHMMSS
+ // timestamp into the build so it can be used
+ // for the snapshot JARs.
+ }
getProject().setProperty("maven.tag", d.getTag());
}
1.6 +8 -4 jakarta-turbine-maven/src/templates/build/plugins/core/build.xml
Index: build.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/core/build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.xml 28 May 2002 01:20:42 -0000 1.5
+++ build.xml 30 May 2002 16:48:11 -0000 1.6
@@ -500,7 +500,9 @@
<!-- ant maven:dist -Dmaven.tag=MAVEN_B4 -->
<!-- ================================================================== -->
- <target name="dist"
depends="dist-check-tag,#callback("pre-dist"),do-dist,#callback("post-dist")"/>
+ <target
+ name="dist"
+ depends="dist-check-tag,#callback("pre-dist"),do-dist,#callback("post-dist")"/>
<target name="do-dist" if="maven.tag">
@@ -692,12 +694,14 @@
</target>
- <target name="dist-check-tag" unless="maven.tag">
+ <target
+ name="dist-check-tag"
+ unless="maven.distid">
<echo>
+-------------------------------------------------------+
| The dist target will not execute correctly unless a |
- | 'maven.tag' property is provided, e.g. |
- | ant maven:dist -Dmaven.tag=MAVEN_B4 |
+ | 'maven.distid' property is provided, e.g. |
+ | ant maven:dist -Dmaven.distid=b4 |
+-------------------------------------------------------+
</echo>
</target>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
