mcconnell 2004/04/25 21:49:09
Modified: merlin maven.xml project.xml
meta/plugin project.xml
tutorials maven.xml project.xml
versioning avalon-merlin.ent
Log:
Removed unused dependencies from meta plugin. Update tutorials build to
delete prior distribution artifacts. Update merlin distribution build id.
Revision Changes Path
1.78 +1 -1 avalon/merlin/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/maven.xml,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- maven.xml 23 Apr 2004 07:29:19 -0000 1.77
+++ maven.xml 26 Apr 2004 04:49:09 -0000 1.78
@@ -10,7 +10,7 @@
==============================================================================
-->
- <ant:property name="merlin.snapshot" value="true"/>
+ <ant:property name="merlin.snapshot" value="false"/>
<!--
==============================================================================
1.34 +4 -1 avalon/merlin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/project.xml,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- project.xml 18 Apr 2004 14:21:32 -0000 1.33
+++ project.xml 26 Apr 2004 04:49:09 -0000 1.34
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE project [
+ <!ENTITY % index SYSTEM "file:index.ent"> %index;
+]>
<!--
Copyright 2004 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,7 +26,7 @@
<groupId>merlin</groupId>
<id>merlin</id>
<name>Avalon Merlin</name>
- <currentVersion>3.3.0</currentVersion>
+ <currentVersion>&merlin-product-version;</currentVersion>
<organization>
<name>The Apache Software Foundation</name>
1.14 +2 -1 avalon/meta/plugin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/meta/plugin/project.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- project.xml 12 Apr 2004 15:43:22 -0000 1.13
+++ project.xml 26 Apr 2004 04:49:09 -0000 1.14
@@ -77,6 +77,7 @@
</dependency>
<!-- xdoclet -->
+ <!--
<dependency>
<id>commons-collections</id>
<version>2.1</version>
@@ -105,7 +106,7 @@
<id>xdoclet+jmx-module</id>
<version>1.2b2</version>
</dependency>
-
+ -->
</dependencies>
<build>
1.5 +9 -0 avalon/tutorials/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/tutorials/maven.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- maven.xml 18 Apr 2004 10:51:55 -0000 1.4
+++ maven.xml 26 Apr 2004 04:49:09 -0000 1.5
@@ -66,6 +66,15 @@
<goal name="avalon:dist" prereqs="avalon:build">
+ <ant:delete>
+ <fileset dir="${maven.build.dir}">
+ <include name="*.zip"/>
+ <include name="*.gz"/>
+ <include name="*.md5"/>
+ <include name="*.asc"/>
+ </fileset>
+ </ant:delete>
+
<j:set var="tutorial.name" value="${maven.final.name}"/>
<ant:echo>Building tutorial kit: ${tutorial.name}</ant:echo>
<ant:zip zipfile="${maven.build.dir}/${tutorial.name}.zip">
1.4 +5 -2 avalon/tutorials/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/tutorials/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 18 Apr 2004 10:51:55 -0000 1.3
+++ project.xml 26 Apr 2004 04:49:09 -0000 1.4
@@ -1,12 +1,15 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE project [
+ <!ENTITY % index SYSTEM "file:index.ent"> %index;
+]>
<project>
<extend>${basedir}/master.xml</extend>
- <id>avalon-tutorial</id>
+ <id>merlin-tutorial</id>
<!-- a short but descriptive name for the project -->
<name>Merlin Simple Web Server Tutorials</name>
- <currentVersion>3.3.0-dev</currentVersion>
+ <currentVersion>&merlin-product-version;</currentVersion>
</project>
1.8 +2 -1 avalon/versioning/avalon-merlin.ent
Index: avalon-merlin.ent
===================================================================
RCS file: /home/cvs/avalon/versioning/avalon-merlin.ent,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- avalon-merlin.ent 23 Apr 2004 04:28:31 -0000 1.7
+++ avalon-merlin.ent 26 Apr 2004 04:49:09 -0000 1.8
@@ -45,8 +45,9 @@
<!-- Avalon Merlin -->
-<!ENTITY merlin-spec "3.3">
<!ENTITY merlin-id "merlin">
+<!ENTITY merlin-spec "3.3">
+<!ENTITY merlin-product-version "3.3.dev-1">
<!ENTITY merlin-api-id "merlin-api">
<!ENTITY merlin-api-version "3.3.dev-0">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
