[jboss-cvs] JBossAS SVN: r104210 - in trunk: aspects and 16 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Apr 23 18:07:59 EDT 2010
Author: pgier
Date: 2010-04-23 18:07:57 -0400 (Fri, 23 Apr 2010)
New Revision: 104210
Modified:
trunk/aspects/pom.xml
trunk/build/build.xml
trunk/client/pom.xml
trunk/component-matrix/pom.xml
trunk/connector/pom.xml
trunk/depchain/pom.xml
trunk/ejb3/pom.xml
trunk/hornetq-int/pom.xml
trunk/iiop/pom.xml
trunk/management/pom.xml
trunk/osgi/zip/pom.xml
trunk/pom.xml
trunk/profileservice/pom.xml
trunk/system-jmx/pom.xml
trunk/testsuite/pom.xml
trunk/tomcat/pom.xml
trunk/varia/pom.xml
trunk/webservices/pom.xml
Log:
[JBAS-7962] Remove the deprecated dependencies from the build.
Modified: trunk/aspects/pom.xml
===================================================================
--- trunk/aspects/pom.xml 2010-04-23 21:28:19 UTC (rev 104209)
+++ trunk/aspects/pom.xml 2010-04-23 22:07:57 UTC (rev 104210)
@@ -131,7 +131,7 @@
<artifactId>jboss-aop-asintegration-mc</artifactId>
</dependency>
<dependency>
- <groupId>apache-xerces</groupId>
+ <groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</dependency>
<dependency>
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2010-04-23 21:28:19 UTC (rev 104209)
+++ trunk/build/build.xml 2010-04-23 22:07:57 UTC (rev 104210)
@@ -1671,7 +1671,7 @@
<fileset refid="org.jboss.ws.native:jbossws-native-core:jar"/>
<fileset refid="org.codehaus.jettison:jettison:jar"/>
<fileset refid="org.jboss.netty:netty:jar"/>
- <fileset refid="org.apache.ws.policy:wscommons-policy:jar"/>
+ <fileset refid="ws-commons:policy:jar"/>
<fileset refid="wsdl4j:wsdl4j:jar"/>
<fileset refid="org.apache:xmlsec:jar"/>
<mapper refid="remove-versions" />
@@ -2154,7 +2154,7 @@
<fileset refid="org.jboss.aop:jboss-aop-deployers:jar"/>
<fileset refid="gnu-getopt:getopt:jar"/>
<fileset refid="xerces:xercesImpl:jar"/>
- <fileset refid="apache-xerces:resolver:jar"/>
+ <fileset refid="xml-resolver:xml-resolver:jar"/>
<fileset refid="org.jboss:jbossxb:jar"/>
<fileset refid="org.jboss.osgi.framework:jboss-osgi-framework-metadata:jar"/>
<mapper refid="remove-versions" />
@@ -2167,7 +2167,7 @@
<fileset refid="apache-xalan:xalan:jar"/>
<fileset refid="apache-xalan:serializer:jar"/>
<fileset refid="xerces:xercesImpl:jar"/>
- <fileset refid="apache-xerces:resolver:jar"/>
+ <fileset refid="xml-resolver:xml-resolver:jar"/>
<fileset refid="org.apache:xmlsec:jar"/>
<fileset refid="wsdl4j:wsdl4j:jar"/>
<fileset refid="javassist:javassist:jar"/>
@@ -2238,7 +2238,7 @@
<fileset refid="com.sun.xml.stream.buffer:streambuffer:jar"/>
<fileset refid="trove:trove:jar"/>
<fileset refid="org.codehaus.woodstox:wstx-lgpl:jar"/>
- <fileset refid="org.apache.ws.policy:wscommons-policy:jar"/>
+ <fileset refid="ws-commons:policy:jar"/>
<fileset refid="com.sun.xml.ws:policy:jar"/>
<fileset refid="org.hibernate:hibernate-core:jar"/>
<fileset refid="org.hibernate:hibernate-annotations:jar"/>
@@ -2260,9 +2260,9 @@
<fileset refid="gnu-getopt:getopt:jar"/>
<fileset refid="oswego-concurrent:concurrent:jar"/>
<fileset refid="org.jboss.security:jbosssx-client:jar"/>
- <fileset refid="apache-scout:scout:jar"/>
+ <fileset refid="org.apache.ws.scout:scout:jar"/>
<fileset refid="jacorb:jacorb:jar"/>
- <fileset refid="apache-avalon-logkit:logkit:jar"/>
+ <fileset refid="logkit:logkit:jar"/>
<fileset refid="sun-fi:FastInfoset:jar"/>
<fileset refid="commons-beanutils:commons-beanutils:jar"/>
<fileset refid="sun-jaxb:jaxb-api:jar"/>
@@ -2371,7 +2371,7 @@
<!-- copy scout.jar and juddi.jar to juddi-service.sar directory -->
<copy todir="${install.server}/all/deploy/juddi-service.sar" filtering="no">
- <fileset refid="apache-scout:scout:jar"/>
+ <fileset refid="org.apache.ws.scout:scout:jar"/>
<fileset refid="juddi:juddi:jar"/>
<mapper refid="remove-versions" />
</copy>
Modified: trunk/client/pom.xml
===================================================================
--- trunk/client/pom.xml 2010-04-23 21:28:19 UTC (rev 104209)
+++ trunk/client/pom.xml 2010-04-23 22:07:57 UTC (rev 104210)
@@ -14,7 +14,7 @@
<url>http://www.jboss.org/jbossas</url>
<dependencies>
-
+
<dependency>
<groupId>oswego-concurrent</groupId>
<artifactId>concurrent</artifactId>
@@ -24,7 +24,7 @@
<groupId>org.hibernate.javax.persistence</groupId>
<artifactId>hibernate-jpa-2.0-api</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
@@ -43,6 +43,10 @@
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -100,80 +104,96 @@
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-common</artifactId>
<classifier>client</classifier>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-ejb-api_3.1</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-ejb-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-transaction-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jms-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- </exclusion>
- </exclusions>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api_3.1</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-transaction-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jms-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-core</artifactId>
<classifier>client</classifier>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-ejb-api_3.1</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-ejb-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jacc-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jca-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-transaction-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jaspi-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jacc-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jms-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- </exclusion>
- </exclusions>
+ <exclusions>
+ <exclusion>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jaspi-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jca-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jacc-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-transaction-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jms-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>sun-jaxws</groupId>
+ <artifactId>jsr181-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>quartz</groupId>
+ <artifactId>quartz</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>sun-jaxws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -207,7 +227,7 @@
</exclusion>
</exclusions>
</dependency>
-
+
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-proxy-clustered</artifactId>
@@ -228,20 +248,20 @@
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-security</artifactId>
<classifier>client</classifier>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jacc-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- </exclusion>
- </exclusions>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jacc-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -295,35 +315,35 @@
<groupId>org.jboss.spec.javax.resource</groupId>
<artifactId>jboss-connector-api_1.5_spec</artifactId>
</dependency>
-
- <dependency>
+
+ <dependency>
<groupId>org.jboss.spec.javax.security.jacc</groupId>
<artifactId>jboss-jacc-api_1.4_spec</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.jboss.spec.javax.security.auth.message</groupId>
- <artifactId>jboss-jaspi-api_1.0_spec</artifactId>
+
+ <dependency>
+ <groupId>org.jboss.spec.javax.security.auth.message</groupId>
+ <artifactId>jboss-jaspi-api_1.0_spec</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.jboss.spec.javax.servlet.jsp</groupId>
- <artifactId>jboss-jsp-api_2.2_spec</artifactId>
+
+ <dependency>
+ <groupId>org.jboss.spec.javax.servlet.jsp</groupId>
+ <artifactId>jboss-jsp-api_2.2_spec</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.jboss.spec.javax.servlet</groupId>
- <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+
+ <dependency>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.jboss.spec.javax.transaction</groupId>
- <artifactId>jboss-transaction-api_1.1_spec</artifactId>
+
+ <dependency>
+ <groupId>org.jboss.spec.javax.transaction</groupId>
+ <artifactId>jboss-transaction-api_1.1_spec</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.jboss.spec.javax.xml.registry</groupId>
- <artifactId>jboss-jaxr-api_1.0_spec</artifactId>
+
+ <dependency>
+ <groupId>org.jboss.spec.javax.xml.registry</groupId>
+ <artifactId>jboss-jaxr-api_1.0_spec</artifactId>
</dependency>
<dependency>
@@ -397,7 +417,7 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
@@ -407,7 +427,7 @@
<groupId>org.apache</groupId>
<artifactId>xmlsec</artifactId>
</dependency>
-
+
</dependencies>
</project>
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2010-04-23 21:28:19 UTC (rev 104209)
+++ trunk/component-matrix/pom.xml 2010-04-23 22:07:57 UTC (rev 104210)
@@ -256,7 +256,7 @@
</dependency>
<dependency>
- <groupId>apache-avalon-logkit</groupId>
+ <groupId>logkit</groupId>
<artifactId>logkit</artifactId>
<version>1.2</version>
</dependency>
@@ -274,7 +274,7 @@
</dependency>
<dependency>
- <groupId>apache-httpclient</groupId>
+ <groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>3.0.1</version>
<scope>test</scope>
@@ -311,7 +311,7 @@
</dependency>
<dependency>
- <groupId>apache-scout</groupId>
+ <groupId>org.apache.ws.scout</groupId>
<artifactId>scout</artifactId>
<version>1.1.1</version>
</dependency>
@@ -341,27 +341,21 @@
</dependency>
<dependency>
- <groupId>apache-xerces</groupId>
- <artifactId>resolver</artifactId>
- <version>2.9.1</version>
+ <groupId>xml-resolver</groupId>
+ <artifactId>xml-resolver</artifactId>
+ <version>1.2</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.9.1</version>
- <exclusions>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
- <groupId>apache-xerces</groupId>
+ <groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
- <version>2.9.1</version>
+ <version>1.3.04</version>
</dependency>
<dependency>
@@ -379,7 +373,7 @@
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
- <version>2.1.3</version>
+ <version>2.1_3</version>
</dependency>
<dependency>
@@ -404,12 +398,6 @@
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
<version>1.7</version>
- <exclusions>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
@@ -440,12 +428,6 @@
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
<version>1.6.1</version>
- <exclusions>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
@@ -837,6 +819,10 @@
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -936,6 +922,10 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>apache-scout</groupId>
+ <artifactId>scout</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -953,6 +943,10 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>apache-scout</groupId>
+ <artifactId>scout</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -1118,6 +1112,10 @@
<groupId>com.sun.xml.fastinfoset</groupId>
<artifactId>FastInfoset</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.ws.policy</groupId>
+ <artifactId>wscommons-policy</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -1346,12 +1344,6 @@
</dependency>
<dependency>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
- <version>${version.jsr181.api}</version>
- </dependency>
-
- <dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<version>1.4.2</version>
@@ -1417,10 +1409,6 @@
<version>${version.jaxws.api}</version>
<exclusions>
<exclusion>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
- </exclusion>
- <exclusion>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</exclusion>
@@ -1765,6 +1753,10 @@
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -1984,6 +1976,10 @@
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -3143,8 +3139,8 @@
</dependency>
<dependency>
- <groupId>org.apache.ws.policy</groupId>
- <artifactId>wscommons-policy</artifactId>
+ <groupId>ws-commons</groupId>
+ <artifactId>policy</artifactId>
<version>1.0</version>
</dependency>
@@ -3249,6 +3245,10 @@
<bannedDependencies>
<searchTransitive>true</searchTransitive>
<excludes>
+ <exclude>apache-avalon-logkit:logkit</exclude>
+ <exclude>apache-xerces:xml-apis</exclude>
+ <exclude>apache-xerces:resolver</exclude>
+ <exclude>org.apache.ws.policy:wscommons-policy</exclude>
<exclude>jboss:jboss-common</exclude>
<exclude>jboss:jboss-common-core</exclude>
<exclude>javax.el:el-api</exclude>
@@ -3270,7 +3270,6 @@
<exclude>javax.security:jaas</exclude>
<exclude>javax.servlet.jsp:jsp-api</exclude>
<exclude>javax.servlet:servlet-api</exclude>
- <exclude>xml-apis:xml-apis</exclude>
<exclude>com.sun.xml.fastinfoset:FastInfoset</exclude>
<exclude>sun-jaxws:FastInfoset</exclude>
<!-- JBAS-6904: use org.hibernate:hibernate-core -->
@@ -3281,6 +3280,8 @@
<exclude>sun-jaxws:jaxws-rt</exclude>
<exclude>sun-jaxb:jaxb-xjc</exclude>
<exclude>sun-jaxws:streambuffer</exclude>
+ <exclude>sun-jaxws:jsr181-api</exclude>
+ <exclude>sun-jaxws:jaxws-api</exclude>
<!-- JBAS-7531 org.jboss.ejb3:jboss-ejb3-as-int is retired.
Use org.jboss.ejb3:jboss-ejb3_1 instead
-->
@@ -3314,6 +3315,7 @@
<exclude>org.jboss.logging:jboss-logging-log4j</exclude>
<exclude>org.jboss.logging:jboss-logging-jdk</exclude>
<exclude>org.jboss.logging:jboss-logging-logmanager</exclude>
+ <exclude>quartz:quartz</exclude>
</excludes>
<includes>
<include>javax.xml.bind:jaxb-api:jar:2.1</include>
Modified: trunk/connector/pom.xml
===================================================================
--- trunk/connector/pom.xml 2010-04-23 21:28:19 UTC (rev 104209)
+++ trunk/connector/pom.xml 2010-04-23 22:07:57 UTC (rev 104210)
@@ -115,7 +115,7 @@
<dependencies>
<dependency>
- <groupId>apache-xerces</groupId>
+ <groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</dependency>
<dependency>
Modified: trunk/depchain/pom.xml
===================================================================
--- trunk/depchain/pom.xml 2010-04-23 21:28:19 UTC (rev 104209)
+++ trunk/depchain/pom.xml 2010-04-23 22:07:57 UTC (rev 104210)
@@ -260,7 +260,7 @@
<!-- Dependencies on additional artifacts not included by the modules -->
<dependency>
- <groupId>apache-avalon-logkit</groupId>
+ <groupId>logkit</groupId>
<artifactId>logkit</artifactId>
</dependency>
<dependency>
@@ -268,7 +268,7 @@
<artifactId>bsf</artifactId>
</dependency>
<dependency>
- <groupId>apache-scout</groupId>
+ <groupId>org.apache.ws.scout</groupId>
<artifactId>scout</artifactId>
</dependency>
<dependency>
@@ -280,8 +280,8 @@
<artifactId>xalan</artifactId>
</dependency>
<dependency>
- <groupId>apache-xerces</groupId>
- <artifactId>resolver</artifactId>
+ <groupId>xml-resolver</groupId>
+ <artifactId>xml-resolver</artifactId>
</dependency>
<dependency>
<groupId>com.sun.xml.ws</groupId>
@@ -422,6 +422,10 @@
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -503,6 +507,10 @@
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -892,8 +900,8 @@
<artifactId>streambuffer</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ws.policy</groupId>
- <artifactId>wscommons-policy</artifactId>
+ <groupId>ws-commons</groupId>
+ <artifactId>policy</artifactId>
</dependency>
<dependency>
<groupId>com.sun.xml.ws</groupId>
Modified: trunk/ejb3/pom.xml
===================================================================
--- trunk/ejb3/pom.xml 2010-04-23 21:28:19 UTC (rev 104209)
+++ trunk/ejb3/pom.xml 2010-04-23 22:07:57 UTC (rev 104210)
@@ -158,7 +158,7 @@
<dependencies>
<dependency>
- <groupId>apache-xerces</groupId>
+ <groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</dependency>
@@ -171,7 +171,7 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
@@ -268,27 +268,27 @@
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-transaction-api</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-dependency</artifactId>
- </exclusion>
<exclusion>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- </exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ </exclusion>
<exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jaspi-api</artifactId>
- </exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </exclusion>
<exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jca-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jms-api</artifactId>
- </exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jaspi-api</artifactId>
+ </exclusion>
<exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jca-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jms-api</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-spi</artifactId>
</exclusion>
@@ -305,6 +305,18 @@
<groupId>org.jboss.ejb3.timeout</groupId>
<artifactId>jboss-ejb3-timeout-3.0</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>quartz</groupId>
+ <artifactId>quartz</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>sun-jaxws</groupId>
+ <artifactId>jsr181-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>sun-jaxws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -312,36 +324,40 @@
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-core</artifactId>
<classifier>client</classifier>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-dependency</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jaspi-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jca-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jacc-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-transaction-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jms-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-ejb-api</artifactId>
- </exclusion>
+ <exclusions>
<exclusion>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jaspi-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jca-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jacc-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-transaction-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jms-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-spi</artifactId>
</exclusion>
@@ -349,13 +365,25 @@
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>sun-jaxws</groupId>
+ <artifactId>jsr181-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>quartz</groupId>
+ <artifactId>quartz</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>sun-jaxws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jboss.ejb3.vfs</groupId>
<artifactId>jboss-ejb3-vfs-spi</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.jboss.ejb3.vfs</groupId>
@@ -390,7 +418,7 @@
</exclusion>
</exclusions>
</dependency>
-
+
<dependency>
<groupId>org.jboss.spec.javax.ejb</groupId>
<artifactId>jboss-ejb-api_3.1_spec</artifactId>
@@ -405,9 +433,9 @@
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-connector</artifactId>
<exclusions>
- <exclusion>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-dependency</artifactId>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -460,14 +488,14 @@
<dependency>
<groupId>org.jboss.integration</groupId>
<artifactId>jboss-corba-ots-spi</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-transaction-api</artifactId>
- </exclusion>
- </exclusions>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-transaction-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
-
+
<dependency>
<groupId>org.jboss.reloaded</groupId>
<artifactId>jboss-reloaded-naming-deployers</artifactId>
Modified: trunk/hornetq-int/pom.xml
===================================================================
--- trunk/hornetq-int/pom.xml 2010-04-23 21:28:19 UTC (rev 104209)
+++ trunk/hornetq-int/pom.xml 2010-04-23 22:07:57 UTC (rev 104210)
@@ -146,7 +146,7 @@
<artifactId>hornetq-jms</artifactId>
</dependency>
<dependency>
- <groupId>apache-xerces</groupId>
+ <groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</dependency>
<dependency>
Modified: trunk/iiop/pom.xml
===================================================================
--- trunk/iiop/pom.xml 2010-04-23 21:28:19 UTC (rev 104209)
+++ trunk/iiop/pom.xml 2010-04-23 22:07:57 UTC (rev 104210)
@@ -117,7 +117,7 @@
<dependencies>
<!-- Compile (global dependencies) -->
<dependency>
- <groupId>apache-xerces</groupId>
+ <groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</dependency>
Modified: trunk/management/pom.xml
===================================================================
--- trunk/management/pom.xml 2010-04-23 21:28:19 UTC (rev 104209)
+++ trunk/management/pom.xml 2010-04-23 22:07:57 UTC (rev 104210)
@@ -143,7 +143,7 @@
<artifactId>jboss-as-cluster</artifactId>
</dependency>
<dependency>
- <groupId>apache-xerces</groupId>
+ <groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</dependency>
</dependencies>
Modified: trunk/osgi/zip/pom.xml
===================================================================
--- trunk/osgi/zip/pom.xml 2010-04-23 21:28:19 UTC (rev 104209)
+++ trunk/osgi/zip/pom.xml 2010-04-23 22:07:57 UTC (rev 104210)
@@ -98,6 +98,10 @@
<artifactId>xercesImpl</artifactId>
</exclusion>
<exclusion>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>wutka-dtdparser</groupId>
<artifactId>dtdparser121</artifactId>
</exclusion>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-04-23 21:28:19 UTC (rev 104209)
+++ trunk/pom.xml 2010-04-23 22:07:57 UTC (rev 104210)
@@ -490,7 +490,7 @@
-->
<!-- Repositories -->
- <repositories>
+ <!--<repositories>
<repository>
<id>jboss-public-repository-group</id>
<name>JBoss Public Maven Repository Group</name>
@@ -506,9 +506,10 @@
</snapshots>
</repository>
</repositories>
+ -->
<!-- Plugin Repositories -->
- <pluginRepositories>
+ <!--<pluginRepositories>
<pluginRepository>
<id>jboss-public-repository-group</id>
<name>JBoss Public Maven Repository Group</name>
@@ -524,7 +525,7 @@
</snapshots>
</pluginRepository>
</pluginRepositories>
-
+ -->
<profiles>
<!-- By default build all modules -->
Modified: trunk/profileservice/pom.xml
===================================================================
--- trunk/profileservice/pom.xml 2010-04-23 21:28:19 UTC (rev 104209)
+++ trunk/profileservice/pom.xml 2010-04-23 22:07:57 UTC (rev 104210)
@@ -180,7 +180,7 @@
<artifactId>jboss-deployers-structure-spi</artifactId>
</dependency>
<dependency>
- <groupId>apache-xerces</groupId>
+ <groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</dependency>
<dependency>
Modified: trunk/system-jmx/pom.xml
===================================================================
--- trunk/system-jmx/pom.xml 2010-04-23 21:28:19 UTC (rev 104209)
+++ trunk/system-jmx/pom.xml 2010-04-23 22:07:57 UTC (rev 104210)
@@ -44,7 +44,7 @@
<dependencies>
<!-- Compile (global dependencies) -->
<dependency>
- <groupId>apache-xerces</groupId>
+ <groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</dependency>
<dependency>
Modified: trunk/testsuite/pom.xml
===================================================================
--- trunk/testsuite/pom.xml 2010-04-23 21:28:19 UTC (rev 104209)
+++ trunk/testsuite/pom.xml 2010-04-23 22:07:57 UTC (rev 104210)
@@ -25,7 +25,7 @@
<artifactId>commons-discovery</artifactId>
</dependency>
<dependency>
- <groupId>apache-httpclient</groupId>
+ <groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
</dependency>
<dependency>
Modified: trunk/tomcat/pom.xml
===================================================================
--- trunk/tomcat/pom.xml 2010-04-23 21:28:19 UTC (rev 104209)
+++ trunk/tomcat/pom.xml 2010-04-23 22:07:57 UTC (rev 104210)
@@ -157,7 +157,7 @@
<dependencies>
<!-- Compile (global dependencies) -->
<dependency>
- <groupId>apache-xerces</groupId>
+ <groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</dependency>
<dependency>
@@ -315,34 +315,38 @@
<classifier>client</classifier>
<exclusions>
<exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-ejb-api_3.1</artifactId>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xml-apis</artifactId>
</exclusion>
<exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-ejb-api</artifactId>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
</exclusion>
<exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jacc-api</artifactId>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jaspi-api</artifactId>
</exclusion>
<exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jca-api</artifactId>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jca-api</artifactId>
</exclusion>
<exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jms-api</artifactId>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jacc-api</artifactId>
</exclusion>
<exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jaspi-api</artifactId>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-transaction-api</artifactId>
</exclusion>
<exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-transaction-api</artifactId>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jms-api</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-spi</artifactId>
</exclusion>
@@ -350,6 +354,18 @@
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>sun-jaxws</groupId>
+ <artifactId>jsr181-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>quartz</groupId>
+ <artifactId>quartz</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>sun-jaxws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
Modified: trunk/varia/pom.xml
===================================================================
--- trunk/varia/pom.xml 2010-04-23 21:28:19 UTC (rev 104209)
+++ trunk/varia/pom.xml 2010-04-23 22:07:57 UTC (rev 104210)
@@ -309,7 +309,7 @@
</dependency>
<dependency>
- <groupId>apache-xerces</groupId>
+ <groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</dependency>
Modified: trunk/webservices/pom.xml
===================================================================
--- trunk/webservices/pom.xml 2010-04-23 21:28:19 UTC (rev 104209)
+++ trunk/webservices/pom.xml 2010-04-23 22:07:57 UTC (rev 104210)
@@ -126,12 +126,20 @@
<classifier>client</classifier>
<exclusions>
<exclusion>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-ejb-api_3.1</artifactId>
+ <artifactId>jboss-jaspi-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-ejb-api</artifactId>
+ <artifactId>jboss-jca-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.javaee</groupId>
@@ -139,7 +147,7 @@
</exclusion>
<exclusion>
<groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jca-api</artifactId>
+ <artifactId>jboss-transaction-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.javaee</groupId>
@@ -147,13 +155,9 @@
</exclusion>
<exclusion>
<groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jaspi-api</artifactId>
+ <artifactId>jboss-ejb-api</artifactId>
</exclusion>
<exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-transaction-api</artifactId>
- </exclusion>
- <exclusion>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-spi</artifactId>
</exclusion>
@@ -161,6 +165,18 @@
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>sun-jaxws</groupId>
+ <artifactId>jsr181-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>quartz</groupId>
+ <artifactId>quartz</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>sun-jaxws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -168,12 +184,20 @@
<artifactId>jboss-ejb3_1</artifactId>
<exclusions>
<exclusion>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-proxy</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.jboss.cache</groupId>
<artifactId>jbosscache-core</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-ejb-api_3.1</artifactId>
+ <artifactId>jboss-jacc-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.javaee</groupId>
@@ -181,25 +205,33 @@
</exclusion>
<exclusion>
<groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jacc-api</artifactId>
+ <artifactId>jboss-ejb-api_3.1</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jca-api</artifactId>
+ <artifactId>jboss-transaction-api</artifactId>
</exclusion>
<exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jms-api</artifactId>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-jaspi-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-transaction-api</artifactId>
+ <artifactId>jboss-jca-api</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jms-api</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-spi</artifactId>
</exclusion>
@@ -207,6 +239,27 @@
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <!-- Only bring in timeout-3.1 -->
+ <exclusion>
+ <groupId>org.jboss.ejb3.timeout</groupId>
+ <artifactId>jboss-ejb3-timeout-3.0</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>quartz</groupId>
+ <artifactId>quartz</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>sun-jaxws</groupId>
+ <artifactId>jsr181-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>sun-jaxws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -237,6 +290,10 @@
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<!-- transitive dependencies -->
More information about the jboss-cvs-commits
mailing list