patch to fix resolution algorithm for dependencies brought in by require-bundle FELIX-1395
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@798648 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/SigilParser.java b/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/SigilParser.java
index ff820d5..54555e7 100644
--- a/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/SigilParser.java
+++ b/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/SigilParser.java
@@ -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 );
}