brett 2003/11/21 16:41:03
Modified: src/plugins-build/jar Tag: MAVEN_RC2_UNSTABLE plugin.jelly
src/plugins-build/jar/xdocs/current Tag: MAVEN_RC2_UNSTABLE
changes.xml
src/plugins-build/plugin Tag: MAVEN_RC2_UNSTABLE
plugin.jelly
src/plugins-build/plugin/xdocs Tag: MAVEN_RC2_UNSTABLE
changes.xml
xdocs Tag: MAVEN_RC2_UNSTABLE changes.xml
Log:
Merge RC2 changes on HEAD
Revision Changes Path
No revision
No revision
1.22.2.2 +6 -5 maven/src/plugins-build/jar/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/jar/plugin.jelly,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -u -r1.22.2.1 -r1.22.2.2
--- plugin.jelly 12 Nov 2003 10:28:00 -0000 1.22.2.1
+++ plugin.jelly 22 Nov 2003 00:41:03 -0000 1.22.2.2
@@ -47,18 +47,19 @@
<ant:attribute name="Build-Jdk" value="${java.version}"/>
<!-- added supplementary entries -->
<ant:attribute name="Extension-Name" value="${pom.artifactId}"/>
- <ant:attribute name="Specification-Version"
value="${pom.specificationVersion}"/>
- <ant:attribute name="Specification-Vendor"
value="${pom.organization.name}"/>
<ant:attribute name="Specification-Title" value="${pom.shortDescription}"/>
- <ant:attribute name="Implementation-Version" value="${pom.currentVersion}"/>
+ <ant:attribute name="Specification-Vendor"
value="${pom.organization.name}"/>
+ <ant:attribute name="Specification-Version" value="${pom.currentVersion}"/>
+ <ant:attribute name="Implementation-Title" value="${pom.package}"/>
<ant:attribute name="Implementation-Vendor"
value="${pom.organization.name}"/>
- <ant:attribute name="Implementation-Vendor-Id"
value="${pom.organization.identifier}"/>
+ <ant:attribute name="Implementation-Version" value="${pom.currentVersion}"/>
<maven:pluginVar var="mainclass" plugin="maven-java-plugin"
property="maven.jar.mainclass" />
<j:if test="${!empty(mainclass)}">
<ant:attribute name="Main-Class" value="${mainclass}"/>
</j:if>
- <j:if test="${maven.jar.manifest.extensions.add == 'true'}">
+ <j:set var="jarExtensions" value="${maven.jar.manifest.extensions.add}"/>
+ <j:if test="${jarExtensions == 'true'}">
<j:set var="extensionList" value=""/>
<j:forEach var="artifact" items="${pom.artifacts}">
<j:set var="dep" value="${artifact.dependency}"/>
No revision
No revision
1.3.2.2 +10 -0 maven/src/plugins-build/jar/xdocs/current/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/jar/xdocs/current/changes.xml,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- changes.xml 12 Nov 2003 10:28:01 -0000 1.3.2.1
+++ changes.xml 22 Nov 2003 00:41:03 -0000 1.3.2.2
@@ -9,6 +9,16 @@
<body>
<release version="1.4" date="in CVS">
+ <action dev="dion" issue="MAVEN-936" type="fix">
+ Reorder Specification-Title/Vendor/Version and
Implementation-Title/Vendor/Version
+ </action>
+ <action dev="dion" issue="MAVEN-936" type="fix">
+ Use pom.currentVersion for Specification-Version
+ </action>
+ <action dev="dion" type="fix">
+ Fix for maven.jar.manifest.extensions.add not being checked
+ correctly.
+ </action>
<action dev="dion" type="fix">Fix MAVEN-1009</action>
</release>
No revision
No revision
1.23.2.1 +19 -1 maven/src/plugins-build/plugin/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/plugin/plugin.jelly,v
retrieving revision 1.23
retrieving revision 1.23.2.1
diff -u -r1.23 -r1.23.2.1
--- plugin.jelly 8 Oct 2003 05:02:11 -0000 1.23
+++ plugin.jelly 22 Nov 2003 00:41:03 -0000 1.23.2.1
@@ -5,6 +5,7 @@
xmlns:j="jelly:core"
xmlns:maven="jelly:maven"
xmlns:u="jelly:util"
+ xmlns:define="jelly:define"
xmlns:x="jelly:xml">
<goal name="plugin"
@@ -231,7 +232,13 @@
</delete>
</j:if>
</goal>
-
+
+ <!--
+ ========================================================================
+ Goals and tags used for testing Maven plugins.
+ ========================================================================
+ -->
+
<!-- test a plugin -->
<goal name="plugin:test">
<u:available file="${basedir}/src/plugin-test/project.xml">
@@ -241,4 +248,15 @@
ignoreFailures="false" />
</u:available>
</goal>
+
+ <define:taglib uri="assert">
+ <define:tag name="assertFileExists">
+ <!-- @file : Full file path -->
+ <u:file var="fileAsFile" name="${file}"/>
+ <j:if test="${!(fileAsFile.exists())}">
+ <ant:fail>${file} does not exist</ant:fail>
+ </j:if>
+ </define:tag>
+ </define:taglib>
+
</project>
No revision
No revision
1.6.2.1 +7 -1 maven/src/plugins-build/plugin/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/plugin/xdocs/changes.xml,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- changes.xml 30 Sep 2003 23:30:32 -0000 1.6
+++ changes.xml 22 Nov 2003 00:41:03 -0000 1.6.2.1
@@ -7,7 +7,13 @@
<body>
<release version="1.2" date="in CVS">
- <action dev="dion" type="add">Add plugin:test goal</action>
+ <action dev="vmassol" type="add">
+ Added assert:assertFileExists tag to verify if a file exists while
+ testing a plugin.
+ </action>
+ <action dev="dion" type="add">
+ Add plugin:test goal
+ </action>
</release>
<release version="1.1" date="2003-09-29">
No revision
No revision
1.14.2.1 +4 -1 maven/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven/xdocs/changes.xml,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -u -r1.14 -r1.14.2.1
--- changes.xml 29 Aug 2003 06:26:23 -0000 1.14
+++ changes.xml 22 Nov 2003 00:41:03 -0000 1.14.2.1
@@ -7,7 +7,10 @@
<body>
- <release version="1.0RC1" date="in CVS">
+ <release version="1.0RC2" date="in CVS">
+ </release>
+
+ <release version="1.0RC1" date="2003-09-30">
<action dev='dion' type='fix'>
Move maven.docs.* and maven.gen.docs to defaults.properties instead of xdoc
plugin
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
