You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by pd...@apache.org on 2015/07/30 01:43:01 UTC

svn commit: r1693362 - in /felix/sandbox/pderop/dependencymanager.ds: ./ cnf/ org.apache.felix.dependencymanager.annotation/ org.apache.felix.dependencymanager.annotation/.settings/ org.apache.felix.dependencymanager.benchmark/ org.apache.felix.depende...

Author: pderop
Date: Wed Jul 29 23:43:00 2015
New Revision: 1693362

URL: http://svn.apache.org/r1693362
Log:
build everything using java8

Modified:
    felix/sandbox/pderop/dependencymanager.ds/cnf/build.bnd
    felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.annotation/.classpath
    felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.annotation/.settings/org.eclipse.jdt.core.prefs
    felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.benchmark/bnd.bnd
    felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.ds.itest/.classpath
    felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.ds.itest/.settings/org.eclipse.jdt.core.prefs
    felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.ds.itest/bnd.bnd
    felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.ds/.classpath
    felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.ds/.settings/org.eclipse.jdt.core.prefs
    felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.ds/test/org/apache/felix/scr/impl/helper/BindMethodTest.java
    felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.itest/.classpath
    felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.itest/.settings/org.eclipse.jdt.core.prefs
    felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.itest/bnd.bnd
    felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.runtime.itest/.classpath
    felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.runtime.itest/.settings/org.eclipse.jdt.core.prefs
    felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.runtime.itest/bnd.bnd
    felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.runtime/.classpath
    felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.runtime/.settings/org.eclipse.jdt.core.prefs
    felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.samples/.classpath
    felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.samples/.settings/org.eclipse.jdt.core.prefs
    felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.samples/bnd.bnd
    felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.shell/.classpath
    felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager/.classpath
    felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager/.settings/org.eclipse.jdt.core.prefs
    felix/sandbox/pderop/dependencymanager.ds/settings.gradle

Modified: felix/sandbox/pderop/dependencymanager.ds/cnf/build.bnd
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager.ds/cnf/build.bnd?rev=1693362&r1=1693361&r2=1693362&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager.ds/cnf/build.bnd (original)
+++ felix/sandbox/pderop/dependencymanager.ds/cnf/build.bnd Wed Jul 29 23:43:00 2015
@@ -49,8 +49,8 @@
 ## Java Compiler Options
 #java:                  java
 #javac:                 javac
-javac.source:          1.7
-javac.target:          1.7
+javac.source:          1.8
+javac.target:          1.8
 #javac.debug:           on
 
 ## Bnd Options

Modified: felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.annotation/.classpath
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.annotation/.classpath?rev=1693362&r1=1693361&r2=1693362&view=diff
==============================================================================
Binary files - no diff available.

Modified: felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.annotation/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.annotation/.settings/org.eclipse.jdt.core.prefs?rev=1693362&r1=1693361&r2=1693362&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.annotation/.settings/org.eclipse.jdt.core.prefs (original)
+++ felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.annotation/.settings/org.eclipse.jdt.core.prefs Wed Jul 29 23:43:00 2015
@@ -1,11 +1,11 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8

Modified: felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.benchmark/bnd.bnd
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.benchmark/bnd.bnd?rev=1693362&r1=1693361&r2=1693362&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.benchmark/bnd.bnd (original)
+++ felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.benchmark/bnd.bnd Wed Jul 29 23:43:00 2015
@@ -14,8 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-javac.source:          1.8
-javac.target:          1.8
 Bundle-Version: 1.0.0
 -buildpath:  \
 	org.apache.felix.dependencymanager;version=latest,\

Modified: felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.ds.itest/.classpath
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.ds.itest/.classpath?rev=1693362&r1=1693361&r2=1693362&view=diff
==============================================================================
Binary files - no diff available.

Modified: felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.ds.itest/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.ds.itest/.settings/org.eclipse.jdt.core.prefs?rev=1693362&r1=1693361&r2=1693362&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.ds.itest/.settings/org.eclipse.jdt.core.prefs (original)
+++ felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.ds.itest/.settings/org.eclipse.jdt.core.prefs Wed Jul 29 23:43:00 2015
@@ -1,14 +1,4 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

