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

MPEAR-37: undoing dependency check introduced by fixing MPEAR-9

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@125381 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
felipeal
2005-01-17 01:43:25 +00:00
parent ddd69448ab
commit 3294da79f1
2 changed files with 2 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
ear/plugin.jelly
View File

@@ -96,38 +96,6 @@
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" />
<util:file name="${maven.repo.local}" var="checkRepoDir" />
<j:set var="repoPathSize" value="${size(checkRepoDir.getCanonicalPath())}"/>
<j:set var="absolutePath" value="${checkFile.getAbsolutePath().substring(repoPathSize)}"/>
<j:set var="canonicalPath" value="${checkFile.getCanonicalPath().substring(repoPathSize)}"/>
<j:if test="${!absolutePath.equals(canonicalPath)}">
<!-- on some environments, the value of MAVEN_HOME might be different thant the
cannonical path, which would make the above test to fail. So, we just show
the warning if the repo -->
<ant:echo>
############################################################################
# WARNING: possible case-sensitiveness issue within a dependency #
############################################################################
# Looks like a 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. #
# #
# Reason for the warning: #
# the dependency ${dep.id} is located (relatively to the local repo) at:
'${absolutePath}'
# but was expected to be located at:
'${canonicalPath}'
############################################################################
</ant:echo>
</j:if>
<ear:setPath lib="${lib}" var="bundledPath"/>
<echo>Dependency ${lib.file.name} will be bundled as ${bundledPath}</echo>

2
ear/xdocs/changes.xml
View File

@@ -25,6 +25,8 @@
</properties>
<body>
<release version="1.7-SNAPSHOT" date="on CVS">
<action dev="felipeal" type="remove" issue="MPEAR-37">Removed checking introduced by MPEAR-9, as the fix introduced more bugs than it solved</code>.
</action>
<action dev="dion" type="fix" issue="MPEAR-32">Re-added property <code>maven.ear.appxml</code>.
</action>
</release>