You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by pa...@apache.org on 2018/04/03 14:55:12 UTC
svn commit: r1828248 - in /felix/trunk/osgi-r7/framework: pom.xml
src/main/resources/default.properties
src/test/java/org/apache/felix/framework/BundleWiringImplTest.java
Author: pauls
Date: Tue Apr 3 14:55:11 2018
New Revision: 1828248
URL: http://svn.apache.org/viewvc?rev=1828248&view=rev
Log:
Set version to 5.9.0-SNAPSHOT, make tests work with java6, and remove ee's below java6
Modified:
felix/trunk/osgi-r7/framework/pom.xml
felix/trunk/osgi-r7/framework/src/main/resources/default.properties
felix/trunk/osgi-r7/framework/src/test/java/org/apache/felix/framework/BundleWiringImplTest.java
Modified: felix/trunk/osgi-r7/framework/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/framework/pom.xml?rev=1828248&r1=1828247&r2=1828248&view=diff
==============================================================================
--- felix/trunk/osgi-r7/framework/pom.xml (original)
+++ felix/trunk/osgi-r7/framework/pom.xml Tue Apr 3 14:55:11 2018
@@ -27,7 +27,7 @@
<packaging>bundle</packaging>
<name>Apache Felix Framework</name>
<artifactId>org.apache.felix.framework</artifactId>
- <version>6.0.0-SNAPSHOT</version>
+ <version>5.9.0-SNAPSHOT</version>
<properties>
<dollar>$</dollar>
<felix.java.version>6</felix.java.version>
Modified: felix/trunk/osgi-r7/framework/src/main/resources/default.properties
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/framework/src/main/resources/default.properties?rev=1828248&r1=1828247&r2=1828248&view=diff
==============================================================================
--- felix/trunk/osgi-r7/framework/src/main/resources/default.properties (original)
+++ felix/trunk/osgi-r7/framework/src/main/resources/default.properties Tue Apr 3 14:55:11 2018
@@ -84,14 +84,6 @@ eecap-1.7=, osgi.ee; osgi.ee="OSGi/Minim
osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7"
eecap-1.6=, osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1,1.2", \
osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0,1.1,1.2,1.3,1.4,1.5,1.6"
-eecap-1.5=, osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1,1.2", \
- osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0,1.1,1.2,1.3,1.4,1.5"
-eecap-1.4=, osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1,1.2", \
- osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0,1.1,1.2,1.3,1.4"
-eecap-1.3=, osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1", \
- osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0,1.1,1.2,1.3"
-eecap-1.2=, osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1", \
- osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0,1.1,1.2"
# Deprecated old-style execution environment properties.
org.osgi.framework.executionenvironment= \
@@ -105,12 +97,6 @@ ee-1.7=JavaSE-1.7,JavaSE-1.6,J2SE-1.5,J2
OSGi/Minimum-1.0
ee-1.6=JavaSE-1.6,J2SE-1.5,J2SE-1.4,J2SE-1.3,J2SE-1.2, \
JRE-1.1,JRE-1.0,OSGi/Minimum-1.2,OSGi/Minimum-1.1,OSGi/Minimum-1.0
-ee-1.5=J2SE-1.5,J2SE-1.4,J2SE-1.3,J2SE-1.2,JRE-1.1,JRE-1.0, \
- OSGi/Minimum-1.2,OSGi/Minimum-1.1,OSGi/Minimum-1.0
-ee-1.4=J2SE-1.4,J2SE-1.3,J2SE-1.2,JRE-1.1,JRE-1.0,OSGi/Minimum-1.2, \
- OSGi/Minimum-1.1,OSGi/Minimum-1.0
-ee-1.3=J2SE-1.3,J2SE-1.2,JRE-1.1,JRE-1.0,OSGi/Minimum-1.1,OSGi/Minimum-1.0
-ee-1.2=J2SE-1.2,JRE-1.1,JRE-1.0,OSGi/Minimum-1.1,OSGi/Minimum-1.0
# Default packages exported by system bundle.
org.osgi.framework.system.packages=\
Modified: felix/trunk/osgi-r7/framework/src/test/java/org/apache/felix/framework/BundleWiringImplTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/framework/src/test/java/org/apache/felix/framework/BundleWiringImplTest.java?rev=1828248&r1=1828247&r2=1828248&view=diff
==============================================================================
--- felix/trunk/osgi-r7/framework/src/test/java/org/apache/felix/framework/BundleWiringImplTest.java (original)
+++ felix/trunk/osgi-r7/framework/src/test/java/org/apache/felix/framework/BundleWiringImplTest.java Tue Apr 3 14:55:11 2018
@@ -46,6 +46,7 @@ import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -558,7 +559,7 @@ public class BundleWiringImplTest
BundleClassLoader notFoundClassLoader = mock(BundleClassLoader.class);
BundleRevision bundleRevision1 = getBundleRevision(classToBeLoaded, foundClassLoader, String.class);
BundleRevision bundleRevision2 = getBundleRevision(classToBeLoaded, notFoundClassLoader, null);
- Map<String, BundleRevision> importedPkgsActual = new HashMap<String, BundleRevision>();
+ Map<String, BundleRevision> importedPkgsActual = new LinkedHashMap<String, BundleRevision>();
importedPkgsActual.put("sun.reflect1", bundleRevision1);
importedPkgsActual.put("sun.reflect2", bundleRevision2);
when(importedPkgs.values()).thenReturn(importedPkgsActual.values());