You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ss...@apache.org on 2019/01/17 08:51:13 UTC
svn commit: r1851503 - in /felix/trunk/tools/org.apache.felix.scr.bnd:
changelog.txt
src/main/java/org/apache/felix/scrplugin/bnd/SCRDescriptorBndPlugin.java
Author: sseifert
Date: Thu Jan 17 08:51:13 2019
New Revision: 1851503
URL: http://svn.apache.org/viewvc?rev=1851503&view=rev
Log:
FELIX-6023 bnd scrplugin preserve sequence of classpath entries (apply patch from Mark Adamcin)
closes #165
Modified:
felix/trunk/tools/org.apache.felix.scr.bnd/changelog.txt
felix/trunk/tools/org.apache.felix.scr.bnd/src/main/java/org/apache/felix/scrplugin/bnd/SCRDescriptorBndPlugin.java
Modified: felix/trunk/tools/org.apache.felix.scr.bnd/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/tools/org.apache.felix.scr.bnd/changelog.txt?rev=1851503&r1=1851502&r2=1851503&view=diff
==============================================================================
--- felix/trunk/tools/org.apache.felix.scr.bnd/changelog.txt (original)
+++ felix/trunk/tools/org.apache.felix.scr.bnd/changelog.txt Thu Jan 17 08:51:13 2019
@@ -1,3 +1,9 @@
+Changes from 1.9.0 to 1.10.0
+----------------------------
+** Bug
+ * [FELIX-6023] - bnd scrplugin preserve sequence of classpath entries
+
+
Changes from 1.8.0 to 1.9.0
---------------------------
** Bug
Modified: felix/trunk/tools/org.apache.felix.scr.bnd/src/main/java/org/apache/felix/scrplugin/bnd/SCRDescriptorBndPlugin.java
URL: http://svn.apache.org/viewvc/felix/trunk/tools/org.apache.felix.scr.bnd/src/main/java/org/apache/felix/scrplugin/bnd/SCRDescriptorBndPlugin.java?rev=1851503&r1=1851502&r2=1851503&view=diff
==============================================================================
--- felix/trunk/tools/org.apache.felix.scr.bnd/src/main/java/org/apache/felix/scrplugin/bnd/SCRDescriptorBndPlugin.java (original)
+++ felix/trunk/tools/org.apache.felix.scr.bnd/src/main/java/org/apache/felix/scrplugin/bnd/SCRDescriptorBndPlugin.java Thu Jan 17 08:51:13 2019
@@ -30,6 +30,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.LinkedHashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -299,7 +300,7 @@ public class SCRDescriptorBndPlugin impl
}
private URL[] getClassPath(Analyzer a) throws Exception {
- final Set<URL> path = new HashSet<URL>();
+ final Set<URL> path = new LinkedHashSet<URL>();
for (final Jar j : a.getClasspath()) {
path.add(j.getSource().toURI().toURL());
}