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 11:03:23 UTC
svn commit: r1349201 - in /karaf/branches/karaf-2.3.x: ./ admin/command/
admin/core/ admin/management/ deployer/features/ deployer/kar/
diagnostic/command/ diagnostic/common/ features/command/ features/core/
features/management/ jaas/command/ jaas/modu...
Author: jbonofre
Date: Tue Jun 12 09:03:22 2012
New Revision: 1349201
URL: http://svn.apache.org/viewvc?rev=1349201&view=rev
Log:
[KARAF-1531] Upgrade to Felix ConfigAdmin 1.4.0
Modified:
karaf/branches/karaf-2.3.x/admin/command/pom.xml
karaf/branches/karaf-2.3.x/admin/core/pom.xml
karaf/branches/karaf-2.3.x/admin/management/pom.xml
karaf/branches/karaf-2.3.x/deployer/features/pom.xml
karaf/branches/karaf-2.3.x/deployer/kar/pom.xml
karaf/branches/karaf-2.3.x/diagnostic/command/pom.xml
karaf/branches/karaf-2.3.x/diagnostic/common/pom.xml
karaf/branches/karaf-2.3.x/features/command/pom.xml
karaf/branches/karaf-2.3.x/features/core/pom.xml
karaf/branches/karaf-2.3.x/features/management/pom.xml
karaf/branches/karaf-2.3.x/jaas/command/pom.xml
karaf/branches/karaf-2.3.x/jaas/modules/pom.xml
karaf/branches/karaf-2.3.x/management/mbeans/config/pom.xml
karaf/branches/karaf-2.3.x/management/mbeans/log/pom.xml
karaf/branches/karaf-2.3.x/pom.xml
karaf/branches/karaf-2.3.x/shell/commands/pom.xml
karaf/branches/karaf-2.3.x/shell/config/pom.xml
karaf/branches/karaf-2.3.x/shell/console/pom.xml
karaf/branches/karaf-2.3.x/shell/dev/pom.xml
karaf/branches/karaf-2.3.x/shell/log/pom.xml
karaf/branches/karaf-2.3.x/shell/osgi/pom.xml
karaf/branches/karaf-2.3.x/shell/packages/pom.xml
karaf/branches/karaf-2.3.x/shell/ssh/pom.xml
Modified: karaf/branches/karaf-2.3.x/admin/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/admin/command/pom.xml?rev=1349201&r1=1349200&r2=1349201&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/admin/command/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/admin/command/pom.xml Tue Jun 12 09:03:22 2012
@@ -110,7 +110,6 @@
org.apache.felix.service.command,
org.apache.felix.gogo.commands,
org.apache.karaf.shell.console,
- org.osgi.service.cm;version="[1.3,2)",
*
</Import-Package>
<Private-Package>
Modified: karaf/branches/karaf-2.3.x/admin/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/admin/core/pom.xml?rev=1349201&r1=1349200&r2=1349201&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/admin/core/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/admin/core/pom.xml Tue Jun 12 09:03:22 2012
@@ -173,7 +173,6 @@
org.apache.felix.service.command,
org.apache.felix.gogo.commands,
org.apache.karaf.shell.console,
- org.osgi.service.cm;version="[1.3,2)",
*
</Import-Package>
<Private-Package>
Modified: karaf/branches/karaf-2.3.x/admin/management/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/admin/management/pom.xml?rev=1349201&r1=1349200&r2=1349201&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/admin/management/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/admin/management/pom.xml Tue Jun 12 09:03:22 2012
@@ -97,7 +97,6 @@
org.apache.felix.service.command,
org.apache.felix.gogo.commands,
org.apache.karaf.shell.console,
- org.osgi.service.cm;version="[1.3,2)",
*
</Import-Package>
<Private-Package>org.apache.karaf.admin.management.internal</Private-Package>
Modified: karaf/branches/karaf-2.3.x/deployer/features/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/deployer/features/pom.xml?rev=1349201&r1=1349200&r2=1349201&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/deployer/features/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/deployer/features/pom.xml Tue Jun 12 09:03:22 2012
@@ -99,7 +99,6 @@
See the blueprint config file -->
<Bundle-SymbolicName>${project.artifactId};blueprint.graceperiod:=false</Bundle-SymbolicName>
<Import-Package>
- org.osgi.service.cm;version="[1.3,2)",
*
</Import-Package>
<Private-Package>
Modified: karaf/branches/karaf-2.3.x/deployer/kar/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/deployer/kar/pom.xml?rev=1349201&r1=1349200&r2=1349201&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/deployer/kar/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/deployer/kar/pom.xml Tue Jun 12 09:03:22 2012
@@ -100,7 +100,6 @@
See the blueprint config file -->
<Bundle-SymbolicName>${project.artifactId};blueprint.graceperiod:=false</Bundle-SymbolicName>
<Import-Package>
- org.osgi.service.cm;version="[1.3,2)",
*
</Import-Package>
<Private-Package>org.apache.karaf.deployer.kar</Private-Package>
Modified: karaf/branches/karaf-2.3.x/diagnostic/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/diagnostic/command/pom.xml?rev=1349201&r1=1349200&r2=1349201&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/diagnostic/command/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/diagnostic/command/pom.xml Tue Jun 12 09:03:22 2012
@@ -82,7 +82,6 @@
<configuration>
<instructions>
<Import-Package>
- org.osgi.service.cm;version="[1.3,2)",
*
</Import-Package>
<Private-Package>!*</Private-Package>
Modified: karaf/branches/karaf-2.3.x/diagnostic/common/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/diagnostic/common/pom.xml?rev=1349201&r1=1349200&r2=1349201&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/diagnostic/common/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/diagnostic/common/pom.xml Tue Jun 12 09:03:22 2012
@@ -85,7 +85,6 @@
<configuration>
<instructions>
<Import-Package>
- org.osgi.service.cm;version="[1.3,2)",
*
</Import-Package>
</instructions>
Modified: karaf/branches/karaf-2.3.x/features/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/features/command/pom.xml?rev=1349201&r1=1349200&r2=1349201&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/features/command/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/features/command/pom.xml Tue Jun 12 09:03:22 2012
@@ -120,7 +120,6 @@
org.apache.felix.service.command,
org.apache.felix.gogo.commands,
org.apache.karaf.shell.console,
- org.osgi.service.cm;version="[1.3,2)",
*
</Import-Package>
<Private-Package>
Modified: karaf/branches/karaf-2.3.x/features/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/features/core/pom.xml?rev=1349201&r1=1349200&r2=1349201&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/features/core/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/features/core/pom.xml Tue Jun 12 09:03:22 2012
@@ -117,7 +117,6 @@
<Export-Package>org.apache.karaf.features;version=${project.version}</Export-Package>
<Import-Package>
!org.apache.karaf.features,
- org.osgi.service.cm;version="[1.3,2)",
org.osgi.service.event*;resolution:=optional,
*
</Import-Package>
Modified: karaf/branches/karaf-2.3.x/features/management/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/features/management/pom.xml?rev=1349201&r1=1349200&r2=1349201&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/features/management/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/features/management/pom.xml Tue Jun 12 09:03:22 2012
@@ -125,7 +125,6 @@
org.apache.felix.service.command,
org.apache.felix.gogo.commands,
org.apache.karaf.shell.console,
- org.osgi.service.cm;version="[1.3,2)",
*
</Import-Package>
<Private-Package>org.apache.karaf.features.management.internal</Private-Package>
Modified: karaf/branches/karaf-2.3.x/jaas/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/jaas/command/pom.xml?rev=1349201&r1=1349200&r2=1349201&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/jaas/command/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/jaas/command/pom.xml Tue Jun 12 09:03:22 2012
@@ -127,7 +127,6 @@
org.apache.felix.service.command,
org.apache.felix.gogo.commands,
org.apache.karaf.shell.console,
- org.osgi.service.cm;version="[1.3,2)",
*
</Import-Package>
<Private-Package>!*</Private-Package>
Modified: karaf/branches/karaf-2.3.x/jaas/modules/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/jaas/modules/pom.xml?rev=1349201&r1=1349200&r2=1349201&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/jaas/modules/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/jaas/modules/pom.xml Tue Jun 12 09:03:22 2012
@@ -108,7 +108,6 @@
<Import-Package>
org.apache.karaf.jaas.config,
org.apache.aries.blueprint.ext,
- org.osgi.service.cm;version="[1.3,2)",
*
</Import-Package>
<Private-Package>
Modified: karaf/branches/karaf-2.3.x/management/mbeans/config/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/management/mbeans/config/pom.xml?rev=1349201&r1=1349200&r2=1349201&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/management/mbeans/config/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/management/mbeans/config/pom.xml Tue Jun 12 09:03:22 2012
@@ -90,7 +90,6 @@
javax.management,
javax.management.loading,
org.apache.karaf.management;version=${project.version},
- org.osgi.service.cm;version="[1.3,2)",
*
</Import-Package>
<Private-Package>
@@ -104,4 +103,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: karaf/branches/karaf-2.3.x/management/mbeans/log/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/management/mbeans/log/pom.xml?rev=1349201&r1=1349200&r2=1349201&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/management/mbeans/log/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/management/mbeans/log/pom.xml Tue Jun 12 09:03:22 2012
@@ -87,7 +87,6 @@
javax.management,
javax.management.loading,
org.apache.karaf.management;version=${project.version},
- 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/branches/karaf-2.3.x/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/pom.xml?rev=1349201&r1=1349200&r2=1349201&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/pom.xml Tue Jun 12 09:03:22 2012
@@ -120,7 +120,7 @@
<easymock.version>3.1</easymock.version>
<equinox.version>3.7.1.R37x_v20110808-1106</equinox.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/branches/karaf-2.3.x/shell/commands/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/shell/commands/pom.xml?rev=1349201&r1=1349200&r2=1349201&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/shell/commands/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/shell/commands/pom.xml Tue Jun 12 09:03:22 2012
@@ -93,7 +93,6 @@
org.apache.felix.service.command,
org.apache.felix.gogo.commands,
org.apache.karaf.shell.console,
- org.osgi.service.cm;version="[1.3,2)",
*
</Import-Package>
<Private-Package>
Modified: karaf/branches/karaf-2.3.x/shell/config/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/shell/config/pom.xml?rev=1349201&r1=1349200&r2=1349201&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/shell/config/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/shell/config/pom.xml Tue Jun 12 09:03:22 2012
@@ -96,7 +96,6 @@
org.apache.felix.service.command,
org.apache.felix.gogo.commands,
org.apache.karaf.shell.console,
- org.osgi.service.cm;version="[1.3,2)",
*
</Import-Package>
<Private-Package>
Modified: karaf/branches/karaf-2.3.x/shell/console/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/shell/console/pom.xml?rev=1349201&r1=1349200&r2=1349201&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/shell/console/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/shell/console/pom.xml Tue Jun 12 09:03:22 2012
@@ -120,7 +120,6 @@
<Import-Package>
org.osgi.service.event;resolution:=optional,
org.apache.karaf.branding;resolution:=optional,
- org.osgi.service.cm;version="[1.3,2)",
*
</Import-Package>
<Export-Package>
Modified: karaf/branches/karaf-2.3.x/shell/dev/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/shell/dev/pom.xml?rev=1349201&r1=1349200&r2=1349201&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/shell/dev/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/shell/dev/pom.xml Tue Jun 12 09:03:22 2012
@@ -102,7 +102,6 @@
org.apache.felix.service.command,
org.apache.felix.gogo.commands,
org.apache.karaf.shell.console,
- org.osgi.service.cm;version="[1.3,2)",
*
</Import-Package>
<Private-Package>
Modified: karaf/branches/karaf-2.3.x/shell/log/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/shell/log/pom.xml?rev=1349201&r1=1349200&r2=1349201&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/shell/log/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/shell/log/pom.xml Tue Jun 12 09:03:22 2012
@@ -92,7 +92,6 @@
org.apache.felix.service.command,
org.apache.felix.gogo.commands,
org.apache.karaf.shell.console,
- org.osgi.service.cm;version="[1.3,2)",
*
</Import-Package>
<Private-Package>!*</Private-Package>
Modified: karaf/branches/karaf-2.3.x/shell/osgi/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/shell/osgi/pom.xml?rev=1349201&r1=1349200&r2=1349201&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/shell/osgi/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/shell/osgi/pom.xml Tue Jun 12 09:03:22 2012
@@ -101,7 +101,6 @@
org.apache.felix.gogo.commands,
org.apache.karaf.shell.console,
org.springframework*;resolution:=optional,
- org.osgi.service.cm;version="[1.3,2)",
*
</Import-Package>
<DynamicImport-Package>
Modified: karaf/branches/karaf-2.3.x/shell/packages/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/shell/packages/pom.xml?rev=1349201&r1=1349200&r2=1349201&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/shell/packages/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/shell/packages/pom.xml Tue Jun 12 09:03:22 2012
@@ -82,7 +82,6 @@
org.apache.felix.service.command,
org.apache.felix.gogo.commands,
org.apache.karaf.shell.console,
- org.osgi.service.cm;version="[1.3,2)",
*
</Import-Package>
<Private-Package>!*</Private-Package>
Modified: karaf/branches/karaf-2.3.x/shell/ssh/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/shell/ssh/pom.xml?rev=1349201&r1=1349200&r2=1349201&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/shell/ssh/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/shell/ssh/pom.xml Tue Jun 12 09:03:22 2012
@@ -95,7 +95,6 @@
org.apache.karaf.shell.console,
org.apache.sshd.server.keyprovider,
org.apache.sshd.server.jaas,
- org.osgi.service.cm;version="[1.3,2)",
*
</Import-Package>
</instructions>