You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ff...@apache.org on 2013/02/18 10:28:38 UTC

svn commit: r1447163 - in /karaf/branches/karaf-2.2.x: pom.xml webconsole/admin/pom.xml webconsole/features/pom.xml webconsole/gogo/pom.xml

Author: ffang
Date: Mon Feb 18 09:28:38 2013
New Revision: 1447163

URL: http://svn.apache.org/r1447163
Log:
[KARAF-2166]revert to use felix webconsole 3.1.8

Modified:
    karaf/branches/karaf-2.2.x/pom.xml
    karaf/branches/karaf-2.2.x/webconsole/admin/pom.xml
    karaf/branches/karaf-2.2.x/webconsole/features/pom.xml
    karaf/branches/karaf-2.2.x/webconsole/gogo/pom.xml

Modified: karaf/branches/karaf-2.2.x/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/pom.xml?rev=1447163&r1=1447162&r2=1447163&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/pom.xml Mon Feb 18 09:28:38 2013
@@ -127,7 +127,7 @@
         <felix.gogo.version>0.10.0</felix.gogo.version>
         <felix.plugin.version>2.3.7</felix.plugin.version>
         <felix.utils.version>1.2.0</felix.utils.version>
-        <felix.webconsole.version>4.0.0</felix.webconsole.version>
+        <felix.webconsole.version>3.1.8</felix.webconsole.version>
         <felix.metatype.version>1.0.4</felix.metatype.version>
         <felix.eventadmin.version>1.2.14</felix.eventadmin.version>
         <felix.eventadmin-plugin.version>1.0.2</felix.eventadmin-plugin.version>

Modified: karaf/branches/karaf-2.2.x/webconsole/admin/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/webconsole/admin/pom.xml?rev=1447163&r1=1447162&r2=1447163&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/webconsole/admin/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/webconsole/admin/pom.xml Mon Feb 18 09:28:38 2013
@@ -114,7 +114,6 @@
                 <configuration>
                     <instructions>
                         <Import-Package>
-                            org.apache.felix.webconsole;version="[3,5)",
                             org.apache.karaf.admin;resolution:=optional,
                             *
                         </Import-Package>

Modified: karaf/branches/karaf-2.2.x/webconsole/features/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/webconsole/features/pom.xml?rev=1447163&r1=1447162&r2=1447163&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/webconsole/features/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/webconsole/features/pom.xml Mon Feb 18 09:28:38 2013
@@ -99,7 +99,6 @@
                 <configuration>
                     <instructions>
                         <Import-Package>
-                            org.apache.felix.webconsole;version="[3,5)",
                             *
                         </Import-Package>
                         <Embed-Dependency>

Modified: karaf/branches/karaf-2.2.x/webconsole/gogo/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/webconsole/gogo/pom.xml?rev=1447163&r1=1447162&r2=1447163&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/webconsole/gogo/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/webconsole/gogo/pom.xml Mon Feb 18 09:28:38 2013
@@ -105,7 +105,6 @@
                     <instructions>
                         <Import-Package>
                             jline;version="[${jline.version}, ${jline.version}]",
-                            org.apache.felix.webconsole;version="[3,5)",
                             *
                         </Import-Package>
                         <Embed-Dependency>