[Maven-plugins-cvs] cvs commit: maven-plugins/javaapp/src/plugin-test project.xml

[<jo...@us...>]

joehni      04/11/19 08:44:42

  Modified:    javaapp  plugin.jelly
               javaapp/src/plugin-test project.xml
  Log:
  Trim manifest entries.
  
  Revision  Changes    Path
  1.12      +6 -3      maven-plugins/javaapp/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /cvsroot/maven-plugins/maven-plugins/javaapp/plugin.jelly,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- plugin.jelly	19 Nov 2004 15:05:59 -0000	1.11
  +++ plugin.jelly	19 Nov 2004 16:44:42 -0000	1.12
  @@ -211,11 +211,14 @@
           </j:if>
           <u:replace var="packagePath" oldChar="." newChar="/" value="${pom.package}"/>
           <ant:section name="${packagePath}/">
  -          <ant:attribute name="Specification-Title" value="${maven.javaapp.manifest.specificationTitle}"/>
  -          <ant:attribute name="Specification-Vendor" value="${maven.javaapp.manifest.specificationVendor}"/>
  +          <j:set var="manifestEntry" value="${maven.javaapp.manifest.specificationTitle}" />
  +          <ant:attribute name="Specification-Title" value="${manifestEntry.trim()}"/>
  +          <j:set var="manifestEntry" value="${maven.javaapp.manifest.specificationVendor}" />
  +          <ant:attribute name="Specification-Vendor" value="${manifestEntry.trim()}"/>
             <ant:attribute name="Specification-Version" value="${specificationVersion}"/>
             <ant:attribute name="Implementation-Title" value="${pom.package}"/>
  -          <ant:attribute name="Implementation-Vendor" value="${pom.organization.name}"/>
  +          <j:set var="manifestEntry" value="${pom.organization.name}" />
  +          <ant:attribute name="Implementation-Vendor" value="${manifestEntry.trim()}"/>
             <ant:attribute name="Implementation-Version" value="${pom.currentVersion}"/>
           </ant:section>
   
  
  
  
  1.2       +7 -2      maven-plugins/javaapp/src/plugin-test/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /cvsroot/maven-plugins/maven-plugins/javaapp/src/plugin-test/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	19 Nov 2004 13:38:05 -0000	1.1
  +++ project.xml	19 Nov 2004 16:44:42 -0000	1.2
  @@ -30,8 +30,13 @@
     </organization>
     <inceptionYear>2004</inceptionYear>
     <package>demo</package>
  -  <shortDescription>Demo Package</shortDescription>
  -  <description>Demo Package Description</description>
  +  <!-- Beware the format, trimming of the description is tested! -->
  +  <shortDescription>
  +    Demo Package
  +  </shortDescription>
  +  <description>
  +    Demo Package Description
  +  </description>
     <url/>
     <issueTrackingUrl/>
     <siteAddress/>