brett 2004/04/24 19:16:27
Modified: jar plugin.jelly
jar/xdocs changes.xml
Log:
PR: MPJAR-24, 27
o fix non-existence of ln -f for Solaris
o fix Specification-Name problems
Revision Changes Path
1.34 +8 -2 maven-plugins/jar/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/jar/plugin.jelly,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- plugin.jelly 15 Apr 2004 06:10:27 -0000 1.33
+++ plugin.jelly 25 Apr 2004 02:16:27 -0000 1.34
@@ -46,6 +46,12 @@
<ant:available property="maven.jar.manifest.available"
file="${maven.jar.manifest}"/>
+ <j:set var="specificationTitle" value="${pom.shortDescription.trim()}"/>
+ <j:if test="${specificationTitle.length() gt 49}">
+ <ant:echo>Warning: shortDescription is > 49 characters - trimming for
specification title.</ant:echo>
+ <j:set var="specificationTitle"
value="${specificationTitle.substring(0,46)}..."/>
+ </j:if>
+
<!-- See http://java.sun.com/j2se/1.3/docs/guide/jar/jar.html -->
<!-- See http://java.sun.com/j2se/1.4.1/docs/guide/jar/jar.html -->
<ant:jar
@@ -87,7 +93,7 @@
</j:if>
<!-- added supplementary entries -->
<ant:attribute name="Extension-Name" value="${pom.artifactId}"/>
- <ant:attribute name="Specification-Title" value="${pom.shortDescription}"/>
+ <ant:attribute name="Specification-Title" value="${specificationTitle}" />
<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}"/>
@@ -204,7 +210,7 @@
artifact="${relativePath}"
type="jars"
assureDirectoryCommand="mkdir -p"
- siteCommand="cd @deployDirectory@; chmod g+w ${maven.jar.to.deploy}; chgrp
${maven.remote.group} ${maven.jar.to.deploy}; ln -sf ${maven.jar.to.deploy}
${pom.artifactId}-SNAPSHOT.jar; echo ${snapshotVersion} >
${pom.artifactId}-snapshot-version"
+ siteCommand="cd @deployDirectory@; chmod g+w ${maven.jar.to.deploy}; chgrp
${maven.remote.group} ${maven.jar.to.deploy}; rm -f ${pom.artifactId}-SNAPSHOT.jar; ln
-s ${maven.jar.to.deploy} ${pom.artifactId}-SNAPSHOT.jar; echo ${snapshotVersion} >
${pom.artifactId}-snapshot-version"
/>
<j:set var="maven.final.name" value="${oldMavenFinalName}" />
1.15 +2 -0 maven-plugins/jar/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/jar/xdocs/changes.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- changes.xml 21 Apr 2004 01:03:25 -0000 1.14
+++ changes.xml 25 Apr 2004 02:16:27 -0000 1.15
@@ -26,6 +26,8 @@
</properties>
<body>
<release version="1.5-SNAPSHOT" date="in CVS">
+ <action dev="brett" type="fix" issue="MPJAR-27">trim shortDescription and
limit to 72 characters with warning when using specification-title to avoid broken
manifests</action>
+ <action dev="brett" type="fix" issue="MPJAR-24">change ln -sf command to rm
-f symlink, ln -s combo because -f flag is not used on Solaris ln.</action>
<action dev="brett" type="fix">move maven.remote.group to
default.properties</action>
<action dev="brett" type="fix" issue="MPJAR-22" due-to="Corey Jewett">improve
manifest generation</action>
<action dev="brett" type="fix" issue="MPJAR-17">revert maven.final.name to
previuous value after executing jar:snapshot related goals.</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
