niclas 2004/04/29 09:26:01 Modified: maven-plugins/versioning Tag: BETTER_MAVENIZATION plugin.jelly plugin.properties Added: maven-plugins/versioning/src/plugin-resources Tag: BETTER_MAVENIZATION default.template merlin.template Removed: maven-plugins/versioning/src/plugin-resources Tag: BETTER_MAVENIZATION entity-template.ent Log: Made the versioning plugin a bit more flexible, so it can handle more formats. Revision Changes Path No revision No revision 1.1.2.1 +6 -3 avalon/maven-plugins/versioning/plugin.jelly Index: plugin.jelly =================================================================== RCS file: /home/cvs/avalon/maven-plugins/versioning/plugin.jelly,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 --- plugin.jelly 14 Apr 2004 06:48:17 -0000 1.1 +++ plugin.jelly 29 Apr 2004 16:26:00 -0000 1.1.2.1 @@ -28,15 +28,18 @@ </define:tag> <define:tag name="update-entities" > - <increment:read/> + <increment:read/> <ant:copy tofile="${maven.increment.central.entities}/${pom.artifactId}.ent" - file="${plugin.resources}/entity-template.ent" + file="${plugin.resources}/${avalon.versioning.type}.template" filtering="true" overwrite="true" > <filterset> <filter token="PROJECT-ID" value="${pom.artifactId}"/> - <filter token="VERSION" value="${major}.${minor}.${phase}${number}"/> + <filter token="MAJOR" value="${major}"/> + <filter token="MINOR" value="${minor}"/> + <filter token="PHASE" value="${phase}"/> + <filter token="BUILD" value="${number}"/> </filterset> </ant:copy> </define:tag> 1.1.2.1 +2 -0 avalon/maven-plugins/versioning/plugin.properties Index: plugin.properties =================================================================== RCS file: /home/cvs/avalon/maven-plugins/versioning/plugin.properties,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 --- plugin.properties 14 Apr 2004 06:48:17 -0000 1.1 +++ plugin.properties 29 Apr 2004 16:26:00 -0000 1.1.2.1 @@ -26,3 +26,5 @@ # If the version number data should be committed to CVS after a deploy. maven.increment.commit = true +# The default type of versioning. +maven.increment.type=default \ No newline at end of file No revision No revision 1.1.2.1 +6 -0 avalon/maven-plugins/versioning/src/plugin-resources/Attic/default.template 1.1.2.1 +6 -0 avalon/maven-plugins/versioning/src/plugin-resources/Attic/merlin.template
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]