You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ds...@apache.org on 2009/07/28 20:52:02 UTC
svn commit: r798648 -
/felix/trunk/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/SigilParser.java
Author: dsavage
Date: Tue Jul 28 18:52:02 2009
New Revision: 798648
URL: http://svn.apache.org/viewvc?rev=798648&view=rev
Log:
patch to fix resolution algorithm for dependencies brought in by require-bundle FELIX-1395
Modified:
felix/trunk/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/SigilParser.java
Modified: felix/trunk/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/SigilParser.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/SigilParser.java?rev=798648&r1=798647&r2=798648&view=diff
==============================================================================
--- felix/trunk/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/SigilParser.java (original)
+++ felix/trunk/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/SigilParser.java Tue Jul 28 18:52:02 2009
@@ -558,8 +558,12 @@
}
else
{
- VersionRange version = versions.get( name );
- String rev = version != null ? version.toString() : info.getVersion().toString();
+ // XXX see FELIX-1395
+ // The following code has been commented out as it causes
+ // problems with require bundle dependencies
+ // VersionRange version = versions.get( name );
+ // String rev = version != null ? version.toString() : info.getVersion().toString();
+ String rev = info.getVersion().toString();
mrid = ModuleRevisionId.newInstance( SigilResolver.ORG_SIGIL, name, rev );
dd = new SigilDependencyDescriptor( md, mrid, force, changing, transitive );
}