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

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

joehni      04/11/19 07:06:00

  Modified:    javaapp  plugin.jelly
  Added:       javaapp/src/plugin-test project.properties
  Log:
  Fix Main-Class.
  
  Revision  Changes    Path
  1.11      +17 -7     maven-plugins/javaapp/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /cvsroot/maven-plugins/maven-plugins/javaapp/plugin.jelly,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- plugin.jelly	19 Nov 2004 13:38:05 -0000	1.10
  +++ plugin.jelly	19 Nov 2004 15:05:59 -0000	1.11
  @@ -96,20 +96,29 @@
     </goal>
       
     <!-- ================================================================== -->
  -  <!-- javaapp:jar                                                        --> 
  +  <!-- javaapp:prereq                                                     --> 
     <!-- ================================================================== -->
   
  -  <goal name="javaapp:jar"
  -        description="Packs all dependent JARs into an executable JAR"
  -        prereqs="test:test,javaapp:copy-deps,javaapp:jar-resources">  
  -        
  -    <!-- fail fast -->
  -
  +  <goal name="javaapp:prereq"
  +        description="Ensure all necessary properties">
       <j:choose>
         <j:when test="${pom.currentVersion == null}">
           <ant:fail>You must define currentVersion in your POM.</ant:fail>
         </j:when>
  +      <j:set var="mainClass" value="${maven.javaapp.mainclass}" />
  +      <j:when test="${empty(mainClass)}">
  +        <ant:fail>You must define your main class.</ant:fail>
  +      </j:when>
       </j:choose>
  +  </goal>
  +  
  +  <!-- ================================================================== -->
  +  <!-- javaapp:jar                                                        --> 
  +  <!-- ================================================================== -->
  +
  +  <goal name="javaapp:jar"
  +        description="Packs all dependent JARs into an executable JAR"
  +        prereqs="javaapp:prereq,test:test,javaapp:copy-deps,javaapp:jar-resources">  
           
       <!-- unzip all JARS -->
   
  @@ -178,6 +187,7 @@
             <j:set var="mavenVersion" value="1.0"/>
           </j:if>
           <ant:attribute name="Maven-Version" value="${mavenVersion}"/>
  +        <ant:attribute name="Main-Class" value="${maven.javaapp.mainclass}"/>
           <j:if test="${context.getVariable('maven.jar.manifest.attributes.list') != null}">
             <u:tokenize var="attributeList" delim="," trim="true">${maven.jar.manifest.attributes.list}</u:tokenize>
             <j:forEach var="attribute" items="${attributeList}">
  
  
  
  1.1                  maven-plugins/javaapp/src/plugin-test/project.properties
  
  Index: project.properties
  ===================================================================
  maven.javaapp.mainclass=demo.Manifest