niclas 2004/04/13 10:56:33
Modified: merlin-test/merlin-jmx-demo maven.xml project.xml
Added: merlin-test/merlin-jmx-demo index.ent project.properties
merlin-test/merlin-jmx-demo/versioning build.numbers
merlin-jmx-demo.ent
Log:
Fooling around with the new Versioning plugin.
Revision Changes Path
1.4 +1 -1 avalon-sandbox/merlin-test/merlin-jmx-demo/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin-test/merlin-jmx-demo/maven.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven.xml 18 Aug 2003 12:46:04 -0000 1.3
+++ maven.xml 13 Apr 2004 17:56:33 -0000 1.4
@@ -1,4 +1,4 @@
-<project default="java:jar" xmlns:maven="jelly:maven" xmlns:j="jelly:core"
xmlns:util="jelly:util">
+<project default="jar:jar" xmlns:maven="jelly:maven" xmlns:j="jelly:core"
xmlns:util="jelly:util">
<preGoal name="java:compile">
<attainGoal name="avalon:meta"/>
1.3 +4 -1 avalon-sandbox/merlin-test/merlin-jmx-demo/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin-test/merlin-jmx-demo/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 18 Aug 2003 12:46:04 -0000 1.2
+++ project.xml 13 Apr 2004 17:56:33 -0000 1.3
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE project [
+ <!ENTITY % index SYSTEM "file:index.ent"> %index;
+]>
<project>
@@ -7,7 +10,7 @@
<name>Merlin JMX RMI Test Case</name>
<package>my.avalon.jmx</package>
- <currentVersion>1.0</currentVersion>
+ <currentVersion>&merlin-jmx-demo-version;</currentVersion>
<inceptionYear>2003</inceptionYear>
<shortDescription>Test for the Merlin RMI JMX Connection.</shortDescription>
1.1 avalon-sandbox/merlin-test/merlin-jmx-demo/index.ent
Index: index.ent
===================================================================
<!ENTITY % merlin-jmx-demo-entities SYSTEM "file:versioning/merlin-jmx-demo.ent">
%merlin-jmx-demo-entities;
1.1 avalon-sandbox/merlin-test/merlin-jmx-demo/project.properties
Index: project.properties
===================================================================
maven.increment.enable = true
1.1
avalon-sandbox/merlin-test/merlin-jmx-demo/versioning/build.numbers
Index: build.numbers
===================================================================
build.major=1
build.minor=0
build.phase=rc-
build.number=1
1.1
avalon-sandbox/merlin-test/merlin-jmx-demo/versioning/merlin-jmx-demo.ent
Index: merlin-jmx-demo.ent
===================================================================
<!ENTITY merlin-jmx-demo-group "merlin-jmx-demo">
<!ENTITY merlin-jmx-demo-id "merlin-jmx-demo">
<!ENTITY merlin-jmx-demo-version "1.0.rc-1">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
