mcconnell 2004/04/05 23:36:08
Modified: merlin/activation/impl maven.xml
merlin/composition/impl maven.xml
merlin/kernel/impl maven.xml project.properties
merlin maven.xml version.ent
Log:
Housekeeping related to version handling.
Revision Changes Path
1.5 +7 -0 avalon/merlin/activation/impl/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/impl/maven.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- maven.xml 10 Feb 2004 16:19:14 -0000 1.4
+++ maven.xml 6 Apr 2004 06:36:07 -0000 1.5
@@ -1,9 +1,16 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE project [
+ <!ENTITY % index SYSTEM "file:index.ent"> %index;
+]>
+
<project
default="jar:install-snapshot"
xmlns:maven="jelly:maven"
xmlns:j="jelly:core"
xmlns:util="jelly:util"
xmlns:ant="jelly:ant">
+
+ <ant:property name="pom.specificationVersion"
value="&avalon-activation-spec;"/>
<postGoal name="java:prepare-filesystem">
<attainGoal name="avalon:artifact"/>
1.7 +7 -0 avalon/merlin/composition/impl/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/maven.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- maven.xml 21 Feb 2004 23:54:42 -0000 1.6
+++ maven.xml 6 Apr 2004 06:36:08 -0000 1.7
@@ -1,9 +1,16 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE project [
+ <!ENTITY % index SYSTEM "file:index.ent"> %index;
+]>
+
<project
default="jar:install-snapshot"
xmlns:maven="jelly:maven"
xmlns:j="jelly:core"
xmlns:util="jelly:util"
xmlns:ant="jelly:ant">
+
+ <ant:property name="pom.specificationVersion"
value="&avalon-composition-spec;"/>
<preGoal name="java:compile">
<attainGoal name="avalon:meta"/>
1.10 +8 -1 avalon/merlin/kernel/impl/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/impl/maven.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- maven.xml 1 Mar 2004 16:31:42 -0000 1.9
+++ maven.xml 6 Apr 2004 06:36:08 -0000 1.10
@@ -1,5 +1,12 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE project [
+ <!ENTITY % index SYSTEM "file:index.ent"> %index;
+]>
+
<project default="jar:install" xmlns:maven="jelly:maven"
xmlns:j="jelly:core" xmlns:util="jelly:util" xmlns:ant="jelly:ant">
+ <ant:property name="pom.specificationVersion" value="&merlin-spec;"/>
+
<postGoal name="java:prepare-filesystem">
<attainGoal name="avalon:artifact"/>
<ant:copy toDir="${maven.repo.local}/${pom.groupId}/jars"
@@ -28,7 +35,7 @@
<filter token="LOGGING_IMPLEMENTATION"
value="${merlin.logging.implementation}"/>
<filter token="STANDARD_RUNTIME"
- value="${merlin.runtime.implementation}"/>
+ value="&avalon-activation-artifact;"/>
</filterset>
</ant:copy>
1.9 +2 -1 avalon/merlin/kernel/impl/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/impl/project.properties,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- project.properties 22 Mar 2004 10:54:41 -0000 1.8
+++ project.properties 6 Apr 2004 06:36:08 -0000 1.9
@@ -9,10 +9,11 @@
#
merlin.logging.implementation =
artifact:avalon-logging/avalon-logkit-impl#1.0-SNAPSHOT
-merlin.runtime.implementation =
artifact:avalon-activation/avalon-activation-impl#2.0-SNAPSHOT
#
# gump
+#
+
project.name = merlin-impl
avalon.buildsystem = ${basedir}/../../../buildsystem
1.62 +34 -2 avalon/merlin/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/maven.xml,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- maven.xml 5 Apr 2004 14:12:08 -0000 1.61
+++ maven.xml 6 Apr 2004 06:36:08 -0000 1.62
@@ -53,7 +53,7 @@
<ant:property name="maven.jar.manifest.extensions.add" value="false"/>
<ant:property name="maven.checkstyle.format" value="avalon"/>
<ant:property name="pom.organization.identifier" value="ASF"/>
- <ant:property name="pom.specificationVersion"
value="&merlin-api-version;"/>
+ <ant:property name="pom.specificationVersion" value="&merlin-spec;"/>
<ant:property name="maven.license.licenseFile"
value="${basedir}/LICENSE.txt"/>
<maven:snapshot project="${pom}"/>
@@ -114,6 +114,8 @@
</ant:fileset>
</ant:copy>
<checksum file="${path}"/>
+ <move file="${path}.md5" toFile="temp"/>
+ <move file="temp" toFile="${path}.md5"/>
<j:if test="${maven_gpg_exe != null}">
<ant:exec executable="${maven_gpg_exe}">
<ant:arg value="-a"/>
@@ -156,6 +158,8 @@
</ant:fileset>
</ant:copy>
<checksum file="${path}"/>
+ <move file="${path}.md5" toFile="temp"/>
+ <move file="temp" toFile="${path}.md5"/>
<j:if test="${maven_gpg_exe != null}">
<ant:exec executable="${maven_gpg_exe}">
<ant:arg value="-a"/>
@@ -199,6 +203,8 @@
</ant:fileset>
</ant:copy>
<checksum file="${path}"/>
+ <move file="${path}.md5" toFile="temp"/>
+ <move file="temp" toFile="${path}.md5"/>
<j:if test="${maven_gpg_exe != null}">
<ant:exec executable="${maven_gpg_exe}">
<ant:arg value="-a"/>
@@ -340,6 +346,16 @@
<goal name="avalon:package">
+ <ant:delete>
+ <fileset dir="${maven.build.dir}">
+ <include name="*.zip"/>
+ <include name="*.tar"/>
+ <include name="*.tar.gz"/>
+ <include name="*.md5"/>
+ <include name="*.asc"/>
+ </fileset>
+ </ant:delete>
+
<j:choose>
<j:when test="${merlin.snapshot}">
<maven:snapshot project="${pom}"/>
@@ -366,6 +382,8 @@
</fileset>
</ant:zip>
<checksum file="${maven.build.dir}/${package.name}.zip"/>
+ <move file="${maven.build.dir}/${package.name}.zip.md5" toFile="temp"/>
+ <move file="temp" toFile="${maven.build.dir}/${package.name}.zip.md5"/>
<j:if test="${maven_gpg_exe != null}">
<ant:exec executable="${maven_gpg_exe}">
<ant:arg value="-a"/>
@@ -389,6 +407,8 @@
src="${maven.build.dir}/${package.name}.tar"/>
<ant:delete file="${maven.build.dir}/${package.name}.tar"/>
<checksum file="${maven.build.dir}/${package.name}.tar.gz"/>
+ <move file="${maven.build.dir}/${package.name}.tar.gz.md5"
toFile="temp"/>
+ <move file="temp"
toFile="${maven.build.dir}/${package.name}.tar.gz.md5"/>
<j:if test="${maven_gpg_exe != null}">
<ant:exec executable="${maven_gpg_exe}">
<ant:arg value="-a"/>
@@ -402,6 +422,16 @@
<zipfileset dir="${basedir}/target/tutorials" prefix="tutorial"/>
</ant:zip>
<checksum file="${maven.build.dir}/${tutorial.name}.zip"/>
+ <move file="${maven.build.dir}/${tutorial.name}.zip.md5" toFile="temp"/>
+ <move file="temp" toFile="${maven.build.dir}/${tutorial.name}.zip.md5"/>
+ <j:if test="${maven_gpg_exe != null}">
+ <ant:exec executable="${maven_gpg_exe}">
+ <ant:arg value="-a"/>
+ <ant:arg value="-b"/>
+ <ant:arg value="${maven.build.dir}/${tutorial.name}.zip"/>
+ </ant:exec>
+ </j:if>
+
<ant:tar longfile="gnu"
tarfile="${maven.build.dir}/${tutorial.name}.tar">
<tarfileset dir="${basedir}/target/tutorials" prefix="tutorial"/>
</ant:tar>
@@ -410,6 +440,8 @@
src="${maven.build.dir}/${tutorial.name}.tar"/>
<ant:delete file="${maven.build.dir}/${tutorial.name}.tar"/>
<checksum file="${maven.build.dir}/${tutorial.name}.tar.gz"/>
+ <move file="${maven.build.dir}/${tutorial.name}.tar.gz.md5"
toFile="temp"/>
+ <move file="temp"
toFile="${maven.build.dir}/${tutorial.name}.tar.gz.md5"/>
<j:if test="${maven_gpg_exe != null}">
<ant:exec executable="${maven_gpg_exe}">
<ant:arg value="-a"/>
@@ -553,7 +585,7 @@
==============================================================================
-->
- <goal name="merlin:validate"
+ <goal name="avalon:validate"
description="Validate that the tutorial targets are buildable." >
<maven:reactor
basedir="${basedir}"
1.5 +11 -5 avalon/merlin/version.ent
Index: version.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/version.ent,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- version.ent 5 Apr 2004 14:04:54 -0000 1.4
+++ version.ent 6 Apr 2004 06:36:08 -0000 1.5
@@ -1,18 +1,24 @@
+<!ENTITY avalon-composition-spec "2.0">
<!ENTITY avalon-composition-id "avalon-composition">
+<!ENTITY avalon-composition-build "0">
<!ENTITY avalon-composition-api-id "avalon-composition-api">
-<!ENTITY avalon-composition-api-version "3.3.0">
+<!ENTITY avalon-composition-api-version "2.0.0">
<!ENTITY avalon-composition-spi-id "avalon-composition-spi">
-<!ENTITY avalon-composition-spi-version "3.3.0">
+<!ENTITY avalon-composition-spi-version "2.0.0">
<!ENTITY avalon-composition-impl-id "avalon-composition-impl">
-<!ENTITY avalon-composition-impl-version "3.3.0">
+<!ENTITY avalon-composition-impl-version "2.0.0">
+<!ENTITY avalon-activation-spec "2.0">
<!ENTITY avalon-activation-id "avalon-activation">
<!ENTITY avalon-activation-api-id "avalon-activation-api">
-<!ENTITY avalon-activation-api-version "3.3.0">
+<!ENTITY avalon-activation-api-version "2.0.0">
<!ENTITY avalon-activation-impl-id "avalon-activation-impl">
-<!ENTITY avalon-activation-impl-version "3.3.0">
+<!ENTITY avalon-activation-impl-version "2.0.0">
+<!ENTITY avalon-activation-artifact
+
"artifact:&avalon-activation-id;/&avalon-activation-impl-id;#&avalon-activation-impl-version;">
+<!ENTITY merlin-spec "3.3">
<!ENTITY merlin-id "merlin">
<!ENTITY merlin-api-id "merlin-api">
<!ENTITY merlin-api-version "3.3.0">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