Modified: felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.ds.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.ds.itest/bnd.bnd?rev=1693362&r1=1693361&r2=1693362&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.ds.itest/bnd.bnd (original)
+++ felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.ds.itest/bnd.bnd Wed Jul 29 23:43:00 2015
@@ -4,7 +4,7 @@
 	osgi.enterprise;version=5.0,\
 	${junit},\
 	biz.aQute.bndlib;version=2.4
--runee: JavaSE-1.7
+-runee: JavaSE-1.8
 -runfw: org.apache.felix.framework;version=5.0.1
 -runsystempackages:  \
 	sun.reflect

Modified: felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.ds/.classpath
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.ds/.classpath?rev=1693362&r1=1693361&r2=1693362&view=diff
==============================================================================
Binary files - no diff available.

Modified: felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.ds/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.ds/.settings/org.eclipse.jdt.core.prefs?rev=1693362&r1=1693361&r2=1693362&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.ds/.settings/org.eclipse.jdt.core.prefs (original)
+++ felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.ds/.settings/org.eclipse.jdt.core.prefs Wed Jul 29 23:43:00 2015
@@ -1,14 +1,14 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

Modified: felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.ds/test/org/apache/felix/scr/impl/helper/BindMethodTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.ds/test/org/apache/felix/scr/impl/helper/BindMethodTest.java?rev=1693362&r1=1693361&r2=1693362&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.ds/test/org/apache/felix/scr/impl/helper/BindMethodTest.java (original)
+++ felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.ds/test/org/apache/felix/scr/impl/helper/BindMethodTest.java Wed Jul 29 23:43:00 2015
@@ -58,7 +58,7 @@ public class BindMethodTest extends Test
         m_serviceInstance = EasyMock.createNiceMock( FakeService.class );
         m_context = EasyMock.createNiceMock( BundleContext.class );
 
