Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PR: MPJAR-24, 27

Browse Source 
o fix non-existence of ln -f for Solaris
o fix Specification-Name problems


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115041 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
brett
2004-04-25 02:16:27 +00:00
parent 48510ac284
commit f59f9e27c4
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
jar/plugin.jelly
View File

@@ -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}" />

2
jar/xdocs/changes.xml
View File

@@ -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>