Re: svn commit: r1345852 - in /karaf/trunk: ./ config/command/ config/command/src/test/java/org/apache/karaf/config/command/ config/core/ dev/command/ dev/core/ diagnostic/command/ diagnostic/core/ features/command/ features/core/ jaas/modules/ log/c

Jean-Baptiste Onofré Fri, 08 Jun 2012 05:03:50 -0700

Hi Andreas,

I don't reproduce your issue (on trunk):

[INFO]------------------------------------------------------------------------

[INFO] Reactor Summary:
[INFO]
[INFO] Apache Karaf :: Demos ............................. SUCCESS [5.222s]
[INFO] Apache Karaf :: Demos :: Web ...................... SUCCESS [12.882s]
[INFO] Apache Karaf :: Demos :: Web ...................... SUCCESS [1.041s]
[INFO] Apache Karaf :: Demos :: Branding :: Shell ........ SUCCESS [5.147s]
[INFO] Apache Karaf :: Demos :: Branding ................. SUCCESS [0.516s]
[INFO] Apache Karaf :: Demos :: Command :: Extend Console  SUCCESS [6.403s]
[INFO] Apache Karaf :: Demos :: Command .................. SUCCESS [0.424s]
[INFO] Apache Karaf :: Demos :: Demo Dump provider ....... SUCCESS [4.362s]
[INFO] Apache Karaf :: Demos :: Demo Dump provider ....... SUCCESS [0.223s]

[INFO]------------------------------------------------------------------------

[INFO] BUILD SUCCESS

[INFO]------------------------------------------------------------------------


I gonna try to purge my local repo.

Regards
JB

On 06/08/2012 12:36 PM, Andreas Pieber wrote:

I'm not sure if this commit introduces the problem but I receive the
following error now if I try to build 2.3.x:

https://gist.github.com/2894770

Any ideas/confirmations?

Kind regards,
Andreas

On Mon, Jun 4, 2012 at 9:45 AM,<[email protected]>  wrote:

Author: jbonofre
Date: Mon Jun  4 07:45:10 2012
New Revision: 1345852

URL: http://svn.apache.org/viewvc?rev=1345852&view=rev
Log:
[KARAF-1517] Upgrade to OSGi Compendium 4.3.0

Modified:
    karaf/trunk/config/command/pom.xml
    
karaf/trunk/config/command/src/test/java/org/apache/karaf/config/command/EditCommandTest.java
    
karaf/trunk/config/command/src/test/java/org/apache/karaf/config/command/UpdateCommandTest.java
    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=1345852&r1=1345851&r2=1345852&view=diff
==============================================================================
--- karaf/trunk/config/command/pom.xml (original)
+++ karaf/trunk/config/command/pom.xml Mon Jun  4 07:45:10 2012
@@ -91,6 +91,15 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+<configuration>
+<instructions>
+<Import-Package>
+                            org.osgi.service.cm;version="[1.3,2)",
+                            *
+</Import-Package>
+<Private-Package>!*</Private-Package>
+</instructions>
+</configuration>
             </plugin>
         </plugins>
     </build>

Modified: 
karaf/trunk/config/command/src/test/java/org/apache/karaf/config/command/EditCommandTest.java
URL: 
http://svn.apache.org/viewvc/karaf/trunk/config/command/src/test/java/org/apache/karaf/config/command/EditCommandTest.java?rev=1345852&r1=1345851&r2=1345852&view=diff
==============================================================================
--- 
karaf/trunk/config/command/src/test/java/org/apache/karaf/config/command/EditCommandTest.java
 (original)
+++ 
karaf/trunk/config/command/src/test/java/org/apache/karaf/config/command/EditCommandTest.java
 Mon Jun  4 07:45:10 2012
@@ -69,7 +69,7 @@ public class EditCommandTest extends Tes
         replay(admin);

         // the ConfigAdmin service returns a Dictionary for an existing PID
-        Properties props = new Properties();
+        Dictionary props = new Properties();
         expect(config.getProperties()).andReturn(props);
         replay(config);


