Return-Path: 
 <dev-return-89914-apmail-geronimo-dev-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-dev-archive@www.apache.org
Received: (qmail 33626 invoked from network); 11 Apr 2011 16:58:53 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 11 Apr 2011 16:58:53 -0000
Received: (qmail 82203 invoked by uid 500); 11 Apr 2011 16:58:53 -0000
Delivered-To: apmail-geronimo-dev-archive@geronimo.apache.org
Received: (qmail 82009 invoked by uid 500); 11 Apr 2011 16:58:53 -0000
Mailing-List: contact dev-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:dev-help@geronimo.apache.org>
list-unsubscribe: <mailto:dev-unsubscribe@geronimo.apache.org>
List-Post: <mailto:dev@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <dev.geronimo.apache.org>
Delivered-To: mailing list dev@geronimo.apache.org
Received: (qmail 82002 invoked by uid 99); 11 Apr 2011 16:58:53 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Apr 2011 16:58:53 +0000
X-ASF-Spam-Status: No, hits=1.5 required=5.0
	tests=FREEMAIL_FROM,HTML_MESSAGE,RCVD_IN_DNSWL_LOW,SPF_PASS,T_TO_NO_BRKTS_FREEMAIL
X-Spam-Check-By: apache.org
Received-SPF: pass (nike.apache.org: domain of forrestxm@gmail.com designates
 209.85.210.54 as permitted sender)
Received: from [209.85.210.54] (HELO mail-pz0-f54.google.com) (209.85.210.54)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Apr 2011 16:58:39 +0000
Received: by pzk27 with SMTP id 27so2760666pzk.13
        for <dev@geronimo.apache.org>; Mon, 11 Apr 2011 09:58:17 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=gamma;
        h=domainkey-signature:mime-version:date:message-id:subject:from:to
         :content-type;
        bh=SbKI7gsNTYQSP0O/nb//zqvs8AJwk6fzJKmvt7SoVzw=;
        b=r63jzhjXxfP/aktjQ3MJyJt4WAInmqWLcheuVqeSR+vJdZICHILhcgs0hMFnc25ikv
         IdV1Zy9TRrXdiGG+1atLZnpC2duNPKDrZxW4rbQ5mXiaOKo+riX6q8+wQ4ALMQNUKqgu
         kA8XkVSf4hqa4fnWDXo2yC3+pqMsaySgVzfFo=
DomainKey-Signature: a=rsa-sha1; c=nofws;
        d=gmail.com; s=gamma;
        h=mime-version:date:message-id:subject:from:to:content-type;
        b=HmcChsUWo7G2ClGGi89zb5wAJTntF+3fPbEYcML2B0/r2N2MGNI73DnPMalORywQOM
         JvmsWO33xCKMzBNzkCHu2wXCf2arCHemGvn4ncndE5fXAkcoNTde7qXqwwR2BxhhgQCs
         nBq8JlXvz6ZsLXI4EhOzcrJ2h4d/KdFRiAF/M=
MIME-Version: 1.0
Received: by 10.142.196.17 with SMTP id t17mr5107759wff.55.1302541096643; Mon,
 11 Apr 2011 09:58:16 -0700 (PDT)
Received: by 10.68.55.73 with HTTP; Mon, 11 Apr 2011 09:58:16 -0700 (PDT)
Date: Tue, 12 Apr 2011 00:58:16 +0800
Message-ID: <BANLkTikvpYFScftSOkZKdU6B40iFkgWEkw@mail.gmail.com>
Subject: Re: svn commit: r1090982 - in /geronimo/server/trunk: ./
 framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/
 framework/buildsupport/geronimo-osgi-plugin/src/main/resources/
 framework/configs/j2ee-security/src/m
From: Forrest Xia <forrestxm@gmail.com>
To: dev@geronimo.apache.org
Content-Type: multipart/alternative; boundary=000e0cd153165ef0de04a0a77b97
X-Virus-Checked: Checked by ClamAV on apache.org

--000e0cd153165ef0de04a0a77b97
Content-Type: text/plain; charset=ISO-8859-1

Hi Viola,

I met build error like this after your patch, can you double check?

#
# A fatal error has been detected by the Java Runtime Environment:
#
#  SIGFPE (0x8) at pc=0xf7f2420b, pid=7251, tid=4145761184
#
# JRE version: 6.0_23-b05
# Java VM: Java HotSpot(TM) Server VM (19.0-b09 mixed mode linux-x86 )
# Problematic frame:
# C  [ld-linux.so.2+0x920b]
#
# An error report file with more information is saved as:
#
/home/tcker/tckdata/tckbuildsrc/geronimo/framework/configs/jsr88-cli/hs_err_pid7251.log
#
# If you would like to submit a bug report, please visit:
#   http://java.sun.com/webapps/bugreport/crash.jsp
# The crash happened outside the Java Virtual Machine in native code.
# See problematic frame for where to report the bug.
#

This happens when build framework/config/jsr88-cli

Forrest

On Mon, Apr 11, 2011 at 4:56 PM, <violalu@apache.org> wrote:

