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/06/12 10:34:25 UTC
svn commit: r1349189 - in /karaf/trunk: ./ config/command/ config/core/
dev/command/ dev/core/ diagnostic/command/ diagnostic/core/
features/command/ features/core/ jaas/modules/ log/command/ log/core/
shell/ssh/
Author: jbonofre
Date: Tue Jun 12 08:34:24 2012
New Revision: 1349189
URL: http://svn.apache.org/viewvc?rev=1349189&view=rev
Log:
[KARAF-1531] Upgrade to Felix ConfigAdmin 1.4.0
Modified:
karaf/trunk/config/command/pom.xml
karaf/trunk/config/core/pom.xml
karaf/trunk/dev/command/pom.xml
karaf/trunk/dev/core/pom.xml
karaf/trunk/diagnostic/command/pom.xml
karaf/trunk/diagnostic/core/pom.xml
karaf/trunk/features/command/pom.xml
karaf/trunk/features/core/pom.xml
karaf/trunk/jaas/modules/pom.xml
karaf/trunk/log/command/pom.xml
karaf/trunk/log/core/pom.xml
karaf/trunk/pom.xml
karaf/trunk/shell/ssh/pom.xml
Modified: karaf/trunk/config/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/config/command/pom.xml?rev=1349189&r1=1349188&r2=1349189&view=diff
==============================================================================
--- karaf/trunk/config/command/pom.xml (original)
+++ karaf/trunk/config/command/pom.xml Tue Jun 12 08:34:24 2012
@@ -94,7 +94,6 @@
<configuration>
<instructions>
<Import-Package>
- org.osgi.service.cm;version="[1.3,2)",
*
</Import-Package>
<Private-Package>!*</Private-Package>
Modified: karaf/trunk/config/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/config/core/pom.xml?rev=1349189&r1=1349188&r2=1349189&view=diff
==============================================================================
--- karaf/trunk/config/core/pom.xml (original)
+++ karaf/trunk/config/core/pom.xml Tue Jun 12 08:34:24 2012
@@ -87,7 +87,6 @@
org.apache.karaf.config.core
</Export-Package>
<Import-Package>
- org.osgi.service.cm;version="[1.3,2)",
*
</Import-Package>
<Private-Package>
Modified: karaf/trunk/dev/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/dev/command/pom.xml?rev=1349189&r1=1349188&r2=1349189&view=diff
==============================================================================
--- karaf/trunk/dev/command/pom.xml (original)
+++ karaf/trunk/dev/command/pom.xml Tue Jun 12 08:34:24 2012
@@ -93,7 +93,6 @@
<instructions>
<Export-Package>!*</Export-Package>
<Import-Package>
- org.osgi.service.cm;version="[1.3,2)",
*
</Import-Package>
<Private-Package>
Modified: karaf/trunk/dev/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/dev/core/pom.xml?rev=1349189&r1=1349188&r2=1349189&view=diff
==============================================================================
--- karaf/trunk/dev/core/pom.xml (original)
+++ karaf/trunk/dev/core/pom.xml Tue Jun 12 08:34:24 2012
@@ -87,7 +87,6 @@
org.apache.karaf.dev.core
</Export-Package>
<Import-Package>
- org.osgi.service.cm;version="[1.3,2)",
*
</Import-Package>
<Private-Package>
@@ -102,4 +101,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: karaf/trunk/diagnostic/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/diagnostic/command/pom.xml?rev=1349189&r1=1349188&r2=1349189&view=diff
==============================================================================
--- karaf/trunk/diagnostic/command/pom.xml (original)
+++ karaf/trunk/diagnostic/command/pom.xml Tue Jun 12 08:34:24 2012
@@ -85,7 +85,6 @@
org.apache.aries.blueprint,
org.osgi.service.blueprint.container,
org.osgi.service.blueprint.reflect,
- org.osgi.service.cm;version="[1.3,2)",
*
</Import-Package>
<Private-Package>!*</Private-Package>
Modified: karaf/trunk/diagnostic/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/diagnostic/core/pom.xml?rev=1349189&r1=1349188&r2=1349189&view=diff
==============================================================================
--- karaf/trunk/diagnostic/core/pom.xml (original)
+++ karaf/trunk/diagnostic/core/pom.xml Tue Jun 12 08:34:24 2012
@@ -83,7 +83,6 @@
${project.artifactId}.common
</Export-Package>
<Import-Package>
- org.osgi.service.cm;version="[1.3,2)",
*
</Import-Package>
<Private-Package>
Modified: karaf/trunk/features/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/features/command/pom.xml?rev=1349189&r1=1349188&r2=1349189&view=diff
==============================================================================
--- karaf/trunk/features/command/pom.xml (original)
+++ karaf/trunk/features/command/pom.xml Tue Jun 12 08:34:24 2012
@@ -91,7 +91,6 @@
org.apache.aries.blueprint,
org.osgi.service.blueprint.container,
org.osgi.service.blueprint.reflect,
- org.osgi.service.cm;version="[1.3,2)",
org.apache.felix.service.command,
org.apache.karaf.shell.commands,
org.apache.karaf.shell.console,
Modified: karaf/trunk/features/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/features/core/pom.xml?rev=1349189&r1=1349188&r2=1349189&view=diff
==============================================================================
--- karaf/trunk/features/core/pom.xml (original)
+++ karaf/trunk/features/core/pom.xml Tue Jun 12 08:34:24 2012
@@ -111,7 +111,6 @@
org.apache.karaf.features.management.codec
</Export-Package>
<Import-Package>
- org.osgi.service.cm;version="[1.3,2)",
*
</Import-Package>
<Private-Package>
Modified: karaf/trunk/jaas/modules/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/pom.xml?rev=1349189&r1=1349188&r2=1349189&view=diff
==============================================================================
--- karaf/trunk/jaas/modules/pom.xml (original)
+++ karaf/trunk/jaas/modules/pom.xml Tue Jun 12 08:34:24 2012
@@ -111,7 +111,6 @@
org.apache.aries.blueprint,
org.osgi.service.blueprint.container,
org.osgi.service.blueprint.reflect,
- org.osgi.service.cm;version="[1.3,2)",
org.apache.karaf.jaas.config,
*
</Import-Package>
Modified: karaf/trunk/log/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/log/command/pom.xml?rev=1349189&r1=1349188&r2=1349189&view=diff
==============================================================================
--- karaf/trunk/log/command/pom.xml (original)
+++ karaf/trunk/log/command/pom.xml Tue Jun 12 08:34:24 2012
@@ -93,7 +93,6 @@
<configuration>
<instructions>
<Import-Package>
- org.osgi.service.cm;version="[1.3,2)",
*
</Import-Package>
<Private-Package>org.apache.karaf.log.command*</Private-Package>
Modified: karaf/trunk/log/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/log/core/pom.xml?rev=1349189&r1=1349188&r2=1349189&view=diff
==============================================================================
--- karaf/trunk/log/core/pom.xml (original)
+++ karaf/trunk/log/core/pom.xml Tue Jun 12 08:34:24 2012
@@ -87,7 +87,6 @@
org.apache.karaf.log.core
</Export-Package>
<Import-Package>
- org.osgi.service.cm;version="[1.3,2)",
*
</Import-Package>
<Private-Package>
@@ -100,4 +99,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1349189&r1=1349188&r2=1349189&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Tue Jun 12 08:34:24 2012
@@ -149,7 +149,7 @@
<bndlib.version>1.50.0</bndlib.version>
<equinox.region.version>1.0.0.v20110506</equinox.region.version>
<felix.bundlerepository.version>1.6.4</felix.bundlerepository.version>
- <felix.configadmin.version>1.2.8</felix.configadmin.version>
+ <felix.configadmin.version>1.4.0</felix.configadmin.version>
<felix.fileinstall.version>3.2.2</felix.fileinstall.version>
<felix.framework.version>4.0.2</felix.framework.version>
<felix.gogo.version>0.10.0</felix.gogo.version>
Modified: karaf/trunk/shell/ssh/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/ssh/pom.xml?rev=1349189&r1=1349188&r2=1349189&view=diff
==============================================================================
--- karaf/trunk/shell/ssh/pom.xml (original)
+++ karaf/trunk/shell/ssh/pom.xml Tue Jun 12 08:34:24 2012
@@ -99,7 +99,6 @@
org.apache.aries.blueprint,
org.osgi.service.blueprint.container,
org.osgi.service.blueprint.reflect,
- org.osgi.service.cm;version="[1.3,2)",
org.apache.felix.service.command,
org.apache.karaf.shell.commands,
org.apache.karaf.shell.console,