You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2012/12/13 19:11:39 UTC
svn commit: r1421410 - in /karaf/branches/karaf-2.2.x: pom.xml
webconsole/admin/pom.xml webconsole/features/pom.xml webconsole/gogo/pom.xml
Author: jbonofre
Date: Thu Dec 13 18:11:37 2012
New Revision: 1421410
URL: http://svn.apache.org/viewvc?rev=1421410&view=rev
Log:
[KARAF-1745] Upgrade to Felix WebConsole 4.0.0
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=1421410&r1=1421409&r2=1421410&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/pom.xml Thu Dec 13 18:11:37 2012
@@ -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>3.1.8</felix.webconsole.version>
+ <felix.webconsole.version>4.0.0</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=1421410&r1=1421409&r2=1421410&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/webconsole/admin/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/webconsole/admin/pom.xml Thu Dec 13 18:11:37 2012
@@ -113,7 +113,10 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Import-Package>*</Import-Package>
+ <Import-Package>
+ org.apache.felix.webconsole;version="[3,5)",
+ *
+ </Import-Package>
<Embed-Dependency>
<!-- Required for JSON data transfer -->
<!-- TODO: this needs to be put in a common place for reuse. -->
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=1421410&r1=1421409&r2=1421410&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/webconsole/features/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/webconsole/features/pom.xml Thu Dec 13 18:11:37 2012
@@ -98,7 +98,10 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Import-Package>*</Import-Package>
+ <Import-Package>
+ org.apache.felix.webconsole;version="[3,5)",
+ *
+ </Import-Package>
<Embed-Dependency>
<!-- Required for JSON data transfer -->
<!-- TODO: this needs to be put in a common place for reuse. -->
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=1421410&r1=1421409&r2=1421410&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/webconsole/gogo/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/webconsole/gogo/pom.xml Thu Dec 13 18:11:37 2012
@@ -105,6 +105,7 @@
<instructions>
<Import-Package>
jline;version="[${jline.version}, ${jline.version}]",
+ org.apache.felix.webconsole;version="[3,5)",
*
</Import-Package>
<Embed-Dependency>