> Author: violalu
> Date: Mon Apr 11 08:56:25 2011
> New Revision: 1090982
>
> URL: http://svn.apache.org/viewvc?rev=1090982&view=rev
> Log:
> GERONIMO-5885 Upgrade karaf from 2.1.2 to 2.2.1-SNAPSHOT
>
> Modified:
>
>  geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
>
>  geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/main/resources/Geronimo-1.6.profile
>
>  geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/dependencies.xml
>
>  geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml
>    geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
>
>  geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
>
>  geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
>
>  geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml
>
>  geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml
>
>  geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/StreamConsoleReader.java
>    geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml
>    geronimo/server/trunk/framework/modules/geronimo-security/pom.xml
>    geronimo/server/trunk/framework/modules/geronimo-shell-base/pom.xml
>
>  geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/deploy/ConnectCommand.java
>    geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/pom.xml
>
>  geronimo/server/trunk/plugingroups/console-jetty/src/main/history/dependencies.xml
>
>  geronimo/server/trunk/plugingroups/console-tomcat/src/main/history/dependencies.xml
>
>  geronimo/server/trunk/plugingroups/eba-jetty/src/main/history/dependencies.xml
>
>  geronimo/server/trunk/plugingroups/webservices-axis2/src/main/history/dependencies.xml
>
>  geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml
>
>  geronimo/server/trunk/plugins/aries/aries/src/main/history/dependencies.xml
>    geronimo/server/trunk/plugins/aries/geronimo-aries/pom.xml
>    geronimo/server/trunk/plugins/aries/pom.xml
>
>  geronimo/server/trunk/plugins/axis/axis/src/main/history/dependencies.xml
>
>  geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml
>
>  geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
>
>  geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml
>    geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml
>
>  geronimo/server/trunk/plugins/hotdeploy/hot-deployer/src/main/history/dependencies.xml
>
>  geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml
>
>  geronimo/server/trunk/plugins/j2ee/javaee-builder-support/src/main/history/dependencies.xml
>
>  geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/src/main/history/dependencies.xml
>
>  geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/src/main/history/dependencies.xml
>
>  geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/src/main/history/dependencies.xml
>    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/pom.xml
>
>  geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/history/dependencies.xml
>
>  geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
>
>  geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/dependencies.xml
>
>  geronimo/server/trunk/plugins/wab/web-extender/src/main/history/dependencies.xml
>
>  geronimo/server/trunk/plugins/wink/wink/src/main/history/dependencies.xml
>    geronimo/server/trunk/pom.xml
>
> Modified:
> geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
> (original)
> +++
> geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
> Mon Apr 11 08:56:25 2011
> @@ -887,7 +887,7 @@ public abstract class AbstractCarMojo
>                         "org.apache.geronimo.transformer," +
>                         "org.apache.geronimo.hook," +
>                         "org.apache.geronimo.mavenplugins.car," +
> -                        "org.apache.karaf.jaas.boot;version=\"2.1.2\"," +
> +
>  "org.apache.karaf.jaas.boot;version=\"2.2.1.SNAPSHOT\"," +
>                         "org.apache.yoko," +
>                         "org.apache.yoko.osgi," +
>                         "org.apache.yoko.rmispec.util"
>
> Modified:
> geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/main/resources/Geronimo-1.6.profile
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/main/resources/Geronimo-1.6.profile?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/main/resources/Geronimo-1.6.profile
> (original)
> +++
> geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/main/resources/Geronimo-1.6.profile
> Mon Apr 11 08:56:25 2011
> @@ -143,7 +143,7 @@ org.osgi.framework.system.packages.extra
>  sun.reflect, \
>  org.apache.geronimo.main, \
>  org.apache.geronimo.transformer, \
> - org.apache.karaf.jaas.boot;version=2.1.2
> + org.apache.karaf.jaas.boot;version=2.2.1.SNAPSHOT
>
>  org.osgi.framework.bootdelegation = \
>  javax.*,\
>
> Modified:
> geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -36,4 +36,9 @@
>         <artifactId>geronimo-jaspic_1.0_spec</artifactId>
>         <type>jar</type>
>     </dependency>
> +    <dependency>
> +        <groupId>org.apache.karaf.jaas</groupId>
> +        <artifactId>org.apache.karaf.jaas.boot</artifactId>
> +        <type>jar</type>
> +    </dependency>
>  </plugin-artifact>
>
> Modified:
> geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -32,6 +32,11 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> +        <groupId>org.apache.felix</groupId>
> +        <artifactId>org.apache.felix.gogo.runtime</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.geronimo.bundles</groupId>
>         <artifactId>jaxb-impl</artifactId>
>         <type>jar</type>
> @@ -127,6 +132,26 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> +        <groupId>org.apache.karaf</groupId>
> +        <artifactId>org.apache.karaf.util</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
> +        <groupId>org.apache.karaf.jaas</groupId>
> +        <artifactId>org.apache.karaf.jaas.boot</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
> +        <groupId>org.apache.karaf.jaas</groupId>
> +        <artifactId>org.apache.karaf.jaas.config</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
> +        <groupId>org.apache.karaf.jaas</groupId>
> +        <artifactId>org.apache.karaf.jaas.modules</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.karaf.shell</groupId>
>         <artifactId>org.apache.karaf.shell.console</artifactId>
>         <type>jar</type>
> @@ -186,4 +211,14 @@
>         <artifactId>pax-logging-api</artifactId>
>         <type>jar</type>
>     </dependency>
> +    <dependency>
> +        <groupId>org.osgi</groupId>
> +        <artifactId>org.osgi.compendium</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
> +        <groupId>org.osgi</groupId>
> +        <artifactId>org.osgi.core</artifactId>
> +        <type>jar</type>
> +    </dependency>
>  </plugin-artifact>
>
> Modified: geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/pom.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> --- geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
> (original)
> +++ geronimo/server/trunk/framework/configs/karaf-framework/pom.xml Mon Apr
> 11 08:56:25 2011
> @@ -38,11 +38,11 @@
>         <depends.maven.plugin.version>1.0</depends.maven.plugin.version>
>         <easymock.version>2.4</easymock.version>
>         <felix.compendium.version>1.2.0</felix.compendium.version>
> -        <felix.fileinstall.version>3.0.2</felix.fileinstall.version>
> +        <felix.fileinstall.version>3.1.10</felix.fileinstall.version>
>         <felix.osgi.version>1.4.0</felix.osgi.version>
>         <felix.plugin.version>2.1.0</felix.plugin.version>
>         <felix.prefs.version>1.0.4</felix.prefs.version>
> -        <felix.metatype.version>1.0.2</felix.metatype.version>
> +        <felix.metatype.version>1.0.2</felix.metatype.version>
>         <jansi.version>1.2</jansi.version>
>         <junit.version>4.7_1</junit.version>
>         <log4j.version>1.2.16</log4j.version>
> @@ -50,7 +50,7 @@
>         <mina.version>2.0.0-RC1</mina.version>
>         <pax.exam.version>1.2.2</pax.exam.version>
>         <pax.runner.version>1.5.0</pax.runner.version>
> -        <sshd.version>0.4.0</sshd.version>
> +        <sshd.version>0.5.0</sshd.version>
>     </properties>
>
>     <dependencyManagement>
> @@ -89,6 +89,7 @@
>                     </exclusion>
>                </exclusions>
>             </dependency>
> +
>
>             <dependency>
>                 <groupId>org.apache.felix</groupId>
> @@ -105,7 +106,7 @@
>                     </exclusion>
>                </exclusions>
>             </dependency>
> -
> +
>             <dependency>
>                 <groupId>org.apache.geronimo.framework</groupId>
>                 <artifactId>geronimo-rmi-loader</artifactId>
> @@ -167,6 +168,18 @@
>             </dependency>
>
>             <dependency>
> +                <groupId>org.apache.aries.proxy</groupId>
> +                <artifactId>org.apache.aries.proxy</artifactId>
> +                <version>${aries.proxy.version}</version>
> +                <exclusions>
> +                    <exclusion>
> +                       <groupId>org.apache.aries.testsupport</groupId>
> +        <artifactId>org.apache.aries.testsupport.unit</artifactId>
> +                    </exclusion>
> +                </exclusions>
> +            </dependency>
> +
> +            <dependency>
>                 <groupId>org.apache.karaf.deployer</groupId>
>
> <artifactId>org.apache.karaf.deployer.blueprint</artifactId>
>                 <version>${karaf.version}</version>
>
> Modified:
> geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
> (original)
> +++
> geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
> Mon Apr 11 08:56:25 2011
> @@ -30,11 +30,11 @@ org/apache/geronimo/framework/geronimo-p
>
>  org/apache/felix/org.apache.felix.configadmin/${felix.configadmin.version}/org.apache.felix.configadmin-${felix.configadmin.version}.jar=8
>
>  org/apache/felix/org.apache.felix.prefs/${felix.prefs.version}/org.apache.felix.prefs-${felix.prefs.version}.jar=10
>
>  org/apache/felix/org.apache.felix.fileinstall/${felix.fileinstall.version}/org.apache.felix.fileinstall-${felix.fileinstall.version}.jar=11
> -
>  #
>  # The rest of the services..
>  #
>
>  org/apache/aries/org.apache.aries.util/${aries.blueprint.version}/org.apache.aries.util-${aries.blueprint.version}.jar=20
>
> +org/apache/aries/proxy/org.apache.aries.proxy/${aries.proxy.version}/org.apache.aries.proxy-${aries.proxy.version}.jar=20
>
>  org/apache/aries/blueprint/org.apache.aries.blueprint/${aries.blueprint.version}/org.apache.aries.blueprint-${aries.blueprint.version}.jar=20
>
>
>  org/apache/geronimo/framework/geronimo-shell/${pom.version}/geronimo-shell-${pom.version}.jar=30
> @@ -48,6 +48,7 @@ org/apache/karaf/shell/org.apache.karaf.
>
>  org/apache/karaf/shell/org.apache.karaf.shell.commands/${karaf.version}/org.apache.karaf.shell.commands-${karaf.version}.jar=30
>
>  org/apache/karaf/shell/org.apache.karaf.shell.obr/${karaf.version}/org.apache.karaf.shell.obr-${karaf.version}.jar=30
>
>  org/apache/karaf/jaas/org.apache.karaf.jaas.config/${karaf.version}/org.apache.karaf.jaas.config-${karaf.version}.jar=30
>
> +org/apache/karaf/jaas/org.apache.karaf.jaas.modules/${karaf.version}/org.apache.karaf.jaas.modules-${karaf.version}.jar=30
>
>
>  #org/apache/karaf/features/org.apache.karaf.features.core/${karaf.version}/org.apache.karaf.features.core-${karaf.version}.jar=30
>
>  #org/apache/karaf/features/org.apache.karaf.features.command/${karaf.version}/org.apache.karaf.features.command-${karaf.version}.jar=30
>
> Modified:
> geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -17,11 +17,6 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> -        <groupId>commons-collections</groupId>
> -        <artifactId>commons-collections</artifactId>
> -        <type>jar</type>
> -    </dependency>
> -    <dependency>
>         <groupId>commons-lang</groupId>
>         <artifactId>commons-lang</artifactId>
>         <type>jar</type>
> @@ -37,6 +32,21 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> +        <groupId>org.apache.aries.proxy</groupId>
> +        <artifactId>org.apache.aries.proxy</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
> +        <groupId>org.apache.aries.proxy</groupId>
> +        <artifactId>org.apache.aries.proxy.api</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
> +        <groupId>org.apache.aries.proxy</groupId>
> +        <artifactId>org.apache.aries.proxy.impl</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.felix</groupId>
>         <artifactId>org.apache.felix.bundlerepository</artifactId>
>         <type>jar</type>
> @@ -58,6 +68,11 @@
>     </dependency>
>     <dependency>
>         <groupId>org.apache.felix</groupId>
> +        <artifactId>org.apache.felix.gogo.runtime</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
> +        <groupId>org.apache.felix</groupId>
>         <artifactId>org.apache.felix.metatype</artifactId>
>         <type>jar</type>
>     </dependency>
> @@ -197,6 +212,11 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> +        <groupId>org.apache.karaf</groupId>
> +        <artifactId>org.apache.karaf.util</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.karaf.deployer</groupId>
>         <artifactId>org.apache.karaf.deployer.blueprint</artifactId>
>         <type>jar</type>
> @@ -232,6 +252,11 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> +        <groupId>org.apache.karaf.jaas</groupId>
> +        <artifactId>org.apache.karaf.jaas.modules</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.karaf.shell</groupId>
>         <artifactId>org.apache.karaf.shell.commands</artifactId>
>         <type>jar</type>
> @@ -371,4 +396,9 @@
>         <artifactId>org.osgi.core</artifactId>
>         <type>jar</type>
>     </dependency>
> +    <dependency>
> +        <groupId>org.slf4j</groupId>
> +        <artifactId>slf4j-api</artifactId>
> +        <type>jar</type>
> +    </dependency>
>  </plugin-artifact>
>
> Modified:
> geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -32,6 +32,11 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> +        <groupId>org.apache.aries.proxy</groupId>
> +        <artifactId>org.apache.aries.proxy.api</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.geronimo.framework</groupId>
>         <artifactId>geronimo-blueprint</artifactId>
>         <type>jar</type>
>
> Modified:
> geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -32,6 +32,11 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> +        <groupId>org.apache.felix</groupId>
> +        <artifactId>org.apache.felix.gogo.runtime</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.geronimo.bundles</groupId>
>         <artifactId>jaxb-impl</artifactId>
>         <type>jar</type>
> @@ -127,6 +132,26 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> +        <groupId>org.apache.karaf</groupId>
> +        <artifactId>org.apache.karaf.util</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
> +        <groupId>org.apache.karaf.jaas</groupId>
> +        <artifactId>org.apache.karaf.jaas.boot</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
> +        <groupId>org.apache.karaf.jaas</groupId>
> +        <artifactId>org.apache.karaf.jaas.config</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
> +        <groupId>org.apache.karaf.jaas</groupId>
> +        <artifactId>org.apache.karaf.jaas.modules</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.karaf.shell</groupId>
>         <artifactId>org.apache.karaf.shell.console</artifactId>
>         <type>jar</type>
> @@ -186,4 +211,14 @@
>         <artifactId>pax-logging-api</artifactId>
>         <type>jar</type>
>     </dependency>
> +    <dependency>
> +        <groupId>org.osgi</groupId>
> +        <artifactId>org.osgi.compendium</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
> +        <groupId>org.osgi</groupId>
> +        <artifactId>org.osgi.core</artifactId>
> +        <type>jar</type>
> +    </dependency>
>  </plugin-artifact>
>
> Modified:
> geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/StreamConsoleReader.java
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/StreamConsoleReader.java?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/StreamConsoleReader.java
> (original)
> +++
> geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/StreamConsoleReader.java
> Mon Apr 11 08:56:25 2011
> @@ -39,7 +39,7 @@ public class StreamConsoleReader impleme
>
>     protected PrintWriter console;
>
> -    private jline.ConsoleReader jlineConsoleReader;
> +    private jline.console.ConsoleReader jlineConsoleReader;
>
>     private boolean jlineConsoleEnabled = true;
>
> @@ -49,7 +49,7 @@ public class StreamConsoleReader impleme
>
>     public StreamConsoleReader(InputStream in, PrintWriter out) {
>         try {
> -            jlineConsoleReader = new jline.ConsoleReader(in, out);
> +            jlineConsoleReader = new jline.console.ConsoleReader(in, out);
>         } catch (IOException e) {
>             logger.warn("Fail to create jline console, some features like
> password mask will be disabled", e);
>             jlineConsoleEnabled = false;
> @@ -66,7 +66,7 @@ public class StreamConsoleReader impleme
>     @Override
>     public void printNewline() throws IOException {
>         if (jlineConsoleEnabled) {
> -            jlineConsoleReader.printNewline();
> +            ((ConsoleReader) jlineConsoleReader).printNewline();
>         } else {
>             console.println();
>         }
> @@ -82,7 +82,7 @@ public class StreamConsoleReader impleme
>     @Override
>     public void printString(String s) throws IOException {
>         if (jlineConsoleEnabled) {
> -            jlineConsoleReader.printString(s);
> +            ((ConsoleReader) jlineConsoleReader).printString(s);
>         } else {
>             console.print(s);
>         }
> @@ -98,8 +98,8 @@ public class StreamConsoleReader impleme
>     @Override
>     public void println(String s) throws IOException {
>         if (jlineConsoleEnabled) {
> -            jlineConsoleReader.printString(s);
> -            jlineConsoleReader.printNewline();
> +            ((ConsoleReader) jlineConsoleReader).printString(s);
> +            ((ConsoleReader) jlineConsoleReader).printNewline();
>         } else {
>             console.println(s);
>             console.println();
> @@ -148,7 +148,7 @@ public class StreamConsoleReader impleme
>     @Override
>     public void flushConsole() throws IOException {
>         if (jlineConsoleEnabled) {
> -            jlineConsoleReader.flushConsole();
> +            ((ConsoleReader) jlineConsoleReader).flushConsole();
>         } else {
>             console.flush();
>         }
>
> Modified:
> geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> --- geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml
> (original)
> +++ geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml
> Mon Apr 11 08:56:25 2011
> @@ -100,7 +100,7 @@
>                         </Import-Package>
>                         <Export-Package>
>                             org.apache.geronimo.logging,
> -
>  org.ops4j.pax.logging.spi;provider=paxlogging;version="1.5.3"
> +
>  org.ops4j.pax.logging.spi;provider=paxlogging;version=${pax.logging.version}
>                         </Export-Package>
>
> <Bundle-Activator>org.apache.geronimo.logging.impl.LoggingServiceActivator</Bundle-Activator>
>                         <Include-Resource>
>
> Modified: geronimo/server/trunk/framework/modules/geronimo-security/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/pom.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> --- geronimo/server/trunk/framework/modules/geronimo-security/pom.xml
> (original)
> +++ geronimo/server/trunk/framework/modules/geronimo-security/pom.xml Mon
> Apr 11 08:56:25 2011
> @@ -68,7 +68,7 @@
>         <dependency>
>             <groupId>org.apache.karaf.jaas</groupId>
>             <artifactId>org.apache.karaf.jaas.boot</artifactId>
> -            <scope>provided</scope>
> +            <!--<scope>provided</scope>-->
>         </dependency>
>
>         <dependency>
>
> Modified:
> geronimo/server/trunk/framework/modules/geronimo-shell-base/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-shell-base/pom.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> --- geronimo/server/trunk/framework/modules/geronimo-shell-base/pom.xml
> (original)
> +++ geronimo/server/trunk/framework/modules/geronimo-shell-base/pom.xml Mon
> Apr 11 08:56:25 2011
> @@ -58,8 +58,8 @@
>         <dependency>
>             <groupId>org.apache.karaf.shell</groupId>
>             <artifactId>org.apache.karaf.shell.console</artifactId>
> -        </dependency>
> -
> +        </dependency>
> +
>         <dependency>
>             <groupId>org.apache.aries.blueprint</groupId>
>             <artifactId>org.apache.aries.blueprint</artifactId>
>
> Modified:
> geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/deploy/ConnectCommand.java
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/deploy/ConnectCommand.java?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/deploy/ConnectCommand.java
> (original)
> +++
> geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/deploy/ConnectCommand.java
> Mon Apr 11 08:56:25 2011
> @@ -31,7 +31,7 @@ import org.apache.geronimo.deployment.cl
>  import
> org.apache.geronimo.deployment.plugin.factories.BaseDeploymentFactory;
>  import org.apache.geronimo.kernel.Kernel;
>  import org.apache.geronimo.shell.BaseCommandSupport;
> -import org.osgi.service.command.CommandSession;
> +import org.apache.felix.service.command.CommandSession;
>
>  /**
>  * @version $Rev$ $Date$
>
> Modified:
> geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/pom.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> --- geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/pom.xml
> (original)
> +++ geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/pom.xml
> Mon Apr 11 08:56:25 2011
> @@ -37,6 +37,18 @@
>         </dependency>
>
>         <dependency>
> +                <groupId>org.apache.aries.proxy</groupId>
> +                <artifactId>org.apache.aries.proxy</artifactId>
> +                <version>${aries.proxy.version}</version>
> +                <exclusions>
> +                    <exclusion>
> +                       <groupId>org.apache.aries.testsupport</groupId>
> +        <artifactId>org.apache.aries.testsupport.unit</artifactId>
> +                    </exclusion>
> +                </exclusions>
> +            </dependency>
> +
> +        <dependency>
>             <groupId>org.apache.aries.blueprint</groupId>
>             <artifactId>org.apache.aries.blueprint</artifactId>
>         </dependency>
> @@ -55,7 +67,7 @@
>                 <configuration>
>                     <instructions>
>                         <Import-Package>
> -                            org.osgi.service.command;version="0.4.0",
> +
>  org.apache.felix.service.command;version="0.4.0",
>                             org.eclipse.*;resolution:=optional,
>                             *
>                         </Import-Package>
>
> Modified:
> geronimo/server/trunk/plugingroups/console-jetty/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/console-jetty/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugingroups/console-jetty/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugingroups/console-jetty/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -28,11 +28,6 @@
>     </dependency>
>     <dependency>
>         <groupId>org.apache.geronimo.plugins</groupId>
> -        <artifactId>osgi-console-jetty</artifactId>
> -        <type>car</type>
> -    </dependency>
> -    <dependency>
> -        <groupId>org.apache.geronimo.plugins</groupId>
>         <artifactId>plugin-console-jetty</artifactId>
>         <type>car</type>
>     </dependency>
>
> Modified:
> geronimo/server/trunk/plugingroups/console-tomcat/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/console-tomcat/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugingroups/console-tomcat/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugingroups/console-tomcat/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -28,11 +28,6 @@
>     </dependency>
>     <dependency>
>         <groupId>org.apache.geronimo.plugins</groupId>
> -        <artifactId>osgi-console-tomcat</artifactId>
> -        <type>car</type>
> -    </dependency>
> -    <dependency>
> -        <groupId>org.apache.geronimo.plugins</groupId>
>         <artifactId>plugin-console-tomcat</artifactId>
>         <type>car</type>
>     </dependency>
>
> Modified:
> geronimo/server/trunk/plugingroups/eba-jetty/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/eba-jetty/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugingroups/eba-jetty/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugingroups/eba-jetty/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -8,6 +8,11 @@
>     </module-id>
>     <dependency>
>         <groupId>org.apache.geronimo.configs</groupId>
> +        <artifactId>aries</artifactId>
> +        <type>car</type>
> +    </dependency>
> +    <dependency>
> +        <groupId>org.apache.geronimo.configs</groupId>
>         <artifactId>aries-deployer</artifactId>
>         <type>car</type>
>     </dependency>
>
> Modified:
> geronimo/server/trunk/plugingroups/webservices-axis2/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/webservices-axis2/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugingroups/webservices-axis2/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugingroups/webservices-axis2/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -16,4 +16,14 @@
>         <artifactId>axis2-deployer</artifactId>
>         <type>car</type>
>     </dependency>
> +    <dependency>
> +        <groupId>org.apache.geronimo.configs</groupId>
> +        <artifactId>axis2-ejb-deployer</artifactId>
> +        <type>car</type>
> +    </dependency>
> +    <dependency>
> +        <groupId>org.apache.geronimo.configs</groupId>
> +        <artifactId>jaxws-tools</artifactId>
> +        <type>car</type>
> +    </dependency>
>  </plugin-artifact>
>
> Modified:
> geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -277,6 +277,11 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> +        <groupId>org.apache.karaf.jaas</groupId>
> +        <artifactId>org.apache.karaf.jaas.boot</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.openejb</groupId>
>         <artifactId>openejb-jee</artifactId>
>         <type>jar</type>
>
> Modified:
> geronimo/server/trunk/plugins/aries/aries/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/aries/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugins/aries/aries/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugins/aries/aries/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -52,6 +52,11 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> +        <groupId>org.apache.aries.proxy</groupId>
> +        <artifactId>org.apache.aries.proxy.api</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.felix</groupId>
>         <artifactId>org.apache.felix.bundlerepository</artifactId>
>         <type>jar</type>
> @@ -292,6 +297,11 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> +        <groupId>org.apache.karaf.jaas</groupId>
> +        <artifactId>org.apache.karaf.jaas.boot</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.openejb</groupId>
>         <artifactId>openejb-jee</artifactId>
>         <type>jar</type>
>
> Modified: geronimo/server/trunk/plugins/aries/geronimo-aries/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries/pom.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> --- geronimo/server/trunk/plugins/aries/geronimo-aries/pom.xml (original)
> +++ geronimo/server/trunk/plugins/aries/geronimo-aries/pom.xml Mon Apr 11
> 08:56:25 2011
> @@ -40,6 +40,10 @@
>             <version>${project.version}</version>
>         </dependency>
>         <dependency>
> +                <groupId>org.apache.aries</groupId>
> +                <artifactId>org.apache.aries.util</artifactId>
> +            </dependency>
> +        <dependency>
>             <groupId>org.apache.aries.application</groupId>
>             <artifactId>org.apache.aries.application.utils</artifactId>
>         </dependency>
>
> Modified: geronimo/server/trunk/plugins/aries/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/pom.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> --- geronimo/server/trunk/plugins/aries/pom.xml (original)
> +++ geronimo/server/trunk/plugins/aries/pom.xml Mon Apr 11 08:56:25 2011
> @@ -45,6 +45,11 @@
>
>     <dependencyManagement>
>         <dependencies>
> +        <dependency>
> +                <groupId>org.apache.aries</groupId>
> +                <artifactId>org.apache.aries.util</artifactId>
> +                <version>0.2-incubating</version>
> +            </dependency>
>             <dependency>
>                 <groupId>org.apache.aries.application</groupId>
>                 <artifactId>org.apache.aries.application.utils</artifactId>
>
> Modified:
> geronimo/server/trunk/plugins/axis/axis/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/axis/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugins/axis/axis/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugins/axis/axis/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -8,6 +8,11 @@
>     </module-id>
>     <dependency>
>         <groupId>commons-logging</groupId>
> +        <artifactId>commons-logging</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
> +        <groupId>commons-logging</groupId>
>         <artifactId>commons-logging-api</artifactId>
>         <type>jar</type>
>     </dependency>
>
> Modified:
> geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -13,7 +13,7 @@
>     </dependency>
>     <dependency>
>         <groupId>org.apache.geronimo.bundles</groupId>
> -        <artifactId>axiom-api</artifactId>
> +        <artifactId>axiom-all</artifactId>
>         <type>jar</type>
>     </dependency>
>     <dependency>
> @@ -23,17 +23,17 @@
>     </dependency>
>     <dependency>
>         <groupId>org.apache.geronimo.bundles</groupId>
> -        <artifactId>httpcore</artifactId>
> +        <artifactId>axis2-saaj</artifactId>
>         <type>jar</type>
>     </dependency>
>     <dependency>
>         <groupId>org.apache.geronimo.bundles</groupId>
> -        <artifactId>scannotation</artifactId>
> +        <artifactId>httpcore</artifactId>
>         <type>jar</type>
>     </dependency>
>     <dependency>
>         <groupId>org.apache.geronimo.bundles</groupId>
> -        <artifactId>woden-impl-dom</artifactId>
> +        <artifactId>scannotation</artifactId>
>         <type>jar</type>
>     </dependency>
>     <dependency>
> @@ -122,6 +122,11 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> +        <groupId>org.apache.karaf.jaas</groupId>
> +        <artifactId>org.apache.karaf.jaas.boot</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.neethi</groupId>
>         <artifactId>neethi</artifactId>
>         <type>jar</type>
> @@ -177,13 +182,13 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> -        <groupId>org.apache.ws.commons.axiom</groupId>
> -        <artifactId>axiom-dom</artifactId>
> +        <groupId>org.apache.woden</groupId>
> +        <artifactId>woden-impl-commons</artifactId>
>         <type>jar</type>
>     </dependency>
>     <dependency>
> -        <groupId>org.apache.ws.commons.axiom</groupId>
> -        <artifactId>axiom-impl</artifactId>
> +        <groupId>org.apache.woden</groupId>
> +        <artifactId>woden-impl-dom</artifactId>
>         <type>jar</type>
>     </dependency>
>     <dependency>
> @@ -206,4 +211,9 @@
>         <artifactId>xbean-reflect</artifactId>
>         <type>jar</type>
>     </dependency>
> +    <dependency>
> +        <groupId>org.osgi</groupId>
> +        <artifactId>org.osgi.compendium</artifactId>
> +        <type>jar</type>
> +    </dependency>
>  </plugin-artifact>
>
> Modified:
> geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -27,6 +27,11 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> +        <groupId>org.apache.aries.proxy</groupId>
> +        <artifactId>org.apache.aries.proxy.api</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.bval</groupId>
>         <artifactId>org.apache.bval.bundle</artifactId>
>         <type>jar</type>
> @@ -242,6 +247,11 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> +        <groupId>org.apache.karaf.jaas</groupId>
> +        <artifactId>org.apache.karaf.jaas.boot</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.myfaces.core</groupId>
>         <artifactId>myfaces-bundle</artifactId>
>         <type>jar</type>
>
> Modified:
> geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -117,6 +117,11 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> +        <groupId>org.apache.karaf.jaas</groupId>
> +        <artifactId>org.apache.karaf.jaas.boot</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.openwebbeans</groupId>
>         <artifactId>openwebbeans-impl</artifactId>
>         <type>jar</type>
>
> Modified:
> geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> --- geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml
> (original)
> +++ geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -18,7 +18,7 @@
>     </dependency>
>     <dependency>
>         <groupId>org.apache.geronimo.bundles</groupId>
> -        <artifactId>axiom-api</artifactId>
> +        <artifactId>axiom-all</artifactId>
>         <type>jar</type>
>     </dependency>
>     <dependency>
> @@ -82,11 +82,6 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> -        <groupId>org.apache.ws.commons.axiom</groupId>
> -        <artifactId>axiom-impl</artifactId>
> -        <type>jar</type>
> -    </dependency>
> -    <dependency>
>         <groupId>org.apache.ws.commons.schema</groupId>
>         <artifactId>XmlSchema</artifactId>
>         <type>jar</type>
>
> Modified:
> geronimo/server/trunk/plugins/hotdeploy/hot-deployer/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/hotdeploy/hot-deployer/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugins/hotdeploy/hot-deployer/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugins/hotdeploy/hot-deployer/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -7,6 +7,11 @@
>         <type>car</type>
>     </module-id>
>     <dependency>
> +        <groupId>org.apache.felix</groupId>
> +        <artifactId>org.apache.felix.gogo.runtime</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.geronimo.configs</groupId>
>         <artifactId>j2ee-deployer</artifactId>
>         <type>car</type>
> @@ -32,6 +37,21 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> +        <groupId>org.apache.karaf</groupId>
> +        <artifactId>org.apache.karaf.util</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
> +        <groupId>org.apache.karaf.jaas</groupId>
> +        <artifactId>org.apache.karaf.jaas.config</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
> +        <groupId>org.apache.karaf.jaas</groupId>
> +        <artifactId>org.apache.karaf.jaas.modules</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.karaf.shell</groupId>
>         <artifactId>org.apache.karaf.shell.console</artifactId>
>         <type>jar</type>
>
> Modified:
> geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -76,4 +76,9 @@
>         <artifactId>xbean-bundleutils</artifactId>
>         <type>jar</type>
>     </dependency>
> +    <dependency>
> +        <groupId>org.apache.xbean</groupId>
> +        <artifactId>xbean-finder</artifactId>
> +        <type>jar</type>
> +    </dependency>
>  </plugin-artifact>
>
> Modified:
> geronimo/server/trunk/plugins/j2ee/javaee-builder-support/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/javaee-builder-support/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugins/j2ee/javaee-builder-support/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugins/j2ee/javaee-builder-support/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -132,6 +132,11 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> +        <groupId>org.apache.karaf.jaas</groupId>
> +        <artifactId>org.apache.karaf.jaas.boot</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.openejb</groupId>
>         <artifactId>openejb-jee</artifactId>
>         <type>jar</type>
>
> Modified:
> geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -317,6 +317,11 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> +        <groupId>org.apache.karaf.jaas</groupId>
> +        <artifactId>org.apache.karaf.jaas.boot</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.openejb</groupId>
>         <artifactId>openejb-jee</artifactId>
>         <type>jar</type>
>
> Modified:
> geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -302,6 +302,11 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> +        <groupId>org.apache.karaf.jaas</groupId>
> +        <artifactId>org.apache.karaf.jaas.boot</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.openejb</groupId>
>         <artifactId>openejb-jee</artifactId>
>         <type>jar</type>
>
> Modified:
> geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -272,6 +272,11 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> +        <groupId>org.apache.karaf.jaas</groupId>
> +        <artifactId>org.apache.karaf.jaas.boot</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.openejb</groupId>
>         <artifactId>openejb-jee</artifactId>
>         <type>jar</type>
>
> Modified:
> geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/pom.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> --- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/pom.xml
> (original)
> +++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/pom.xml
> Mon Apr 11 08:56:25 2011
> @@ -61,7 +61,7 @@
>                 <configuration>
>                     <instructions>
>                         <Import-Package>
> -                            org.osgi.service.command;version="0.4.0",
> +
>  org.apache.felix.service.command;version="0.4.0",
>                             *
>                         </Import-Package>
>                     </instructions>
>
> Modified:
> geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -1,5 +1,5 @@
>  <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
> -<plugin-artifact xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3"
> xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
> +<plugin-artifact xmlns:ns2="
> http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="
> http://geronimo.apache.org/xml/ns/plugins-1.3">
>     <module-id>
>         <groupId>org.apache.geronimo.configs</groupId>
>         <artifactId>jaxws-sun-tools</artifactId>
> @@ -32,6 +32,11 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> +        <groupId>org.apache.felix</groupId>
> +        <artifactId>org.apache.felix.gogo.runtime</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.geronimo.configs</groupId>
>         <artifactId>jaxws-deployer</artifactId>
>         <type>car</type>
> @@ -42,6 +47,21 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> +        <groupId>org.apache.karaf</groupId>
> +        <artifactId>org.apache.karaf.util</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
> +        <groupId>org.apache.karaf.jaas</groupId>
> +        <artifactId>org.apache.karaf.jaas.config</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
> +        <groupId>org.apache.karaf.jaas</groupId>
> +        <artifactId>org.apache.karaf.jaas.modules</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.karaf.shell</groupId>
>         <artifactId>org.apache.karaf.shell.console</artifactId>
>         <type>jar</type>
>
> Modified:
> geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -137,6 +137,11 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> +        <groupId>org.apache.xbean</groupId>
> +        <artifactId>xbean-finder</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.yoko</groupId>
>         <artifactId>yoko-spec-corba</artifactId>
>         <type>jar</type>
>
> Modified:
> geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -57,6 +57,11 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> +        <groupId>org.apache.geronimo.ext.tomcat</groupId>
> +        <artifactId>util</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.geronimo.framework</groupId>
>         <artifactId>geronimo-deployment</artifactId>
>         <type>jar</type>
>
> Modified:
> geronimo/server/trunk/plugins/wab/web-extender/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/wab/web-extender/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugins/wab/web-extender/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugins/wab/web-extender/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -102,6 +102,11 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> +        <groupId>org.apache.karaf.jaas</groupId>
> +        <artifactId>org.apache.karaf.jaas.boot</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.openejb</groupId>
>         <artifactId>openejb-jee</artifactId>
>         <type>jar</type>
>
> Modified:
> geronimo/server/trunk/plugins/wink/wink/src/main/history/dependencies.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/wink/wink/src/main/history/dependencies.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> ---
> geronimo/server/trunk/plugins/wink/wink/src/main/history/dependencies.xml
> (original)
> +++
> geronimo/server/trunk/plugins/wink/wink/src/main/history/dependencies.xml
> Mon Apr 11 08:56:25 2011
> @@ -82,6 +82,11 @@
>         <type>jar</type>
>     </dependency>
>     <dependency>
> +        <groupId>org.apache.karaf.jaas</groupId>
> +        <artifactId>org.apache.karaf.jaas.boot</artifactId>
> +        <type>jar</type>
> +    </dependency>
> +    <dependency>
>         <groupId>org.apache.openejb</groupId>
>         <artifactId>openejb-jee</artifactId>
>         <type>jar</type>
>
> Modified: geronimo/server/trunk/pom.xml
> URL:
> http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=1090982&r1=1090981&r2=1090982&view=diff
>
> ==============================================================================
> --- geronimo/server/trunk/pom.xml (original)
> +++ geronimo/server/trunk/pom.xml Mon Apr 11 08:56:25 2011
> @@ -85,7 +85,7 @@
>         <jaxbImplVersion>2.2.3_1-SNAPSHOT</jaxbImplVersion>
>
>
> <monitoringConsoleVersion>${project.version}</monitoringConsoleVersion>
> -        <pax.logging.version>1.5.3</pax.logging.version>
> +        <pax.logging.version>1.6.1</pax.logging.version>
>         <woodstoxVersion>3.2.9_1</woodstoxVersion>
>         <sxcVersion>0.7.3_1</sxcVersion>
>         <yokoVersion>1.2-SNAPSHOT</yokoVersion>
> @@ -139,12 +139,13 @@
>
>         <!-- OSGI properties -->
>
> <felix.bundlerepository.version>1.6.4</felix.bundlerepository.version>
> -        <karaf.version>2.1.2</karaf.version>
> -        <karaf.osgi.version>2.1.2</karaf.osgi.version>
> -        <aries.blueprint.version>0.2-incubating</aries.blueprint.version>
> -        <aries.jmx.version>0.2-incubating</aries.jmx.version>
> -        <aries.util.version>0.2-incubating</aries.util.version>
> -        <aries.jndi.version>0.2-incubating</aries.jndi.version>
> +        <karaf.version>2.2.1-SNAPSHOT</karaf.version>
> +        <karaf.osgi.version>2.2.1.SNAPSHOT</karaf.osgi.version>
> +        <aries.blueprint.version>0.3</aries.blueprint.version>
> +        <aries.jmx.version>0.3</aries.jmx.version>
> +        <aries.util.version>0.3</aries.util.version>
> +        <aries.jndi.version>0.3</aries.jndi.version>
> +        <aries.proxy.version>0.3</aries.proxy.version>
>     </properties>
>
>     <dependencyManagement>
> @@ -648,7 +649,8 @@
>             <dependency>
>                 <groupId>org.slf4j</groupId>
>                 <artifactId>slf4j-api</artifactId>
> -                <version>1.5.5</version>
> +                <!--<version>1.5.5</version>-->
> +                <version>1.6.0</version>
>             </dependency>
>
>             <dependency>
> @@ -1732,7 +1734,7 @@ only found in cxf
>
> <artifactId>org.apache.felix.gogo.runtime</artifactId>
>                     </exclusion>
>                     <exclusion>
> -                        <groupId>jline</groupId>
> +                        <groupId>org.sonatype.jline</groupId>
>                         <artifactId>jline</artifactId>
>                     </exclusion>
>                     <exclusion>
> @@ -1748,14 +1750,38 @@ only found in cxf
>
>             <dependency>
>                 <groupId>org.apache.karaf.jaas</groupId>
> +                <artifactId>org.apache.karaf.jaas.modules</artifactId>
> +                <version>${karaf.version}</version>
> +            </dependency>
> +
> +            <dependency>
> +                <groupId>org.apache.karaf.jaas</groupId>
>                 <artifactId>org.apache.karaf.jaas.boot</artifactId>
>                 <version>${karaf.version}</version>
>             </dependency>
> +
> +             <dependency>
> +                <groupId>org.apache.aries.application</groupId>
> +
>  <artifactId>org.apache.aries.application.utils</artifactId>
> +                <version>${aries.util.version}</version>
> +                <exclusions>
> +                    <exclusion>
> +                       <groupId>org.apache.aries.testsupport</groupId>
> +        <artifactId>org.apache.aries.testsupport.unit</artifactId>
> +                    </exclusion>
> +                </exclusions>
> +            </dependency>
>
>             <dependency>
>                 <groupId>org.apache.aries</groupId>
>                 <artifactId>org.apache.aries.util</artifactId>
>                 <version>${aries.util.version}</version>
> +                 <exclusions>
> +                    <exclusion>
> +                       <groupId>org.apache.aries.testsupport</groupId>
> +        <artifactId>org.apache.aries.testsupport.unit</artifactId>
> +                    </exclusion>
> +                </exclusions>
>             </dependency>
>
>             <dependency>
> @@ -1783,6 +1809,18 @@ only found in cxf
>             </dependency>
>
>             <dependency>
> +                <groupId>org.apache.aries.proxy</groupId>
> +                <artifactId>org.apache.aries.proxy</artifactId>
> +                <version>${aries.proxy.version}</version>
> +                <exclusions>
> +                    <exclusion>
> +                       <groupId>org.apache.aries.testsupport</groupId>
> +        <artifactId>org.apache.aries.testsupport.unit</artifactId>
> +                    </exclusion>
> +                </exclusions>
> +            </dependency>
> +
> +            <dependency>
>                 <groupId>org.apache.aries.blueprint</groupId>
>                 <artifactId>org.apache.aries.blueprint</artifactId>
>                 <version>${aries.blueprint.version}</version>
> @@ -1791,8 +1829,14 @@ only found in cxf
>                         <groupId>org.slf4j</groupId>
>                         <artifactId>slf4j-api</artifactId>
>                     </exclusion>
> +                    <exclusion>
> +                       <groupId>org.apache.aries.testsupport</groupId>
> +        <artifactId>org.apache.aries.testsupport.unit</artifactId>
> +                    </exclusion>
>                 </exclusions>
>             </dependency>
> +
> +
>
>         </dependencies>
>     </dependencyManagement>
>
>
>

--000e0cd153165ef0de04a0a77b97
Content-Type: text/html; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

Hi Viola,<br><br>I met build error like this after your patch, can you doub=
le check?<br><br>#<br># A fatal error has been detected by the Java Runtime=
 Environment:<br>#<br>#=A0 SIGFPE (0x8) at pc=3D0xf7f2420b, pid=3D7251, tid=
=3D4145761184<br>
#<br># JRE version: 6.0_23-b05<br># Java VM: Java HotSpot(TM) Server VM (19=
.0-b09 mixed mode linux-x86 )<br># Problematic frame:<br># C=A0 [ld-linux.s=
o.2+0x920b]<br>#<br># An error report file with more information is saved a=
s:<br>
# /home/tcker/tckdata/tckbuildsrc/geronimo/framework/configs/jsr88-cli/hs_e=
rr_pid7251.log<br>#<br># If you would like to submit a bug report, please v=
isit:<br>#=A0=A0 <a href=3D"http://java.sun.com/webapps/bugreport/crash.jsp=
">http://java.sun.com/webapps/bugreport/crash.jsp</a><br>
# The crash happened outside the Java Virtual Machine in native code.<br># =
See problematic frame for where to report the bug.<br>#<br><br>This happens=
 when build framework/config/jsr88-cli<br><br>Forrest<br><br><div class=3D"=
gmail_quote">
On Mon, Apr 11, 2011 at 4:56 PM,  <span dir=3D"ltr">&lt;<a href=3D"mailto:v=
iolalu@apache.org">violalu@apache.org</a>&gt;</span> wrote:<br><blockquote =
class=3D"gmail_quote" style=3D"margin: 0pt 0pt 0pt 0.8ex; border-left: 1px =
solid rgb(204, 204, 204); padding-left: 1ex;">
Author: violalu<br>
Date: Mon Apr 11 08:56:25 2011<br>
New Revision: 1090982<br>
<br>
URL: <a href=3D"http://svn.apache.org/viewvc?rev=3D1090982&amp;view=3Drev" =
target=3D"_blank">http://svn.apache.org/viewvc?rev=3D1090982&amp;view=3Drev=
</a><br>
Log:<br>
GERONIMO-5885 Upgrade karaf from 2.1.2 to 2.2.1-SNAPSHOT<br>
<br>
Modified:<br>
 =A0 =A0geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/m=
ain/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java<br>
 =A0 =A0geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/s=
rc/main/resources/Geronimo-1.6.profile<br>
 =A0 =A0geronimo/server/trunk/framework/configs/j2ee-security/src/main/hist=
ory/dependencies.xml<br>
 =A0 =A0geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/=
dependencies.xml<br>
 =A0 =A0geronimo/server/trunk/framework/configs/karaf-framework/pom.xml<br>
 =A0 =A0geronimo/server/trunk/framework/configs/karaf-framework/src/main/fi=
ltered-resources/etc/startup.properties<br>
 =A0 =A0geronimo/server/trunk/framework/configs/karaf-framework/src/main/hi=
story/dependencies.xml<br>
 =A0 =A0geronimo/server/trunk/framework/configs/rmi-naming/src/main/history=
/dependencies.xml<br>
 =A0 =A0geronimo/server/trunk/framework/configs/shutdown/src/main/history/d=
ependencies.xml<br>
 =A0 =A0geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/ma=
in/java/org/apache/geronimo/deployment/cli/StreamConsoleReader.java<br>
 =A0 =A0geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xm=
l<br>
 =A0 =A0geronimo/server/trunk/framework/modules/geronimo-security/pom.xml<b=
r>
 =A0 =A0geronimo/server/trunk/framework/modules/geronimo-shell-base/pom.xml=
<br>
 =A0 =A0geronimo/server/trunk/framework/modules/geronimo-shell-base/src/mai=
n/java/org/apache/geronimo/shell/deploy/ConnectCommand.java<br>
 =A0 =A0geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/pom=
.xml<br>
 =A0 =A0geronimo/server/trunk/plugingroups/console-jetty/src/main/history/d=
ependencies.xml<br>
 =A0 =A0geronimo/server/trunk/plugingroups/console-tomcat/src/main/history/=
dependencies.xml<br>
 =A0 =A0geronimo/server/trunk/plugingroups/eba-jetty/src/main/history/depen=
dencies.xml<br>
 =A0 =A0geronimo/server/trunk/plugingroups/webservices-axis2/src/main/histo=
ry/dependencies.xml<br>
 =A0 =A0geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history=
/dependencies.xml<br>
 =A0 =A0geronimo/server/trunk/plugins/aries/aries/src/main/history/dependen=
cies.xml<br>
 =A0 =A0geronimo/server/trunk/plugins/aries/geronimo-aries/pom.xml<br>
 =A0 =A0geronimo/server/trunk/plugins/aries/pom.xml<br>
 =A0 =A0geronimo/server/trunk/plugins/axis/axis/src/main/history/dependenci=
es.xml<br>
 =A0 =A0geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependen=
cies.xml<br>
 =A0 =A0geronimo/server/trunk/plugins/client/client/src/main/history/depend=
encies.xml<br>
 =A0 =A0geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/=
src/main/history/dependencies.xml<br>
 =A0 =A0geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies=
.xml<br>
 =A0 =A0geronimo/server/trunk/plugins/hotdeploy/hot-deployer/src/main/histo=
ry/dependencies.xml<br>
 =A0 =A0geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/d=
ependencies.xml<br>
 =A0 =A0geronimo/server/trunk/plugins/j2ee/javaee-builder-support/src/main/=
history/dependencies.xml<br>
 =A0 =A0geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/src/main/hi=
story/dependencies.xml<br>
 =A0 =A0geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/src/main/hi=
story/dependencies.xml<br>
 =A0 =A0geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/src/main/hi=
story/dependencies.xml<br>
 =A0 =A0geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/pom.xm=
l<br>
 =A0 =A0geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/histor=
y/dependencies.xml<br>
 =A0 =A0geronimo/server/trunk/plugins/openejb/openejb/src/main/history/depe=
ndencies.xml<br>
 =A0 =A0geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/depen=
dencies.xml<br>
 =A0 =A0geronimo/server/trunk/plugins/wab/web-extender/src/main/history/dep=
endencies.xml<br>
 =A0 =A0geronimo/server/trunk/plugins/wink/wink/src/main/history/dependenci=
es.xml<br>
 =A0 =A0geronimo/server/trunk/pom.xml<br>
<br>
Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src=
/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java<br>
URL: <a href=3D"http://svn.apache.org/viewvc/geronimo/server/trunk/framewor=
k/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplug=
ins/car/AbstractCarMojo.java?rev=3D1090982&amp;r1=3D1090981&amp;r2=3D109098=
2&amp;view=3Ddiff" target=3D"_blank">http://svn.apache.org/viewvc/geronimo/=
server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apac=
he/geronimo/mavenplugins/car/AbstractCarMojo.java?rev=3D1090982&amp;r1=3D10=
90981&amp;r2=3D1090982&amp;view=3Ddiff</a><br>

=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D<br>
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/=
java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java (original)<b=
r>
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/=
java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java Mon Apr 11 0=
8:56:25 2011<br>
@@ -887,7 +887,7 @@ public abstract class AbstractCarMojo<br>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &quot;org.apache.geronimo.=
transformer,&quot; +<br>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &quot;org.apache.geronimo.=
hook,&quot; +<br>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &quot;org.apache.geronimo.=
mavenplugins.car,&quot; +<br>
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&quot;org.apache.karaf.jaa=
s.boot;version=3D\&quot;2.1.2\&quot;,&quot; +<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&quot;org.apache.karaf.jaa=
s.boot;version=3D\&quot;2.2.1.SNAPSHOT\&quot;,&quot; +<br>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &quot;org.apache.yoko,&quo=
t; +<br>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &quot;org.apache.yoko.osgi=
,&quot; +<br>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &quot;org.apache.yoko.rmis=
pec.util&quot;<br>
<br>
Modified: geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin=
/src/main/resources/Geronimo-1.6.profile<br>
URL: <a href=3D"http://svn.apache.org/viewvc/geronimo/server/trunk/framewor=
k/buildsupport/geronimo-osgi-plugin/src/main/resources/Geronimo-1.6.profile=
?rev=3D1090982&amp;r1=3D1090981&amp;r2=3D1090982&amp;view=3Ddiff" target=3D=
"_blank">http://svn.apache.org/viewvc/geronimo/server/trunk/framework/build=
support/geronimo-osgi-plugin/src/main/resources/Geronimo-1.6.profile?rev=3D=
1090982&amp;r1=3D1090981&amp;r2=3D1090982&amp;view=3Ddiff</a><br>

=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D<br>
--- geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/m=
ain/resources/Geronimo-1.6.profile (original)<br>
+++ geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/m=
ain/resources/Geronimo-1.6.profile Mon Apr 11 08:56:25 2011<br>
@@ -143,7 +143,7 @@ org.osgi.framework.system.packages.extra<br>
 =A0sun.reflect, \<br>
 =A0org.apache.geronimo.main, \<br>
 =A0org.apache.geronimo.transformer, \<br>
- org.apache.karaf.jaas.boot;version=3D2.1.2<br>
+ org.apache.karaf.jaas.boot;version=3D2.2.1.SNAPSHOT<br>
<br>
=A0org.osgi.framework.bootdelegation =3D \<br>
 =A0javax.*,\<br>
<br>
Modified: geronimo/server/trunk/framework/configs/j2ee-security/src/main/hi=
story/dependencies.xml<br>
URL: <a href=3D"http://svn.apache.org/viewvc/geronimo/server/trunk/framewor=
k/configs/j2ee-security/src/main/history/dependencies.xml?rev=3D1090982&amp=
;r1=3D1090981&amp;r2=3D1090982&amp;view=3Ddiff" target=3D"_blank">http://sv=
n.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-security/s=
rc/main/history/dependencies.xml?rev=3D1090982&amp;r1=3D1090981&amp;r2=3D10=
90982&amp;view=3Ddiff</a><br>

=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D<br>
--- geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/=
dependencies.xml (original)<br>
+++ geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/=
dependencies.xml Mon Apr 11 08:56:25 2011<br>
@@ -36,4 +36,9 @@<br>
 =A0 =A0 =A0 =A0 &lt;artifactId&gt;geronimo-jaspic_1.0_spec&lt;/artifactId&=
gt;<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
 =A0 =A0 &lt;/dependency&gt;<br>
+ =A0 =A0&lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.karaf.jaas&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;org.apache.karaf.jaas.boot&lt;/artifactI=
d&gt;<br>
+ =A0 =A0 =A0 =A0&lt;type&gt;jar&lt;/type&gt;<br>
+ =A0 =A0&lt;/dependency&gt;<br>
=A0&lt;/plugin-artifact&gt;<br>
<br>
Modified: geronimo/server/trunk/framework/configs/jsr88-cli/src/main/histor=
y/dependencies.xml<br>
URL: <a href=3D"http://svn.apache.org/viewvc/geronimo/server/trunk/framewor=
k/configs/jsr88-cli/src/main/history/dependencies.xml?rev=3D1090982&amp;r1=
=3D1090981&amp;r2=3D1090982&amp;view=3Ddiff" target=3D"_blank">http://svn.a=
pache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-cli/src/main=
/history/dependencies.xml?rev=3D1090982&amp;r1=3D1090981&amp;r2=3D1090982&a=
mp;view=3Ddiff</a><br>

=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D<br>
--- geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/depe=
ndencies.xml (original)<br>
+++ geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/depe=
ndencies.xml Mon Apr 11 08:56:25 2011<br>
@@ -32,6 +32,11 @@<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
 =A0 =A0 &lt;/dependency&gt;<br>
 =A0 =A0 &lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.felix&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;org.apache.felix.gogo.runtime&lt;/artifa=
ctId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;type&gt;jar&lt;/type&gt;<br>
+ =A0 =A0&lt;/dependency&gt;<br>
+ =A0 =A0&lt;dependency&gt;<br>
 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.geronimo.bundles&lt;/groupId&gt;=
<br>
 =A0 =A0 =A0 =A0 &lt;artifactId&gt;jaxb-impl&lt;/artifactId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
@@ -127,6 +132,26 @@<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
 =A0 =A0 &lt;/dependency&gt;<br>
 =A0 =A0 &lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.karaf&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;org.apache.karaf.util&lt;/artifactId&gt;=
<br>
+ =A0 =A0 =A0 =A0&lt;type&gt;jar&lt;/type&gt;<br>
+ =A0 =A0&lt;/dependency&gt;<br>
+ =A0 =A0&lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.karaf.jaas&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;org.apache.karaf.jaas.boot&lt;/artifactI=
d&gt;<br>
+ =A0 =A0 =A0 =A0&lt;type&gt;jar&lt;/type&gt;<br>
+ =A0 =A0&lt;/dependency&gt;<br>
+ =A0 =A0&lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.karaf.jaas&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;org.apache.karaf.jaas.config&lt;/artifac=
tId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;type&gt;jar&lt;/type&gt;<br>
+ =A0 =A0&lt;/dependency&gt;<br>
+ =A0 =A0&lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.karaf.jaas&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;org.apache.karaf.jaas.modules&lt;/artifa=
ctId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;type&gt;jar&lt;/type&gt;<br>
+ =A0 =A0&lt;/dependency&gt;<br>
+ =A0 =A0&lt;dependency&gt;<br>
 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.karaf.shell&lt;/groupId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;artifactId&gt;org.apache.karaf.shell.console&lt;/artif=
actId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
@@ -186,4 +211,14 @@<br>
 =A0 =A0 =A0 =A0 &lt;artifactId&gt;pax-logging-api&lt;/artifactId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
 =A0 =A0 &lt;/dependency&gt;<br>
+ =A0 =A0&lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;org.osgi&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;org.osgi.compendium&lt;/artifactId&gt;<b=
r>
+ =A0 =A0 =A0 =A0&lt;type&gt;jar&lt;/type&gt;<br>
+ =A0 =A0&lt;/dependency&gt;<br>
+ =A0 =A0&lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;org.osgi&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;org.osgi.core&lt;/artifactId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;type&gt;jar&lt;/type&gt;<br>
+ =A0 =A0&lt;/dependency&gt;<br>
=A0&lt;/plugin-artifact&gt;<br>
<br>
Modified: geronimo/server/trunk/framework/configs/karaf-framework/pom.xml<b=
r>
URL: <a href=3D"http://svn.apache.org/viewvc/geronimo/server/trunk/framewor=
k/configs/karaf-framework/pom.xml?rev=3D1090982&amp;r1=3D1090981&amp;r2=3D1=
090982&amp;view=3Ddiff" target=3D"_blank">http://svn.apache.org/viewvc/gero=
nimo/server/trunk/framework/configs/karaf-framework/pom.xml?rev=3D1090982&a=
mp;r1=3D1090981&amp;r2=3D1090982&amp;view=3Ddiff</a><br>

=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D<br>
--- geronimo/server/trunk/framework/configs/karaf-framework/pom.xml (origin=
al)<br>
+++ geronimo/server/trunk/framework/configs/karaf-framework/pom.xml Mon Apr=
 11 08:56:25 2011<br>
@@ -38,11 +38,11 @@<br>
 =A0 =A0 =A0 =A0 &lt;depends.maven.plugin.version&gt;1.0&lt;/depends.maven.=
plugin.version&gt;<br>
 =A0 =A0 =A0 =A0 &lt;easymock.version&gt;2.4&lt;/easymock.version&gt;<br>
 =A0 =A0 =A0 =A0 &lt;felix.compendium.version&gt;1.2.0&lt;/felix.compendium=
.version&gt;<br>
- =A0 =A0 =A0 =A0&lt;felix.fileinstall.version&gt;3.0.2&lt;/felix.fileinsta=
ll.version&gt;<br>
+ =A0 =A0 =A0 =A0&lt;felix.fileinstall.version&gt;3.1.10&lt;/felix.fileinst=
all.version&gt;<br>
 =A0 =A0 =A0 =A0 &lt;felix.osgi.version&gt;1.4.0&lt;/felix.osgi.version&gt;=
<br>
 =A0 =A0 =A0 =A0 &lt;felix.plugin.version&gt;2.1.0&lt;/felix.plugin.version=
&gt;<br>
 =A0 =A0 =A0 =A0 &lt;felix.prefs.version&gt;1.0.4&lt;/felix.prefs.version&g=
t;<br>
- =A0 =A0 =A0 =A0&lt;felix.metatype.version&gt;1.0.2&lt;/felix.metatype.ver=
sion&gt;<br>
+ =A0 =A0 =A0 =A0&lt;felix.metatype.version&gt;1.0.2&lt;/felix.metatype.ver=
sion&gt;<br>
 =A0 =A0 =A0 =A0 &lt;jansi.version&gt;1.2&lt;/jansi.version&gt;<br>
 =A0 =A0 =A0 =A0 &lt;junit.version&gt;4.7_1&lt;/junit.version&gt;<br>
 =A0 =A0 =A0 =A0 &lt;log4j.version&gt;1.2.16&lt;/log4j.version&gt;<br>
@@ -50,7 +50,7 @@<br>
 =A0 =A0 =A0 =A0 &lt;mina.version&gt;2.0.0-RC1&lt;/mina.version&gt;<br>
 =A0 =A0 =A0 =A0 &lt;pax.exam.version&gt;1.2.2&lt;/pax.exam.version&gt;<br>
 =A0 =A0 =A0 =A0 &lt;pax.runner.version&gt;1.5.0&lt;/pax.runner.version&gt;=
<br>
- =A0 =A0 =A0 =A0&lt;sshd.version&gt;0.4.0&lt;/sshd.version&gt;<br>
+ =A0 =A0 =A0 =A0&lt;sshd.version&gt;0.5.0&lt;/sshd.version&gt;<br>
 =A0 =A0 &lt;/properties&gt;<br>
<br>
 =A0 =A0 &lt;dependencyManagement&gt;<br>
@@ -89,6 +89,7 @@<br>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &lt;/exclusion&gt;<br>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&lt;/exclusions&gt;<br>
 =A0 =A0 =A0 =A0 =A0 =A0 &lt;/dependency&gt;<br>
+<br>
<br>
 =A0 =A0 =A0 =A0 =A0 =A0 &lt;dependency&gt;<br>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.felix&lt;/groupI=
d&gt;<br>
@@ -105,7 +106,7 @@<br>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &lt;/exclusion&gt;<br>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&lt;/exclusions&gt;<br>
 =A0 =A0 =A0 =A0 =A0 =A0 &lt;/dependency&gt;<br>
-<br>
+<br>
 =A0 =A0 =A0 =A0 =A0 =A0 &lt;dependency&gt;<br>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.geronimo.framewo=
rk&lt;/groupId&gt;<br>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &lt;artifactId&gt;geronimo-rmi-loader&lt;/=
artifactId&gt;<br>
@@ -167,6 +168,18 @@<br>
 =A0 =A0 =A0 =A0 =A0 =A0 &lt;/dependency&gt;<br>
<br>
 =A0 =A0 =A0 =A0 =A0 =A0 &lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.aries.proxy&lt;/=
groupId&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&lt;artifactId&gt;org.apache.aries.proxy&l=
t;/artifactId&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&lt;version&gt;${aries.proxy.version}&lt;/=
version&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&lt;exclusions&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&lt;exclusion&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.ari=
es.testsupport&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;org.apache.aries.testsupport.unit&lt;/ar=
tifactId&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&lt;/exclusion&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&lt;/exclusions&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0&lt;/dependency&gt;<br>
+<br>
+ =A0 =A0 =A0 =A0 =A0 =A0&lt;dependency&gt;<br>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.karaf.deployer&l=
t;/groupId&gt;<br>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &lt;artifactId&gt;org.apache.karaf.deploye=
r.blueprint&lt;/artifactId&gt;<br>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &lt;version&gt;${karaf.version}&lt;/versio=
n&gt;<br>
<br>
Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/=
filtered-resources/etc/startup.properties<br>
URL: <a href=3D"http://svn.apache.org/viewvc/geronimo/server/trunk/framewor=
k/configs/karaf-framework/src/main/filtered-resources/etc/startup.propertie=
s?rev=3D1090982&amp;r1=3D1090981&amp;r2=3D1090982&amp;view=3Ddiff" target=
=3D"_blank">http://svn.apache.org/viewvc/geronimo/server/trunk/framework/co=
nfigs/karaf-framework/src/main/filtered-resources/etc/startup.properties?re=
v=3D1090982&amp;r1=3D1090981&amp;r2=3D1090982&amp;view=3Ddiff</a><br>

=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D<br>
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/filter=
ed-resources/etc/startup.properties (original)<br>
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/filter=
ed-resources/etc/startup.properties Mon Apr 11 08:56:25 2011<br>
@@ -30,11 +30,11 @@ org/apache/geronimo/framework/geronimo-p<br>
=A0org/apache/felix/org.apache.felix.configadmin/${felix.configadmin.versio=
n}/org.apache.felix.configadmin-${felix.configadmin.version}.jar=3D8<br>
=A0org/apache/felix/org.apache.felix.prefs/${felix.prefs.version}/org.apach=
e.felix.prefs-${felix.prefs.version}.jar=3D10<br>
=A0org/apache/felix/org.apache.felix.fileinstall/${felix.fileinstall.versio=
n}/org.apache.felix.fileinstall-${felix.fileinstall.version}.jar=3D11<br>
-<br>
=A0#<br>
=A0# The rest of the services..<br>
=A0#<br>
=A0org/apache/aries/org.apache.aries.util/${aries.blueprint.version}/org.ap=
ache.aries.util-${aries.blueprint.version}.jar=3D20<br>
+org/apache/aries/proxy/org.apache.aries.proxy/${aries.proxy.version}/org.a=
pache.aries.proxy-${aries.proxy.version}.jar=3D20<br>
=A0org/apache/aries/blueprint/org.apache.aries.blueprint/${aries.blueprint.=
version}/org.apache.aries.blueprint-${aries.blueprint.version}.jar=3D20<br>
<br>
=A0org/apache/geronimo/framework/geronimo-shell/${pom.version}/geronimo-she=
ll-${pom.version}.jar=3D30<br>
@@ -48,6 +48,7 @@ org/apache/karaf/shell/org.apache.karaf.<br>
=A0org/apache/karaf/shell/org.apache.karaf.shell.commands/${karaf.version}/=
org.apache.karaf.shell.commands-${karaf.version}.jar=3D30<br>
=A0org/apache/karaf/shell/org.apache.karaf.shell.obr/${karaf.version}/org.a=
pache.karaf.shell.obr-${karaf.version}.jar=3D30<br>
=A0org/apache/karaf/jaas/org.apache.karaf.jaas.config/${karaf.version}/org.=
apache.karaf.jaas.config-${karaf.version}.jar=3D30<br>
+org/apache/karaf/jaas/org.apache.karaf.jaas.modules/${karaf.version}/org.a=
pache.karaf.jaas.modules-${karaf.version}.jar=3D30<br>
<br>
=A0#org/apache/karaf/features/org.apache.karaf.features.core/${karaf.versio=
n}/org.apache.karaf.features.core-${karaf.version}.jar=3D30<br>
=A0#org/apache/karaf/features/org.apache.karaf.features.command/${karaf.ver=
sion}/org.apache.karaf.features.command-${karaf.version}.jar=3D30<br>
<br>
Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/=
history/dependencies.xml<br>
URL: <a href=3D"http://svn.apache.org/viewvc/geronimo/server/trunk/framewor=
k/configs/karaf-framework/src/main/history/dependencies.xml?rev=3D1090982&a=
mp;r1=3D1090981&amp;r2=3D1090982&amp;view=3Ddiff" target=3D"_blank">http://=
svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framewo=
rk/src/main/history/dependencies.xml?rev=3D1090982&amp;r1=3D1090981&amp;r2=
=3D1090982&amp;view=3Ddiff</a><br>

=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D<br>
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/histor=
y/dependencies.xml (original)<br>
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/histor=
y/dependencies.xml Mon Apr 11 08:56:25 2011<br>
@@ -17,11 +17,6 @@<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
 =A0 =A0 &lt;/dependency&gt;<br>
 =A0 =A0 &lt;dependency&gt;<br>
- =A0 =A0 =A0 =A0&lt;groupId&gt;commons-collections&lt;/groupId&gt;<br>
- =A0 =A0 =A0 =A0&lt;artifactId&gt;commons-collections&lt;/artifactId&gt;<b=
r>
- =A0 =A0 =A0 =A0&lt;type&gt;jar&lt;/type&gt;<br>
- =A0 =A0&lt;/dependency&gt;<br>
- =A0 =A0&lt;dependency&gt;<br>
 =A0 =A0 =A0 =A0 &lt;groupId&gt;commons-lang&lt;/groupId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;artifactId&gt;commons-lang&lt;/artifactId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
@@ -37,6 +32,21 @@<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
 =A0 =A0 &lt;/dependency&gt;<br>
 =A0 =A0 &lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.aries.proxy&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;org.apache.aries.proxy&lt;/artifactId&gt=
;<br>
+ =A0 =A0 =A0 =A0&lt;type&gt;jar&lt;/type&gt;<br>
+ =A0 =A0&lt;/dependency&gt;<br>
+ =A0 =A0&lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.aries.proxy&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;org.apache.aries.proxy.api&lt;/artifactI=
d&gt;<br>
+ =A0 =A0 =A0 =A0&lt;type&gt;jar&lt;/type&gt;<br>
+ =A0 =A0&lt;/dependency&gt;<br>
+ =A0 =A0&lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.aries.proxy&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;org.apache.aries.proxy.impl&lt;/artifact=
Id&gt;<br>
+ =A0 =A0 =A0 =A0&lt;type&gt;jar&lt;/type&gt;<br>
+ =A0 =A0&lt;/dependency&gt;<br>
+ =A0 =A0&lt;dependency&gt;<br>
 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.felix&lt;/groupId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;artifactId&gt;org.apache.felix.bundlerepository&lt;/ar=
tifactId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
@@ -58,6 +68,11 @@<br>
 =A0 =A0 &lt;/dependency&gt;<br>
 =A0 =A0 &lt;dependency&gt;<br>
 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.felix&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;org.apache.felix.gogo.runtime&lt;/artifa=
ctId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;type&gt;jar&lt;/type&gt;<br>
+ =A0 =A0&lt;/dependency&gt;<br>
+ =A0 =A0&lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.felix&lt;/groupId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;artifactId&gt;org.apache.felix.metatype&lt;/artifactId=
&gt;<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
 =A0 =A0 &lt;/dependency&gt;<br>
@@ -197,6 +212,11 @@<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
 =A0 =A0 &lt;/dependency&gt;<br>
 =A0 =A0 &lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.karaf&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;org.apache.karaf.util&lt;/artifactId&gt;=
<br>
+ =A0 =A0 =A0 =A0&lt;type&gt;jar&lt;/type&gt;<br>
+ =A0 =A0&lt;/dependency&gt;<br>
+ =A0 =A0&lt;dependency&gt;<br>
 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.karaf.deployer&lt;/groupId&gt;<b=
r>
 =A0 =A0 =A0 =A0 &lt;artifactId&gt;org.apache.karaf.deployer.blueprint&lt;/=
artifactId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
@@ -232,6 +252,11 @@<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
 =A0 =A0 &lt;/dependency&gt;<br>
 =A0 =A0 &lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.karaf.jaas&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;org.apache.karaf.jaas.modules&lt;/artifa=
ctId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;type&gt;jar&lt;/type&gt;<br>
+ =A0 =A0&lt;/dependency&gt;<br>
+ =A0 =A0&lt;dependency&gt;<br>
 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.karaf.shell&lt;/groupId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;artifactId&gt;org.apache.karaf.shell.commands&lt;/arti=
factId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
@@ -371,4 +396,9 @@<br>
 =A0 =A0 =A0 =A0 &lt;artifactId&gt;org.osgi.core&lt;/artifactId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
 =A0 =A0 &lt;/dependency&gt;<br>
+ =A0 =A0&lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;org.slf4j&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;slf4j-api&lt;/artifactId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;type&gt;jar&lt;/type&gt;<br>
+ =A0 =A0&lt;/dependency&gt;<br>
=A0&lt;/plugin-artifact&gt;<br>
<br>
Modified: geronimo/server/trunk/framework/configs/rmi-naming/src/main/histo=
ry/dependencies.xml<br>
URL: <a href=3D"http://svn.apache.org/viewvc/geronimo/server/trunk/framewor=
k/configs/rmi-naming/src/main/history/dependencies.xml?rev=3D1090982&amp;r1=
=3D1090981&amp;r2=3D1090982&amp;view=3Ddiff" target=3D"_blank">http://svn.a=
pache.org/viewvc/geronimo/server/trunk/framework/configs/rmi-naming/src/mai=
n/history/dependencies.xml?rev=3D1090982&amp;r1=3D1090981&amp;r2=3D1090982&=
amp;view=3Ddiff</a><br>

=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D<br>
--- geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dep=
endencies.xml (original)<br>
+++ geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dep=
endencies.xml Mon Apr 11 08:56:25 2011<br>
@@ -32,6 +32,11 @@<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
 =A0 =A0 &lt;/dependency&gt;<br>
 =A0 =A0 &lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.aries.proxy&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;org.apache.aries.proxy.api&lt;/artifactI=
d&gt;<br>
+ =A0 =A0 =A0 =A0&lt;type&gt;jar&lt;/type&gt;<br>
+ =A0 =A0&lt;/dependency&gt;<br>
+ =A0 =A0&lt;dependency&gt;<br>
 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.geronimo.framework&lt;/groupId&g=
t;<br>
 =A0 =A0 =A0 =A0 &lt;artifactId&gt;geronimo-blueprint&lt;/artifactId&gt;<br=
>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
<br>
Modified: geronimo/server/trunk/framework/configs/shutdown/src/main/history=
/dependencies.xml<br>
URL: <a href=3D"http://svn.apache.org/viewvc/geronimo/server/trunk/framewor=
k/configs/shutdown/src/main/history/dependencies.xml?rev=3D1090982&amp;r1=
=3D1090981&amp;r2=3D1090982&amp;view=3Ddiff" target=3D"_blank">http://svn.a=
pache.org/viewvc/geronimo/server/trunk/framework/configs/shutdown/src/main/=
history/dependencies.xml?rev=3D1090982&amp;r1=3D1090981&amp;r2=3D1090982&am=
p;view=3Ddiff</a><br>

=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D<br>
--- geronimo/server/trunk/framework/configs/shutdown/src/main/history/depen=
dencies.xml (original)<br>
+++ geronimo/server/trunk/framework/configs/shutdown/src/main/history/depen=
dencies.xml Mon Apr 11 08:56:25 2011<br>
@@ -32,6 +32,11 @@<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
 =A0 =A0 &lt;/dependency&gt;<br>
 =A0 =A0 &lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.felix&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;org.apache.felix.gogo.runtime&lt;/artifa=
ctId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;type&gt;jar&lt;/type&gt;<br>
+ =A0 =A0&lt;/dependency&gt;<br>
+ =A0 =A0&lt;dependency&gt;<br>
 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.geronimo.bundles&lt;/groupId&gt;=
<br>
 =A0 =A0 =A0 =A0 &lt;artifactId&gt;jaxb-impl&lt;/artifactId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
@@ -127,6 +132,26 @@<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
 =A0 =A0 &lt;/dependency&gt;<br>
 =A0 =A0 &lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.karaf&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;org.apache.karaf.util&lt;/artifactId&gt;=
<br>
+ =A0 =A0 =A0 =A0&lt;type&gt;jar&lt;/type&gt;<br>
+ =A0 =A0&lt;/dependency&gt;<br>
+ =A0 =A0&lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.karaf.jaas&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;org.apache.karaf.jaas.boot&lt;/artifactI=
d&gt;<br>
+ =A0 =A0 =A0 =A0&lt;type&gt;jar&lt;/type&gt;<br>
+ =A0 =A0&lt;/dependency&gt;<br>
+ =A0 =A0&lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.karaf.jaas&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;org.apache.karaf.jaas.config&lt;/artifac=
tId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;type&gt;jar&lt;/type&gt;<br>
+ =A0 =A0&lt;/dependency&gt;<br>
+ =A0 =A0&lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.karaf.jaas&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;org.apache.karaf.jaas.modules&lt;/artifa=
ctId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;type&gt;jar&lt;/type&gt;<br>
+ =A0 =A0&lt;/dependency&gt;<br>
+ =A0 =A0&lt;dependency&gt;<br>
 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.karaf.shell&lt;/groupId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;artifactId&gt;org.apache.karaf.shell.console&lt;/artif=
actId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
@@ -186,4 +211,14 @@<br>
 =A0 =A0 =A0 =A0 &lt;artifactId&gt;pax-logging-api&lt;/artifactId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
 =A0 =A0 &lt;/dependency&gt;<br>
+ =A0 =A0&lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;org.osgi&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;org.osgi.compendium&lt;/artifactId&gt;<b=
r>
+ =A0 =A0 =A0 =A0&lt;type&gt;jar&lt;/type&gt;<br>
+ =A0 =A0&lt;/dependency&gt;<br>
+ =A0 =A0&lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;org.osgi&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;org.osgi.core&lt;/artifactId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;type&gt;jar&lt;/type&gt;<br>
+ =A0 =A0&lt;/dependency&gt;<br>
=A0&lt;/plugin-artifact&gt;<br>
<br>
Modified: geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/=
main/java/org/apache/geronimo/deployment/cli/StreamConsoleReader.java<br>
URL: <a href=3D"http://svn.apache.org/viewvc/geronimo/server/trunk/framewor=
k/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment=
/cli/StreamConsoleReader.java?rev=3D1090982&amp;r1=3D1090981&amp;r2=3D10909=
82&amp;view=3Ddiff" target=3D"_blank">http://svn.apache.org/viewvc/geronimo=
/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apac=
he/geronimo/deployment/cli/StreamConsoleReader.java?rev=3D1090982&amp;r1=3D=
1090981&amp;r2=3D1090982&amp;view=3Ddiff</a><br>

=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D<br>
--- geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/j=
ava/org/apache/geronimo/deployment/cli/StreamConsoleReader.java (original)<=
br>
+++ geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/j=
ava/org/apache/geronimo/deployment/cli/StreamConsoleReader.java Mon Apr 11 =
08:56:25 2011<br>
@@ -39,7 +39,7 @@ public class StreamConsoleReader impleme<br>
<br>
 =A0 =A0 protected PrintWriter console;<br>
<br>
- =A0 =A0private jline.ConsoleReader jlineConsoleReader;<br>
+ =A0 =A0private jline.console.ConsoleReader jlineConsoleReader;<br>
<br>
 =A0 =A0 private boolean jlineConsoleEnabled =3D true;<br>
<br>
@@ -49,7 +49,7 @@ public class StreamConsoleReader impleme<br>
<br>
 =A0 =A0 public StreamConsoleReader(InputStream in, PrintWriter out) {<br>
 =A0 =A0 =A0 =A0 try {<br>
- =A0 =A0 =A0 =A0 =A0 =A0jlineConsoleReader =3D new jline.ConsoleReader(in,=
 out);<br>
+ =A0 =A0 =A0 =A0 =A0 =A0jlineConsoleReader =3D new jline.console.ConsoleRe=
ader(in, out);<br>
 =A0 =A0 =A0 =A0 } catch (IOException e) {<br>
 =A0 =A0 =A0 =A0 =A0 =A0 logger.warn(&quot;Fail to create jline console, so=
me features like password mask will be disabled&quot;, e);<br>
 =A0 =A0 =A0 =A0 =A0 =A0 jlineConsoleEnabled =3D false;<br>
@@ -66,7 +66,7 @@ public class StreamConsoleReader impleme<br>
 =A0 =A0 @Override<br>
 =A0 =A0 public void printNewline() throws IOException {<br>
 =A0 =A0 =A0 =A0 if (jlineConsoleEnabled) {<br>
- =A0 =A0 =A0 =A0 =A0 =A0jlineConsoleReader.printNewline();<br>
+ =A0 =A0 =A0 =A0 =A0 =A0((ConsoleReader) jlineConsoleReader).printNewline(=
);<br>
 =A0 =A0 =A0 =A0 } else {<br>
 =A0 =A0 =A0 =A0 =A0 =A0 console.println();<br>
 =A0 =A0 =A0 =A0 }<br>
@@ -82,7 +82,7 @@ public class StreamConsoleReader impleme<br>
 =A0 =A0 @Override<br>
 =A0 =A0 public void printString(String s) throws IOException {<br>
 =A0 =A0 =A0 =A0 if (jlineConsoleEnabled) {<br>
- =A0 =A0 =A0 =A0 =A0 =A0jlineConsoleReader.printString(s);<br>
+ =A0 =A0 =A0 =A0 =A0 =A0((ConsoleReader) jlineConsoleReader).printString(s=
);<br>
 =A0 =A0 =A0 =A0 } else {<br>
 =A0 =A0 =A0 =A0 =A0 =A0 console.print(s);<br>
 =A0 =A0 =A0 =A0 }<br>
@@ -98,8 +98,8 @@ public class StreamConsoleReader impleme<br>
 =A0 =A0 @Override<br>
 =A0 =A0 public void println(String s) throws IOException {<br>
 =A0 =A0 =A0 =A0 if (jlineConsoleEnabled) {<br>
- =A0 =A0 =A0 =A0 =A0 =A0jlineConsoleReader.printString(s);<br>
- =A0 =A0 =A0 =A0 =A0 =A0jlineConsoleReader.printNewline();<br>
+ =A0 =A0 =A0 =A0 =A0 =A0((ConsoleReader) jlineConsoleReader).printString(s=
);<br>
+ =A0 =A0 =A0 =A0 =A0 =A0((ConsoleReader) jlineConsoleReader).printNewline(=
);<br>
 =A0 =A0 =A0 =A0 } else {<br>
 =A0 =A0 =A0 =A0 =A0 =A0 console.println(s);<br>
 =A0 =A0 =A0 =A0 =A0 =A0 console.println();<br>
@@ -148,7 +148,7 @@ public class StreamConsoleReader impleme<br>
 =A0 =A0 @Override<br>
 =A0 =A0 public void flushConsole() throws IOException {<br>
 =A0 =A0 =A0 =A0 if (jlineConsoleEnabled) {<br>
- =A0 =A0 =A0 =A0 =A0 =A0jlineConsoleReader.flushConsole();<br>
+ =A0 =A0 =A0 =A0 =A0 =A0((ConsoleReader) jlineConsoleReader).flushConsole(=
);<br>
 =A0 =A0 =A0 =A0 } else {<br>
 =A0 =A0 =A0 =A0 =A0 =A0 console.flush();<br>
 =A0 =A0 =A0 =A0 }<br>
<br>
Modified: geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.=
xml<br>
URL: <a href=3D"http://svn.apache.org/viewvc/geronimo/server/trunk/framewor=
k/modules/geronimo-pax-logging/pom.xml?rev=3D1090982&amp;r1=3D1090981&amp;r=
2=3D1090982&amp;view=3Ddiff" target=3D"_blank">http://svn.apache.org/viewvc=
/geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml?rev=
=3D1090982&amp;r1=3D1090981&amp;r2=3D1090982&amp;view=3Ddiff</a><br>

=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D<br>
--- geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml (o=
riginal)<br>
+++ geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml Mo=
n Apr 11 08:56:25 2011<br>
@@ -100,7 +100,7 @@<br>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &lt;/Import-Package&gt;<br=
>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &lt;Export-Package&gt;<br>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 org.apache.geronim=
o.logging,<br>
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0org.ops4j.pax.logg=
ing.spi;provider=3Dpaxlogging;version=3D&quot;1.5.3&quot;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0org.ops4j.pax.logg=
ing.spi;provider=3Dpaxlogging;version=3D${pax.logging.version}<br>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &lt;/Export-Package&gt;<br=
>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &lt;Bundle-Activator&gt;or=
g.apache.geronimo.logging.impl.LoggingServiceActivator&lt;/Bundle-Activator=
&gt;<br>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &lt;Include-Resource&gt;<b=
r>
<br>
Modified: geronimo/server/trunk/framework/modules/geronimo-security/pom.xml=
<br>
URL: <a href=3D"http://svn.apache.org/viewvc/geronimo/server/trunk/framewor=
k/modules/geronimo-security/pom.xml?rev=3D1090982&amp;r1=3D1090981&amp;r2=
=3D1090982&amp;view=3Ddiff" target=3D"_blank">http://svn.apache.org/viewvc/=
geronimo/server/trunk/framework/modules/geronimo-security/pom.xml?rev=3D109=
0982&amp;r1=3D1090981&amp;r2=3D1090982&amp;view=3Ddiff</a><br>

=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D<br>
--- geronimo/server/trunk/framework/modules/geronimo-security/pom.xml (orig=
inal)<br>
+++ geronimo/server/trunk/framework/modules/geronimo-security/pom.xml Mon A=
pr 11 08:56:25 2011<br>
@@ -68,7 +68,7 @@<br>
 =A0 =A0 =A0 =A0 &lt;dependency&gt;<br>
 =A0 =A0 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.karaf.jaas&lt;/groupId&g=
t;<br>
 =A0 =A0 =A0 =A0 =A0 =A0 &lt;artifactId&gt;org.apache.karaf.jaas.boot&lt;/a=
rtifactId&gt;<br>
- =A0 =A0 =A0 =A0 =A0 =A0&lt;scope&gt;provided&lt;/scope&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0&lt;!--&lt;scope&gt;provided&lt;/scope&gt;--&gt;<b=
r>
 =A0 =A0 =A0 =A0 &lt;/dependency&gt;<br>
<br>
 =A0 =A0 =A0 =A0 &lt;dependency&gt;<br>
<br>
Modified: geronimo/server/trunk/framework/modules/geronimo-shell-base/pom.x=
ml<br>
URL: <a href=3D"http://svn.apache.org/viewvc/geronimo/server/trunk/framewor=
k/modules/geronimo-shell-base/pom.xml?rev=3D1090982&amp;r1=3D1090981&amp;r2=
=3D1090982&amp;view=3Ddiff" target=3D"_blank">http://svn.apache.org/viewvc/=
geronimo/server/trunk/framework/modules/geronimo-shell-base/pom.xml?rev=3D1=
090982&amp;r1=3D1090981&amp;r2=3D1090982&amp;view=3Ddiff</a><br>

=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D<br>
--- geronimo/server/trunk/framework/modules/geronimo-shell-base/pom.xml (or=
iginal)<br>
+++ geronimo/server/trunk/framework/modules/geronimo-shell-base/pom.xml Mon=
 Apr 11 08:56:25 2011<br>
@@ -58,8 +58,8 @@<br>
 =A0 =A0 =A0 =A0 &lt;dependency&gt;<br>
 =A0 =A0 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.karaf.shell&lt;/groupId&=
gt;<br>
 =A0 =A0 =A0 =A0 =A0 =A0 &lt;artifactId&gt;org.apache.karaf.shell.console&l=
t;/artifactId&gt;<br>
- =A0 =A0 =A0 =A0&lt;/dependency&gt;<br>
-<br>
+ =A0 =A0 =A0 =A0&lt;/dependency&gt;<br>
+<br>
 =A0 =A0 =A0 =A0 &lt;dependency&gt;<br>
 =A0 =A0 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.aries.blueprint&lt;/grou=
pId&gt;<br>
 =A0 =A0 =A0 =A0 =A0 =A0 &lt;artifactId&gt;org.apache.aries.blueprint&lt;/a=
rtifactId&gt;<br>
<br>
Modified: geronimo/server/trunk/framework/modules/geronimo-shell-base/src/m=
ain/java/org/apache/geronimo/shell/deploy/ConnectCommand.java<br>
URL: <a href=3D"http://svn.apache.org/viewvc/geronimo/server/trunk/framewor=
k/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/deplo=
y/ConnectCommand.java?rev=3D1090982&amp;r1=3D1090981&amp;r2=3D1090982&amp;v=
iew=3Ddiff" target=3D"_blank">http://svn.apache.org/viewvc/geronimo/server/=
trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geroni=
mo/shell/deploy/ConnectCommand.java?rev=3D1090982&amp;r1=3D1090981&amp;r2=
=3D1090982&amp;view=3Ddiff</a><br>

=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D<br>
--- geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/ja=
va/org/apache/geronimo/shell/deploy/ConnectCommand.java (original)<br>
+++ geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/ja=
va/org/apache/geronimo/shell/deploy/ConnectCommand.java Mon Apr 11 08:56:25=
 2011<br>
@@ -31,7 +31,7 @@ import <a href=3D"http://org.apache.geronimo.deployment.c=
l" target=3D"_blank">org.apache.geronimo.deployment.cl</a><br>
=A0import org.apache.geronimo.deployment.plugin.factories.BaseDeploymentFac=
tory;<br>
=A0import org.apache.geronimo.kernel.Kernel;<br>
=A0import org.apache.geronimo.shell.BaseCommandSupport;<br>
-import org.osgi.service.command.CommandSession;<br>
+import org.apache.felix.service.command.CommandSession;<br>
<br>
=A0/**<br>
 =A0* @version $Rev$ $Date$<br>
<br>
Modified: geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/p=
om.xml<br>
URL: <a href=3D"http://svn.apache.org/viewvc/geronimo/server/trunk/framewor=
k/modules/geronimo-shell-diagnose/pom.xml?rev=3D1090982&amp;r1=3D1090981&am=
p;r2=3D1090982&amp;view=3Ddiff" target=3D"_blank">http://svn.apache.org/vie=
wvc/geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/pom.xml=
?rev=3D1090982&amp;r1=3D1090981&amp;r2=3D1090982&amp;view=3Ddiff</a><br>

=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D<br>
--- geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/pom.xml=
 (original)<br>
+++ geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/pom.xml=
 Mon Apr 11 08:56:25 2011<br>
@@ -37,6 +37,18 @@<br>
 =A0 =A0 =A0 =A0 &lt;/dependency&gt;<br>
<br>
 =A0 =A0 =A0 =A0 &lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.aries.proxy&lt;/=
groupId&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&lt;artifactId&gt;org.apache.aries.proxy&l=
t;/artifactId&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&lt;version&gt;${aries.proxy.version}&lt;/=
version&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&lt;exclusions&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&lt;exclusion&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.ari=
es.testsupport&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;org.apache.aries.testsupport.unit&lt;/ar=
tifactId&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&lt;/exclusion&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&lt;/exclusions&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0&lt;/dependency&gt;<br>
+<br>
+ =A0 =A0 =A0 =A0&lt;dependency&gt;<br>
 =A0 =A0 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.aries.blueprint&lt;/grou=
pId&gt;<br>
 =A0 =A0 =A0 =A0 =A0 =A0 &lt;artifactId&gt;org.apache.aries.blueprint&lt;/a=
rtifactId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;/dependency&gt;<br>
@@ -55,7 +67,7 @@<br>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &lt;configuration&gt;<br>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &lt;instructions&gt;<br>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &lt;Import-Package&gt;<br>
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0org.osgi.service.c=
ommand;version=3D&quot;0.4.0&quot;,<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0org.apache.felix.s=
ervice.command;version=3D&quot;0.4.0&quot;,<br>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 org.eclipse.*;reso=
lution:=3Doptional,<br>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 *<br>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &lt;/Import-Package&gt;<br=
>
<br>
Modified: geronimo/server/trunk/plugingroups/console-jetty/src/main/history=
/dependencies.xml<br>
URL: <a href=3D"http://svn.apache.org/viewvc/geronimo/server/trunk/plugingr=
oups/console-jetty/src/main/history/dependencies.xml?rev=3D1090982&amp;r1=
=3D1090981&amp;r2=3D1090982&amp;view=3Ddiff" target=3D"_blank">http://svn.a=
pache.org/viewvc/geronimo/server/trunk/plugingroups/console-jetty/src/main/=
history/dependencies.xml?rev=3D1090982&amp;r1=3D1090981&amp;r2=3D1090982&am=
p;view=3Ddiff</a><br>

=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D<br>
--- geronimo/server/trunk/plugingroups/console-jetty/src/main/history/depen=
dencies.xml (original)<br>
+++ geronimo/server/trunk/plugingroups/console-jetty/src/main/history/depen=
dencies.xml Mon Apr 11 08:56:25 2011<br>
@@ -28,11 +28,6 @@<br>
 =A0 =A0 &lt;/dependency&gt;<br>
 =A0 =A0 &lt;dependency&gt;<br>
 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.geronimo.plugins&lt;/groupId&gt;=
<br>
- =A0 =A0 =A0 =A0&lt;artifactId&gt;osgi-console-jetty&lt;/artifactId&gt;<br=
>
- =A0 =A0 =A0 =A0&lt;type&gt;car&lt;/type&gt;<br>
- =A0 =A0&lt;/dependency&gt;<br>
- =A0 =A0&lt;dependency&gt;<br>
- =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.geronimo.plugins&lt;/groupId&gt;=
<br>
 =A0 =A0 =A0 =A0 &lt;artifactId&gt;plugin-console-jetty&lt;/artifactId&gt;<=
br>
 =A0 =A0 =A0 =A0 &lt;type&gt;car&lt;/type&gt;<br>
 =A0 =A0 &lt;/dependency&gt;<br>
<br>
Modified: geronimo/server/trunk/plugingroups/console-tomcat/src/main/histor=
y/dependencies.xml<br>
URL: <a href=3D"http://svn.apache.org/viewvc/geronimo/server/trunk/plugingr=
oups/console-tomcat/src/main/history/dependencies.xml?rev=3D1090982&amp;r1=
=3D1090981&amp;r2=3D1090982&amp;view=3Ddiff" target=3D"_blank">http://svn.a=
pache.org/viewvc/geronimo/server/trunk/plugingroups/console-tomcat/src/main=
/history/dependencies.xml?rev=3D1090982&amp;r1=3D1090981&amp;r2=3D1090982&a=
mp;view=3Ddiff</a><br>

=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D<br>
--- geronimo/server/trunk/plugingroups/console-tomcat/src/main/history/depe=
ndencies.xml (original)<br>
+++ geronimo/server/trunk/plugingroups/console-tomcat/src/main/history/depe=
ndencies.xml Mon Apr 11 08:56:25 2011<br>
@@ -28,11 +28,6 @@<br>
 =A0 =A0 &lt;/dependency&gt;<br>
 =A0 =A0 &lt;dependency&gt;<br>
 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.geronimo.plugins&lt;/groupId&gt;=
<br>
- =A0 =A0 =A0 =A0&lt;artifactId&gt;osgi-console-tomcat&lt;/artifactId&gt;<b=
r>
- =A0 =A0 =A0 =A0&lt;type&gt;car&lt;/type&gt;<br>
- =A0 =A0&lt;/dependency&gt;<br>
- =A0 =A0&lt;dependency&gt;<br>
- =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.geronimo.plugins&lt;/groupId&gt;=
<br>
 =A0 =A0 =A0 =A0 &lt;artifactId&gt;plugin-console-tomcat&lt;/artifactId&gt;=
<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;car&lt;/type&gt;<br>
 =A0 =A0 &lt;/dependency&gt;<br>
<br>
Modified: geronimo/server/trunk/plugingroups/eba-jetty/src/main/history/dep=
endencies.xml<br>
URL: <a href=3D"http://svn.apache.org/viewvc/geronimo/server/trunk/plugingr=
oups/eba-jetty/src/main/history/dependencies.xml?rev=3D1090982&amp;r1=3D109=
0981&amp;r2=3D1090982&amp;view=3Ddiff" target=3D"_blank">http://svn.apache.=
org/viewvc/geronimo/server/trunk/plugingroups/eba-jetty/src/main/history/de=
pendencies.xml?rev=3D1090982&amp;r1=3D1090981&amp;r2=3D1090982&amp;view=3Dd=
iff</a><br>

=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D<br>
--- geronimo/server/trunk/plugingroups/eba-jetty/src/main/history/dependenc=
ies.xml (original)<br>
+++ geronimo/server/trunk/plugingroups/eba-jetty/src/main/history/dependenc=
ies.xml Mon Apr 11 08:56:25 2011<br>
@@ -8,6 +8,11 @@<br>
 =A0 =A0 &lt;/module-id&gt;<br>
 =A0 =A0 &lt;dependency&gt;<br>
 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.geronimo.configs&lt;/groupId&gt;=
<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;aries&lt;/artifactId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;type&gt;car&lt;/type&gt;<br>
+ =A0 =A0&lt;/dependency&gt;<br>
+ =A0 =A0&lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.geronimo.configs&lt;/groupId&gt;=
<br>
 =A0 =A0 =A0 =A0 &lt;artifactId&gt;aries-deployer&lt;/artifactId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;car&lt;/type&gt;<br>
 =A0 =A0 &lt;/dependency&gt;<br>
<br>
Modified: geronimo/server/trunk/plugingroups/webservices-axis2/src/main/his=
tory/dependencies.xml<br>
URL: <a href=3D"http://svn.apache.org/viewvc/geronimo/server/trunk/plugingr=
oups/webservices-axis2/src/main/history/dependencies.xml?rev=3D1090982&amp;=
r1=3D1090981&amp;r2=3D1090982&amp;view=3Ddiff" target=3D"_blank">http://svn=
.apache.org/viewvc/geronimo/server/trunk/plugingroups/webservices-axis2/src=
/main/history/dependencies.xml?rev=3D1090982&amp;r1=3D1090981&amp;r2=3D1090=
982&amp;view=3Ddiff</a><br>

=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D<br>
--- geronimo/server/trunk/plugingroups/webservices-axis2/src/main/history/d=
ependencies.xml (original)<br>
+++ geronimo/server/trunk/plugingroups/webservices-axis2/src/main/history/d=
ependencies.xml Mon Apr 11 08:56:25 2011<br>
@@ -16,4 +16,14 @@<br>
 =A0 =A0 =A0 =A0 &lt;artifactId&gt;axis2-deployer&lt;/artifactId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;car&lt;/type&gt;<br>
 =A0 =A0 &lt;/dependency&gt;<br>
+ =A0 =A0&lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.geronimo.configs&lt;/groupId&gt;=
<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;axis2-ejb-deployer&lt;/artifactId&gt;<br=
>
+ =A0 =A0 =A0 =A0&lt;type&gt;car&lt;/type&gt;<br>
+ =A0 =A0&lt;/dependency&gt;<br>
+ =A0 =A0&lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.geronimo.configs&lt;/groupId&gt;=
<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;jaxws-tools&lt;/artifactId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;type&gt;car&lt;/type&gt;<br>
+ =A0 =A0&lt;/dependency&gt;<br>
=A0&lt;/plugin-artifact&gt;<br>
<br>
Modified: geronimo/server/trunk/plugins/aries/aries-deployer/src/main/histo=
ry/dependencies.xml<br>
URL: <a href=3D"http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/=
aries/aries-deployer/src/main/history/dependencies.xml?rev=3D1090982&amp;r1=
=3D1090981&amp;r2=3D1090982&amp;view=3Ddiff" target=3D"_blank">http://svn.a=
pache.org/viewvc/geronimo/server/trunk/plugins/aries/aries-deployer/src/mai=
n/history/dependencies.xml?rev=3D1090982&amp;r1=3D1090981&amp;r2=3D1090982&=
amp;view=3Ddiff</a><br>

=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D<br>
--- geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dep=
endencies.xml (original)<br>
+++ geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dep=
endencies.xml Mon Apr 11 08:56:25 2011<br>
@@ -277,6 +277,11 @@<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
 =A0 =A0 &lt;/dependency&gt;<br>
 =A0 =A0 &lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.karaf.jaas&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;org.apache.karaf.jaas.boot&lt;/artifactI=
d&gt;<br>
+ =A0 =A0 =A0 =A0&lt;type&gt;jar&lt;/type&gt;<br>
+ =A0 =A0&lt;/dependency&gt;<br>
+ =A0 =A0&lt;dependency&gt;<br>
 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.openejb&lt;/groupId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;artifactId&gt;openejb-jee&lt;/artifactId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
<br>
Modified: geronimo/server/trunk/plugins/aries/aries/src/main/history/depend=
encies.xml<br>
URL: <a href=3D"http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/=
aries/aries/src/main/history/dependencies.xml?rev=3D1090982&amp;r1=3D109098=
1&amp;r2=3D1090982&amp;view=3Ddiff" target=3D"_blank">http://svn.apache.org=
/viewvc/geronimo/server/trunk/plugins/aries/aries/src/main/history/dependen=
cies.xml?rev=3D1090982&amp;r1=3D1090981&amp;r2=3D1090982&amp;view=3Ddiff</a=
><br>

=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D<br>
--- geronimo/server/trunk/plugins/aries/aries/src/main/history/dependencies=
.xml (original)<br>
+++ geronimo/server/trunk/plugins/aries/aries/src/main/history/dependencies=
.xml Mon Apr 11 08:56:25 2011<br>
@@ -52,6 +52,11 @@<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
 =A0 =A0 &lt;/dependency&gt;<br>
 =A0 =A0 &lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.aries.proxy&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;org.apache.aries.proxy.api&lt;/artifactI=
d&gt;<br>
+ =A0 =A0 =A0 =A0&lt;type&gt;jar&lt;/type&gt;<br>
+ =A0 =A0&lt;/dependency&gt;<br>
+ =A0 =A0&lt;dependency&gt;<br>
 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.felix&lt;/groupId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;artifactId&gt;org.apache.felix.bundlerepository&lt;/ar=
tifactId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
@@ -292,6 +297,11 @@<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
 =A0 =A0 &lt;/dependency&gt;<br>
 =A0 =A0 &lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.karaf.jaas&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;org.apache.karaf.jaas.boot&lt;/artifactI=
d&gt;<br>
+ =A0 =A0 =A0 =A0&lt;type&gt;jar&lt;/type&gt;<br>
+ =A0 =A0&lt;/dependency&gt;<br>
+ =A0 =A0&lt;dependency&gt;<br>
 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.openejb&lt;/groupId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;artifactId&gt;openejb-jee&lt;/artifactId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
<br>
Modified: geronimo/server/trunk/plugins/aries/geronimo-aries/pom.xml<br>
URL: <a href=3D"http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/=
aries/geronimo-aries/pom.xml?rev=3D1090982&amp;r1=3D1090981&amp;r2=3D109098=
2&amp;view=3Ddiff" target=3D"_blank">http://svn.apache.org/viewvc/geronimo/=
server/trunk/plugins/aries/geronimo-aries/pom.xml?rev=3D1090982&amp;r1=3D10=
90981&amp;r2=3D1090982&amp;view=3Ddiff</a><br>

=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D<br>
--- geronimo/server/trunk/plugins/aries/geronimo-aries/pom.xml (original)<b=
r>
+++ geronimo/server/trunk/plugins/aries/geronimo-aries/pom.xml Mon Apr 11 0=
8:56:25 2011<br>
@@ -40,6 +40,10 @@<br>
 =A0 =A0 =A0 =A0 =A0 =A0 &lt;version&gt;${project.version}&lt;/version&gt;<=
br>
 =A0 =A0 =A0 =A0 &lt;/dependency&gt;<br>
 =A0 =A0 =A0 =A0 &lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.aries&lt;/groupI=
d&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&lt;artifactId&gt;org.apache.aries.util&lt=
;/artifactId&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0&lt;/dependency&gt;<br>
+ =A0 =A0 =A0 =A0&lt;dependency&gt;<br>
 =A0 =A0 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.aries.application&lt;/gr=
oupId&gt;<br>
 =A0 =A0 =A0 =A0 =A0 =A0 &lt;artifactId&gt;org.apache.aries.application.uti=
ls&lt;/artifactId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;/dependency&gt;<br>
<br>
Modified: geronimo/server/trunk/plugins/aries/pom.xml<br>
URL: <a href=3D"http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/=
aries/pom.xml?rev=3D1090982&amp;r1=3D1090981&amp;r2=3D1090982&amp;view=3Ddi=
ff" target=3D"_blank">http://svn.apache.org/viewvc/geronimo/server/trunk/pl=
ugins/aries/pom.xml?rev=3D1090982&amp;r1=3D1090981&amp;r2=3D1090982&amp;vie=
w=3Ddiff</a><br>

=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D<br>
--- geronimo/server/trunk/plugins/aries/pom.xml (original)<br>
+++ geronimo/server/trunk/plugins/aries/pom.xml Mon Apr 11 08:56:25 2011<br=
>
@@ -45,6 +45,11 @@<br>
<br>
 =A0 =A0 &lt;dependencyManagement&gt;<br>
 =A0 =A0 =A0 =A0 &lt;dependencies&gt;<br>
+ =A0 =A0 =A0 =A0&lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.aries&lt;/groupI=
d&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&lt;artifactId&gt;org.apache.aries.util&lt=
;/artifactId&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&lt;version&gt;0.2-incubating&lt;/version&=
gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0&lt;/dependency&gt;<br>
 =A0 =A0 =A0 =A0 =A0 =A0 &lt;dependency&gt;<br>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.aries.applicatio=
n&lt;/groupId&gt;<br>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &lt;artifactId&gt;org.apache.aries.applica=
tion.utils&lt;/artifactId&gt;<br>
<br>
Modified: geronimo/server/trunk/plugins/axis/axis/src/main/history/dependen=
cies.xml<br>
URL: <a href=3D"http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/=
axis/axis/src/main/history/dependencies.xml?rev=3D1090982&amp;r1=3D1090981&=
amp;r2=3D1090982&amp;view=3Ddiff" target=3D"_blank">http://svn.apache.org/v=
iewvc/geronimo/server/trunk/plugins/axis/axis/src/main/history/dependencies=
.xml?rev=3D1090982&amp;r1=3D1090981&amp;r2=3D1090982&amp;view=3Ddiff</a><br=
>

=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D<br>
--- geronimo/server/trunk/plugins/axis/axis/src/main/history/dependencies.x=
ml (original)<br>
+++ geronimo/server/trunk/plugins/axis/axis/src/main/history/dependencies.x=
ml Mon Apr 11 08:56:25 2011<br>
@@ -8,6 +8,11 @@<br>
 =A0 =A0 &lt;/module-id&gt;<br>
 =A0 =A0 &lt;dependency&gt;<br>
 =A0 =A0 =A0 =A0 &lt;groupId&gt;commons-logging&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;commons-logging&lt;/artifactId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;type&gt;jar&lt;/type&gt;<br>
+ =A0 =A0&lt;/dependency&gt;<br>
+ =A0 =A0&lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;commons-logging&lt;/groupId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;artifactId&gt;commons-logging-api&lt;/artifactId&gt;<b=
r>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
 =A0 =A0 &lt;/dependency&gt;<br>
<br>
Modified: geronimo/server/trunk/plugins/axis2/axis2/src/main/history/depend=
encies.xml<br>
URL: <a href=3D"http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/=
axis2/axis2/src/main/history/dependencies.xml?rev=3D1090982&amp;r1=3D109098=
1&amp;r2=3D1090982&amp;view=3Ddiff" target=3D"_blank">http://svn.apache.org=
/viewvc/geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependen=
cies.xml?rev=3D1090982&amp;r1=3D1090981&amp;r2=3D1090982&amp;view=3Ddiff</a=
><br>

=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D<br>
--- geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies=
.xml (original)<br>
+++ geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies=
.xml Mon Apr 11 08:56:25 2011<br>
@@ -13,7 +13,7 @@<br>
 =A0 =A0 &lt;/dependency&gt;<br>
 =A0 =A0 &lt;dependency&gt;<br>
 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.geronimo.bundles&lt;/groupId&gt;=
<br>
- =A0 =A0 =A0 =A0&lt;artifactId&gt;axiom-api&lt;/artifactId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;axiom-all&lt;/artifactId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
 =A0 =A0 &lt;/dependency&gt;<br>
 =A0 =A0 &lt;dependency&gt;<br>
@@ -23,17 +23,17 @@<br>
 =A0 =A0 &lt;/dependency&gt;<br>
 =A0 =A0 &lt;dependency&gt;<br>
 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.geronimo.bundles&lt;/groupId&gt;=
<br>
- =A0 =A0 =A0 =A0&lt;artifactId&gt;httpcore&lt;/artifactId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;axis2-saaj&lt;/artifactId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
 =A0 =A0 &lt;/dependency&gt;<br>
 =A0 =A0 &lt;dependency&gt;<br>
 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.geronimo.bundles&lt;/groupId&gt;=
<br>
- =A0 =A0 =A0 =A0&lt;artifactId&gt;scannotation&lt;/artifactId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;httpcore&lt;/artifactId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
 =A0 =A0 &lt;/dependency&gt;<br>
 =A0 =A0 &lt;dependency&gt;<br>
 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.geronimo.bundles&lt;/groupId&gt;=
<br>
- =A0 =A0 =A0 =A0&lt;artifactId&gt;woden-impl-dom&lt;/artifactId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;scannotation&lt;/artifactId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
 =A0 =A0 &lt;/dependency&gt;<br>
 =A0 =A0 &lt;dependency&gt;<br>
@@ -122,6 +122,11 @@<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
 =A0 =A0 &lt;/dependency&gt;<br>
 =A0 =A0 &lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.karaf.jaas&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;org.apache.karaf.jaas.boot&lt;/artifactI=
d&gt;<br>
+ =A0 =A0 =A0 =A0&lt;type&gt;jar&lt;/type&gt;<br>
+ =A0 =A0&lt;/dependency&gt;<br>
+ =A0 =A0&lt;dependency&gt;<br>
 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.neethi&lt;/groupId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;artifactId&gt;neethi&lt;/artifactId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
@@ -177,13 +182,13 @@<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
 =A0 =A0 &lt;/dependency&gt;<br>
 =A0 =A0 &lt;dependency&gt;<br>
- =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.ws.commons.axiom&lt;/groupId&gt;=
<br>
- =A0 =A0 =A0 =A0&lt;artifactId&gt;axiom-dom&lt;/artifactId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.woden&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;woden-impl-commons&lt;/artifactId&gt;<br=
>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
 =A0 =A0 &lt;/dependency&gt;<br>
 =A0 =A0 &lt;dependency&gt;<br>
- =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.ws.commons.axiom&lt;/groupId&gt;=
<br>
- =A0 =A0 =A0 =A0&lt;artifactId&gt;axiom-impl&lt;/artifactId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.woden&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;woden-impl-dom&lt;/artifactId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
 =A0 =A0 &lt;/dependency&gt;<br>
 =A0 =A0 &lt;dependency&gt;<br>
@@ -206,4 +211,9 @@<br>
 =A0 =A0 =A0 =A0 &lt;artifactId&gt;xbean-reflect&lt;/artifactId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
 =A0 =A0 &lt;/dependency&gt;<br>
+ =A0 =A0&lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;org.osgi&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;org.osgi.compendium&lt;/artifactId&gt;<b=
r>
+ =A0 =A0 =A0 =A0&lt;type&gt;jar&lt;/type&gt;<br>
+ =A0 =A0&lt;/dependency&gt;<br>
=A0&lt;/plugin-artifact&gt;<br>
<br>
Modified: geronimo/server/trunk/plugins/client/client/src/main/history/depe=
ndencies.xml<br>
URL: <a href=3D"http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/=
client/client/src/main/history/dependencies.xml?rev=3D1090982&amp;r1=3D1090=
981&amp;r2=3D1090982&amp;view=3Ddiff" target=3D"_blank">http://svn.apache.o=
rg/viewvc/geronimo/server/trunk/plugins/client/client/src/main/history/depe=
ndencies.xml?rev=3D1090982&amp;r1=3D1090981&amp;r2=3D1090982&amp;view=3Ddif=
f</a><br>

=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D<br>
--- geronimo/server/trunk/plugins/client/client/src/main/history/dependenci=
es.xml (original)<br>
+++ geronimo/server/trunk/plugins/client/client/src/main/history/dependenci=
es.xml Mon Apr 11 08:56:25 2011<br>
@@ -27,6 +27,11 @@<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
 =A0 =A0 &lt;/dependency&gt;<br>
 =A0 =A0 &lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.aries.proxy&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;org.apache.aries.proxy.api&lt;/artifactI=
d&gt;<br>
+ =A0 =A0 =A0 =A0&lt;type&gt;jar&lt;/type&gt;<br>
+ =A0 =A0&lt;/dependency&gt;<br>
+ =A0 =A0&lt;dependency&gt;<br>
 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.bval&lt;/groupId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;artifactId&gt;org.apache.bval.bundle&lt;/artifactId&gt=
;<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
@@ -242,6 +247,11 @@<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
 =A0 =A0 &lt;/dependency&gt;<br>
 =A0 =A0 &lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.karaf.jaas&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;org.apache.karaf.jaas.boot&lt;/artifactI=
d&gt;<br>
+ =A0 =A0 =A0 =A0&lt;type&gt;jar&lt;/type&gt;<br>
+ =A0 =A0&lt;/dependency&gt;<br>
+ =A0 =A0&lt;dependency&gt;<br>
 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.myfaces.core&lt;/groupId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;artifactId&gt;myfaces-bundle&lt;/artifactId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
<br>
Modified: geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_=
6/src/main/history/dependencies.xml<br>
URL: <a href=3D"http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/=
connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml?rev=
=3D1090982&amp;r1=3D1090981&amp;r2=3D1090982&amp;view=3Ddiff" target=3D"_bl=
ank">http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1=
_6/connector-deployer-1_6/src/main/history/dependencies.xml?rev=3D1090982&a=
mp;r1=3D1090981&amp;r2=3D1090982&amp;view=3Ddiff</a><br>

=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D<br>
--- geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/=
main/history/dependencies.xml (original)<br>
+++ geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/=
main/history/dependencies.xml Mon Apr 11 08:56:25 2011<br>
@@ -117,6 +117,11 @@<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
 =A0 =A0 &lt;/dependency&gt;<br>
 =A0 =A0 &lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.karaf.jaas&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;org.apache.karaf.jaas.boot&lt;/artifactI=
d&gt;<br>
+ =A0 =A0 =A0 =A0&lt;type&gt;jar&lt;/type&gt;<br>
+ =A0 =A0&lt;/dependency&gt;<br>
+ =A0 =A0&lt;dependency&gt;<br>
 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.openwebbeans&lt;/groupId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;artifactId&gt;openwebbeans-impl&lt;/artifactId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
<br>
Modified: geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependenci=
es.xml<br>
URL: <a href=3D"http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/=
cxf/cxf/src/main/history/dependencies.xml?rev=3D1090982&amp;r1=3D1090981&am=
p;r2=3D1090982&amp;view=3Ddiff" target=3D"_blank">http://svn.apache.org/vie=
wvc/geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml=
?rev=3D1090982&amp;r1=3D1090981&amp;r2=3D1090982&amp;view=3Ddiff</a><br>

=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D<br>
--- geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml=
 (original)<br>
+++ geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml=
 Mon Apr 11 08:56:25 2011<br>
@@ -18,7 +18,7 @@<br>
 =A0 =A0 &lt;/dependency&gt;<br>
 =A0 =A0 &lt;dependency&gt;<br>
 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.geronimo.bundles&lt;/groupId&gt;=
<br>
- =A0 =A0 =A0 =A0&lt;artifactId&gt;axiom-api&lt;/artifactId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;axiom-all&lt;/artifactId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
 =A0 =A0 &lt;/dependency&gt;<br>
 =A0 =A0 &lt;dependency&gt;<br>
@@ -82,11 +82,6 @@<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
 =A0 =A0 &lt;/dependency&gt;<br>
 =A0 =A0 &lt;dependency&gt;<br>
- =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.ws.commons.axiom&lt;/groupId&gt;=
<br>
- =A0 =A0 =A0 =A0&lt;artifactId&gt;axiom-impl&lt;/artifactId&gt;<br>
- =A0 =A0 =A0 =A0&lt;type&gt;jar&lt;/type&gt;<br>
- =A0 =A0&lt;/dependency&gt;<br>
- =A0 =A0&lt;dependency&gt;<br>
 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.ws.commons.schema&lt;/groupId&gt=
;<br>
 =A0 =A0 =A0 =A0 &lt;artifactId&gt;XmlSchema&lt;/artifactId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
<br>
Modified: geronimo/server/trunk/plugins/hotdeploy/hot-deployer/src/main/his=
tory/dependencies.xml<br>
URL: <a href=3D"http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/=
hotdeploy/hot-deployer/src/main/history/dependencies.xml?rev=3D1090982&amp;=
r1=3D1090981&amp;r2=3D1090982&amp;view=3Ddiff" target=3D"_blank">http://svn=
.apache.org/viewvc/geronimo/server/trunk/plugins/hotdeploy/hot-deployer/src=
/main/history/dependencies.xml?rev=3D1090982&amp;r1=3D1090981&amp;r2=3D1090=
982&amp;view=3Ddiff</a><br>

=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D<br>
--- geronimo/server/trunk/plugins/hotdeploy/hot-deployer/src/main/history/d=
ependencies.xml (original)<br>
+++ geronimo/server/trunk/plugins/hotdeploy/hot-deployer/src/main/history/d=
ependencies.xml Mon Apr 11 08:56:25 2011<br>
@@ -7,6 +7,11 @@<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;car&lt;/type&gt;<br>
 =A0 =A0 &lt;/module-id&gt;<br>
 =A0 =A0 &lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.felix&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;org.apache.felix.gogo.runtime&lt;/artifa=
ctId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;type&gt;jar&lt;/type&gt;<br>
+ =A0 =A0&lt;/dependency&gt;<br>
+ =A0 =A0&lt;dependency&gt;<br>
 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.geronimo.configs&lt;/groupId&gt;=
<br>
 =A0 =A0 =A0 =A0 &lt;artifactId&gt;j2ee-deployer&lt;/artifactId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;car&lt;/type&gt;<br>
@@ -32,6 +37,21 @@<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
 =A0 =A0 &lt;/dependency&gt;<br>
 =A0 =A0 &lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.karaf&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;org.apache.karaf.util&lt;/artifactId&gt;=
<br>
+ =A0 =A0 =A0 =A0&lt;type&gt;jar&lt;/type&gt;<br>
+ =A0 =A0&lt;/dependency&gt;<br>
+ =A0 =A0&lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.karaf.jaas&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;org.apache.karaf.jaas.config&lt;/artifac=
tId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;type&gt;jar&lt;/type&gt;<br>
+ =A0 =A0&lt;/dependency&gt;<br>
+ =A0 =A0&lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.karaf.jaas&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;org.apache.karaf.jaas.modules&lt;/artifa=
ctId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;type&gt;jar&lt;/type&gt;<br>
+ =A0 =A0&lt;/dependency&gt;<br>
+ =A0 =A0&lt;dependency&gt;<br>
 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.karaf.shell&lt;/groupId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;artifactId&gt;org.apache.karaf.shell.console&lt;/artif=
actId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
<br>
Modified: geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history=
/dependencies.xml<br>
URL: <a href=3D"http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/=
j2ee/j2ee-deployer/src/main/history/dependencies.xml?rev=3D1090982&amp;r1=
=3D1090981&amp;r2=3D1090982&amp;view=3Ddiff" target=3D"_blank">http://svn.a=
pache.org/viewvc/geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/=
history/dependencies.xml?rev=3D1090982&amp;r1=3D1090981&amp;r2=3D1090982&am=
p;view=3Ddiff</a><br>

=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D<br>
--- geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/depen=
dencies.xml (original)<br>
+++ geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/depen=
dencies.xml Mon Apr 11 08:56:25 2011<br>
@@ -76,4 +76,9 @@<br>
 =A0 =A0 =A0 =A0 &lt;artifactId&gt;xbean-bundleutils&lt;/artifactId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
 =A0 =A0 &lt;/dependency&gt;<br>
+ =A0 =A0&lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.xbean&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;xbean-finder&lt;/artifactId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;type&gt;jar&lt;/type&gt;<br>
+ =A0 =A0&lt;/dependency&gt;<br>
=A0&lt;/plugin-artifact&gt;<br>
<br>
Modified: geronimo/server/trunk/plugins/j2ee/javaee-builder-support/src/mai=
n/history/dependencies.xml<br>
URL: <a href=3D"http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/=
j2ee/javaee-builder-support/src/main/history/dependencies.xml?rev=3D1090982=
&amp;r1=3D1090981&amp;r2=3D1090982&amp;view=3Ddiff" target=3D"_blank">http:=
//svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/javaee-builder-s=
upport/src/main/history/dependencies.xml?rev=3D1090982&amp;r1=3D1090981&amp=
;r2=3D1090982&amp;view=3Ddiff</a><br>

=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D<br>
--- geronimo/server/trunk/plugins/j2ee/javaee-builder-support/src/main/hist=
ory/dependencies.xml (original)<br>
+++ geronimo/server/trunk/plugins/j2ee/javaee-builder-support/src/main/hist=
ory/dependencies.xml Mon Apr 11 08:56:25 2011<br>
@@ -132,6 +132,11 @@<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
 =A0 =A0 &lt;/dependency&gt;<br>
 =A0 =A0 &lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.karaf.jaas&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;org.apache.karaf.jaas.boot&lt;/artifactI=
d&gt;<br>
+ =A0 =A0 =A0 =A0&lt;type&gt;jar&lt;/type&gt;<br>
+ =A0 =A0&lt;/dependency&gt;<br>
+ =A0 =A0&lt;dependency&gt;<br>
 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.openejb&lt;/groupId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;artifactId&gt;openejb-jee&lt;/artifactId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
<br>
Modified: geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/src/main/=
history/dependencies.xml<br>
URL: <a href=3D"http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/=
j2ee/jsr88-jar-configurer/src/main/history/dependencies.xml?rev=3D1090982&a=
mp;r1=3D1090981&amp;r2=3D1090982&amp;view=3Ddiff" target=3D"_blank">http://=
svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/jsr88-jar-configur=
er/src/main/history/dependencies.xml?rev=3D1090982&amp;r1=3D1090981&amp;r2=
=3D1090982&amp;view=3Ddiff</a><br>

=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D<br>
--- geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/src/main/histor=
y/dependencies.xml (original)<br>
+++ geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/src/main/histor=
y/dependencies.xml Mon Apr 11 08:56:25 2011<br>
@@ -317,6 +317,11 @@<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
 =A0 =A0 &lt;/dependency&gt;<br>
 =A0 =A0 &lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.karaf.jaas&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;org.apache.karaf.jaas.boot&lt;/artifactI=
d&gt;<br>
+ =A0 =A0 =A0 =A0&lt;type&gt;jar&lt;/type&gt;<br>
+ =A0 =A0&lt;/dependency&gt;<br>
+ =A0 =A0&lt;dependency&gt;<br>
 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.openejb&lt;/groupId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;artifactId&gt;openejb-jee&lt;/artifactId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
<br>
Modified: geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/src/main/=
history/dependencies.xml<br>
URL: <a href=3D"http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/=
j2ee/jsr88-rar-configurer/src/main/history/dependencies.xml?rev=3D1090982&a=
mp;r1=3D1090981&amp;r2=3D1090982&amp;view=3Ddiff" target=3D"_blank">http://=
svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/jsr88-rar-configur=
er/src/main/history/dependencies.xml?rev=3D1090982&amp;r1=3D1090981&amp;r2=
=3D1090982&amp;view=3Ddiff</a><br>

=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D<br>
--- geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/src/main/histor=
y/dependencies.xml (original)<br>
+++ geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/src/main/histor=
y/dependencies.xml Mon Apr 11 08:56:25 2011<br>
@@ -302,6 +302,11 @@<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
 =A0 =A0 &lt;/dependency&gt;<br>
 =A0 =A0 &lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.karaf.jaas&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;org.apache.karaf.jaas.boot&lt;/artifactI=
d&gt;<br>
+ =A0 =A0 =A0 =A0&lt;type&gt;jar&lt;/type&gt;<br>
+ =A0 =A0&lt;/dependency&gt;<br>
+ =A0 =A0&lt;dependency&gt;<br>
 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.openejb&lt;/groupId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;artifactId&gt;openejb-jee&lt;/artifactId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
<br>
Modified: geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/src/main/=
history/dependencies.xml<br>
URL: <a href=3D"http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/=
j2ee/jsr88-war-configurer/src/main/history/dependencies.xml?rev=3D1090982&a=
mp;r1=3D1090981&amp;r2=3D1090982&amp;view=3Ddiff" target=3D"_blank">http://=
svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/jsr88-war-configur=
er/src/main/history/dependencies.xml?rev=3D1090982&amp;r1=3D1090981&amp;r2=
=3D1090982&amp;view=3Ddiff</a><br>

=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D<br>
--- geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/src/main/histor=
y/dependencies.xml (original)<br>
+++ geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/src/main/histor=
y/dependencies.xml Mon Apr 11 08:56:25 2011<br>
@@ -272,6 +272,11 @@<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
 =A0 =A0 &lt;/dependency&gt;<br>
 =A0 =A0 &lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.karaf.jaas&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;org.apache.karaf.jaas.boot&lt;/artifactI=
d&gt;<br>
+ =A0 =A0 =A0 =A0&lt;type&gt;jar&lt;/type&gt;<br>
+ =A0 =A0&lt;/dependency&gt;<br>
+ =A0 =A0&lt;dependency&gt;<br>
 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.openejb&lt;/groupId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;artifactId&gt;openejb-jee&lt;/artifactId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
<br>
Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/pom.=
xml<br>
URL: <a href=3D"http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/=
jaxws/geronimo-jaxws-sun-tools/pom.xml?rev=3D1090982&amp;r1=3D1090981&amp;r=
2=3D1090982&amp;view=3Ddiff" target=3D"_blank">http://svn.apache.org/viewvc=
/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/pom.xml?rev=
=3D1090982&amp;r1=3D1090981&amp;r2=3D1090982&amp;view=3Ddiff</a><br>

=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D<br>
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/pom.xml (o=
riginal)<br>
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/pom.xml Mo=
n Apr 11 08:56:25 2011<br>
@@ -61,7 +61,7 @@<br>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &lt;configuration&gt;<br>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &lt;instructions&gt;<br>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &lt;Import-Package&gt;<br>
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0org.osgi.service.c=
ommand;version=3D&quot;0.4.0&quot;,<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0org.apache.felix.s=
ervice.command;version=3D&quot;0.4.0&quot;,<br>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 *<br>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &lt;/Import-Package&gt;<br=
>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &lt;/instructions&gt;<br>
<br>
Modified: geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/hist=
ory/dependencies.xml<br>
URL: <a href=3D"http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/=
jaxws/jaxws-sun-tools/src/main/history/dependencies.xml?rev=3D1090982&amp;r=
1=3D1090981&amp;r2=3D1090982&amp;view=3Ddiff" target=3D"_blank">http://svn.=
apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/m=
ain/history/dependencies.xml?rev=3D1090982&amp;r1=3D1090981&amp;r2=3D109098=
2&amp;view=3Ddiff</a><br>

=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D<br>
--- geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/history/de=
pendencies.xml (original)<br>
+++ geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/history/de=
pendencies.xml Mon Apr 11 08:56:25 2011<br>
@@ -1,5 +1,5 @@<br>
=A0&lt;?xml version=3D&quot;1.0&quot; encoding=3D&quot;UTF-8&quot; standalo=
ne=3D&quot;yes&quot;?&gt;<br>
-&lt;plugin-artifact xmlns=3D&quot;<a href=3D"http://geronimo.apache.org/xm=
l/ns/plugins-1.3" target=3D"_blank">http://geronimo.apache.org/xml/ns/plugi=
ns-1.3</a>&quot; xmlns:ns2=3D&quot;<a href=3D"http://geronimo.apache.org/xm=
l/ns/attributes-1.2" target=3D"_blank">http://geronimo.apache.org/xml/ns/at=
tributes-1.2</a>&quot;&gt;<br>

+&lt;plugin-artifact xmlns:ns2=3D&quot;<a href=3D"http://geronimo.apache.or=
g/xml/ns/attributes-1.2" target=3D"_blank">http://geronimo.apache.org/xml/n=
s/attributes-1.2</a>&quot; xmlns=3D&quot;<a href=3D"http://geronimo.apache.=
org/xml/ns/plugins-1.3" target=3D"_blank">http://geronimo.apache.org/xml/ns=
/plugins-1.3</a>&quot;&gt;<br>

 =A0 =A0 &lt;module-id&gt;<br>
 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.geronimo.configs&lt;/groupId&gt;=
<br>
 =A0 =A0 =A0 =A0 &lt;artifactId&gt;jaxws-sun-tools&lt;/artifactId&gt;<br>
@@ -32,6 +32,11 @@<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
 =A0 =A0 &lt;/dependency&gt;<br>
 =A0 =A0 &lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.felix&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;org.apache.felix.gogo.runtime&lt;/artifa=
ctId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;type&gt;jar&lt;/type&gt;<br>
+ =A0 =A0&lt;/dependency&gt;<br>
+ =A0 =A0&lt;dependency&gt;<br>
 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.geronimo.configs&lt;/groupId&gt;=
<br>
 =A0 =A0 =A0 =A0 &lt;artifactId&gt;jaxws-deployer&lt;/artifactId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;car&lt;/type&gt;<br>
@@ -42,6 +47,21 @@<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
 =A0 =A0 &lt;/dependency&gt;<br>
 =A0 =A0 &lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.karaf&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;org.apache.karaf.util&lt;/artifactId&gt;=
<br>
+ =A0 =A0 =A0 =A0&lt;type&gt;jar&lt;/type&gt;<br>
+ =A0 =A0&lt;/dependency&gt;<br>
+ =A0 =A0&lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.karaf.jaas&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;org.apache.karaf.jaas.config&lt;/artifac=
tId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;type&gt;jar&lt;/type&gt;<br>
+ =A0 =A0&lt;/dependency&gt;<br>
+ =A0 =A0&lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.karaf.jaas&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;org.apache.karaf.jaas.modules&lt;/artifa=
ctId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;type&gt;jar&lt;/type&gt;<br>
+ =A0 =A0&lt;/dependency&gt;<br>
+ =A0 =A0&lt;dependency&gt;<br>
 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.karaf.shell&lt;/groupId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;artifactId&gt;org.apache.karaf.shell.console&lt;/artif=
actId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
<br>
Modified: geronimo/server/trunk/plugins/openejb/openejb/src/main/history/de=
pendencies.xml<br>
URL: <a href=3D"http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/=
openejb/openejb/src/main/history/dependencies.xml?rev=3D1090982&amp;r1=3D10=
90981&amp;r2=3D1090982&amp;view=3Ddiff" target=3D"_blank">http://svn.apache=
.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb/src/main/history/=
dependencies.xml?rev=3D1090982&amp;r1=3D1090981&amp;r2=3D1090982&amp;view=
=3Ddiff</a><br>

=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D<br>
--- geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependen=
cies.xml (original)<br>
+++ geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependen=
cies.xml Mon Apr 11 08:56:25 2011<br>
@@ -137,6 +137,11 @@<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
 =A0 =A0 &lt;/dependency&gt;<br>
 =A0 =A0 &lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.xbean&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;xbean-finder&lt;/artifactId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;type&gt;jar&lt;/type&gt;<br>
+ =A0 =A0&lt;/dependency&gt;<br>
+ =A0 =A0&lt;dependency&gt;<br>
 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.yoko&lt;/groupId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;artifactId&gt;yoko-spec-corba&lt;/artifactId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
<br>
Modified: geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/dep=
endencies.xml<br>
URL: <a href=3D"http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/=
tomcat/tomcat7/src/main/history/dependencies.xml?rev=3D1090982&amp;r1=3D109=
0981&amp;r2=3D1090982&amp;view=3Ddiff" target=3D"_blank">http://svn.apache.=
org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/de=
pendencies.xml?rev=3D1090982&amp;r1=3D1090981&amp;r2=3D1090982&amp;view=3Dd=
iff</a><br>

=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D<br>
--- geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/dependenc=
ies.xml (original)<br>
+++ geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/dependenc=
ies.xml Mon Apr 11 08:56:25 2011<br>
@@ -57,6 +57,11 @@<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
 =A0 =A0 &lt;/dependency&gt;<br>
 =A0 =A0 &lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.geronimo.ext.tomcat&lt;/groupId&=
gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;util&lt;/artifactId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;type&gt;jar&lt;/type&gt;<br>
+ =A0 =A0&lt;/dependency&gt;<br>
+ =A0 =A0&lt;dependency&gt;<br>
 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.geronimo.framework&lt;/groupId&g=
t;<br>
 =A0 =A0 =A0 =A0 &lt;artifactId&gt;geronimo-deployment&lt;/artifactId&gt;<b=
r>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
<br>
Modified: geronimo/server/trunk/plugins/wab/web-extender/src/main/history/d=
ependencies.xml<br>
URL: <a href=3D"http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/=
wab/web-extender/src/main/history/dependencies.xml?rev=3D1090982&amp;r1=3D1=
090981&amp;r2=3D1090982&amp;view=3Ddiff" target=3D"_blank">http://svn.apach=
e.org/viewvc/geronimo/server/trunk/plugins/wab/web-extender/src/main/histor=
y/dependencies.xml?rev=3D1090982&amp;r1=3D1090981&amp;r2=3D1090982&amp;view=
=3Ddiff</a><br>

=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D<br>
--- geronimo/server/trunk/plugins/wab/web-extender/src/main/history/depende=
ncies.xml (original)<br>
+++ geronimo/server/trunk/plugins/wab/web-extender/src/main/history/depende=
ncies.xml Mon Apr 11 08:56:25 2011<br>
@@ -102,6 +102,11 @@<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
 =A0 =A0 &lt;/dependency&gt;<br>
 =A0 =A0 &lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.karaf.jaas&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;org.apache.karaf.jaas.boot&lt;/artifactI=
d&gt;<br>
+ =A0 =A0 =A0 =A0&lt;type&gt;jar&lt;/type&gt;<br>
+ =A0 =A0&lt;/dependency&gt;<br>
+ =A0 =A0&lt;dependency&gt;<br>
 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.openejb&lt;/groupId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;artifactId&gt;openejb-jee&lt;/artifactId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
<br>
Modified: geronimo/server/trunk/plugins/wink/wink/src/main/history/dependen=
cies.xml<br>
URL: <a href=3D"http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/=
wink/wink/src/main/history/dependencies.xml?rev=3D1090982&amp;r1=3D1090981&=
amp;r2=3D1090982&amp;view=3Ddiff" target=3D"_blank">http://svn.apache.org/v=
iewvc/geronimo/server/trunk/plugins/wink/wink/src/main/history/dependencies=
.xml?rev=3D1090982&amp;r1=3D1090981&amp;r2=3D1090982&amp;view=3Ddiff</a><br=
>

=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D<br>
--- geronimo/server/trunk/plugins/wink/wink/src/main/history/dependencies.x=
ml (original)<br>
+++ geronimo/server/trunk/plugins/wink/wink/src/main/history/dependencies.x=
ml Mon Apr 11 08:56:25 2011<br>
@@ -82,6 +82,11 @@<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
 =A0 =A0 &lt;/dependency&gt;<br>
 =A0 =A0 &lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.karaf.jaas&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;org.apache.karaf.jaas.boot&lt;/artifactI=
d&gt;<br>
+ =A0 =A0 =A0 =A0&lt;type&gt;jar&lt;/type&gt;<br>
+ =A0 =A0&lt;/dependency&gt;<br>
+ =A0 =A0&lt;dependency&gt;<br>
 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.openejb&lt;/groupId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;artifactId&gt;openejb-jee&lt;/artifactId&gt;<br>
 =A0 =A0 =A0 =A0 &lt;type&gt;jar&lt;/type&gt;<br>
<br>
Modified: geronimo/server/trunk/pom.xml<br>
URL: <a href=3D"http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?=
rev=3D1090982&amp;r1=3D1090981&amp;r2=3D1090982&amp;view=3Ddiff" target=3D"=
_blank">http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=3D10=
90982&amp;r1=3D1090981&amp;r2=3D1090982&amp;view=3Ddiff</a><br>

=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D<br>
--- geronimo/server/trunk/pom.xml (original)<br>
+++ geronimo/server/trunk/pom.xml Mon Apr 11 08:56:25 2011<br>
@@ -85,7 +85,7 @@<br>
 =A0 =A0 =A0 =A0 &lt;jaxbImplVersion&gt;2.2.3_1-SNAPSHOT&lt;/jaxbImplVersio=
n&gt;<br>
<br>
 =A0 =A0 =A0 =A0 &lt;monitoringConsoleVersion&gt;${project.version}&lt;/mon=
itoringConsoleVersion&gt;<br>
- =A0 =A0 =A0 =A0&lt;pax.logging.version&gt;1.5.3&lt;/pax.logging.version&g=
t;<br>
+ =A0 =A0 =A0 =A0&lt;pax.logging.version&gt;1.6.1&lt;/pax.logging.version&g=
t;<br>
 =A0 =A0 =A0 =A0 &lt;woodstoxVersion&gt;3.2.9_1&lt;/woodstoxVersion&gt;<br>
 =A0 =A0 =A0 =A0 &lt;sxcVersion&gt;0.7.3_1&lt;/sxcVersion&gt;<br>
 =A0 =A0 =A0 =A0 &lt;yokoVersion&gt;1.2-SNAPSHOT&lt;/yokoVersion&gt;<br>
@@ -139,12 +139,13 @@<br>
<br>
 =A0 =A0 =A0 =A0 &lt;!-- OSGI properties --&gt;<br>
 =A0 =A0 =A0 =A0 &lt;felix.bundlerepository.version&gt;1.6.4&lt;/felix.bund=
lerepository.version&gt;<br>
- =A0 =A0 =A0 =A0&lt;karaf.version&gt;2.1.2&lt;/karaf.version&gt;<br>
- =A0 =A0 =A0 =A0&lt;karaf.osgi.version&gt;2.1.2&lt;/karaf.osgi.version&gt;=
<br>
- =A0 =A0 =A0 =A0&lt;aries.blueprint.version&gt;0.2-incubating&lt;/aries.bl=
ueprint.version&gt;<br>
- =A0 =A0 =A0 =A0&lt;aries.jmx.version&gt;0.2-incubating&lt;/aries.jmx.vers=
ion&gt;<br>
- =A0 =A0 =A0 =A0&lt;aries.util.version&gt;0.2-incubating&lt;/aries.util.ve=
rsion&gt;<br>
- =A0 =A0 =A0 =A0&lt;aries.jndi.version&gt;0.2-incubating&lt;/aries.jndi.ve=
rsion&gt;<br>
+ =A0 =A0 =A0 =A0&lt;karaf.version&gt;2.2.1-SNAPSHOT&lt;/karaf.version&gt;<=
br>
+ =A0 =A0 =A0 =A0&lt;karaf.osgi.version&gt;2.2.1.SNAPSHOT&lt;/karaf.osgi.ve=
rsion&gt;<br>
+ =A0 =A0 =A0 =A0&lt;aries.blueprint.version&gt;0.3&lt;/aries.blueprint.ver=
sion&gt;<br>
+ =A0 =A0 =A0 =A0&lt;aries.jmx.version&gt;0.3&lt;/aries.jmx.version&gt;<br>
+ =A0 =A0 =A0 =A0&lt;aries.util.version&gt;0.3&lt;/aries.util.version&gt;<b=
r>
+ =A0 =A0 =A0 =A0&lt;aries.jndi.version&gt;0.3&lt;/aries.jndi.version&gt;<b=
r>
+ =A0 =A0 =A0 =A0&lt;aries.proxy.version&gt;0.3&lt;/aries.proxy.version&gt;=
<br>
 =A0 =A0 &lt;/properties&gt;<br>
<br>
 =A0 =A0 &lt;dependencyManagement&gt;<br>
@@ -648,7 +649,8 @@<br>
 =A0 =A0 =A0 =A0 =A0 =A0 &lt;dependency&gt;<br>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.slf4j&lt;/groupId&gt;<b=
r>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &lt;artifactId&gt;slf4j-api&lt;/artifactId=
&gt;<br>
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&lt;version&gt;1.5.5&lt;/version&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&lt;!--&lt;version&gt;1.5.5&lt;/version&gt=
;--&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&lt;version&gt;1.6.0&lt;/version&gt;<br>
 =A0 =A0 =A0 =A0 =A0 =A0 &lt;/dependency&gt;<br>
<br>
 =A0 =A0 =A0 =A0 =A0 =A0 &lt;dependency&gt;<br>
@@ -1732,7 +1734,7 @@ only found in cxf<br>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &lt;artifactId&gt;org.apac=
he.felix.gogo.runtime&lt;/artifactId&gt;<br>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &lt;/exclusion&gt;<br>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &lt;exclusion&gt;<br>
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&lt;groupId&gt;jline&lt;/g=
roupId&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&lt;groupId&gt;org.sonatyp=
e.jline&lt;/groupId&gt;<br>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &lt;artifactId&gt;jline&lt=
;/artifactId&gt;<br>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &lt;/exclusion&gt;<br>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &lt;exclusion&gt;<br>
@@ -1748,14 +1750,38 @@ only found in cxf<br>
<br>
 =A0 =A0 =A0 =A0 =A0 =A0 &lt;dependency&gt;<br>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.karaf.jaas&lt;/g=
roupId&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&lt;artifactId&gt;org.apache.karaf.jaas.mo=
dules&lt;/artifactId&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&lt;version&gt;${karaf.version}&lt;/versio=
n&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0&lt;/dependency&gt;<br>
+<br>
+ =A0 =A0 =A0 =A0 =A0 =A0&lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.karaf.jaas&lt;/g=
roupId&gt;<br>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &lt;artifactId&gt;org.apache.karaf.jaas.bo=
ot&lt;/artifactId&gt;<br>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &lt;version&gt;${karaf.version}&lt;/versio=
n&gt;<br>
 =A0 =A0 =A0 =A0 =A0 =A0 &lt;/dependency&gt;<br>
+<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 &lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.aries.applicatio=
n&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&lt;artifactId&gt;org.apache.aries.applica=
tion.utils&lt;/artifactId&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&lt;version&gt;${aries.util.version}&lt;/v=
ersion&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&lt;exclusions&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&lt;exclusion&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.ari=
es.testsupport&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;org.apache.aries.testsupport.unit&lt;/ar=
tifactId&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&lt;/exclusion&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&lt;/exclusions&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0&lt;/dependency&gt;<br>
<br>
 =A0 =A0 =A0 =A0 =A0 =A0 &lt;dependency&gt;<br>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.aries&lt;/groupI=
d&gt;<br>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &lt;artifactId&gt;org.apache.aries.util&lt=
;/artifactId&gt;<br>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &lt;version&gt;${aries.util.version}&lt;/v=
ersion&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &lt;exclusions&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&lt;exclusion&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.ari=
es.testsupport&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;org.apache.aries.testsupport.unit&lt;/ar=
tifactId&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&lt;/exclusion&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&lt;/exclusions&gt;<br>
 =A0 =A0 =A0 =A0 =A0 =A0 &lt;/dependency&gt;<br>
<br>
 =A0 =A0 =A0 =A0 =A0 =A0 &lt;dependency&gt;<br>
@@ -1783,6 +1809,18 @@ only found in cxf<br>
 =A0 =A0 =A0 =A0 =A0 =A0 &lt;/dependency&gt;<br>
<br>
 =A0 =A0 =A0 =A0 =A0 =A0 &lt;dependency&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&lt;groupId&gt;org.apache.aries.proxy&lt;/=
groupId&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&lt;artifactId&gt;org.apache.aries.proxy&l=
t;/artifactId&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&lt;version&gt;${aries.proxy.version}&lt;/=
version&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&lt;exclusions&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&lt;exclusion&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.ari=
es.testsupport&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;org.apache.aries.testsupport.unit&lt;/ar=
tifactId&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&lt;/exclusion&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&lt;/exclusions&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0&lt;/dependency&gt;<br>
+<br>
+ =A0 =A0 =A0 =A0 =A0 =A0&lt;dependency&gt;<br>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.aries.blueprint&=
lt;/groupId&gt;<br>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &lt;artifactId&gt;org.apache.aries.bluepri=
nt&lt;/artifactId&gt;<br>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &lt;version&gt;${aries.blueprint.version}&=
lt;/version&gt;<br>
@@ -1791,8 +1829,14 @@ only found in cxf<br>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.slf4j&l=
t;/groupId&gt;<br>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &lt;artifactId&gt;slf4j-ap=
i&lt;/artifactId&gt;<br>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &lt;/exclusion&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&lt;exclusion&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &lt;groupId&gt;org.apache.ari=
es.testsupport&lt;/groupId&gt;<br>
+ =A0 =A0 =A0 =A0&lt;artifactId&gt;org.apache.aries.testsupport.unit&lt;/ar=
tifactId&gt;<br>
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&lt;/exclusion&gt;<br>
 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 &lt;/exclusions&gt;<br>
 =A0 =A0 =A0 =A0 =A0 =A0 &lt;/dependency&gt;<br>
+<br>
+<br>
<br>
 =A0 =A0 =A0 =A0 &lt;/dependencies&gt;<br>
 =A0 =A0 &lt;/dependencyManagement&gt;<br>
<br>
<br>
</blockquote></div><br>

--000e0cd153165ef0de04a0a77b97--