[jboss-svn-commits] JBL Code SVN: r31253 - labs/jbosstm/trunk/maven.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Jan 27 09:44:00 EST 2010
Author: jhalliday
Date: 2010-01-27 09:44:00 -0500 (Wed, 27 Jan 2010)
New Revision: 31253
Modified:
labs/jbosstm/trunk/maven/build.xml
labs/jbosstm/trunk/maven/pom-template.xml
Log:
Add maven hooks for XTS 3rd party deps. JBTM-687
Modified: labs/jbosstm/trunk/maven/build.xml
===================================================================
--- labs/jbosstm/trunk/maven/build.xml 2010-01-27 13:58:26 UTC (rev 31252)
+++ labs/jbosstm/trunk/maven/build.xml 2010-01-27 14:44:00 UTC (rev 31253)
@@ -39,6 +39,7 @@
<property name="ext.lib.src" value="../ext"/>
<property name="ext.lib.dest" value="../build/extlib"/>
+ <property name="xts.ext.lib.dest" value="../XTS/build/extlib"/>
<property name="groupid" value="jboss.jbossts"/>
<property name="artifact" value="jbossts-build"/>
@@ -49,7 +50,9 @@
the dependencies into the dir where the build looks for them -->
<delete dir="${ext.lib.dest}"/>
+ <delete dir="${xts.ext.lib.dest}"/>
<mkdir dir="${ext.lib.dest}"/>
+ <mkdir dir="${xts.ext.lib.dest}"/>
<copy file="pom-template.xml"
tofile="pom.xml"
@@ -76,6 +79,17 @@
</fileset>
</copy>
+ <!-- XTS uses its own copy for now, so it can override some deps -->
+ <copy todir="${xts.ext.lib.dest}" overwrite="true">
+ <fileset dir="${ext.lib.dest}" includes="*"/>
+ </copy>
+ <copy todir="${xts.ext.lib.dest}" overwrite="true">
+ <fileset dir="../XTS/ext">
+ <include name="junit.jar"/>
+ </fileset>
+ </copy>
+
+
</target>
<target name="standalone">
Modified: labs/jbosstm/trunk/maven/pom-template.xml
===================================================================
--- labs/jbosstm/trunk/maven/pom-template.xml 2010-01-27 13:58:26 UTC (rev 31252)
+++ labs/jbosstm/trunk/maven/pom-template.xml 2010-01-27 14:44:00 UTC (rev 31253)
@@ -162,6 +162,31 @@
</plugins>
</build>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-component-matrix</artifactId>
+ <version>6.0.0.M1</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+ <!-- the default WS stack in AS is Native. To build XTS against CXF, we
+ need to pull it in separately. The tricky bit is knowing what version
+ to use, since the AS pom won't tell us. In general it's the same as the
+ 'version.jboss.jbossws' in whatever version of AS you choose. -->
+ <dependency>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf</artifactId>
+ <version>3.2.2.GA</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<!-- combined deps for the entire JBossTS. At some point we need to modularize this for different builds -->
@@ -171,13 +196,11 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1</version>
</dependency>
<dependency>
- <groupId>apache-log4j</groupId>
+ <groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.14</version>
</dependency>
@@ -194,7 +217,6 @@
<dependency>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-jca-api</artifactId>
- <version>1.5.0.GA</version>
</dependency>
<!-- unit tests use junit4 and some use byteman -->
@@ -233,36 +255,104 @@
</dependency>
- <!-- atsintegration (i.e. the JBossAS glue code) requires some app server bits.
- TODO versions for these (and maybe other deps too) should really come
- from the JBossAS component-matrix/pom.xml i.e.
- http://repository.jboss.com/maven2/org/jboss/jbossas/jboss-as-component-matrix/
- rather than be hardcoded here -->
+ <!-- atsintegration (i.e. the JBossAS glue code) requires some app server bits. -->
<dependency>
<groupId>org.jboss.logmanager</groupId>
<artifactId>jboss-logmanager</artifactId>
- <version>1.1.1.GA</version>
</dependency>
<dependency>
<groupId>org.jboss.integration</groupId>
<artifactId>jboss-transaction-spi</artifactId>
- <version>5.1.0.SP1</version>
</dependency>
<dependency>
<groupId>org.jboss.integration</groupId>
<artifactId>jboss-corba-ots-spi</artifactId>
- <version>5.1.0.SP1</version>
</dependency>
<dependency>
<groupId>org.jboss.security</groupId>
<artifactId>jbosssx</artifactId>
- <version>2.1.0.20091223</version>
</dependency>
+
+ <!-- XTS: -->
+
+ <dependency>
+ <groupId>jboss.web</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>sun-jaxb</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-saaj</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-jaxrpc</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-jaxws</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-jaxws-ext</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-common</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ </dependency>
+
+ <!--
+ can this one be more fine grained?
+ <dependency>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-javaee</artifactId>
+ </dependency>
+ -->
+
</dependencies>
</project>
\ No newline at end of file
More information about the jboss-svn-commits
mailing list