-        EasyMock.expect( m_context.getService( m_serviceReference ) ).andReturn( m_serviceInstance )
+        EasyMock.expect( (FakeService) m_context.getService( m_serviceReference ) ).andReturn( m_serviceInstance )
                 .anyTimes();
 
         EasyMock.expect( m_serviceReference.getPropertyKeys() ).andReturn( new String[]

Modified: felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.itest/.classpath
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.itest/.classpath?rev=1693362&r1=1693361&r2=1693362&view=diff
==============================================================================
Binary files - no diff available.

Modified: felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.itest/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.itest/.settings/org.eclipse.jdt.core.prefs?rev=1693362&r1=1693361&r2=1693362&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.itest/.settings/org.eclipse.jdt.core.prefs (original)
+++ felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.itest/.settings/org.eclipse.jdt.core.prefs Wed Jul 29 23:43:00 2015
@@ -1,11 +1,11 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8

Modified: felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.itest/bnd.bnd?rev=1693362&r1=1693361&r2=1693362&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.itest/bnd.bnd (original)
+++ felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.itest/bnd.bnd Wed Jul 29 23:43:00 2015
@@ -21,7 +21,7 @@
 	org.apache.felix.configadmin;version=1.8.6,\
 	org.apache.felix.dependencymanager;version=latest,\
 	org.apache.felix.dependencymanager.shell;version=latest
--runee: JavaSE-1.7
+-runee: JavaSE-1.8
 -runvm: -ea
 -runfw: org.apache.felix.framework;version=5.0.1
 -buildpath:  \

Modified: felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.runtime.itest/.classpath
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.runtime.itest/.classpath?rev=1693362&r1=1693361&r2=1693362&view=diff
==============================================================================
Binary files - no diff available.

Modified: felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.runtime.itest/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.runtime.itest/.settings/org.eclipse.jdt.core.prefs?rev=1693362&r1=1693361&r2=1693362&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.runtime.itest/.settings/org.eclipse.jdt.core.prefs (original)
+++ felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.runtime.itest/.settings/org.eclipse.jdt.core.prefs Wed Jul 29 23:43:00 2015
@@ -1,11 +1,11 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8

Modified: felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.runtime.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.runtime.itest/bnd.bnd?rev=1693362&r1=1693361&r2=1693362&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.runtime.itest/bnd.bnd (original)
+++ felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.runtime.itest/bnd.bnd Wed Jul 29 23:43:00 2015
@@ -30,7 +30,7 @@
 	org.apache.felix.dependencymanager;version=latest,\
 	org.apache.felix.dependencymanager.runtime;version=latest,\
 	org.apache.felix.dependencymanager.shell;version=latest
--runee: JavaSE-1.7
+-runee: JavaSE-1.8
 -runfw: org.apache.felix.framework;version=5.0.1
 -runsystempackages: \
 	sun.reflect

Modified: felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.runtime/.classpath
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.runtime/.classpath?rev=1693362&r1=1693361&r2=1693362&view=diff
==============================================================================
Binary files - no diff available.

Modified: felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.runtime/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.runtime/.settings/org.eclipse.jdt.core.prefs?rev=1693362&r1=1693361&r2=1693362&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.runtime/.settings/org.eclipse.jdt.core.prefs (original)
+++ felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.runtime/.settings/org.eclipse.jdt.core.prefs Wed Jul 29 23:43:00 2015
@@ -1,11 +1,11 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8

Modified: felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.samples/.classpath
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.samples/.classpath?rev=1693362&r1=1693361&r2=1693362&view=diff
==============================================================================
Binary files - no diff available.

Modified: felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.samples/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.samples/.settings/org.eclipse.jdt.core.prefs?rev=1693362&r1=1693361&r2=1693362&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.samples/.settings/org.eclipse.jdt.core.prefs (original)
+++ felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.samples/.settings/org.eclipse.jdt.core.prefs Wed Jul 29 23:43:00 2015
@@ -1,11 +1,11 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8

Modified: felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.samples/bnd.bnd
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.samples/bnd.bnd?rev=1693362&r1=1693361&r2=1693362&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.samples/bnd.bnd (original)
+++ felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.samples/bnd.bnd Wed Jul 29 23:43:00 2015
@@ -24,7 +24,7 @@ Bundle-Version: 1.0.0
 	org.apache.felix.dependencymanager.annotation;version=latest,\
 	biz.aQute.bnd.annotation
 -runfw: org.apache.felix.framework;version=5.0.1
--runee: JavaSE-1.7
+-runee: JavaSE-1.8
 -runbundles:  \
 	org.apache.felix.dependencymanager;version=latest,\
 	org.apache.felix.metatype;version=1.0.4,\

Modified: felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.shell/.classpath
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager.shell/.classpath?rev=1693362&r1=1693361&r2=1693362&view=diff
==============================================================================
Binary files - no diff available.

Modified: felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager/.classpath
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager/.classpath?rev=1693362&r1=1693361&r2=1693362&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager/.classpath (original)
+++ felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager/.classpath Wed Jul 29 23:43:00 2015
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Modified: felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager/.settings/org.eclipse.jdt.core.prefs?rev=1693362&r1=1693361&r2=1693362&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager/.settings/org.eclipse.jdt.core.prefs (original)
+++ felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager/.settings/org.eclipse.jdt.core.prefs Wed Jul 29 23:43:00 2015
@@ -1,11 +1,11 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8

Modified: felix/sandbox/pderop/dependencymanager.ds/settings.gradle
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager.ds/settings.gradle?rev=1693362&r1=1693361&r2=1693362&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager.ds/settings.gradle (original)
+++ felix/sandbox/pderop/dependencymanager.ds/settings.gradle Wed Jul 29 23:43:00 2015
@@ -100,13 +100,10 @@ if (projectNames.remove('')) {
 
 /* Add each project and its dependencies to the graph */
 projectNames.each { projectName ->
-  // Don't build the org.apache.felix.dependencymanager.benchmark, which requires java8 (build the benchmark bundle only makes sense within eclipse
-  if (! projectName.equals("org.apache.felix.dependencymanager.benchmark")) {
-    include projectName
-    def project = getBndProject(workspace, projectName)
-    project?.dependson.each {
-      include it.name
-    }
+  include projectName
+  def project = getBndProject(workspace, projectName)
+  project?.dependson.each {
+    include it.name
   }
 }