You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2004/04/14 02:57:17 UTC

cvs commit: maven-plugins/war/xdocs changes.xml

brett       2004/04/13 17:57:17

  Modified:    war      plugin.jelly project.xml
               war/xdocs changes.xml
  Log:
  PR: MPWAR-1
  copy resources even if no sources present by running test:test
  
  Revision  Changes    Path
  1.40      +1 -3      maven-plugins/war/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/maven-plugins/war/plugin.jelly,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- plugin.jelly	7 Apr 2004 06:07:45 -0000	1.39
  +++ plugin.jelly	14 Apr 2004 00:57:17 -0000	1.40
  @@ -39,9 +39,7 @@
       <ant:available property="webSourcesPresent" type="dir"
         file="${maven.war.src}"/>
   
  -    <j:if test="${sourcesPresent == 'true'}">
  -      <attainGoal name="test:test"/>
  -    </j:if>
  +    <attainGoal name="test:test"/>
   
       <ant:property name="maven.war.final.name" 
         value="${pom.artifactId}.war"/>
  
  
  
  1.23      +1 -6      maven-plugins/war/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/maven-plugins/war/project.xml,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- project.xml	10 Apr 2004 00:59:24 -0000	1.22
  +++ project.xml	14 Apr 2004 00:57:17 -0000	1.23
  @@ -38,11 +38,6 @@
       <version>
         <id>1.5</id>
         <name>1.5</name>
  -      <tag>HEAD</tag>
  -    </version>
  -    <version>
  -      <id>1.5</id>
  -      <name>1.5</name>
         <tag>MAVEN_WAR_1_5</tag>
       </version>
     </versions>
  @@ -69,7 +64,7 @@
       </developer>
       <developer>
         <name>Brett Porter</name>
  -      <id>bporter</id>
  +      <id>brett</id>
         <email>brett@apache.org</email>
         <organization>f2 network</organization>
         <roles>
  
  
  
  1.23      +3 -2      maven-plugins/war/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/maven-plugins/war/xdocs/changes.xml,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- changes.xml	7 Apr 2004 06:07:44 -0000	1.22
  +++ changes.xml	14 Apr 2004 00:57:17 -0000	1.23
  @@ -25,6 +25,7 @@
     </properties>
     <body>
       <release version="1.6" date="in CVS">
  +      <action dev="brett" type="fix" issue="MPWAR-1">Call test:test regardless of whether sources are present as it contains build logic</action>
         <action dev="dion" type="fix" issue="MPWAR-24">Remove extra call to java:compile</action>
         <action dev="dion" type="update" issue="MPWAR-21">Allow automated generation of manifest Class-Path</action>
         <action dev="dion" type="update" issue="MPWAR-22">Allow customizing of MANIFEST.MF</action>
  @@ -35,8 +36,8 @@
         <action dev="vmassol" type="add">Use the new
           <code>caller</code>plugin to isolate the java compilation goal called from its implementation.
         </action>
  -      <action dev="bporter" type="add">Add war:inplace goal for building the webapp into maven.war.src. You should cvsignore WEB-INF/lib and WEB-INF/classes</action>
  -      <action dev="bporter" type="add">Add target path to dependencies so you can copy to elsewhere than WEB-INF/lib. Useful for applets.</action>
  +      <action dev="brett" type="add">Add war:inplace goal for building the webapp into maven.war.src. You should cvsignore WEB-INF/lib and WEB-INF/classes</action>
  +      <action dev="brett" type="add">Add target path to dependencies so you can copy to elsewhere than WEB-INF/lib. Useful for applets.</action>
       </release>
       <release version="1.4" date="2003-09-29">
         <action dev="dion" type="update">Apply MAVEN-831. Copy web.xml as specified by ${maven.war.webxml}</action>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org