Fix run targets:
- we need to explicitly add the Servlet-API in order to get all bundles to
resolve;
- also updated the desired EE to 1.7.
git-svn-id: https://svn.apache.org/repos/asf/ace/trunk@1727259 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/run-client/client.bndrun b/run-client/client.bndrun
index 90baa6e..01feafd 100644
--- a/run-client/client.bndrun
+++ b/run-client/client.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.dependencymanager,\
org.apache.felix.useradmin,\
org.apache.felix.useradmin.filestore,\
@@ -12,6 +12,7 @@
org.apache.felix.gogo.runtime,\
org.apache.felix.gogo.shell,\
org.apache.felix.gogo.command,\
+ org.apache.felix.http.servlet-api,\
org.apache.felix.http.jetty,\
org.apache.felix.dependencymanager.shell,\
osgi.cmpn,\
diff --git a/run-obr/obr.bndrun b/run-obr/obr.bndrun
index ea52c2e..50da0e3 100644
--- a/run-obr/obr.bndrun
+++ b/run-obr/obr.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.dependencymanager,\
org.apache.felix.dependencymanager.shell,\
org.apache.felix.log,\
@@ -9,6 +9,7 @@
org.apache.felix.gogo.shell,\
org.apache.felix.gogo.command,\
org.apache.felix.configadmin,\
+ org.apache.felix.http.servlet-api,\
org.apache.felix.http.jetty,\
org.apache.felix.useradmin,\
org.apache.felix.useradmin.filestore,\
diff --git a/run-relay/relay.bndrun b/run-relay/relay.bndrun
index 942737a..bdf6c05 100644
--- a/run-relay/relay.bndrun
+++ b/run-relay/relay.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.dependencymanager,\
org.apache.felix.useradmin,\
org.apache.felix.useradmin.filestore,\
@@ -12,6 +12,7 @@
org.apache.felix.gogo.runtime,\
org.apache.felix.gogo.shell,\
org.apache.felix.gogo.command,\
+ org.apache.felix.http.servlet-api,\
org.apache.felix.http.jetty,\
org.apache.felix.dependencymanager.shell,\
osgi.cmpn;version=latest,\
diff --git a/run-server-allinone/server-allinone.bndrun b/run-server-allinone/server-allinone.bndrun
index 9df35ea..665cf84 100644
--- a/run-server-allinone/server-allinone.bndrun
+++ b/run-server-allinone/server-allinone.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.dependencymanager,\
org.apache.felix.useradmin,\
org.apache.felix.useradmin.filestore,\
@@ -12,6 +12,7 @@
org.apache.felix.gogo.runtime,\
org.apache.felix.gogo.shell,\
org.apache.felix.gogo.command,\
+ org.apache.felix.http.servlet-api,\
org.apache.felix.http.jetty,\
org.apache.felix.dependencymanager.shell,\
osgi.cmpn;version=latest,\
diff --git a/run-server/server.bndrun b/run-server/server.bndrun
index 3c8fa48..2455584 100644
--- a/run-server/server.bndrun
+++ b/run-server/server.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.dependencymanager,\
org.apache.felix.useradmin,\
org.apache.felix.useradmin.filestore,\
@@ -12,6 +12,7 @@
org.apache.felix.gogo.runtime,\
org.apache.felix.gogo.shell,\
org.apache.felix.gogo.command,\
+ org.apache.felix.http.servlet-api,\
org.apache.felix.http.jetty,\
org.apache.felix.dependencymanager.shell,\
osgi.cmpn;version=latest,\
