geronimo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Guillaume Nodet <gno...@gmail.com>
Subject Re: svn commit: r926551 [1/2] - in /geronimo/server/trunk: ./ framework/ framework/buildsupport/car-maven-plugin/ framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ framework/bundles/ framework/bundles/jaxb-im
Date Wed, 24 Mar 2010 07:14:29 GMT
Try "mvn dependency:tree" which displays the tree of dependencies.  That
usually helps me a lot.

On Tue, Mar 23, 2010 at 19:49, Rick McGuire <rickmcg@gmail.com> wrote:

> Yeah, that looks like the same dependencies that are causing jaxb problems.
>  So far, I haven't managed to track down what is pulling those in.
>
> Rick
>
> On 3/23/2010 11:04 AM, Jarek Gawor wrote:
>
>> Rick,
>>
>> Something is pulling in the following dependencies and they shouldn't
>> be needed at all:
>>
>>     <dependency>
>> +<groupId>com.sun.xml.bind</groupId>
>> +<artifactId>jaxb-impl</artifactId>
>> +<type>jar</type>
>> +</dependency>
>>
>> +<dependency>
>> +<groupId>javax.activation</groupId>
>> +<artifactId>activation</artifactId>
>> +<type>jar</type>
>> +</dependency>
>> +<dependency>
>> +<groupId>javax.xml.bind</groupId>
>> +<artifactId>jaxb-api</artifactId>
>> +<type>jar</type>
>> +</dependency>
>> +<dependency>
>> +<groupId>javax.xml.stream</groupId>
>> +<artifactId>stax-api</artifactId>
>> +<type>jar</type>
>> +</dependency>
>>
>> Jarek
>>
>> On Tue, Mar 23, 2010 at 9:04 AM,<rickmcguire@apache.org>  wrote:
>>
>>
>>> Author: rickmcguire
>>> Date: Tue Mar 23 13:04:43 2010
>>> New Revision: 926551
>>>
>>> URL: http://svn.apache.org/viewvc?rev=926551&view=rev
>>> Log:
>>> GERONIMO-5201 Repace service versions of spec bundles with Geronimo
>>> latest versions.
>>>
>>>
>>> Added:
>>>    geronimo/server/trunk/framework/bundles/jaxb-impl/
>>>    geronimo/server/trunk/framework/bundles/jaxb-impl/pom.xml   (with
>>> props)
>>>
>>>  geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/resource/
>>>
>>>  geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/resource/mail/
>>>      - copied from r926025,
>>> geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/mail/
>>>
>>>  geronimo/server/trunk/plugins/javamail/geronimo-mail/src/test/java/org/apache/geronimo/resource/
>>>
>>>  geronimo/server/trunk/plugins/javamail/geronimo-mail/src/test/java/org/apache/geronimo/resource/mail/
>>>      - copied from r926025,
>>> geronimo/server/trunk/plugins/javamail/geronimo-mail/src/test/java/org/apache/geronimo/mail/
>>> Removed:
>>>
>>>  geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/mail/
>>>
>>>  geronimo/server/trunk/plugins/javamail/geronimo-mail/src/test/java/org/apache/geronimo/mail/
>>> Modified:
>>>    geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml
>>>
>>>  geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
>>>    geronimo/server/trunk/framework/bundles/pom.xml
>>>    geronimo/server/trunk/framework/bundles/sxc-jaxb/pom.xml
>>>    geronimo/server/trunk/framework/configs/client-system/pom.xml
>>>
>>>  geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml
>>>
>>>  geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/pom.xml
>>>
>>>  geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml
>>>
>>>  geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml
>>>
>>>  geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml
>>>
>>>  geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml
>>>
>>>  geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/dependencies.xml
>>>    geronimo/server/trunk/framework/configs/j2ee-system/pom.xml
>>>
>>>  geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml
>>>    geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml
>>>
>>>  geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml
>>>
>>>  geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml
>>>
>>>  geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml
>>>
>>>  geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties
>>>
>>>  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/online-deployer/pom.xml
>>>
>>>  geronimo/server/trunk/framework/configs/online-deployer/src/main/history/dependencies.xml
>>>
>>>  geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml
>>>    geronimo/server/trunk/framework/modules/geronimo-deployment/pom.xml
>>>    geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml
>>>    geronimo/server/trunk/framework/modules/geronimo-plugin/pom.xml
>>>    geronimo/server/trunk/framework/modules/geronimo-security/pom.xml
>>>    geronimo/server/trunk/framework/modules/geronimo-system/pom.xml
>>>
>>>  geronimo/server/trunk/framework/modules/geronimo-upgrade/src/test/resources/appclient_dep_1.xml
>>>
>>>  geronimo/server/trunk/framework/modules/geronimo-upgrade/src/test/resources/appclient_dep_1_result.xml
>>>    geronimo/server/trunk/framework/modules/testsupport-common/pom.xml
>>>    geronimo/server/trunk/framework/pom.xml
>>>
>>>  geronimo/server/trunk/plugins/aries/aries-deployer/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/jsr88-war-configurer/src/main/history/dependencies.xml
>>>    geronimo/server/trunk/plugins/javamail/geronimo-mail/pom.xml
>>>
>>>  geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/resource/mail/IMAPStoreGBean.java
>>>
>>>  geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/resource/mail/MailGBean.java
>>>
>>>  geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/resource/mail/NNTPGBeanConstants.java
>>>
>>>  geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/resource/mail/NNTPStoreGBean.java
>>>
>>>  geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/resource/mail/NNTPTransportGBean.java
>>>
>>>  geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/resource/mail/NullTransport.java
>>>
>>>  geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/resource/mail/POP3StoreGBean.java
>>>
>>>  geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/resource/mail/ProtocolGBean.java
>>>
>>>  geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/resource/mail/SMTPSTransportGBean.java
>>>
>>>  geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/resource/mail/SMTPTransportGBean.java
>>>
>>>  geronimo/server/trunk/plugins/javamail/geronimo-mail/src/test/java/org/apache/geronimo/resource/mail/MailGBeanTest.java
>>>
>>>  geronimo/server/trunk/plugins/javamail/geronimo-mail/src/test/java/org/apache/geronimo/resource/mail/TestStore.java
>>>
>>>  geronimo/server/trunk/plugins/javamail/geronimo-mail/src/test/java/org/apache/geronimo/resource/mail/TestTransport.java
>>>
>>>  geronimo/server/trunk/plugins/javamail/javamail/src/main/history/dependencies.xml
>>>    geronimo/server/trunk/plugins/javamail/javamail/src/main/plan/plan.xml
>>>    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml
>>>
>>>  geronimo/server/trunk/plugins/jaxws/jaxws-deployer/src/main/history/dependencies.xml
>>>    geronimo/server/trunk/plugins/monitoring/agent-jar/pom.xml
>>>    geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml
>>>
>>>  geronimo/server/trunk/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml
>>>
>>>  geronimo/server/trunk/plugins/pluto/pluto-support/src/main/history/dependencies.xml
>>>
>>>  geronimo/server/trunk/plugins/wab/web-extender/src/main/history/dependencies.xml
>>>    geronimo/server/trunk/pom.xml
>>>
>>>  geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/pom.xml
>>>
>>>  geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/pom.xml
>>>
>>>  geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/pom.xml
>>>
>>>  geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-mtom-tests/pom.xml
>>>
>>>  geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-provider-tests/pom.xml
>>>
>>>  geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/pom.xml
>>>
>>>  geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/pom.xml
>>>
>>> Modified:
>>> geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml
>>> URL:
>>> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml?rev=926551&r1=926550&r2=926551&view=diff
>>>
>>> ==============================================================================
>>> --- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml
>>> (original)
>>> +++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml
>>> Tue Mar 23 13:04:43 2010
>>> @@ -43,13 +43,13 @@
>>>
>>>     <dependencies>
>>>         <dependency>
>>> -<groupId>org.apache.servicemix.specs</groupId>
>>> -<artifactId>org.apache.servicemix.specs.jaxb-api-2.1</artifactId>
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-jaxb_2.2_spec</artifactId>
>>>         </dependency>
>>>
>>>         <dependency>
>>> -<groupId>org.apache.servicemix.bundles</groupId>
>>> -<artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
>>> +<groupId>org.apache.geronimo.bundles</groupId>
>>> +<artifactId>jaxb-impl</artifactId>
>>>         </dependency>
>>>
>>>         <dependency>
>>> @@ -58,8 +58,8 @@
>>>         </dependency>
>>>
>>>         <dependency>
>>> -<groupId>org.apache.servicemix.specs</groupId>
>>> -<artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-stax-api_1.0_spec</artifactId>
>>>         </dependency>
>>>         <dependency>
>>>             <groupId>org.apache.servicemix.bundles</groupId>
>>> @@ -67,8 +67,8 @@
>>>         </dependency>
>>>
>>>         <dependency>
>>> -<groupId>org.apache.servicemix.specs</groupId>
>>> -<artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-activation_1.1_spec</artifactId>
>>>         </dependency>
>>>         <!-- try to make javax.transaction classes loadable during build
>>> -->
>>>         <dependency>
>>> @@ -87,7 +87,7 @@
>>>             <artifactId>geronimo-system</artifactId>
>>>             <version>${version}</version>
>>>         </dependency>
>>> -
>>> +
>>>         <dependency>
>>>             <groupId>org.apache.geronimo.framework</groupId>
>>>             <artifactId>geronimo-obr</artifactId>
>>>
>>> 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=926551&r1=926550&r2=926551&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
>>> Tue Mar 23 13:04:43 2010
>>> @@ -726,12 +726,12 @@ public abstract class AbstractCarMojo
>>>                        "javax.util.concurrent;version=1.0," +
>>>                        "javax.util.concurrent.locks;version=1.0," +
>>>                        "javax.xml," +
>>> -                       "javax.xml.bind;version=2.1," +
>>> -                       "javax.xml.bind.annotation;version=2.1," +
>>> -                       "javax.xml.bind.annotation.adapters;version=2.1,"
>>> +
>>> -                       "javax.xml.bind.attachment;version=2.1," +
>>> -                       "javax.xml.bind.helpers;version=2.1," +
>>> -                       "javax.xml.bind.util;version=2.1," +
>>> +                       "javax.xml.bind;version=2.2," +
>>> +                       "javax.xml.bind.annotation;version=2.2," +
>>> +                       "javax.xml.bind.annotation.adapters;version=2.2,"
>>> +
>>> +                       "javax.xml.bind.attachment;version=2.2," +
>>> +                       "javax.xml.bind.helpers;version=2.2," +
>>> +                       "javax.xml.bind.util;version=2.2," +
>>>                        "javax.xml.crypto," +
>>>                        "javax.xml.crypto.dom," +
>>>                        "javax.xml.crypto.dsig," +
>>> @@ -739,12 +739,8 @@ public abstract class AbstractCarMojo
>>>                        "javax.xml.crypto.dsig.keyinfo," +
>>>                        "javax.xml.crypto.dsig.spec," +
>>>                        "javax.xml.datatype," +
>>> -                       "javax.xml.namespace," +
>>>                        "javax.xml.parsers," +
>>>                        "javax.xml.soap;version=1.3," +
>>> -                       "javax.xml.stream;version=1.0," +
>>> -                       "javax.xml.stream.events;version=1.0," +
>>> -                       "javax.xml.stream.util;version=1.0," +
>>>                        "javax.xml.transform," +
>>>                        "javax.xml.transform.dom," +
>>>                        "javax.xml.transform.sax," +
>>> @@ -941,9 +937,9 @@ public abstract class AbstractCarMojo
>>>                         "javax.enterprise.deploy.shared," +
>>>                         "javax.enterprise.deploy.spi");
>>>  */
>>> -
>>> +
>>>         properties.put(Constants.FRAMEWORK_BOOTDELEGATION,
>>> "sun.*,com.sun.*");
>>> -
>>> +
>>>         File storageDir = new File(basedir, "target/bundle-cache");
>>>         properties.put(Constants.FRAMEWORK_STORAGE,
>>> storageDir.getAbsolutePath());
>>>
>>> @@ -951,15 +947,15 @@ public abstract class AbstractCarMojo
>>>             properties.put("felix.log.level", "4");
>>>         }
>>>
>>> -        /*
>>> +        /*
>>>          * A hack for Equinox to restore FrameworkProperties to the
>>> initial state.
>>>          * If the FrameworkProperties is not restored to the initial
>>> state, Equinox
>>>          * will create a separate classloader and load the Geronimo
>>> kernel classes
>>> -         * from deployed geronimo-kernel bundle instead of the system
>>> bundle.
>>> -         * That will result in ClassCastException.
>>> +         * from deployed geronimo-kernel bundle instead of the system
>>> bundle.
>>> +         * That will result in ClassCastException.
>>>          */
>>>         resetFrameworkProperties();
>>> -
>>> +
>>>         ServiceLoader<FrameworkFactory>  loader =
>>> ServiceLoader.load(FrameworkFactory.class);
>>>         Framework framework =
>>> loader.iterator().next().newFramework(properties);
>>>         framework.start();
>>>
>>> Added: geronimo/server/trunk/framework/bundles/jaxb-impl/pom.xml
>>> URL:
>>> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/jaxb-impl/pom.xml?rev=926551&view=auto
>>>
>>> ==============================================================================
>>> --- geronimo/server/trunk/framework/bundles/jaxb-impl/pom.xml (added)
>>> +++ geronimo/server/trunk/framework/bundles/jaxb-impl/pom.xml Tue Mar 23
>>> 13:04:43 2010
>>> @@ -0,0 +1,108 @@
>>> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="
>>> http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="
>>> http://maven.apache.org/POM/4.0.0
>>> http://maven.apache.org/maven-v4_0_0.xsd">
>>> +
>>> +<!--
>>> +
>>> +        Licensed to the Apache Software Foundation (ASF) under one or
>>> more
>>> +        contributor license agreements.  See the NOTICE file distributed
>>> with
>>> +        this work for additional information regarding copyright
>>> ownership.
>>> +        The ASF licenses this file to You under the Apache License,
>>> Version 2.0
>>> +        (the "License"); you may not use this file except in compliance
>>> with
>>> +        the License.  You may obtain a copy of the License at
>>> +
>>> +           http://www.apache.org/licenses/LICENSE-2.0
>>> +
>>> +        Unless required by applicable law or agreed to in writing,
>>> software
>>> +        distributed under the License is distributed on an "AS IS"
>>> BASIS,
>>> +        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
>>> implied.
>>> +        See the License for the specific language governing permissions
>>> and
>>> +        limitations under the License.
>>> +    -->
>>> +
>>> +<modelVersion>4.0.0</modelVersion>
>>> +
>>> +<parent>
>>> +<groupId>org.apache.geronimo.framework</groupId>
>>> +<artifactId>framework</artifactId>
>>> +<version>3.0-SNAPSHOT</version>
>>> +<relativePath>../../pom.xml</relativePath>
>>> +</parent>
>>> +
>>> +<groupId>org.apache.geronimo.bundles</groupId>
>>> +<artifactId>jaxb-impl</artifactId>
>>> +<version>2.2-SNAPSHOT</version>
>>> +<packaging>bundle</packaging>
>>> +<name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
>>> +<description>
>>> +        This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
>>> +</description>
>>> +
>>> +<properties>
>>> +<pkgGroupId>com.sun.xml.bind</pkgGroupId>
>>> +<pkgArtifactId>jaxb-impl</pkgArtifactId>
>>> +<pkgVersion>2.1.12</pkgVersion>
>>> +</properties>
>>> +
>>> +<dependencies>
>>> +<dependency>
>>> +<groupId>${pkgGroupId}</groupId>
>>> +<artifactId>${pkgArtifactId}</artifactId>
>>> +<version>${pkgVersion}</version>
>>> +</dependency>
>>> +<dependency>
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-stax-api_1.0_spec</artifactId>
>>> +</dependency>
>>> +<dependency>
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-jaxb_2.2_spec</artifactId>
>>> +</dependency>
>>> +</dependencies>
>>> +
>>> +<repositories>
>>> +<repository>
>>> +<id>java.net</id>
>>> +<name>java.net Maven Repository</name>
>>> +<url>http://download.java.net/maven/1/</url>
>>> +<layout>legacy</layout>
>>> +<releases>
>>> +<enabled>true</enabled>
>>> +</releases>
>>> +<snapshots>
>>> +<enabled>false</enabled>
>>> +</snapshots>
>>> +</repository>
>>> +</repositories>
>>> +
>>> +<build>
>>> +<plugins>
>>> +<plugin>
>>> +<groupId>org.apache.felix</groupId>
>>> +<artifactId>maven-bundle-plugin</artifactId>
>>> +<configuration>
>>> +<instructions>
>>> +<Export-Package>
>>> +
>>> com.sun.xml.bind*;-split-package:=merge-first,
>>> +                           com.sun.istack*;-split-package:=merge-first,
>>> +                           com.sun.xml.txw2*;-split-package:=merge-first
>>> +</Export-Package>
>>> +<Import-Package>
>>> +                           !com.sun.xml.bind*,
>>> +                           !com.sun.istack*,
>>> +                           !com.sun.xml.txw2*,
>>> +
>>> com.sun.xml.fastinfoset*;resolution:=optional,
>>> +                           javax.xml.stream*;resolution:=optional,
>>> +                           org.jvnet.fastinfoset*;resolution:=optional,
>>> +                           org.jvnet.staxex*;resolution:=optional,
>>> +                           *
>>> +</Import-Package>
>>> +<Private-Package>
>>> +                           META-INF;-split-package:=merge-first,
>>> +
>>> META-INF.maven.org.apache.servicemix.bundles*;-split-package:=merge-first,
>>> +
>>> META-INF.services;-split-package:=merge-first,
>>> +</Private-Package>
>>> +</instructions>
>>> +</configuration>
>>> +</plugin>
>>> +</plugins>
>>> +</build>
>>> +</project>
>>>
>>> Propchange: geronimo/server/trunk/framework/bundles/jaxb-impl/pom.xml
>>>
>>> ------------------------------------------------------------------------------
>>>    svn:eol-style = native
>>>
>>> Propchange: geronimo/server/trunk/framework/bundles/jaxb-impl/pom.xml
>>>
>>> ------------------------------------------------------------------------------
>>>    svn:keywords = Date Revision
>>>
>>> Propchange: geronimo/server/trunk/framework/bundles/jaxb-impl/pom.xml
>>>
>>> ------------------------------------------------------------------------------
>>>    svn:mime-type = text/xml
>>>
>>> Modified: geronimo/server/trunk/framework/bundles/pom.xml
>>> URL:
>>> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/pom.xml?rev=926551&r1=926550&r2=926551&view=diff
>>>
>>> ==============================================================================
>>> --- geronimo/server/trunk/framework/bundles/pom.xml (original)
>>> +++ geronimo/server/trunk/framework/bundles/pom.xml Tue Mar 23 13:04:43
>>> 2010
>>> @@ -43,9 +43,10 @@
>>>         <module>commons-discovery</module>
>>>         <module>derby-all</module>
>>>         <module>dwr</module>
>>> +<module>jaxb-impl</module>
>>>         <module>jstl</module>
>>>         <module>woden-impl-dom</module>
>>> -<module>backport-util-concurrent</module>
>>> +<module>backport-util-concurrent</module>
>>>         <module>httpcore</module>
>>>         <module>karaf-client</module>
>>>         <!-- todo remove -->
>>>
>>> Modified: geronimo/server/trunk/framework/bundles/sxc-jaxb/pom.xml
>>> URL:
>>> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/sxc-jaxb/pom.xml?rev=926551&r1=926550&r2=926551&view=diff
>>>
>>> ==============================================================================
>>> --- geronimo/server/trunk/framework/bundles/sxc-jaxb/pom.xml (original)
>>> +++ geronimo/server/trunk/framework/bundles/sxc-jaxb/pom.xml Tue Mar 23
>>> 13:04:43 2010
>>> @@ -42,6 +42,7 @@
>>>         <pkgArtifactId>sxc-jaxb</pkgArtifactId>
>>>         <pkgVersion>0.7.2</pkgVersion>
>>>     </properties>
>>> +
>>>     <dependencies>
>>>         <dependency>
>>>             <groupId>${pkgGroupId}</groupId>
>>> @@ -50,23 +51,23 @@
>>>             <optional>true</optional>
>>>         </dependency>
>>>         <dependency>
>>> -<groupId>org.apache.servicemix.bundles</groupId>
>>> -<artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
>>> -<optional>true</optional>
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-activation_1.1_spec</artifactId>
>>> +<!--<optional>true</optional>-->
>>>         </dependency>
>>>         <dependency>
>>> -<groupId>org.apache.servicemix.specs</groupId>
>>> -<artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
>>> -<!--<optional>true</optional>-->
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-jaxb_2.2_spec</artifactId>
>>> +<optional>true</optional>
>>>         </dependency>
>>>         <dependency>
>>> -<groupId>org.apache.servicemix.specs</groupId>
>>> -<artifactId>org.apache.servicemix.specs.jaxb-api-2.1</artifactId>
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-stax-api_1.0_spec</artifactId>
>>>             <optional>true</optional>
>>>         </dependency>
>>>         <dependency>
>>> -<groupId>org.apache.servicemix.specs</groupId>
>>> -<artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
>>> +<groupId>org.apache.geronimo.bundles</groupId>
>>> +<artifactId>jaxb-impl</artifactId>
>>>             <optional>true</optional>
>>>         </dependency>
>>>     </dependencies>
>>>
>>> Modified: geronimo/server/trunk/framework/configs/client-system/pom.xml
>>> URL:
>>> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/client-system/pom.xml?rev=926551&r1=926550&r2=926551&view=diff
>>>
>>> ==============================================================================
>>> --- geronimo/server/trunk/framework/configs/client-system/pom.xml
>>> (original)
>>> +++ geronimo/server/trunk/framework/configs/client-system/pom.xml Tue Mar
>>> 23 13:04:43 2010
>>> @@ -81,18 +81,18 @@
>>>
>>>         <!-- used by plugin installer -->
>>>         <dependency>
>>> -<groupId>org.apache.servicemix.specs</groupId>
>>> -<artifactId>org.apache.servicemix.specs.jaxb-api-2.1</artifactId>
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-jaxb_2.2_spec</artifactId>
>>>         </dependency>
>>>
>>>         <dependency>
>>> -<groupId>org.apache.servicemix.bundles</groupId>
>>> -<artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
>>> +<groupId>org.apache.geronimo.bundles</groupId>
>>> +<artifactId>jaxb-impl</artifactId>
>>>         </dependency>
>>>
>>>         <dependency>
>>> -<groupId>org.apache.servicemix.specs</groupId>
>>> -<artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-stax-api_1.0_spec</artifactId>
>>>         </dependency>
>>>
>>>         <dependency>
>>> @@ -101,8 +101,8 @@
>>>         </dependency>
>>>
>>>         <dependency>
>>> -<groupId>org.apache.servicemix.specs</groupId>
>>> -<artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-activation_1.1_spec</artifactId>
>>>         </dependency>
>>>
>>>         <dependency>
>>>
>>> Modified:
>>> geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml
>>> URL:
>>> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml?rev=926551&r1=926550&r2=926551&view=diff
>>>
>>> ==============================================================================
>>> ---
>>> geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml
>>> (original)
>>> +++
>>> geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml
>>> Tue Mar 23 13:04:43 2010
>>> @@ -12,11 +12,31 @@
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>> +<groupId>com.sun.xml.bind</groupId>
>>> +<artifactId>jaxb-impl</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>>         <groupId>commons-cli</groupId>
>>>         <artifactId>commons-cli</artifactId>
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>> +<groupId>javax.activation</groupId>
>>> +<artifactId>activation</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>> +<groupId>javax.xml.bind</groupId>
>>> +<artifactId>jaxb-api</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>> +<groupId>javax.xml.stream</groupId>
>>> +<artifactId>stax-api</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>>         <groupId>org.apache.felix</groupId>
>>>         <artifactId>org.apache.felix.bundlerepository</artifactId>
>>>         <type>jar</type>
>>> @@ -27,6 +47,11 @@
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>> +<groupId>org.apache.geronimo.bundles</groupId>
>>> +<artifactId>jaxb-impl</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>>         <groupId>org.apache.geronimo.framework</groupId>
>>>         <artifactId>geronimo-cli</artifactId>
>>>         <type>jar</type>
>>> @@ -62,58 +87,53 @@
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>> -<groupId>org.apache.servicemix.bundles</groupId>
>>> -<artifactId>org.apache.servicemix.bundles.cglib</artifactId>
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-activation_1.1_spec</artifactId>
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>> -<groupId>org.apache.servicemix.bundles</groupId>
>>> -<artifactId>org.apache.servicemix.bundles.commons-jexl</artifactId>
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-jaxb_2.2_spec</artifactId>
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>> -<groupId>org.apache.servicemix.bundles</groupId>
>>> -<artifactId>org.apache.servicemix.bundles.commons-lang</artifactId>
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-stax-api_1.0_spec</artifactId>
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>>         <groupId>org.apache.servicemix.bundles</groupId>
>>> -<artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
>>> +<artifactId>org.apache.servicemix.bundles.cglib</artifactId>
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>>         <groupId>org.apache.servicemix.bundles</groupId>
>>> -<artifactId>org.apache.servicemix.bundles.jline</artifactId>
>>> +<artifactId>org.apache.servicemix.bundles.commons-jexl</artifactId>
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>>         <groupId>org.apache.servicemix.bundles</groupId>
>>> -<artifactId>org.apache.servicemix.bundles.woodstox</artifactId>
>>> +<artifactId>org.apache.servicemix.bundles.commons-lang</artifactId>
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>>         <groupId>org.apache.servicemix.bundles</groupId>
>>> -<artifactId>org.apache.servicemix.bundles.xpp3</artifactId>
>>> +<artifactId>org.apache.servicemix.bundles.jline</artifactId>
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>>         <groupId>org.apache.servicemix.bundles</groupId>
>>> -<artifactId>org.apache.servicemix.bundles.xstream</artifactId>
>>> -<type>jar</type>
>>> -</dependency>
>>> -<dependency>
>>> -<groupId>org.apache.servicemix.specs</groupId>
>>> -<artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
>>> +<artifactId>org.apache.servicemix.bundles.woodstox</artifactId>
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>> -<groupId>org.apache.servicemix.specs</groupId>
>>> -<artifactId>org.apache.servicemix.specs.jaxb-api-2.1</artifactId>
>>> +<groupId>org.apache.servicemix.bundles</groupId>
>>> +<artifactId>org.apache.servicemix.bundles.xpp3</artifactId>
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>> -<groupId>org.apache.servicemix.specs</groupId>
>>> -<artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
>>> +<groupId>org.apache.servicemix.bundles</groupId>
>>> +<artifactId>org.apache.servicemix.bundles.xstream</artifactId>
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>>
>>> Modified:
>>> geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/pom.xml
>>> URL:
>>> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/pom.xml?rev=926551&r1=926550&r2=926551&view=diff
>>>
>>> ==============================================================================
>>> ---
>>> geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/pom.xml
>>> (original)
>>> +++
>>> geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/pom.xml
>>> Tue Mar 23 13:04:43 2010
>>> @@ -21,7 +21,7 @@
>>>  <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="
>>> http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="
>>> http://maven.apache.org/POM/4.0.0
>>> http://maven.apache.org/maven-v4_0_0.xsd">
>>>
>>>     <modelVersion>4.0.0</modelVersion>
>>> -
>>> +
>>>     <parent>
>>>         <groupId>org.apache.geronimo.framework</groupId>
>>>         <artifactId>configs</artifactId>
>>> @@ -31,7 +31,7 @@
>>>     <artifactId>geronimo-gbean-deployer-bootstrap</artifactId>
>>>     <name>Geronimo Framework, Configs :: GBean Deployer Boostrap</name>
>>>     <packaging>car</packaging>
>>> -
>>> +
>>>     <dependencies>
>>>         <!-- N.B. ordering is crucial until maven dependencies express
>>> the osgi dependencies. xmlbeans requires xml-resolver -->
>>>         <!-- required for environment dconfigbean support -->
>>> @@ -53,8 +53,8 @@
>>>         </dependency>
>>>
>>>         <dependency>
>>> -<groupId>org.apache.servicemix.specs</groupId>
>>> -<artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-stax-api_1.0_spec</artifactId>
>>>         </dependency>
>>>
>>>         <!-- needed by the plan -->
>>> @@ -83,7 +83,7 @@
>>>         </dependency>
>>>
>>>     </dependencies>
>>> -
>>> +
>>>     <build>
>>>         <plugins>
>>>             <plugin>
>>>
>>> Modified:
>>> geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml
>>> URL:
>>> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml?rev=926551&r1=926550&r2=926551&view=diff
>>>
>>> ==============================================================================
>>> ---
>>> geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml
>>> (original)
>>> +++
>>> geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml
>>> Tue Mar 23 13:04:43 2010
>>> @@ -12,16 +12,41 @@
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>> +<groupId>com.sun.xml.bind</groupId>
>>> +<artifactId>jaxb-impl</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>>         <groupId>commons-cli</groupId>
>>>         <artifactId>commons-cli</artifactId>
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>> +<groupId>javax.activation</groupId>
>>> +<artifactId>activation</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>> +<groupId>javax.xml.bind</groupId>
>>> +<artifactId>jaxb-api</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>> +<groupId>javax.xml.stream</groupId>
>>> +<artifactId>stax-api</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>>         <groupId>org.apache.felix</groupId>
>>>         <artifactId>org.apache.felix.bundlerepository</artifactId>
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>> +<groupId>org.apache.geronimo.bundles</groupId>
>>> +<artifactId>jaxb-impl</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>>         <groupId>org.apache.geronimo.framework</groupId>
>>>         <artifactId>geronimo-cli</artifactId>
>>>         <type>jar</type>
>>> @@ -83,27 +108,37 @@
>>>     </dependency>
>>>     <dependency>
>>>         <groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-activation_1.1_spec</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>>         <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>> -<groupId>org.apache.servicemix.bundles</groupId>
>>> -<artifactId>org.apache.servicemix.bundles.cglib</artifactId>
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-jaxb_2.2_spec</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-stax-api_1.0_spec</artifactId>
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>>         <groupId>org.apache.servicemix.bundles</groupId>
>>> -<artifactId>org.apache.servicemix.bundles.commons-jexl</artifactId>
>>> +<artifactId>org.apache.servicemix.bundles.cglib</artifactId>
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>>         <groupId>org.apache.servicemix.bundles</groupId>
>>> -<artifactId>org.apache.servicemix.bundles.commons-lang</artifactId>
>>> +<artifactId>org.apache.servicemix.bundles.commons-jexl</artifactId>
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>>         <groupId>org.apache.servicemix.bundles</groupId>
>>> -<artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
>>> +<artifactId>org.apache.servicemix.bundles.commons-lang</artifactId>
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>> @@ -132,21 +167,6 @@
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>> -<groupId>org.apache.servicemix.specs</groupId>
>>> -<artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
>>> -<type>jar</type>
>>> -</dependency>
>>> -<dependency>
>>> -<groupId>org.apache.servicemix.specs</groupId>
>>> -<artifactId>org.apache.servicemix.specs.jaxb-api-2.1</artifactId>
>>> -<type>jar</type>
>>> -</dependency>
>>> -<dependency>
>>> -<groupId>org.apache.servicemix.specs</groupId>
>>> -<artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
>>> -<type>jar</type>
>>> -</dependency>
>>> -<dependency>
>>>         <groupId>org.apache.xbean</groupId>
>>>         <artifactId>xbean-finder</artifactId>
>>>         <type>jar</type>
>>>
>>> Modified:
>>> geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml
>>> URL:
>>> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml?rev=926551&r1=926550&r2=926551&view=diff
>>>
>>> ==============================================================================
>>> ---
>>> geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml
>>> (original)
>>> +++
>>> geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml
>>> Tue Mar 23 13:04:43 2010
>>> @@ -89,24 +89,24 @@
>>>         <!-- used by plugin installer -->
>>>         <dependency>
>>>             <groupId>org.apache.geronimo.specs</groupId>
>>> -<artifactId>geronimo-jaxb_2.1_spec</artifactId>
>>> +<artifactId>geronimo-jaxb_2.2_spec</artifactId>
>>>         </dependency>
>>>
>>>         <dependency>
>>> -<groupId>com.sun.xml.bind</groupId>
>>> +<groupId>org.apache.geronimo.bundles</groupId>
>>>             <artifactId>jaxb-impl</artifactId>
>>>         </dependency>
>>> -
>>> +
>>>         <dependency>
>>>             <groupId>org.apache.geronimo.specs</groupId>
>>>             <artifactId>geronimo-stax-api_1.0_spec</artifactId>
>>>         </dependency>
>>> -
>>> +
>>>         <dependency>
>>>             <groupId>org.codehaus.woodstox</groupId>
>>>             <artifactId>wstx-asl</artifactId>
>>>         </dependency>
>>> -
>>> +
>>>         <dependency>
>>>             <groupId>org.apache.geronimo.specs</groupId>
>>>             <artifactId>geronimo-activation_1.1_spec</artifactId>
>>> @@ -182,7 +182,7 @@
>>>                         <!-- TODO bad idea... temp, for plugins -->
>>>                         <element>
>>>                             <groupId>org.apache.geronimo.specs</groupId>
>>> -<artifactId>geronimo-jaxb_2.1_spec</artifactId>
>>> +<artifactId>geronimo-jaxb_2.2_spec</artifactId>
>>>                         </element>
>>>                         <element>
>>>                             <groupId>com.sun.xml.bind</groupId>
>>>
>>> Modified:
>>> geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml
>>> URL:
>>> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml?rev=926551&r1=926550&r2=926551&view=diff
>>>
>>> ==============================================================================
>>> ---
>>> geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml
>>> (original)
>>> +++
>>> geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml
>>> Tue Mar 23 13:04:43 2010
>>> @@ -89,24 +89,24 @@
>>>         <!-- used by plugin installer -->
>>>         <dependency>
>>>             <groupId>org.apache.geronimo.specs</groupId>
>>> -<artifactId>geronimo-jaxb_2.1_spec</artifactId>
>>> +<artifactId>geronimo-jaxb_2.2_spec</artifactId>
>>>         </dependency>
>>>
>>>         <dependency>
>>> -<groupId>com.sun.xml.bind</groupId>
>>> +<groupId>org.apache.geronimo.bundles</groupId>
>>>             <artifactId>jaxb-impl</artifactId>
>>>         </dependency>
>>> -
>>> +
>>>         <dependency>
>>>             <groupId>org.apache.geronimo.specs</groupId>
>>>             <artifactId>geronimo-stax-api_1.0_spec</artifactId>
>>>         </dependency>
>>> -
>>> +
>>>         <dependency>
>>>             <groupId>org.codehaus.woodstox</groupId>
>>>             <artifactId>wstx-asl</artifactId>
>>>         </dependency>
>>> -
>>> +
>>>         <dependency>
>>>             <groupId>org.apache.geronimo.specs</groupId>
>>>             <artifactId>geronimo-activation_1.1_spec</artifactId>
>>> @@ -182,7 +182,7 @@
>>>                         <!-- TODO bad idea... temp, for plugins -->
>>>                         <element>
>>>                             <groupId>org.apache.geronimo.specs</groupId>
>>> -<artifactId>geronimo-jaxb_2.1_spec</artifactId>
>>> +<artifactId>geronimo-jaxb_2.2_spec</artifactId>
>>>                         </element>
>>>                         <element>
>>>                             <groupId>com.sun.xml.bind</groupId>
>>>
>>> Modified:
>>> geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml
>>> URL:
>>> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml?rev=926551&r1=926550&r2=926551&view=diff
>>>
>>> ==============================================================================
>>> ---
>>> geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml
>>> (original)
>>> +++
>>> geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml
>>> Tue Mar 23 13:04:43 2010
>>> @@ -7,6 +7,26 @@
>>>         <type>car</type>
>>>     </module-id>
>>>     <dependency>
>>> +<groupId>com.sun.xml.bind</groupId>
>>> +<artifactId>jaxb-impl</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>> +<groupId>javax.activation</groupId>
>>> +<artifactId>activation</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>> +<groupId>javax.xml.bind</groupId>
>>> +<artifactId>jaxb-api</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>> +<groupId>javax.xml.stream</groupId>
>>> +<artifactId>stax-api</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>>         <groupId>org.apache.geronimo.framework</groupId>
>>>         <artifactId>geronimo-cli</artifactId>
>>>         <type>jar</type>
>>>
>>> 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=926551&r1=926550&r2=926551&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
>>> Tue Mar 23 13:04:43 2010
>>> @@ -38,12 +38,12 @@
>>>     </dependency>
>>>     <dependency>
>>>         <groupId>org.apache.geronimo.specs</groupId>
>>> -<artifactId>geronimo-servlet_3.0_spec</artifactId>
>>> +<artifactId>geronimo-saaj_1.3_spec</artifactId>
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>> -<groupId>org.apache.servicemix.specs</groupId>
>>> -<artifactId>org.apache.servicemix.specs.saaj-api-1.3</artifactId>
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-servlet_3.0_spec</artifactId>
>>>         <type>jar</type>
>>>     </dependency>
>>>  </plugin-artifact>
>>>
>>> Modified: geronimo/server/trunk/framework/configs/j2ee-system/pom.xml
>>> URL:
>>> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-system/pom.xml?rev=926551&r1=926550&r2=926551&view=diff
>>>
>>> ==============================================================================
>>> --- geronimo/server/trunk/framework/configs/j2ee-system/pom.xml
>>> (original)
>>> +++ geronimo/server/trunk/framework/configs/j2ee-system/pom.xml Tue Mar
>>> 23 13:04:43 2010
>>> @@ -64,7 +64,7 @@
>>>             <artifactId>geronimo-obr</artifactId>
>>>             <version>${version}</version>
>>>         </dependency>
>>> -
>>> +
>>>         <dependency>
>>>             <groupId>org.apache.geronimo.framework</groupId>
>>>             <artifactId>geronimo-transformer</artifactId>
>>> @@ -114,25 +114,25 @@
>>>
>>>         <!-- used by plugin installer -->
>>>         <dependency>
>>> -<groupId>org.apache.servicemix.specs</groupId>
>>> -<artifactId>org.apache.servicemix.specs.jaxb-api-2.1</artifactId>
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-jaxb_2.2_spec</artifactId>
>>>         </dependency>
>>>
>>>         <dependency>
>>> -<groupId>org.apache.servicemix.bundles</groupId>
>>> -<artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
>>> +<groupId>org.apache.geronimo.bundles</groupId>
>>> +<artifactId>jaxb-impl</artifactId>
>>>         </dependency>
>>>
>>>         <dependency>
>>>             <groupId>org.codehaus.groovy</groupId>
>>>             <artifactId>groovy-all-minimal</artifactId>
>>>         </dependency>
>>> -
>>> +
>>>         <dependency>
>>> -<groupId>org.apache.servicemix.specs</groupId>
>>> -<artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-stax-api_1.0_spec</artifactId>
>>>         </dependency>
>>> -
>>> +
>>>         <dependency>
>>>             <groupId>org.apache.servicemix.bundles</groupId>
>>>
>>> <artifactId>org.apache.servicemix.bundles.woodstox</artifactId>
>>> @@ -149,8 +149,8 @@
>>>         </dependency>
>>>
>>>         <dependency>
>>> -<groupId>org.apache.servicemix.specs</groupId>
>>> -<artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-activation_1.1_spec</artifactId>
>>>         </dependency>
>>>
>>>
>>> @@ -170,7 +170,7 @@
>>>             <artifactId>org.apache.felix.configadmin</artifactId>
>>>         </dependency>
>>>
>>> -
>>> +
>>>         <!-- build order hint -->
>>>         <dependency>
>>>             <groupId>org.apache.geronimo.framework</groupId>
>>> @@ -186,7 +186,7 @@
>>>             <plugin>
>>>                 <groupId>org.apache.geronimo.buildsupport</groupId>
>>>                 <artifactId>car-maven-plugin</artifactId>
>>> -
>>> +
>>>                 <configuration>
>>>                     <deploymentConfigs>
>>>
>>> <deploymentConfig>${gbeanDeployerBootstrap}</deploymentConfig>
>>>
>>> Modified:
>>> geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml
>>> URL:
>>> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml?rev=926551&r1=926550&r2=926551&view=diff
>>>
>>> ==============================================================================
>>> ---
>>> geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml
>>> (original)
>>> +++
>>> geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml
>>> Tue Mar 23 13:04:43 2010
>>> @@ -12,11 +12,31 @@
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>> +<groupId>com.sun.xml.bind</groupId>
>>> +<artifactId>jaxb-impl</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>>         <groupId>commons-cli</groupId>
>>>         <artifactId>commons-cli</artifactId>
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>> +<groupId>javax.activation</groupId>
>>> +<artifactId>activation</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>> +<groupId>javax.xml.bind</groupId>
>>> +<artifactId>jaxb-api</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>> +<groupId>javax.xml.stream</groupId>
>>> +<artifactId>stax-api</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>>         <groupId>org.apache.felix</groupId>
>>>         <artifactId>org.apache.felix.bundlerepository</artifactId>
>>>         <type>jar</type>
>>> @@ -28,6 +48,11 @@
>>>     </dependency>
>>>     <dependency>
>>>         <groupId>org.apache.geronimo.bundles</groupId>
>>> +<artifactId>jaxb-impl</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>> +<groupId>org.apache.geronimo.bundles</groupId>
>>>         <artifactId>sxc-jaxb</artifactId>
>>>         <type>jar</type>
>>>     </dependency>
>>> @@ -87,58 +112,53 @@
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>> -<groupId>org.apache.servicemix.bundles</groupId>
>>> -<artifactId>org.apache.servicemix.bundles.cglib</artifactId>
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-activation_1.1_spec</artifactId>
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>> -<groupId>org.apache.servicemix.bundles</groupId>
>>> -<artifactId>org.apache.servicemix.bundles.commons-jexl</artifactId>
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-jaxb_2.2_spec</artifactId>
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>> -<groupId>org.apache.servicemix.bundles</groupId>
>>> -<artifactId>org.apache.servicemix.bundles.commons-lang</artifactId>
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-stax-api_1.0_spec</artifactId>
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>>         <groupId>org.apache.servicemix.bundles</groupId>
>>> -<artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
>>> +<artifactId>org.apache.servicemix.bundles.cglib</artifactId>
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>>         <groupId>org.apache.servicemix.bundles</groupId>
>>> -<artifactId>org.apache.servicemix.bundles.jline</artifactId>
>>> +<artifactId>org.apache.servicemix.bundles.commons-jexl</artifactId>
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>>         <groupId>org.apache.servicemix.bundles</groupId>
>>> -<artifactId>org.apache.servicemix.bundles.woodstox</artifactId>
>>> +<artifactId>org.apache.servicemix.bundles.commons-lang</artifactId>
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>>         <groupId>org.apache.servicemix.bundles</groupId>
>>> -<artifactId>org.apache.servicemix.bundles.xpp3</artifactId>
>>> +<artifactId>org.apache.servicemix.bundles.jline</artifactId>
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>>         <groupId>org.apache.servicemix.bundles</groupId>
>>> -<artifactId>org.apache.servicemix.bundles.xstream</artifactId>
>>> -<type>jar</type>
>>> -</dependency>
>>> -<dependency>
>>> -<groupId>org.apache.servicemix.specs</groupId>
>>> -<artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
>>> +<artifactId>org.apache.servicemix.bundles.woodstox</artifactId>
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>> -<groupId>org.apache.servicemix.specs</groupId>
>>> -<artifactId>org.apache.servicemix.specs.jaxb-api-2.1</artifactId>
>>> +<groupId>org.apache.servicemix.bundles</groupId>
>>> +<artifactId>org.apache.servicemix.bundles.xpp3</artifactId>
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>> -<groupId>org.apache.servicemix.specs</groupId>
>>> -<artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
>>> +<groupId>org.apache.servicemix.bundles</groupId>
>>> +<artifactId>org.apache.servicemix.bundles.xstream</artifactId>
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>>
>>> Modified: geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml
>>> URL:
>>> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml?rev=926551&r1=926550&r2=926551&view=diff
>>>
>>> ==============================================================================
>>> --- geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml (original)
>>> +++ geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml Tue Mar 23
>>> 13:04:43 2010
>>> @@ -101,24 +101,24 @@
>>>
>>>         <!-- used by plugin installer -->
>>>         <dependency>
>>> -<groupId>org.apache.servicemix.specs</groupId>
>>> -<artifactId>org.apache.servicemix.specs.jaxb-api-2.1</artifactId>
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-jaxb_2.2_spec</artifactId>
>>>         </dependency>
>>>         <dependency>
>>> -<groupId>org.apache.servicemix.bundles</groupId>
>>> -<artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
>>> +<groupId>org.apache.geronimo.bundles</groupId>
>>> +<artifactId>jaxb-impl</artifactId>
>>>         </dependency>
>>>         <dependency>
>>> -<groupId>org.apache.servicemix.specs</groupId>
>>> -<artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-stax-api_1.0_spec</artifactId>
>>>         </dependency>
>>>         <dependency>
>>>             <groupId>org.apache.servicemix.bundles</groupId>
>>>
>>> <artifactId>org.apache.servicemix.bundles.woodstox</artifactId>
>>>         </dependency>
>>>         <dependency>
>>> -<groupId>org.apache.servicemix.specs</groupId>
>>> -<artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-activation_1.1_spec</artifactId>
>>>         </dependency>
>>>
>>>     </dependencies>
>>>
>>> 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=926551&r1=926550&r2=926551&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
>>> Tue Mar 23 13:04:43 2010
>>> @@ -12,16 +12,41 @@
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>> +<groupId>com.sun.xml.bind</groupId>
>>> +<artifactId>jaxb-impl</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>>         <groupId>commons-cli</groupId>
>>>         <artifactId>commons-cli</artifactId>
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>> +<groupId>javax.activation</groupId>
>>> +<artifactId>activation</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>> +<groupId>javax.xml.bind</groupId>
>>> +<artifactId>jaxb-api</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>> +<groupId>javax.xml.stream</groupId>
>>> +<artifactId>stax-api</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>>         <groupId>org.apache.felix</groupId>
>>>         <artifactId>org.apache.felix.bundlerepository</artifactId>
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>> +<groupId>org.apache.geronimo.bundles</groupId>
>>> +<artifactId>jaxb-impl</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>>         <groupId>org.apache.geronimo.framework</groupId>
>>>         <artifactId>geronimo-cli</artifactId>
>>>         <type>jar</type>
>>> @@ -98,10 +123,25 @@
>>>     </dependency>
>>>     <dependency>
>>>         <groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-activation_1.1_spec</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>>         <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-jaxb_2.2_spec</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-stax-api_1.0_spec</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>>         <groupId>org.apache.servicemix.bundles</groupId>
>>>         <artifactId>org.apache.servicemix.bundles.ant</artifactId>
>>>         <type>jar</type>
>>> @@ -123,11 +163,6 @@
>>>     </dependency>
>>>     <dependency>
>>>         <groupId>org.apache.servicemix.bundles</groupId>
>>> -<artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
>>> -<type>jar</type>
>>> -</dependency>
>>> -<dependency>
>>> -<groupId>org.apache.servicemix.bundles</groupId>
>>>         <artifactId>org.apache.servicemix.bundles.jline</artifactId>
>>>         <type>jar</type>
>>>     </dependency>
>>> @@ -157,21 +192,6 @@
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>> -<groupId>org.apache.servicemix.specs</groupId>
>>> -<artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
>>> -<type>jar</type>
>>> -</dependency>
>>> -<dependency>
>>> -<groupId>org.apache.servicemix.specs</groupId>
>>> -<artifactId>org.apache.servicemix.specs.jaxb-api-2.1</artifactId>
>>> -<type>jar</type>
>>> -</dependency>
>>> -<dependency>
>>> -<groupId>org.apache.servicemix.specs</groupId>
>>> -<artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
>>> -<type>jar</type>
>>> -</dependency>
>>> -<dependency>
>>>         <groupId>org.apache.xbean</groupId>
>>>         <artifactId>xbean-finder</artifactId>
>>>         <type>jar</type>
>>>
>>> Modified:
>>> geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml
>>> URL:
>>> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml?rev=926551&r1=926550&r2=926551&view=diff
>>>
>>> ==============================================================================
>>> ---
>>> geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml
>>> (original)
>>> +++
>>> geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml Tue
>>> Mar 23 13:04:43 2010
>>> @@ -87,18 +87,18 @@
>>>
>>>         <!-- used by plugin installer -->
>>>         <dependency>
>>> -<groupId>org.apache.servicemix.specs</groupId>
>>> -<artifactId>org.apache.servicemix.specs.jaxb-api-2.1</artifactId>
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-jaxb_2.2_spec</artifactId>
>>>         </dependency>
>>>
>>>         <dependency>
>>> -<groupId>org.apache.servicemix.bundles</groupId>
>>> -<artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
>>> +<groupId>org.apache.geronimo.bundles</groupId>
>>> +<artifactId>jaxb-impl</artifactId>
>>>         </dependency>
>>>
>>>         <dependency>
>>> -<groupId>org.apache.servicemix.specs</groupId>
>>> -<artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-stax-api_1.0_spec</artifactId>
>>>         </dependency>
>>>
>>>         <dependency>
>>> @@ -107,8 +107,8 @@
>>>         </dependency>
>>>
>>>         <dependency>
>>> -<groupId>org.apache.servicemix.specs</groupId>
>>> -<artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-activation_1.1_spec</artifactId>
>>>         </dependency>
>>>     </dependencies>
>>>
>>>
>>> Modified:
>>> geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml
>>> URL:
>>> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml?rev=926551&r1=926550&r2=926551&view=diff
>>>
>>> ==============================================================================
>>> ---
>>> geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml
>>> (original)
>>> +++
>>> geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml
>>> Tue Mar 23 13:04:43 2010
>>> @@ -12,16 +12,41 @@
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>> +<groupId>com.sun.xml.bind</groupId>
>>> +<artifactId>jaxb-impl</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>>         <groupId>commons-cli</groupId>
>>>         <artifactId>commons-cli</artifactId>
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>> +<groupId>javax.activation</groupId>
>>> +<artifactId>activation</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>> +<groupId>javax.xml.bind</groupId>
>>> +<artifactId>jaxb-api</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>> +<groupId>javax.xml.stream</groupId>
>>> +<artifactId>stax-api</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>>         <groupId>org.apache.felix</groupId>
>>>         <artifactId>org.apache.felix.bundlerepository</artifactId>
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>> +<groupId>org.apache.geronimo.bundles</groupId>
>>> +<artifactId>jaxb-impl</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>>         <groupId>org.apache.geronimo.framework</groupId>
>>>         <artifactId>geronimo-cli</artifactId>
>>>         <type>jar</type>
>>> @@ -73,10 +98,25 @@
>>>     </dependency>
>>>     <dependency>
>>>         <groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-activation_1.1_spec</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>>         <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-jaxb_2.2_spec</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-stax-api_1.0_spec</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>>         <groupId>org.apache.servicemix.bundles</groupId>
>>>         <artifactId>org.apache.servicemix.bundles.ant</artifactId>
>>>         <type>jar</type>
>>> @@ -98,11 +138,6 @@
>>>     </dependency>
>>>     <dependency>
>>>         <groupId>org.apache.servicemix.bundles</groupId>
>>> -<artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
>>> -<type>jar</type>
>>> -</dependency>
>>> -<dependency>
>>> -<groupId>org.apache.servicemix.bundles</groupId>
>>>         <artifactId>org.apache.servicemix.bundles.woodstox</artifactId>
>>>         <type>jar</type>
>>>     </dependency>
>>> @@ -117,21 +152,6 @@
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>> -<groupId>org.apache.servicemix.specs</groupId>
>>> -<artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
>>> -<type>jar</type>
>>> -</dependency>
>>> -<dependency>
>>> -<groupId>org.apache.servicemix.specs</groupId>
>>> -<artifactId>org.apache.servicemix.specs.jaxb-api-2.1</artifactId>
>>> -<type>jar</type>
>>> -</dependency>
>>> -<dependency>
>>> -<groupId>org.apache.servicemix.specs</groupId>
>>> -<artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
>>> -<type>jar</type>
>>> -</dependency>
>>> -<dependency>
>>>         <groupId>org.apache.xbean</groupId>
>>>         <artifactId>xbean-finder</artifactId>
>>>         <type>jar</type>
>>>
>>> Modified:
>>> geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties
>>> URL:
>>> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties?rev=926551&r1=926550&r2=926551&view=diff
>>>
>>> ==============================================================================
>>> ---
>>> geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties
>>> (original)
>>> +++
>>> geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties
>>> Tue Mar 23 13:04:43 2010
>>> @@ -150,7 +150,6 @@ jre-1.5=, \
>>>  javax.transaction; javax.transaction.xa; partial=true;
>>> mandatory:=partial, \
>>>  javax.xml, \
>>>  javax.xml.datatype, \
>>> - javax.xml.namespace, \
>>>  javax.xml.parsers, \
>>>  javax.xml.transform, \
>>>  javax.xml.transform.dom, \
>>> @@ -288,12 +287,12 @@ jre-1.6=, \
>>>  javax.util.concurrent;version=1.0, \
>>>  javax.util.concurrent.locks;version=1.0, \
>>>  javax.xml, \
>>> - javax.xml.bind;version=2.1, \
>>> - javax.xml.bind.annotation;version=2.1, \
>>> - javax.xml.bind.annotation.adapters;version=2.1, \
>>> - javax.xml.bind.attachment;version=2.1, \
>>> - javax.xml.bind.helpers;version=2.1, \
>>> - javax.xml.bind.util;version=2.1, \
>>> + javax.xml.bind;version=2.2, \
>>> + javax.xml.bind.annotation;version=2.2, \
>>> + javax.xml.bind.annotation.adapters;version=2.2, \
>>> + javax.xml.bind.attachment;version=2.2, \
>>> + javax.xml.bind.helpers;version=2.2, \
>>> + javax.xml.bind.util;version=2.2, \
>>>  javax.xml.crypto, \
>>>  javax.xml.crypto.dom, \
>>>  javax.xml.crypto.dsig, \
>>> @@ -304,9 +303,6 @@ jre-1.6=, \
>>>  javax.xml.namespace, \
>>>  javax.xml.parsers, \
>>>  javax.xml.soap;version=1.3, \
>>> - javax.xml.stream;version=1.0, \
>>> - javax.xml.stream.events;version=1.0, \
>>> - javax.xml.stream.util;version=1.0, \
>>>  javax.xml.transform, \
>>>  javax.xml.transform.dom, \
>>>  javax.xml.transform.sax, \
>>>
>>> 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=926551&r1=926550&r2=926551&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
>>> Tue Mar 23 13:04:43 2010
>>> @@ -65,16 +65,17 @@ org/apache/mina/mina-core/${mina.version
>>>
>>>  org/apache/sshd/sshd-core/${sshd.version}/sshd-core-${sshd.version}.jar=30
>>>
>>>  org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.ssh/${felix.karaf.version}/org.apache.felix.karaf.shell.ssh-${felix.karaf.version}.jar=30
>>>
>>>
>>> +org/apache/geronimo/specs/geronimo-osgi-registry/1.0.0-SNAPSHOT/geronimo-osgi-registry-1.0.0-SNAPSHOT.jar=35
>>>
>>>
>>>  org/apache/servicemix/bundles/org.apache.servicemix.bundles.xstream/1.3_3/org.apache.servicemix.bundles.xstream-1.3_3.jar=40
>>>
>>>  org/apache/servicemix/bundles/org.apache.servicemix.bundles.xpp3/1.1.4c_3/org.apache.servicemix.bundles.xpp3-1.1.4c_3.jar=40
>>>
>>>  org/apache/servicemix/bundles/org.apache.servicemix.bundles.cglib/2.1_3_4/org.apache.servicemix.bundles.cglib-2.1_3_4.jar=40
>>>
>>>  org/apache/servicemix/bundles/org.apache.servicemix.bundles.commons-jexl/1.1_1/org.apache.servicemix.bundles.commons-jexl-1.1_1.jar=40
>>>
>>>  org/apache/servicemix/bundles/org.apache.servicemix.bundles.commons-lang/2.4_3/org.apache.servicemix.bundles.commons-lang-2.4_3.jar=40
>>>
>>> -org/apache/servicemix/bundles/org.apache.servicemix.bundles.jaxb-impl/2.1.6_1/org.apache.servicemix.bundles.jaxb-impl-2.1.6_1.jar=40
>>>
>>> -org/apache/servicemix/specs/org.apache.servicemix.specs.activation-api-1.1/1.4.0/org.apache.servicemix.specs.activation-api-1.1-1.4.0.jar=40
>>>
>>> -org/apache/servicemix/specs/org.apache.servicemix.specs.jaxb-api-2.1/1.2.0/org.apache.servicemix.specs.jaxb-api-2.1-1.2.0.jar=40
>>>
>>> -org/apache/servicemix/specs/org.apache.servicemix.specs.stax-api-1.0/1.3.0/org.apache.servicemix.specs.stax-api-1.0-1.3.0.jar=40
>>>
>>> +org/apache/geronimo/bundles/jaxb-impl/2.2-SNAPSHOT/jaxb-impl-2.2-SNAPSHOT.jar=40
>>>
>>> +org/apache/geronimo/specs/geronimo-activation_1.1_spec/1.0.3-SNAPSHOT/geronimo-activation_1.1_spec-1.0.3-SNAPSHOT.jar=40
>>>
>>> +org/apache/geronimo/specs/geronimo-jaxb_2.2_spec/1.0-SNAPSHOT/geronimo-jaxb_2.2_spec-1.0-SNAPSHOT.jar=40
>>>
>>> +org/apache/geronimo/specs/geronimo-stax-api_1.0_spec/1.0.2-SNAPSHOT/geronimo-stax-api_1.0_spec-1.0.2-SNAPSHOT.jar=40
>>>
>>>  org/apache/servicemix/bundles/org.apache.servicemix.bundles.woodstox/3.2.8_1/org.apache.servicemix.bundles.woodstox-3.2.8_1.jar=40
>>>  asm/asm-all/3.2/asm-all-3.2.jar=40
>>>  commons-cli/commons-cli/1.2/commons-cli-1.2.jar=40
>>>
>>> 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=926551&r1=926550&r2=926551&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
>>> Tue Mar 23 13:04:43 2010
>>> @@ -12,11 +12,31 @@
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>> +<groupId>com.sun.xml.bind</groupId>
>>> +<artifactId>jaxb-impl</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>>         <groupId>commons-cli</groupId>
>>>         <artifactId>commons-cli</artifactId>
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>> +<groupId>javax.activation</groupId>
>>> +<artifactId>activation</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>> +<groupId>javax.xml.bind</groupId>
>>> +<artifactId>jaxb-api</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>> +<groupId>javax.xml.stream</groupId>
>>> +<artifactId>stax-api</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>>         <groupId>org.apache.aries</groupId>
>>>         <artifactId>org.apache.aries.util</artifactId>
>>>         <type>jar</type>
>>> @@ -192,6 +212,11 @@
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>> +<groupId>org.apache.geronimo.bundles</groupId>
>>> +<artifactId>jaxb-impl</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>>         <groupId>org.apache.geronimo.framework</groupId>
>>>         <artifactId>geronimo-cli</artifactId>
>>>         <type>jar</type>
>>> @@ -278,15 +303,30 @@
>>>     </dependency>
>>>     <dependency>
>>>         <groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-activation_1.1_spec</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>>         <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>>         <groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-jaxb_2.2_spec</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>>         <artifactId>geronimo-servlet_3.0_spec</artifactId>
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-stax-api_1.0_spec</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>>         <groupId>org.apache.mina</groupId>
>>>         <artifactId>mina-core</artifactId>
>>>         <type>jar</type>
>>> @@ -313,11 +353,6 @@
>>>     </dependency>
>>>     <dependency>
>>>         <groupId>org.apache.servicemix.bundles</groupId>
>>> -<artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
>>> -<type>jar</type>
>>> -</dependency>
>>> -<dependency>
>>> -<groupId>org.apache.servicemix.bundles</groupId>
>>>         <artifactId>org.apache.servicemix.bundles.jline</artifactId>
>>>         <type>jar</type>
>>>     </dependency>
>>> @@ -347,21 +382,6 @@
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>> -<groupId>org.apache.servicemix.specs</groupId>
>>> -<artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
>>> -<type>jar</type>
>>> -</dependency>
>>> -<dependency>
>>> -<groupId>org.apache.servicemix.specs</groupId>
>>> -<artifactId>org.apache.servicemix.specs.jaxb-api-2.1</artifactId>
>>> -<type>jar</type>
>>> -</dependency>
>>> -<dependency>
>>> -<groupId>org.apache.servicemix.specs</groupId>
>>> -<artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
>>> -<type>jar</type>
>>> -</dependency>
>>> -<dependency>
>>>         <groupId>org.apache.sshd</groupId>
>>>         <artifactId>sshd-core</artifactId>
>>>         <type>jar</type>
>>>
>>> Modified: geronimo/server/trunk/framework/configs/online-deployer/pom.xml
>>> URL:
>>> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/online-deployer/pom.xml?rev=926551&r1=926550&r2=926551&view=diff
>>>
>>> ==============================================================================
>>> --- geronimo/server/trunk/framework/configs/online-deployer/pom.xml
>>> (original)
>>> +++ geronimo/server/trunk/framework/configs/online-deployer/pom.xml Tue
>>> Mar 23 13:04:43 2010
>>> @@ -88,18 +88,18 @@
>>>         </dependency>
>>>
>>>         <dependency>
>>> -<groupId>org.apache.servicemix.specs</groupId>
>>> -<artifactId>org.apache.servicemix.specs.jaxb-api-2.1</artifactId>
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-jaxb_2.2_spec</artifactId>
>>>         </dependency>
>>>
>>>         <dependency>
>>> -<groupId>org.apache.servicemix.bundles</groupId>
>>> -<artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
>>> +<groupId>org.apache.geronimo.bundles</groupId>
>>> +<artifactId>jaxb-impl</artifactId>
>>>         </dependency>
>>>
>>>         <dependency>
>>> -<groupId>org.apache.servicemix.specs</groupId>
>>> -<artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-stax-api_1.0_spec</artifactId>
>>>         </dependency>
>>>
>>>         <dependency>
>>> @@ -108,8 +108,8 @@
>>>         </dependency>
>>>
>>>         <dependency>
>>> -<groupId>org.apache.servicemix.specs</groupId>
>>> -<artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-activation_1.1_spec</artifactId>
>>>         </dependency>
>>>     </dependencies>
>>>
>>>
>>> Modified:
>>> geronimo/server/trunk/framework/configs/online-deployer/src/main/history/dependencies.xml
>>> URL:
>>> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/online-deployer/src/main/history/dependencies.xml?rev=926551&r1=926550&r2=926551&view=diff
>>>
>>> ==============================================================================
>>> ---
>>> geronimo/server/trunk/framework/configs/online-deployer/src/main/history/dependencies.xml
>>> (original)
>>> +++
>>> geronimo/server/trunk/framework/configs/online-deployer/src/main/history/dependencies.xml
>>> Tue Mar 23 13:04:43 2010
>>> @@ -12,16 +12,41 @@
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>> +<groupId>com.sun.xml.bind</groupId>
>>> +<artifactId>jaxb-impl</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>>         <groupId>commons-cli</groupId>
>>>         <artifactId>commons-cli</artifactId>
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>> +<groupId>javax.activation</groupId>
>>> +<artifactId>activation</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>> +<groupId>javax.xml.bind</groupId>
>>> +<artifactId>jaxb-api</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>> +<groupId>javax.xml.stream</groupId>
>>> +<artifactId>stax-api</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>>         <groupId>org.apache.felix</groupId>
>>>         <artifactId>org.apache.felix.bundlerepository</artifactId>
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>> +<groupId>org.apache.geronimo.bundles</groupId>
>>> +<artifactId>jaxb-impl</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>>         <groupId>org.apache.geronimo.framework</groupId>
>>>         <artifactId>geronimo-cli</artifactId>
>>>         <type>jar</type>
>>> @@ -57,6 +82,21 @@
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-activation_1.1_spec</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-jaxb_2.2_spec</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-stax-api_1.0_spec</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>>         <groupId>org.apache.servicemix.bundles</groupId>
>>>         <artifactId>org.apache.servicemix.bundles.ant</artifactId>
>>>         <type>jar</type>
>>> @@ -78,11 +118,6 @@
>>>     </dependency>
>>>     <dependency>
>>>         <groupId>org.apache.servicemix.bundles</groupId>
>>> -<artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
>>> -<type>jar</type>
>>> -</dependency>
>>> -<dependency>
>>> -<groupId>org.apache.servicemix.bundles</groupId>
>>>         <artifactId>org.apache.servicemix.bundles.jline</artifactId>
>>>         <type>jar</type>
>>>     </dependency>
>>> @@ -102,21 +137,6 @@
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>> -<groupId>org.apache.servicemix.specs</groupId>
>>> -<artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
>>> -<type>jar</type>
>>> -</dependency>
>>> -<dependency>
>>> -<groupId>org.apache.servicemix.specs</groupId>
>>> -<artifactId>org.apache.servicemix.specs.jaxb-api-2.1</artifactId>
>>> -<type>jar</type>
>>> -</dependency>
>>> -<dependency>
>>> -<groupId>org.apache.servicemix.specs</groupId>
>>> -<artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
>>> -<type>jar</type>
>>> -</dependency>
>>> -<dependency>
>>>         <groupId>org.apache.xbean</groupId>
>>>         <artifactId>xbean-finder</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=926551&r1=926550&r2=926551&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
>>> Tue Mar 23 13:04:43 2010
>>> @@ -12,16 +12,41 @@
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>> +<groupId>com.sun.xml.bind</groupId>
>>> +<artifactId>jaxb-impl</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>>         <groupId>commons-cli</groupId>
>>>         <artifactId>commons-cli</artifactId>
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>> +<groupId>javax.activation</groupId>
>>> +<artifactId>activation</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>> +<groupId>javax.xml.bind</groupId>
>>> +<artifactId>jaxb-api</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>> +<groupId>javax.xml.stream</groupId>
>>> +<artifactId>stax-api</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>>         <groupId>org.apache.felix</groupId>
>>>         <artifactId>org.apache.felix.bundlerepository</artifactId>
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>> +<groupId>org.apache.geronimo.bundles</groupId>
>>> +<artifactId>jaxb-impl</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>>         <groupId>org.apache.geronimo.framework</groupId>
>>>         <artifactId>geronimo-cli</artifactId>
>>>         <type>jar</type>
>>> @@ -98,10 +123,25 @@
>>>     </dependency>
>>>     <dependency>
>>>         <groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-activation_1.1_spec</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>>         <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-jaxb_2.2_spec</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-stax-api_1.0_spec</artifactId>
>>> +<type>jar</type>
>>> +</dependency>
>>> +<dependency>
>>>         <groupId>org.apache.servicemix.bundles</groupId>
>>>         <artifactId>org.apache.servicemix.bundles.ant</artifactId>
>>>         <type>jar</type>
>>> @@ -123,11 +163,6 @@
>>>     </dependency>
>>>     <dependency>
>>>         <groupId>org.apache.servicemix.bundles</groupId>
>>> -<artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
>>> -<type>jar</type>
>>> -</dependency>
>>> -<dependency>
>>> -<groupId>org.apache.servicemix.bundles</groupId>
>>>         <artifactId>org.apache.servicemix.bundles.jline</artifactId>
>>>         <type>jar</type>
>>>     </dependency>
>>> @@ -157,21 +192,6 @@
>>>         <type>jar</type>
>>>     </dependency>
>>>     <dependency>
>>> -<groupId>org.apache.servicemix.specs</groupId>
>>> -<artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
>>> -<type>jar</type>
>>> -</dependency>
>>> -<dependency>
>>> -<groupId>org.apache.servicemix.specs</groupId>
>>> -<artifactId>org.apache.servicemix.specs.jaxb-api-2.1</artifactId>
>>> -<type>jar</type>
>>> -</dependency>
>>> -<dependency>
>>> -<groupId>org.apache.servicemix.specs</groupId>
>>> -<artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
>>> -<type>jar</type>
>>> -</dependency>
>>> -<dependency>
>>>         <groupId>org.apache.xbean</groupId>
>>>         <artifactId>xbean-finder</artifactId>
>>>         <type>jar</type>
>>>
>>> Modified:
>>> geronimo/server/trunk/framework/modules/geronimo-deployment/pom.xml
>>> URL:
>>> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deployment/pom.xml?rev=926551&r1=926550&r2=926551&view=diff
>>>
>>> ==============================================================================
>>> --- geronimo/server/trunk/framework/modules/geronimo-deployment/pom.xml
>>> (original)
>>> +++ geronimo/server/trunk/framework/modules/geronimo-deployment/pom.xml
>>> Tue Mar 23 13:04:43 2010
>>> @@ -31,14 +31,14 @@
>>>     <artifactId>geronimo-deployment</artifactId>
>>>     <packaging>bundle</packaging>
>>>     <name>Geronimo Framework, Modules :: Deployment</name>
>>> -
>>> +
>>>     <dependencies>
>>>         <dependency>
>>>             <groupId>org.apache.geronimo.framework</groupId>
>>>             <artifactId>geronimo-system</artifactId>
>>>             <version>${version}</version>
>>>         </dependency>
>>> -
>>> +
>>>         <dependency>
>>>             <groupId>org.apache.servicemix.bundles</groupId>
>>>
>>> <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
>>> @@ -49,8 +49,13 @@
>>>         <!--</dependency>-->
>>>
>>>         <dependency>
>>> -<groupId>org.apache.servicemix.specs</groupId>
>>> -<artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-stax-api_1.0_spec</artifactId>
>>> +</dependency>
>>> +
>>> +<dependency>
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-jaxb_2.2_spec</artifactId>
>>>         </dependency>
>>>
>>>         <dependency>
>>> @@ -73,6 +78,6 @@
>>>         </dependency>
>>>
>>>     </dependencies>
>>> -
>>> +
>>>  </project>
>>>
>>>
>>> Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml
>>> URL:
>>> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml?rev=926551&r1=926550&r2=926551&view=diff
>>>
>>> ==============================================================================
>>> --- geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml
>>> (original)
>>> +++ geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml Tue
>>> Mar 23 13:04:43 2010
>>> @@ -6,9 +6,9 @@
>>>     The ASF licenses this file to You under the Apache License, Version
>>> 2.0
>>>     (the "License"); you may not use this file except in compliance with
>>>     the License.  You may obtain a copy of the License at
>>> -
>>> +
>>>        http://www.apache.org/licenses/LICENSE-2.0
>>> -
>>> +
>>>     Unless required by applicable law or agreed to in writing, software
>>>     distributed under the License is distributed on an "AS IS" BASIS,
>>>     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
>>> implied.
>>> @@ -31,7 +31,7 @@
>>>     <artifactId>geronimo-kernel</artifactId>
>>>     <packaging>bundle</packaging>
>>>     <name>Geronimo Framework, Modules :: Kernel</name>
>>> -
>>> +
>>>     <dependencies>
>>>         <dependency>
>>>             <groupId>org.apache.geronimo.framework</groupId>
>>> @@ -75,8 +75,8 @@
>>>         </dependency>
>>>
>>>         <dependency>
>>> -<groupId>org.apache.servicemix.specs</groupId>
>>> -<artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-stax-api_1.0_spec</artifactId>
>>>         </dependency>
>>>
>>>         <dependency>
>>> @@ -97,7 +97,7 @@
>>>             <artifactId>junit</artifactId>
>>>             <scope>test</scope>
>>>         </dependency>
>>> -
>>> +
>>>     </dependencies>
>>>
>>>     <build>
>>> @@ -116,12 +116,12 @@
>>>                             <tasks>
>>>                                 <delete
>>> dir="${project.build.directory}/tmp" />
>>>                                 <mkdir
>>> dir="${project.build.directory}/tmp" />
>>> -
>>> +
>>>                                 <mkdir
>>> dir="${project.build.directory}/m1" />
>>>                                 <copy
>>> todir="${project.build.directory}/m1">
>>>                                     <fileset
>>> dir="${basedir}/src/test/repo/m1" />
>>>                                 </copy>
>>> -
>>> +
>>>                                 <mkdir
>>> dir="${project.build.directory}/m2" />
>>>                                 <copy
>>> todir="${project.build.directory}/m2">
>>>                                     <fileset
>>> dir="${basedir}/src/test/repo/m2" />
>>> @@ -131,7 +131,7 @@
>>>                     </execution>
>>>                 </executions>
>>>             </plugin>
>>> -
>>> +
>>>             <plugin>
>>>                 <groupId>org.apache.maven.plugins</groupId>
>>>                 <artifactId>maven-jar-plugin</artifactId>
>>> @@ -152,6 +152,6 @@
>>>             </plugin>
>>>         </plugins>
>>>     </build>
>>> -
>>> +
>>>  </project>
>>>
>>>
>>> Modified: geronimo/server/trunk/framework/modules/geronimo-plugin/pom.xml
>>> URL:
>>> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-plugin/pom.xml?rev=926551&r1=926550&r2=926551&view=diff
>>>
>>> ==============================================================================
>>> --- geronimo/server/trunk/framework/modules/geronimo-plugin/pom.xml
>>> (original)
>>> +++ geronimo/server/trunk/framework/modules/geronimo-plugin/pom.xml Tue
>>> Mar 23 13:04:43 2010
>>> @@ -49,13 +49,13 @@
>>>         </dependency>
>>>
>>>         <dependency>
>>> -<groupId>org.apache.servicemix.bundles</groupId>
>>> -<artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
>>> +<groupId>org.apache.geronimo.bundles</groupId>
>>> +<artifactId>jaxb-impl</artifactId>
>>>         </dependency>
>>>
>>>         <dependency>
>>> -<groupId>org.apache.servicemix.specs</groupId>
>>> -<artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-activation_1.1_spec</artifactId>
>>>         </dependency>
>>>
>>>         <dependency>
>>>
>>> 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=926551&r1=926550&r2=926551&view=diff
>>>
>>> ==============================================================================
>>> --- geronimo/server/trunk/framework/modules/geronimo-security/pom.xml
>>> (original)
>>> +++ geronimo/server/trunk/framework/modules/geronimo-security/pom.xml Tue
>>> Mar 23 13:04:43 2010
>>> @@ -6,9 +6,9 @@
>>>     The ASF licenses this file to You under the Apache License, Version
>>> 2.0
>>>     (the "License"); you may not use this file except in compliance with
>>>     the License.  You may obtain a copy of the License at
>>> -
>>> +
>>>        http://www.apache.org/licenses/LICENSE-2.0
>>> -
>>> +
>>>     Unless required by applicable law or agreed to in writing, software
>>>     distributed under the License is distributed on an "AS IS" BASIS,
>>>     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
>>> implied.
>>> @@ -31,7 +31,7 @@
>>>     <artifactId>geronimo-security</artifactId>
>>>     <packaging>bundle</packaging>
>>>     <name>Geronimo Framework, Modules :: Security</name>
>>> -
>>> +
>>>     <dependencies>
>>>
>>>         <dependency>
>>> @@ -59,10 +59,10 @@
>>>             <groupId>org.apache.geronimo.specs</groupId>
>>>             <artifactId>geronimo-jaspic_1.0_spec</artifactId>
>>>         </dependency>
>>> -
>>> +
>>>         <dependency>
>>> -<groupId>org.apache.servicemix.specs</groupId>
>>> -<artifactId>org.apache.servicemix.specs.saaj-api-1.3</artifactId>
>>> +<groupId>org.apache.geronimo.specs</groupId>
>>> +<artifactId>geronimo-saaj_1.3_spec</artifactId>
>>>         </dependency>
>>>
>>>         <dependency>
>>> @@ -99,7 +99,7 @@
>>>             <scope>test</scope>
>>>         </dependency>
>>>     </dependencies>
>>> -
>>> +
>>>     <build>
>>>         <plugins>
>>>             <plugin>
>>> @@ -116,6 +116,6 @@
>>>             </plugin>
>>>         </plugins>
>>>     </build>
>>> -
>>> +
>>>  </project>
>>>
>>>
>>>
>>>
>>>
>>>
>>
>>
>
>


-- 
Cheers,
Guillaume Nodet
------------------------
Blog: http://gnodet.blogspot.com/
------------------------
Open Source SOA
http://fusesource.com

Mime
View raw message