Author: thomas.diesler(a)jboss.com Date: 2008-04-18 16:17:59 -0400 (Fri, 18 Apr 2008) New Revision: 6516 Modified: framework/trunk/pom.xml Log: Use jbossws-parent Modified: framework/trunk/pom.xml =================================================================== --- framework/trunk/pom.xml 2008-04-18 19:56:01 UTC (rev 6515) +++ framework/trunk/pom.xml 2008-04-18 20:17:59 UTC (rev 6516) @@ -9,28 +9,38 @@ <version>3.0.2-SNAPSHOT</version> - <organization> - <name>JBoss, a division of Red Hat</name> - <url>http://www.jboss.org</url> - </organization> - <url>http://maven.apache.org</url> - <!-- Parent --> <parent> - <groupId>org.jboss</groupId> - <artifactId>jboss-parent</artifactId> - <version>3</version> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-parent</artifactId> + <version>1.0-SNAPSHOT</version> </parent> <!-- Properties --> <properties> - <jbossws-common>3.0.0-SNAPSHOT</jbossws-common> - <jbossws-spi>3.0.0-SNAPSHOT</jbossws-spi> + <jbossws.common.version>3.0.0-SNAPSHOT</jbossws.common.version> + <jbossws.spi.version>3.0.0-SNAPSHOT</jbossws.spi.version> + <jboss.common.version>1.2.1.GA</jboss.common.version> + <jbossxb.version>1.0.0.SP1</jbossxb.version> </properties> <!-- Dependencies --> <dependencies> + + <!-- jbossws dependencies --> <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-common</artifactId> + <version>${jbossws.common.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-spi</artifactId> + <version>${jbossws.spi.version}</version> + </dependency> + + <!-- provided apis --> + <dependency> <groupId>javax.annotation</groupId> <artifactId>jsr250-api</artifactId> <version>1.0</version> @@ -60,27 +70,41 @@ <version>2.1</version> <scope>provided</scope> </dependency> + + <!-- jboss provided --> <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-common</artifactId> - <version>${jbossws-common}</version> + <groupId>jboss.common</groupId> + <artifactId>jboss-common</artifactId> + <version>${jboss.common.version}</version> + <scope>provided</scope> </dependency> <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-spi</artifactId> - <version>${jbossws-spi}</version> - </dependency> - <dependency> <groupId>org.jboss</groupId> <artifactId>jbossxb</artifactId> - <version>2.0.0.CR8</version> + <version>${jbossxb.version}</version> + <!-- dependencies not in sync with jboss-4.2.2 --> + <exclusions> + <exclusion> + <groupId>jboss.common.core</groupId> + <artifactId>jboss-common-core</artifactId> + </exclusion> + <exclusion> + <groupId>jboss.logging</groupId> + <artifactId>jboss-logging-spi</artifactId> + </exclusion> + <exclusion> + <groupId>jboss.logging.log4j</groupId> + <artifactId>jboss-logging-log4j</artifactId> + </exclusion> + </exclusions> <scope>provided</scope> </dependency> + + <!-- transitve dependencies --> <dependency> <groupId>tjws</groupId> <artifactId>webserver</artifactId> <version>1.3.3</version> - <scope>provided</scope> </dependency> <dependency> <groupId>wsdl4j</groupId> @@ -142,23 +166,6 @@ </execution> </executions> </plugin> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifest> - <addDefaultImplementationEntries>true</addDefaultImplementationEntries> - </manifest> - </archive> - </configuration> - </plugin> </plugins> </build>