diff --git a/org.apache.ace.agent.launcher/.classpath b/org.apache.ace.agent.launcher/.classpath
index 33afd9d..3673c1e 100644
--- a/org.apache.ace.agent.launcher/.classpath
+++ b/org.apache.ace.agent.launcher/.classpath
@@ -3,6 +3,6 @@
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test"/>
 	<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.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.apache.ace.agent.launcher/.settings/org.eclipse.jdt.core.prefs b/org.apache.ace.agent.launcher/.settings/org.eclipse.jdt.core.prefs
index ef8a789..d17b672 100644
--- a/org.apache.ace.agent.launcher/.settings/org.eclipse.jdt.core.prefs
+++ b/org.apache.ace.agent.launcher/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,12 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+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.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.apache.ace.agent.launcher/bnd.bnd b/org.apache.ace.agent.launcher/bnd.bnd
index 435e2d9..cd98716 100644
--- a/org.apache.ace.agent.launcher/bnd.bnd
+++ b/org.apache.ace.agent.launcher/bnd.bnd
@@ -10,5 +10,5 @@
 
 -diffignore: org.apache.ace.agent.jar
 
-javac.source: 1.6
-javac.target: 1.6
+javac.source: 1.7
+javac.target: 1.7
diff --git a/org.apache.ace.agent/.classpath b/org.apache.ace.agent/.classpath
index 70015f0..f89b661 100644
--- a/org.apache.ace.agent/.classpath
+++ b/org.apache.ace.agent/.classpath
@@ -3,6 +3,6 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test"/>
 	<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.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.apache.ace.agent/.settings/org.eclipse.jdt.core.prefs b/org.apache.ace.agent/.settings/org.eclipse.jdt.core.prefs
index ef8a789..d17b672 100644
--- a/org.apache.ace.agent/.settings/org.eclipse.jdt.core.prefs
+++ b/org.apache.ace.agent/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,12 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+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.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.apache.ace.agent/bnd.bnd b/org.apache.ace.agent/bnd.bnd
index 688fed9..483c0b4 100644
--- a/org.apache.ace.agent/bnd.bnd
+++ b/org.apache.ace.agent/bnd.bnd
@@ -48,5 +48,5 @@
 	org.apache.ace.range.api;version=latest,\
 	org.apache.ace.feedback.common;version=latest
 
-javac.source: 1.6
-javac.target: 1.6
\ No newline at end of file
+javac.source: 1.7
+javac.target: 1.7
\ No newline at end of file
diff --git a/org.apache.ace.resourceprocessor.useradmin/.classpath b/org.apache.ace.resourceprocessor.useradmin/.classpath
index a449a41..8578d2f 100644
--- a/org.apache.ace.resourceprocessor.useradmin/.classpath
+++ b/org.apache.ace.resourceprocessor.useradmin/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<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="output" path="bin"/>
 </classpath>
diff --git a/org.apache.ace.resourceprocessor.useradmin/.settings/org.eclipse.jdt.core.prefs b/org.apache.ace.resourceprocessor.useradmin/.settings/org.eclipse.jdt.core.prefs
index ef8a789..d17b672 100644
--- a/org.apache.ace.resourceprocessor.useradmin/.settings/org.eclipse.jdt.core.prefs
+++ b/org.apache.ace.resourceprocessor.useradmin/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,12 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+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.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.apache.ace.resourceprocessor.useradmin/bnd.bnd b/org.apache.ace.resourceprocessor.useradmin/bnd.bnd
index dfdd6ef..753c5bb 100644
--- a/org.apache.ace.resourceprocessor.useradmin/bnd.bnd
+++ b/org.apache.ace.resourceprocessor.useradmin/bnd.bnd
@@ -13,5 +13,5 @@
 Bundle-Name: Apache ACE ResourceProcessor UserAdmin
 Bundle-Description: Registers a ResourceProcessor service that handle useradmin resources
 
-javac.source: 1.6
-javac.target: 1.6
+javac.source: 1.7
+javac.target: 1.7
diff --git a/run-develop/.classpath b/run-develop/.classpath
index cdafd99..f89ae43 100644
--- a/run-develop/.classpath
+++ b/run-develop/.classpath
@@ -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.6"/>
+	<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="output" path="bin"/>
 </classpath>
diff --git a/run-develop/bnd.bnd b/run-develop/bnd.bnd
index fcc44d2..82854af 100644
--- a/run-develop/bnd.bnd
+++ b/run-develop/bnd.bnd
@@ -4,5 +4,5 @@
 Bundle-Name: Apache ACE Development Target
 Bundle-Description: Bnd run project for a standard ACE Target when used in a development environment, such as Eclipse. This projects does not generate any artifacts.
 
-javac.source: 1.6
-javac.target: 1.6
+javac.source: 1.7
+javac.target: 1.7
diff --git a/run-develop/develop.bndrun b/run-develop/develop.bndrun
index ccf8cdb..3129b3a 100644
--- a/run-develop/develop.bndrun
+++ b/run-develop/develop.bndrun
@@ -1,7 +1,7 @@
 # Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
 
 -runfw: org.apache.felix.framework;version='[5.2.0,6)'
--runee: JavaSE-1.6
+-runee: JavaSE-1.7
 -runbundles: org.apache.felix.gogo.command,\
 	org.apache.felix.gogo.runtime,\
 	org.apache.felix.gogo.shell,\
diff --git a/run-target/.classpath b/run-target/.classpath
index cdafd99..f89ae43 100644
--- a/run-target/.classpath
+++ b/run-target/.classpath
@@ -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.6"/>
+	<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="output" path="bin"/>
 </classpath>
diff --git a/run-target/.settings/org.eclipse.jdt.core.prefs b/run-target/.settings/org.eclipse.jdt.core.prefs
index ef8a789..d17b672 100644
--- a/run-target/.settings/org.eclipse.jdt.core.prefs
+++ b/run-target/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,12 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+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.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/run-target/bnd.bnd b/run-target/bnd.bnd
index e2aaacd..89ee6be 100644
--- a/run-target/bnd.bnd
+++ b/run-target/bnd.bnd
@@ -4,5 +4,5 @@
 Bundle-Name: Apache ACE Run Target
 Bundle-Description: Bnd run project for a standard ACE Target. This projects does not generate any artifacts.
 
-javac.source: 1.6
-javac.target: 1.6
\ No newline at end of file
+javac.source: 1.7
+javac.target: 1.7
\ No newline at end of file
diff --git a/run-target/target.bndrun b/run-target/target.bndrun
index f9996fe..1f93e62 100644
--- a/run-target/target.bndrun
+++ b/run-target/target.bndrun
@@ -1,7 +1,7 @@
 # Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
 
 -runfw: org.apache.felix.framework;version='[5.2.0,6)'
--runee: JavaSE-1.6
+-runee: JavaSE-1.7
 -runbundles:  \
 	org.apache.ace.agent;version=latest
 -runproperties: \