Repository: karaf Updated Branches: refs/heads/master 9aa4c88a2 -> 91755c92b
[KARAF-2602] Loosen the requirement on build JDK Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/91755c92 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/91755c92 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/91755c92 Branch: refs/heads/master Commit: 91755c92b951fe38467aac2afc8a1b6e34594674 Parents: 9aa4c88 Author: Guillaume Nodet <gno...@gmail.com> Authored: Tue Apr 22 15:52:56 2014 +0200 Committer: Guillaume Nodet <gno...@gmail.com> Committed: Tue Apr 22 15:52:56 2014 +0200 ---------------------------------------------------------------------- .../src/main/filtered-resources/resources/etc/config.properties | 2 ++ pom.xml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/91755c92/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties ---------------------------------------------------------------------- diff --git a/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties b/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties index d9f3114..6bee778 100644 --- a/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties +++ b/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties @@ -126,6 +126,8 @@ org.osgi.framework.system.capabilities= \ osgi.service;effective:=active;objectClass=org.osgi.service.startlevel.StartLevel, \ ${services-${karaf.framework}} +eecap-1.8= 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,1.7,1.8" eecap-1.7= 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,1.7" eecap-1.6= osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1,1.2", \ http://git-wip-us.apache.org/repos/asf/karaf/blob/91755c92/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 5166f71..2a86c92 100644 --- a/pom.xml +++ b/pom.xml @@ -2089,7 +2089,7 @@ <version>3.0.2</version> </requireMavenVersion> <requireJavaVersion> - <version>[1.6,1.8)</version> + <version>[1.6,1.9)</version> </requireJavaVersion> </rules> </configuration>
