You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ace.apache.org by ja...@apache.org on 2016/01/28 08:56:16 UTC

svn commit: r1727259 - in /ace/trunk: run-client/client.bndrun run-obr/obr.bndrun run-relay/relay.bndrun run-server-allinone/server-allinone.bndrun run-server/server.bndrun

Author: jawi
Date: Thu Jan 28 07:56:16 2016
New Revision: 1727259

URL: http://svn.apache.org/viewvc?rev=1727259&view=rev
Log:
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.


Modified:
    ace/trunk/run-client/client.bndrun
    ace/trunk/run-obr/obr.bndrun
    ace/trunk/run-relay/relay.bndrun
    ace/trunk/run-server-allinone/server-allinone.bndrun
    ace/trunk/run-server/server.bndrun

Modified: ace/trunk/run-client/client.bndrun
URL: http://svn.apache.org/viewvc/ace/trunk/run-client/client.bndrun?rev=1727259&r1=1727258&r2=1727259&view=diff
==============================================================================
--- ace/trunk/run-client/client.bndrun (original)
+++ ace/trunk/run-client/client.bndrun Thu Jan 28 07:56:16 2016
@@ -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,\

Modified: ace/trunk/run-obr/obr.bndrun
URL: http://svn.apache.org/viewvc/ace/trunk/run-obr/obr.bndrun?rev=1727259&r1=1727258&r2=1727259&view=diff
==============================================================================
--- ace/trunk/run-obr/obr.bndrun (original)
+++ ace/trunk/run-obr/obr.bndrun Thu Jan 28 07:56:16 2016
@@ -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,\

Modified: ace/trunk/run-relay/relay.bndrun
URL: http://svn.apache.org/viewvc/ace/trunk/run-relay/relay.bndrun?rev=1727259&r1=1727258&r2=1727259&view=diff
==============================================================================
--- ace/trunk/run-relay/relay.bndrun (original)
+++ ace/trunk/run-relay/relay.bndrun Thu Jan 28 07:56:16 2016
@@ -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,\

Modified: ace/trunk/run-server-allinone/server-allinone.bndrun
URL: http://svn.apache.org/viewvc/ace/trunk/run-server-allinone/server-allinone.bndrun?rev=1727259&r1=1727258&r2=1727259&view=diff
==============================================================================
--- ace/trunk/run-server-allinone/server-allinone.bndrun (original)
+++ ace/trunk/run-server-allinone/server-allinone.bndrun Thu Jan 28 07:56:16 2016
@@ -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,\

Modified: ace/trunk/run-server/server.bndrun
URL: http://svn.apache.org/viewvc/ace/trunk/run-server/server.bndrun?rev=1727259&r1=1727258&r2=1727259&view=diff
==============================================================================
--- ace/trunk/run-server/server.bndrun (original)
+++ ace/trunk/run-server/server.bndrun Thu Jan 28 07:56:16 2016
@@ -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,\