geronimo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jason Dillon <ja...@planet57.com>
Subject Re: svn commit: r487651 - /geronimo/server/trunk/pom.xml
Date Fri, 15 Dec 2006 20:57:06 GMT
Yikes... what happened on this change?

The diff shows a lot more changed than just what was indicated in the  
comment...

--jason


On Dec 15, 2006, at 12:34 PM, prasad@apache.org wrote:

> Author: prasad
> Date: Fri Dec 15 12:34:16 2006
> New Revision: 487651
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=487651
> Log:
> <addMavenDescriptor>false</addMavenDescriptor> for maven-jar-plugin  
> too.
>
> Modified:
>     geronimo/server/trunk/pom.xml
>
> Modified: geronimo/server/trunk/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml? 
> view=diff&rev=487651&r1=487650&r2=487651
> ====================================================================== 
> ========
> --- geronimo/server/trunk/pom.xml (original)
> +++ geronimo/server/trunk/pom.xml Fri Dec 15 12:34:16 2006
> @@ -702,7 +702,7 @@
>                  <version>${openejbVersion}</version>
>              </dependency>
>
> -             <dependency>
> +            <dependency>
>                  <groupId>org.apache.openejb</groupId>
>                  <artifactId>openejb-builder</artifactId>
>                  <version>${openejbVersion}</version>
> @@ -912,332 +912,332 @@
>
>              <!--jee5 stuff -->
>              <dependency>
> -                 <groupId>org.apache.geronimo.specs</groupId>
> -                 <artifactId>geronimo-jpa_3.0_spec</artifactId>
> -                 <version>1.0-SNAPSHOT</version>
> -             </dependency>
> -
> -             <dependency>
> -                 <groupId>org.apache.geronimo.specs</groupId>
> -                 <artifactId>geronimo-jta_1.1_spec</artifactId>
> -                 <version>1.0-SNAPSHOT</version>
> -             </dependency>
> -
> -             <dependency>
> -                 <groupId>org.apache.geronimo.specs</groupId>
> -                 <artifactId>geronimo-servlet_2.5_spec</artifactId>
> -                 <!--  <version>1.0.1</version>   -->
> -                 <version>1.1-SNAPSHOT</version>
> -             </dependency>
> -             <dependency>
> -                 <groupId>org.apache.geronimo.specs</groupId>
> -                 <artifactId>geronimo-annotation_1.0_spec</ 
> artifactId>
> -                 <version>1.0-SNAPSHOT</version>
> -             </dependency>
> -             <dependency>
> -                 <groupId>org.apache.geronimo.specs</groupId>
> -                 <artifactId>geronimo-ws-metadata_2.0_spec</ 
> artifactId>
> -                 <!--  <version>1.0</version>   -->
> -                 <version>1.1-SNAPSHOT</version>
> -             </dependency>
> -
> -             <!-- javamail 1.4 config -->
> -             <!--<dependency>-->
> -                 <!--<groupId>javax.mail</groupId>-->
> -                 <!--<artifactId>mail</artifactId>-->
> -                 <!--<version>1.4</version>-->
> -             <!--</dependency>-->
> -             <!--<dependency>-->
> -                 <!--<groupId>javax.activation</groupId>-->
> -                 <!--<artifactId>activation</artifactId>-->
> -                 <!--<version>1.1</version>-->
> -             <!--</dependency>-->
> -             <dependency>
> -                 <groupId>org.apache.geronimo.schema</groupId>
> -                 <artifactId>geronimo-schema-jee_5</artifactId>
> -                 <version>1.0-SNAPSHOT</version>
> -             </dependency>
> -
> -             <dependency>
> -                 <groupId>org.mortbay.jetty</groupId>
> -                 <artifactId>jetty</artifactId>
> -                 <version>6.1-SNAPSHOT</version>
> -             </dependency>
> -
> -             <dependency>
> -                 <groupId>org.mortbay.jetty</groupId>
> -                 <artifactId>jetty-util</artifactId>
> -                 <version>6.1-SNAPSHOT</version>
> -             </dependency>
> -
> -             <dependency>
> -                 <groupId>org.apache.cxf</groupId>
> -                 <artifactId>cxf-api</artifactId>
> -                 <version>2.0-incubator-RC-SNAPSHOT</version>
> -                 <exclusions>
> -                     <exclusion>
> -                         <groupId>javax.annotation</groupId>
> -                         <artifactId>jsr250-api</artifactId>
> -                     </exclusion>
> -                     <exclusion>
> -                         <groupId>javax.jws</groupId>
> -                         <artifactId>jsr181-api</artifactId>
> -                     </exclusion>
> -                 </exclusions>
> -             </dependency>
> -             <dependency>
> -                 <groupId>org.apache.cxf</groupId>
> -                 <artifactId>cxf-metacode</artifactId>
> -                 <version>2.0-incubator-RC-SNAPSHOT</version>
> -                 <exclusions>
> -                     <exclusion>
> -                         <groupId>javax.annotation</groupId>
> -                         <artifactId>jsr250-api</artifactId>
> -                     </exclusion>
> -                     <exclusion>
> -                         <groupId>javax.jws</groupId>
> -                         <artifactId>jsr181-api</artifactId>
> -                     </exclusion>
> -                 </exclusions>
> -             </dependency>
> -             <dependency>
> -                 <groupId>org.apache.cxf</groupId>
> -                 <artifactId>cxf-common-utilities</artifactId>
> -                 <version>2.0-incubator-RC-SNAPSHOT</version>
> -                 <exclusions>
> -                     <exclusion>
> -                         <groupId>javax.annotation</groupId>
> -                         <artifactId>jsr250-api</artifactId>
> -                     </exclusion>
> -                     <exclusion>
> -                         <groupId>javax.jws</groupId>
> -                         <artifactId>jsr181-api</artifactId>
> -                     </exclusion>
> -                 </exclusions>
> -             </dependency>
> -             <dependency>
> -                 <groupId>org.apache.cxf</groupId>
> -                 <artifactId>cxf-rt-core</artifactId>
> -                 <version>2.0-incubator-RC-SNAPSHOT</version>
> -                 <exclusions>
> -                     <exclusion>
> -                         <groupId>javax.annotation</groupId>
> -                         <artifactId>jsr250-api</artifactId>
> -                     </exclusion>
> -                     <exclusion>
> -                         <groupId>javax.jws</groupId>
> -                         <artifactId>jsr181-api</artifactId>
> -                     </exclusion>
> -                 </exclusions>
> -             </dependency>
> -             <dependency>
> -                 <groupId>org.apache.cxf</groupId>
> -                 <artifactId>cxf-rt-bindings-xml</artifactId>
> -                 <version>2.0-incubator-RC-SNAPSHOT</version>
> -                 <exclusions>
> -                     <exclusion>
> -                         <groupId>javax.annotation</groupId>
> -                         <artifactId>jsr250-api</artifactId>
> -                     </exclusion>
> -                     <exclusion>
> -                         <groupId>javax.jws</groupId>
> -                         <artifactId>jsr181-api</artifactId>
> -                     </exclusion>
> -                 </exclusions>
> -             </dependency>
> -             <dependency>
> -                 <groupId>org.apache.cxf</groupId>
> -                 <artifactId>cxf-rt-bindings-soap</artifactId>
> -                 <version>2.0-incubator-RC-SNAPSHOT</version>
> -                 <exclusions>
> -                     <exclusion>
> -                         <groupId>javax.annotation</groupId>
> -                         <artifactId>jsr250-api</artifactId>
> -                     </exclusion>
> -                     <exclusion>
> -                         <groupId>javax.jws</groupId>
> -                         <artifactId>jsr181-api</artifactId>
> -                     </exclusion>
> -                 </exclusions>
> -             </dependency>
> -             <dependency>
> -                 <groupId>org.apache.cxf</groupId>
> -                 <artifactId>cxf-rt-databinding-jaxb</artifactId>
> -                 <version>2.0-incubator-RC-SNAPSHOT</version>
> -                 <exclusions>
> -                     <exclusion>
> -                         <groupId>javax.annotation</groupId>
> -                         <artifactId>jsr250-api</artifactId>
> -                     </exclusion>
> -                     <exclusion>
> -                         <groupId>javax.jws</groupId>
> -                         <artifactId>jsr181-api</artifactId>
> -                     </exclusion>
> -                 </exclusions>
> -             </dependency>
> -             <dependency>
> -                 <groupId>org.apache.cxf</groupId>
> -                 <artifactId>cxf-rt-frontend-jaxws</artifactId>
> -                 <version>2.0-incubator-RC-SNAPSHOT</version>
> -                 <exclusions>
> -                     <exclusion>
> -                         <groupId>javax.annotation</groupId>
> -                         <artifactId>jsr250-api</artifactId>
> -                     </exclusion>
> -                     <exclusion>
> -                         <groupId>javax.jws</groupId>
> -                         <artifactId>jsr181-api</artifactId>
> -                     </exclusion>
> -                 </exclusions>
> -             </dependency>
> -             <dependency>
> -                 <groupId>org.apache.cxf</groupId>
> -                 <artifactId>cxf-rt-frontend-simple</artifactId>
> -                 <version>2.0-incubator-RC-SNAPSHOT</version>
> -                 <exclusions>
> -                     <exclusion>
> -                         <groupId>javax.annotation</groupId>
> -                         <artifactId>jsr250-api</artifactId>
> -                     </exclusion>
> -                     <exclusion>
> -                         <groupId>javax.jws</groupId>
> -                         <artifactId>jsr181-api</artifactId>
> -                     </exclusion>
> -                 </exclusions>
> -             </dependency>
> -             <dependency>
> -                 <groupId>org.apache.cxf</groupId>
> -                 <artifactId>cxf-rt-transports-http</artifactId>
> -                 <version>2.0-incubator-RC-SNAPSHOT</version>
> -                 <exclusions>
> -                     <exclusion>
> -                         <groupId>javax.annotation</groupId>
> -                         <artifactId>jsr250-api</artifactId>
> -                     </exclusion>
> -                     <exclusion>
> -                         <groupId>javax.jws</groupId>
> -                         <artifactId>jsr181-api</artifactId>
> -                     </exclusion>
> -                 </exclusions>
> -             </dependency>
> -             <dependency>
> -                 <groupId>org.apache.cxf</groupId>
> -                 <artifactId>cxf-tools-common</artifactId>
> -                 <version>2.0-incubator-RC-SNAPSHOT</version>
> -                 <exclusions>
> -                     <exclusion>
> -                         <groupId>javax.annotation</groupId>
> -                         <artifactId>jsr250-api</artifactId>
> -                     </exclusion>
> -                     <exclusion>
> -                         <groupId>javax.jws</groupId>
> -                         <artifactId>jsr181-api</artifactId>
> -                     </exclusion>
> -                 </exclusions>
> -             </dependency>
> -
> -             <dependency>
> -                 <groupId>stax</groupId>
> -                 <artifactId>stax-api</artifactId>
> -                 <version>1.0.1</version>
> -             </dependency>
> -             <dependency>
> -                 <groupId>woodstox</groupId>
> -                 <artifactId>wstx-asl</artifactId>
> -                 <version>3.0.2</version>
> -             </dependency>
> -             <dependency>
> -                 <groupId>org.apache.ws.commons</groupId>
> -                 <artifactId>XmlSchema</artifactId>
> -                 <version>1.1</version>
> -             </dependency>
> -             <dependency>
> -                 <groupId>javax.xml.soap</groupId>
> -                 <artifactId>saaj-api</artifactId>
> -                 <version>1.3</version>
> -                 <exclusions>
> -                     <exclusion>
> -                         <groupId>javax.activation</groupId>
> -                         <artifactId>activation</artifactId>
> -                     </exclusion>
> -                 </exclusions>
> -             </dependency>
> -             <dependency>
> -                 <groupId>javax.xml.bind</groupId>
> -                 <artifactId>jaxb-api</artifactId>
> -                 <version>2.0</version>
> -                 <exclusions>
> -                     <exclusion>
> -                         <groupId>javax.xml.bind</groupId>
> -                         <artifactId>jsr173_api</artifactId>
> -                     </exclusion>
> -                 </exclusions>
> -             </dependency>
> -             <dependency>
> -                 <groupId>com.sun.xml.messaging.saaj</groupId>
> -                 <artifactId>saaj-impl</artifactId>
> -                 <version>1.3</version>
> -                 <exclusions>
> -                     <exclusion>
> -                         <groupId>javax.activation</groupId>
> -                         <artifactId>activation</artifactId>
> -                     </exclusion>
> -                 </exclusions>
> -             </dependency>
> -
> -             <dependency>
> -                 <groupId>com.sun.xml.bind</groupId>
> -                 <artifactId>jaxb-impl</artifactId>
> -                 <version>2.0.2</version>
> -                 <exclusions>
> -                     <exclusion>
> -                         <groupId>javax.xml.bind</groupId>
> -                         <artifactId>jsr173_api</artifactId>
> -                     </exclusion>
> -                     <exclusion>
> -                         <groupId>javax.xml.bind</groupId>
> -                         <artifactId>activation</artifactId>
> -                     </exclusion>
> -                 </exclusions>
> -             </dependency>
> -             <dependency>
> -                 <groupId>org.springframework</groupId>
> -                 <artifactId>spring-core</artifactId>
> -                 <version>2.0-rc2</version>
> -             </dependency>
> -             <dependency>
> -                 <groupId>org.springframework</groupId>
> -                 <artifactId>spring-beans</artifactId>
> -                 <version>2.0-rc2</version>
> -             </dependency>
> -             <dependency>
> -                 <groupId>org.springframework</groupId>
> -                 <artifactId>spring-context</artifactId>
> -                 <version>2.0-rc2</version>
> -             </dependency>
> -             <dependency>
> -                 <groupId>javax.xml.ws</groupId>
> -                 <artifactId>jaxws-api</artifactId>
> -                 <version>2.0</version>
> -                 <exclusions>
> -                     <exclusion>
> -                         <groupId>javax.xml.bind</groupId>
> -                         <artifactId>jsr173_api</artifactId>
> -                     </exclusion>
> -                 </exclusions>
> -             </dependency>
> -
> -             <!--JSF 1.2 JARs from Apache MyFaces -->
> -             <dependency>
> -                 <groupId>org.apache.myfaces.core</groupId>
> -                 <artifactId>myfaces-api</artifactId>
> -                 <version>1.2.0-SNAPSHOT</version>
> -             </dependency>
> -             <dependency>
> -                 <groupId>org.apache.myfaces.core</groupId>
> -                 <artifactId>myfaces-impl</artifactId>
> -                 <version>1.2.0-SNAPSHOT</version>
> -             </dependency>
> +                <groupId>org.apache.geronimo.specs</groupId>
> +                <artifactId>geronimo-jpa_3.0_spec</artifactId>
> +                <version>1.0-SNAPSHOT</version>
> +            </dependency>
> +
> +            <dependency>
> +                <groupId>org.apache.geronimo.specs</groupId>
> +                <artifactId>geronimo-jta_1.1_spec</artifactId>
> +                <version>1.0-SNAPSHOT</version>
> +            </dependency>
> +
> +            <dependency>
> +                <groupId>org.apache.geronimo.specs</groupId>
> +                <artifactId>geronimo-servlet_2.5_spec</artifactId>
> +                <!--  <version>1.0.1</version>   -->
> +                <version>1.1-SNAPSHOT</version>
> +            </dependency>
> +            <dependency>
> +                <groupId>org.apache.geronimo.specs</groupId>
> +                <artifactId>geronimo-annotation_1.0_spec</artifactId>
> +                <version>1.0-SNAPSHOT</version>
> +            </dependency>
> +            <dependency>
> +                <groupId>org.apache.geronimo.specs</groupId>
> +                <artifactId>geronimo-ws-metadata_2.0_spec</ 
> artifactId>
> +                <!--  <version>1.0</version>   -->
> +                <version>1.1-SNAPSHOT</version>
> +            </dependency>
> +
> +            <!-- javamail 1.4 config -->
> +            <!--<dependency>-->
> +            <!--<groupId>javax.mail</groupId>-->
> +            <!--<artifactId>mail</artifactId>-->
> +            <!--<version>1.4</version>-->
> +            <!--</dependency>-->
> +            <!--<dependency>-->
> +            <!--<groupId>javax.activation</groupId>-->
> +            <!--<artifactId>activation</artifactId>-->
> +            <!--<version>1.1</version>-->
> +            <!--</dependency>-->
> +            <dependency>
> +                <groupId>org.apache.geronimo.schema</groupId>
> +                <artifactId>geronimo-schema-jee_5</artifactId>
> +                <version>1.0-SNAPSHOT</version>
> +            </dependency>
> +
> +            <dependency>
> +                <groupId>org.mortbay.jetty</groupId>
> +                <artifactId>jetty</artifactId>
> +                <version>6.1-SNAPSHOT</version>
> +            </dependency>
> +
> +            <dependency>
> +                <groupId>org.mortbay.jetty</groupId>
> +                <artifactId>jetty-util</artifactId>
> +                <version>6.1-SNAPSHOT</version>
> +            </dependency>
> +
> +            <dependency>
> +                <groupId>org.apache.cxf</groupId>
> +                <artifactId>cxf-api</artifactId>
> +                <version>2.0-incubator-RC-SNAPSHOT</version>
> +                <exclusions>
> +                    <exclusion>
> +                        <groupId>javax.annotation</groupId>
> +                        <artifactId>jsr250-api</artifactId>
> +                    </exclusion>
> +                    <exclusion>
> +                        <groupId>javax.jws</groupId>
> +                        <artifactId>jsr181-api</artifactId>
> +                    </exclusion>
> +                </exclusions>
> +            </dependency>
> +            <dependency>
> +                <groupId>org.apache.cxf</groupId>
> +                <artifactId>cxf-metacode</artifactId>
> +                <version>2.0-incubator-RC-SNAPSHOT</version>
> +                <exclusions>
> +                    <exclusion>
> +                        <groupId>javax.annotation</groupId>
> +                        <artifactId>jsr250-api</artifactId>
> +                    </exclusion>
> +                    <exclusion>
> +                        <groupId>javax.jws</groupId>
> +                        <artifactId>jsr181-api</artifactId>
> +                    </exclusion>
> +                </exclusions>
> +            </dependency>
> +            <dependency>
> +                <groupId>org.apache.cxf</groupId>
> +                <artifactId>cxf-common-utilities</artifactId>
> +                <version>2.0-incubator-RC-SNAPSHOT</version>
> +                <exclusions>
> +                    <exclusion>
> +                        <groupId>javax.annotation</groupId>
> +                        <artifactId>jsr250-api</artifactId>
> +                    </exclusion>
> +                    <exclusion>
> +                        <groupId>javax.jws</groupId>
> +                        <artifactId>jsr181-api</artifactId>
> +                    </exclusion>
> +                </exclusions>
> +            </dependency>
> +            <dependency>
> +                <groupId>org.apache.cxf</groupId>
> +                <artifactId>cxf-rt-core</artifactId>
> +                <version>2.0-incubator-RC-SNAPSHOT</version>
> +                <exclusions>
> +                    <exclusion>
> +                        <groupId>javax.annotation</groupId>
> +                        <artifactId>jsr250-api</artifactId>
> +                    </exclusion>
> +                    <exclusion>
> +                        <groupId>javax.jws</groupId>
> +                        <artifactId>jsr181-api</artifactId>
> +                    </exclusion>
> +                </exclusions>
> +            </dependency>
> +            <dependency>
> +                <groupId>org.apache.cxf</groupId>
> +                <artifactId>cxf-rt-bindings-xml</artifactId>
> +                <version>2.0-incubator-RC-SNAPSHOT</version>
> +                <exclusions>
> +                    <exclusion>
> +                        <groupId>javax.annotation</groupId>
> +                        <artifactId>jsr250-api</artifactId>
> +                    </exclusion>
> +                    <exclusion>
> +                        <groupId>javax.jws</groupId>
> +                        <artifactId>jsr181-api</artifactId>
> +                    </exclusion>
> +                </exclusions>
> +            </dependency>
> +            <dependency>
> +                <groupId>org.apache.cxf</groupId>
> +                <artifactId>cxf-rt-bindings-soap</artifactId>
> +                <version>2.0-incubator-RC-SNAPSHOT</version>
> +                <exclusions>
> +                    <exclusion>
> +                        <groupId>javax.annotation</groupId>
> +                        <artifactId>jsr250-api</artifactId>
> +                    </exclusion>
> +                    <exclusion>
> +                        <groupId>javax.jws</groupId>
> +                        <artifactId>jsr181-api</artifactId>
> +                    </exclusion>
> +                </exclusions>
> +            </dependency>
> +            <dependency>
> +                <groupId>org.apache.cxf</groupId>
> +                <artifactId>cxf-rt-databinding-jaxb</artifactId>
> +                <version>2.0-incubator-RC-SNAPSHOT</version>
> +                <exclusions>
> +                    <exclusion>
> +                        <groupId>javax.annotation</groupId>
> +                        <artifactId>jsr250-api</artifactId>
> +                    </exclusion>
> +                    <exclusion>
> +                        <groupId>javax.jws</groupId>
> +                        <artifactId>jsr181-api</artifactId>
> +                    </exclusion>
> +                </exclusions>
> +            </dependency>
> +            <dependency>
> +                <groupId>org.apache.cxf</groupId>
> +                <artifactId>cxf-rt-frontend-jaxws</artifactId>
> +                <version>2.0-incubator-RC-SNAPSHOT</version>
> +                <exclusions>
> +                    <exclusion>
> +                        <groupId>javax.annotation</groupId>
> +                        <artifactId>jsr250-api</artifactId>
> +                    </exclusion>
> +                    <exclusion>
> +                        <groupId>javax.jws</groupId>
> +                        <artifactId>jsr181-api</artifactId>
> +                    </exclusion>
> +                </exclusions>
> +            </dependency>
> +            <dependency>
> +                <groupId>org.apache.cxf</groupId>
> +                <artifactId>cxf-rt-frontend-simple</artifactId>
> +                <version>2.0-incubator-RC-SNAPSHOT</version>
> +                <exclusions>
> +                    <exclusion>
> +                        <groupId>javax.annotation</groupId>
> +                        <artifactId>jsr250-api</artifactId>
> +                    </exclusion>
> +                    <exclusion>
> +                        <groupId>javax.jws</groupId>
> +                        <artifactId>jsr181-api</artifactId>
> +                    </exclusion>
> +                </exclusions>
> +            </dependency>
> +            <dependency>
> +                <groupId>org.apache.cxf</groupId>
> +                <artifactId>cxf-rt-transports-http</artifactId>
> +                <version>2.0-incubator-RC-SNAPSHOT</version>
> +                <exclusions>
> +                    <exclusion>
> +                        <groupId>javax.annotation</groupId>
> +                        <artifactId>jsr250-api</artifactId>
> +                    </exclusion>
> +                    <exclusion>
> +                        <groupId>javax.jws</groupId>
> +                        <artifactId>jsr181-api</artifactId>
> +                    </exclusion>
> +                </exclusions>
> +            </dependency>
> +            <dependency>
> +                <groupId>org.apache.cxf</groupId>
> +                <artifactId>cxf-tools-common</artifactId>
> +                <version>2.0-incubator-RC-SNAPSHOT</version>
> +                <exclusions>
> +                    <exclusion>
> +                        <groupId>javax.annotation</groupId>
> +                        <artifactId>jsr250-api</artifactId>
> +                    </exclusion>
> +                    <exclusion>
> +                        <groupId>javax.jws</groupId>
> +                        <artifactId>jsr181-api</artifactId>
> +                    </exclusion>
> +                </exclusions>
> +            </dependency>
> +
> +            <dependency>
> +                <groupId>stax</groupId>
> +                <artifactId>stax-api</artifactId>
> +                <version>1.0.1</version>
> +            </dependency>
> +            <dependency>
> +                <groupId>woodstox</groupId>
> +                <artifactId>wstx-asl</artifactId>
> +                <version>3.0.2</version>
> +            </dependency>
> +            <dependency>
> +                <groupId>org.apache.ws.commons</groupId>
> +                <artifactId>XmlSchema</artifactId>
> +                <version>1.1</version>
> +            </dependency>
> +            <dependency>
> +                <groupId>javax.xml.soap</groupId>
> +                <artifactId>saaj-api</artifactId>
> +                <version>1.3</version>
> +                <exclusions>
> +                    <exclusion>
> +                        <groupId>javax.activation</groupId>
> +                        <artifactId>activation</artifactId>
> +                    </exclusion>
> +                </exclusions>
> +            </dependency>
> +            <dependency>
> +                <groupId>javax.xml.bind</groupId>
> +                <artifactId>jaxb-api</artifactId>
> +                <version>2.0</version>
> +                <exclusions>
> +                    <exclusion>
> +                        <groupId>javax.xml.bind</groupId>
> +                        <artifactId>jsr173_api</artifactId>
> +                    </exclusion>
> +                </exclusions>
> +            </dependency>
> +            <dependency>
> +                <groupId>com.sun.xml.messaging.saaj</groupId>
> +                <artifactId>saaj-impl</artifactId>
> +                <version>1.3</version>
> +                <exclusions>
> +                    <exclusion>
> +                        <groupId>javax.activation</groupId>
> +                        <artifactId>activation</artifactId>
> +                    </exclusion>
> +                </exclusions>
> +            </dependency>
> +
> +            <dependency>
> +                <groupId>com.sun.xml.bind</groupId>
> +                <artifactId>jaxb-impl</artifactId>
> +                <version>2.0.2</version>
> +                <exclusions>
> +                    <exclusion>
> +                        <groupId>javax.xml.bind</groupId>
> +                        <artifactId>jsr173_api</artifactId>
> +                    </exclusion>
> +                    <exclusion>
> +                        <groupId>javax.xml.bind</groupId>
> +                        <artifactId>activation</artifactId>
> +                    </exclusion>
> +                </exclusions>
> +            </dependency>
> +            <dependency>
> +                <groupId>org.springframework</groupId>
> +                <artifactId>spring-core</artifactId>
> +                <version>2.0-rc2</version>
> +            </dependency>
> +            <dependency>
> +                <groupId>org.springframework</groupId>
> +                <artifactId>spring-beans</artifactId>
> +                <version>2.0-rc2</version>
> +            </dependency>
> +            <dependency>
> +                <groupId>org.springframework</groupId>
> +                <artifactId>spring-context</artifactId>
> +                <version>2.0-rc2</version>
> +            </dependency>
> +            <dependency>
> +                <groupId>javax.xml.ws</groupId>
> +                <artifactId>jaxws-api</artifactId>
> +                <version>2.0</version>
> +                <exclusions>
> +                    <exclusion>
> +                        <groupId>javax.xml.bind</groupId>
> +                        <artifactId>jsr173_api</artifactId>
> +                    </exclusion>
> +                </exclusions>
> +            </dependency>
> +
> +            <!--JSF 1.2 JARs from Apache MyFaces -->
> +            <dependency>
> +                <groupId>org.apache.myfaces.core</groupId>
> +                <artifactId>myfaces-api</artifactId>
> +                <version>1.2.0-SNAPSHOT</version>
> +            </dependency>
> +            <dependency>
> +                <groupId>org.apache.myfaces.core</groupId>
> +                <artifactId>myfaces-impl</artifactId>
> +                <version>1.2.0-SNAPSHOT</version>
> +            </dependency>
>
>          </dependencies>
>      </dependencyManagement>
> @@ -1329,6 +1329,17 @@
>                  </plugin>
>
>                  <plugin>
> +                  <groupId>org.apache.maven.plugins</groupId>
> +                    <artifactId>maven-jar-plugin</artifactId>
> +                    <configuration>
> +                        <archive>
> +                            <!-- Do not include META-INF/maven to  
> avoid long file problems on windows -->
> +                            <addMavenDescriptor>false</ 
> addMavenDescriptor>
> +                        </archive>
> +                    </configuration>
> +                </plugin>
> +
> +                <plugin>
>                      <groupId>org.apache.geronimo.plugins</groupId>
>                      <artifactId>geronimo-maven-plugin</artifactId>
>                      <version>${version}</version>
> @@ -1444,7 +1455,7 @@
>                      <tagBase>https://svn.apache.org/repos/asf/ 
> geronimo/server/tags</tagBase>
>                  </configuration>
>              </plugin>
> -         </plugins>
> +        </plugins>
>      </build>
>
>      <repositories>
> @@ -1662,7 +1673,7 @@
>              </build>
>          </profile>
>
> -         <profile>
> +        <profile>
>              <id>itests-environment</id>
>
>              <activation>
>
>


Mime
View raw message