You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by pr...@apache.org on 2006/12/15 21:34:17 UTC
svn commit: r487651 - /geronimo/server/trunk/pom.xml
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>
Re: svn commit: r487651 - /geronimo/server/trunk/pom.xml
Posted by David Blevins <da...@visi.com>.
On Dec 19, 2006, at 6:23 AM, Vamsavardhana Reddy wrote:
>
>
> On 12/16/06, Matt Hogstrom <ma...@hogstrom.org> wrote:
> On Dec 15, 2006, at 3:57 PM, Jason Dillon wrote:
>
> > Yikes... what happened on this change?
> >
> > The diff shows a lot more changed than just what was indicated in
> > the comment...
> >
>
> Ya, looks like a formatting change. A diff before would help :) I
> too am guilty of transgressions like this. Thanks for the reminder.
>
> I check the diff on each file before checkin and eliminate all
> unnecessary changes (like line with spaces replacing blank lines
> etc.). It costs some extra time :o(, but, keeps the commit clean.
> I hope that my energy will last for some more time :o)
I usually do as Jason suggested and check my "beauty" diff in first.
That is if I notice the formatting is not right before I start
editing :)
-David
Re: svn commit: r487651 - /geronimo/server/trunk/pom.xml
Posted by Jason Dillon <ja...@planet57.com>.
I actually use the diff to help me remember what I changed... so its
part of my routine. TextMate is awesome too, you can `svn diff |
mate` and it will open up an editor in diff mode with colors... so
nice :-)
--jason
On Dec 19, 2006, at 6:23 AM, Vamsavardhana Reddy wrote:
>
>
> On 12/16/06, Matt Hogstrom <ma...@hogstrom.org> wrote:
>
> On Dec 15, 2006, at 3:57 PM, Jason Dillon wrote:
>
> > Yikes... what happened on this change?
> >
> > The diff shows a lot more changed than just what was indicated in
> > the comment...
> >
>
> Ya, looks like a formatting change. A diff before would help :) I
> too am guilty of transgressions like this. Thanks for the reminder.
>
> I check the diff on each file before checkin and eliminate all
> unnecessary changes (like line with spaces replacing blank lines
> etc.). It costs some extra time :o(, but, keeps the commit clean.
> I hope that my energy will last for some more time :o)
>
> Matt Hogstrom
> matt@hogstrom.org
>
>
>
Re: svn commit: r487651 - /geronimo/server/trunk/pom.xml
Posted by Vamsavardhana Reddy <c1...@gmail.com>.
On 12/16/06, Matt Hogstrom <ma...@hogstrom.org> wrote:
>
>
> On Dec 15, 2006, at 3:57 PM, Jason Dillon wrote:
>
> > Yikes... what happened on this change?
> >
> > The diff shows a lot more changed than just what was indicated in
> > the comment...
> >
>
> Ya, looks like a formatting change. A diff before would help :) I
> too am guilty of transgressions like this. Thanks for the reminder.
I check the diff on each file before checkin and eliminate all unnecessary
changes (like line with spaces replacing blank lines etc.). It costs some
extra time :o(, but, keeps the commit clean. I hope that my energy will
last for some more time :o)
Matt Hogstrom
> matt@hogstrom.org
>
>
>
Re: svn commit: r487651 - /geronimo/server/trunk/pom.xml
Posted by Matt Hogstrom <ma...@hogstrom.org>.
On Dec 15, 2006, at 3:57 PM, Jason Dillon wrote:
> Yikes... what happened on this change?
>
> The diff shows a lot more changed than just what was indicated in
> the comment...
>
Ya, looks like a formatting change. A diff before would help :) I
too am guilty of transgressions like this. Thanks for the reminder.
Matt Hogstrom
matt@hogstrom.org
Re: svn commit: r487651 - /geronimo/server/trunk/pom.xml
Posted by Jason Dillon <ja...@planet57.com>.
I dunno man... just commenting that the little change you made also
got committed with a bunch of other stuff... I have no idea why svn
does this... but it does tend to happen quite often, maybe some line
ending muck or something.
but anyways, just by looking at the diff it appears that more was
changed that what was included in the comment. not really your
fault, just a pita from an audit perspective.
anyways, this happens to all of us... me too. but if possible limit
beautification check ins from others if possible.
--jason
On Dec 15, 2006, at 6:29 PM, Prasad Kashyap wrote:
> Now what ?
>
> All I did was to especially remember to run this thro' "beautify'"
> before I checked it in. I didn't want you to bitch and moan about the
> formatting, esp during the happy holiday season :-)
>
> Jokes apart, that's all it is. I don't know why it shows that many
> diffs. They both look exactly alike.
>
> Cheers
> Prasad
>
> On 12/15/06, Jason Dillon <ja...@planet57.com> wrote:
>> 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>
>> >
>> >
>>
>>
Re: svn commit: r487651 - /geronimo/server/trunk/pom.xml
Posted by Prasad Kashyap <go...@gmail.com>.
Now what ?
All I did was to especially remember to run this thro' "beautify'"
before I checked it in. I didn't want you to bitch and moan about the
formatting, esp during the happy holiday season :-)
Jokes apart, that's all it is. I don't know why it shows that many
diffs. They both look exactly alike.
Cheers
Prasad
On 12/15/06, Jason Dillon <ja...@planet57.com> wrote:
> 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>
> >
> >
>
>
Re: svn commit: r487651 - /geronimo/server/trunk/pom.xml
Posted by Jason Dillon <ja...@planet57.com>.
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>
>
>
Re: svn commit: r487651 - /geronimo/server/trunk/pom.xml
Posted by Jason Dillon <ja...@planet57.com>.
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>
>
>