Modified: 
karaf/trunk/config/command/src/test/java/org/apache/karaf/config/command/UpdateCommandTest.java
URL: 
http://svn.apache.org/viewvc/karaf/trunk/config/command/src/test/java/org/apache/karaf/config/command/UpdateCommandTest.java?rev=1345852&r1=1345851&r2=1345852&view=diff
==============================================================================
--- 
karaf/trunk/config/command/src/test/java/org/apache/karaf/config/command/UpdateCommandTest.java
 (original)
+++ 
karaf/trunk/config/command/src/test/java/org/apache/karaf/config/command/UpdateCommandTest.java
 Mon Jun  4 07:45:10 2012
@@ -21,6 +21,7 @@ import static org.easymock.EasyMock.crea
  import static org.easymock.EasyMock.expect;
  import static org.easymock.EasyMock.replay;

+import java.util.Dictionary;
  import java.util.Properties;

  import junit.framework.TestCase;
@@ -61,7 +62,7 @@ public class UpdateCommandTest extends T
     }

     public void testupdateOnNewFactoryPid() throws Exception {
-        Properties props = new Properties();
+        Dictionary props = new Properties();

         session.put(ConfigCommandSupport.PROPERTY_CONFIG_PID, PID);
         session.put(ConfigCommandSupport.PROPERTY_CONFIG_PROPS, props);

Modified: karaf/trunk/config/core/pom.xml
URL: 
http://svn.apache.org/viewvc/karaf/trunk/config/core/pom.xml?rev=1345852&r1=1345851&r2=1345852&view=diff
==============================================================================
--- karaf/trunk/config/core/pom.xml (original)
+++ karaf/trunk/config/core/pom.xml Mon Jun  4 07:45:10 2012
@@ -86,6 +86,10 @@
                         <Export-Package>
                             org.apache.karaf.config.core
                         </Export-Package>
+<Import-Package>
+                            org.osgi.service.cm;version="[1.3,2)",
+                            *
+</Import-Package>
                         <Private-Package>
                             org.apache.karaf.config.core.impl
                         </Private-Package>

Modified: karaf/trunk/dev/command/pom.xml
URL: 
http://svn.apache.org/viewvc/karaf/trunk/dev/command/pom.xml?rev=1345852&r1=1345851&r2=1345852&view=diff
==============================================================================
--- karaf/trunk/dev/command/pom.xml (original)
+++ karaf/trunk/dev/command/pom.xml Mon Jun  4 07:45:10 2012
@@ -92,6 +92,10 @@
                 <configuration>
                     <instructions>
                         <Export-Package>!*</Export-Package>
+<Import-Package>
+                            org.osgi.service.cm;version="[1.3,2)",
+                            *
+</Import-Package>
                         <Private-Package>
                             org.apache.karaf.dev.command,
                             org.apache.karaf.dev.command.bundletree,

Modified: karaf/trunk/dev/core/pom.xml
URL: 
http://svn.apache.org/viewvc/karaf/trunk/dev/core/pom.xml?rev=1345852&r1=1345851&r2=1345852&view=diff
==============================================================================
--- karaf/trunk/dev/core/pom.xml (original)
+++ karaf/trunk/dev/core/pom.xml Mon Jun  4 07:45:10 2012
@@ -86,6 +86,10 @@
                         <Export-Package>
                             org.apache.karaf.dev.core
                         </Export-Package>
+<Import-Package>
+                            org.osgi.service.cm;version="[1.3,2)",
+                            *
+</Import-Package>
                         <Private-Package>
                             org.apache.karaf.dev.core.internal,
                             org.apache.felix.utils.manifest,

Modified: karaf/trunk/diagnostic/command/pom.xml
URL: 
http://svn.apache.org/viewvc/karaf/trunk/diagnostic/command/pom.xml?rev=1345852&r1=1345851&r2=1345852&view=diff
==============================================================================
--- karaf/trunk/diagnostic/command/pom.xml (original)
+++ karaf/trunk/diagnostic/command/pom.xml Mon Jun  4 07:45:10 2012
@@ -85,6 +85,7 @@
                             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=1345852&r1=1345851&r2=1345852&view=diff
==============================================================================
--- karaf/trunk/diagnostic/core/pom.xml (original)
+++ karaf/trunk/diagnostic/core/pom.xml Mon Jun  4 07:45:10 2012
@@ -82,6 +82,10 @@
                                ${project.artifactId},
                                ${project.artifactId}.common
                                </Export-Package>
+<Import-Package>
+                            org.osgi.service.cm;version="[1.3,2)",
+                            *
+</Import-Package>
                         <Private-Package>
                             org.apache.karaf.diagnostic.core.internal
                         </Private-Package>

Modified: karaf/trunk/features/command/pom.xml
URL: 
http://svn.apache.org/viewvc/karaf/trunk/features/command/pom.xml?rev=1345852&r1=1345851&r2=1345852&view=diff
==============================================================================
--- karaf/trunk/features/command/pom.xml (original)
+++ karaf/trunk/features/command/pom.xml Mon Jun  4 07:45:10 2012
@@ -91,6 +91,7 @@
                             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=1345852&r1=1345851&r2=1345852&view=diff
==============================================================================
--- karaf/trunk/features/core/pom.xml (original)
+++ karaf/trunk/features/core/pom.xml Mon Jun  4 07:45:10 2012
@@ -110,6 +110,10 @@
                             org.apache.karaf.features.management,
                             org.apache.karaf.features.management.codec
                         </Export-Package>
+<Import-Package>
+                            org.osgi.service.cm;version="[1.3,2)",
+                            *
+</Import-Package>
                         <Private-Package>
                             org.apache.karaf.features.internal,
                             org.apache.karaf.features.internal.model,

Modified: karaf/trunk/jaas/modules/pom.xml
URL: 
http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/pom.xml?rev=1345852&r1=1345851&r2=1345852&view=diff
==============================================================================
--- karaf/trunk/jaas/modules/pom.xml (original)
+++ karaf/trunk/jaas/modules/pom.xml Mon Jun  4 07:45:10 2012
@@ -111,6 +111,7 @@
                             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=1345852&r1=1345851&r2=1345852&view=diff
==============================================================================
--- karaf/trunk/log/command/pom.xml (original)
+++ karaf/trunk/log/command/pom.xml Mon Jun  4 07:45:10 2012
@@ -93,6 +93,7 @@
                 <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=1345852&r1=1345851&r2=1345852&view=diff
==============================================================================
--- karaf/trunk/log/core/pom.xml (original)
+++ karaf/trunk/log/core/pom.xml Mon Jun  4 07:45:10 2012
@@ -86,6 +86,10 @@
                         <Export-Package>
                             org.apache.karaf.log.core
                         </Export-Package>
+<Import-Package>
+                            org.osgi.service.cm;version="[1.3,2)",
+                            *
+</Import-Package>
                         <Private-Package>
                             org.apache.karaf.log.core.internal,
                             org.apache.karaf.log.core.internal.layout

Modified: karaf/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1345852&r1=1345851&r2=1345852&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Mon Jun  4 07:45:10 2012
@@ -190,7 +190,7 @@
         <maven.version>2.0.9</maven.version>
         <mina.version>2.0.4</mina.version>
         <osgi.version>4.3.0</osgi.version>
-<osgi.compendium.version>4.2.0</osgi.compendium.version>
+<osgi.compendium.version>4.3.0</osgi.compendium.version>
         <pax.exam.version>2.4.0</pax.exam.version>
         <pax.logging.version>1.6.7</pax.logging.version>
         <pax.runner.version>1.7.5</pax.runner.version>

Modified: karaf/trunk/shell/ssh/pom.xml
URL: 
http://svn.apache.org/viewvc/karaf/trunk/shell/ssh/pom.xml?rev=1345852&r1=1345851&r2=1345852&view=diff
==============================================================================
--- karaf/trunk/shell/ssh/pom.xml (original)
+++ karaf/trunk/shell/ssh/pom.xml Mon Jun  4 07:45:10 2012
@@ -99,6 +99,7 @@
                             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,


--
Jean-Baptiste Onofré
[email protected]
http://blog.nanthrax.net
Talend - http://www.talend.com

Re: svn commit: r1345852 - in /karaf/trunk: ./ config/command/ config/command/src/test/java/org/apache/karaf/config/command/ config/core/ dev/command/ dev/core/ diagnostic/command/ diagnostic/core/ features/command/ features/core/ jaas/modules/ log/c

Reply via email to