felipeal    2004/12/08 04:00:21

  Modified:    ear      plugin.jelly project.xml
               ear/xdocs changes.xml
  Log:
  Fix for MAVEN-1526: issues a warning (instead of failing the build) when a 
case-sensitiveness dependency issue is found
  
  Revision  Changes    Path
  1.30      +25 -2     maven-plugins/ear/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/maven-plugins/ear/plugin.jelly,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- plugin.jelly      16 Nov 2004 06:01:44 -0000      1.29
  +++ plugin.jelly      8 Dec 2004 12:00:21 -0000       1.30
  @@ -94,9 +94,32 @@
              We know that this dep "wants" to be bundled.
             -->
                       
  +
  +          <!-- 
  +           Check if there is no case-sensitive issues
  +          -->
             <util:file name="${lib.file.parent}/${lib.file.name}" 
var="checkFile" />
  -          <j:if 
test="${!(checkFile.getAbsolutePath().equals(checkFile.getCanonicalPath()))}">
  -             <ant:fail>Case-sensitive issue: The dependency ${dep.id} has a 
case problem.  The dependency was either retrieved in the past with the wrong 
case or has been specified with the wrong case in your project.xml file.  Fix 
your project.xml or update your local repository with the properly-cased file 
and try again.</ant:fail>
  +          <j:if 
test="${(!checkFile.getAbsolutePath().equals(checkFile.getCanonicalPath()))}">
  +             <ant:echo>
  +############################################################################
  +#      WARNING: possible case-sensitiveness issue within a dependency      #
  +############################################################################
  +# One possibility is that the dependency was either retrieved in the past  #
  +# with the wrong case or has been specified with the wrong case in your    #
  +# project.xml file. If that is the case, fix your project.xml or update    # 
  +# your local repository with the properly-cased file and try again.        #
  +#                                                                          #
  +# Another possibility is that your MAVEN_HOME is set with different cases  # 
  +# than its canonical representation in your operating systems. If that's   #
  +# the case, you can ignore this message or correct the value of MAVEN_HOME #
  +#                                                                          #
  +# Reason for the warning:                                                  # 
  +# the dependency ${dep.id} is located at:
  +'${checkFile.getAbsolutePath()}'
  +# but was expected to be located at:
  +'${checkFile.getCanonicalPath()}'
  +############################################################################
  +</ant:echo>
             </j:if>
   
             <ant:echo>Bundling: ${dep.type} - ${dep.id} - 
${dep.version}</ant:echo>
  
  
  
  1.39      +1 -1      maven-plugins/ear/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/maven-plugins/ear/project.xml,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- project.xml       4 Dec 2004 22:22:22 -0000       1.38
  +++ project.xml       8 Dec 2004 12:00:21 -0000       1.39
  @@ -23,7 +23,7 @@
     <pomVersion>3</pomVersion>
     <id>maven-ear-plugin</id>
     <name>Maven EAR Plugin</name>
  -  <currentVersion>1.6</currentVersion>
  +  <currentVersion>1.7-SNAPSHOT</currentVersion>
     <description>Ear Plugin for Maven</description>
     <shortDescription>Ear Plugin for Maven</shortDescription>
     <url>http://maven.apache.org/reference/plugins/ear/</url>
  
  
  
  1.32      +3 -0      maven-plugins/ear/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/maven-plugins/ear/xdocs/changes.xml,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- changes.xml       4 Dec 2004 22:22:23 -0000       1.31
  +++ changes.xml       8 Dec 2004 12:00:21 -0000       1.32
  @@ -24,6 +24,9 @@
       <author email="[EMAIL PROTECTED]">Nathan Coast</author>
     </properties>
     <body>
  +    <release version="1.7-SNAPSHOT" date="on CVS">
  +      <action dev="felipeal" type="update" issue="MAVEN-1526">Issues a 
warning (instead of failing the build) when a case-sensitiveness dependency 
issue is found</action>
  +    </release>
       <release version="1.6" date="2004-12-05">
         <action dev="felipeal" type="fix" issue="MPEAR-27">Fixed the name of 
the bundled dependency when
           <code>maven.jar.overrides</code>is used.
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to