[jboss-cvs] JBossAS SVN: r108430 - in projects/jboss-jca/trunk: sjc and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Oct 4 12:42:38 EDT 2010
Author: jesper.pedersen
Date: 2010-10-04 12:42:38 -0400 (Mon, 04 Oct 2010)
New Revision: 108430
Modified:
projects/jboss-jca/trunk/build.xml
projects/jboss-jca/trunk/ivy.xml
projects/jboss-jca/trunk/sjc/build.xml
Log:
[JBJCA-433] PicketBox 4.0.0.Alpha1
Modified: projects/jboss-jca/trunk/build.xml
===================================================================
--- projects/jboss-jca/trunk/build.xml 2010-10-04 16:42:11 UTC (rev 108429)
+++ projects/jboss-jca/trunk/build.xml 2010-10-04 16:42:38 UTC (rev 108430)
@@ -86,11 +86,9 @@
<!-- =================================
Versions
================================= -->
- <property name="version.activation" value="1.1.1"/>
<property name="version.ant" value="1.8.1"/>
<property name="version.apache-log4j" value="1.2.16"/>
<property name="version.apache-logging" value="1.1.0.jboss"/>
- <property name="version.apache-xerces" value="2.9.1"/>
<property name="version.apiviz" value="1.3.1.GA"/>
<property name="version.arquillian" value="1.0.0.Alpha4"/>
<property name="version.dom4j" value="1.6.1"/>
@@ -100,8 +98,6 @@
<property name="version.h2" value="1.2.143"/>
<property name="version.hibernate-validator" value="4.1.0.Final"/>
<property name="version.javassist" value="3.12.0.GA"/>
- <property name="version.jaxb.api" value="2.1"/>
- <property name="version.jaxb.impl" value="2.1.9"/>
<property name="version.jboss.common" value="2.2.17.GA"/>
<property name="version.jboss.integration" value="5.1.0.CR1"/>
<property name="version.jboss.jaspi.api" value="1.0.0.GA"/>
@@ -109,8 +105,7 @@
<property name="version.jboss.logmanager" value="1.2.0.CR7"/>
<property name="version.jboss.naming" value="5.0.3.GA"/>
<property name="version.jboss.papaki" value="1.0.0.Beta3"/>
- <property name="version.jboss.picketbox" value="3.0.0.CR1"/>
- <property name="version.jboss.reflect" value="2.0.2.GA"/>
+ <property name="version.jboss.picketbox" value="4.0.0.Alpha1"/>
<property name="version.jboss.security" value="2.1.0.20090318"/>
<property name="version.jboss.shrinkwrap" value="1.0.0-alpha-11"/>
<property name="version.jboss.slf4j" value="1.0.2.GA"/>
@@ -118,7 +113,6 @@
<property name="version.jboss.stdio" value="1.0.0.CR3"/>
<property name="version.jboss.threads" value="2.0.0.CR5"/>
<property name="version.jboss.ts" value="4.11.0.Final"/>
- <property name="version.jboss.xb" value="2.0.2.Beta8"/>
<property name="version.jdepend" value="2.9.1"/>
<property name="version.jetty" value="7.1.5.v20100705"/>
<property name="version.jetty.servlet" value="6.1.14"/>
@@ -127,7 +121,6 @@
<property name="version.junit" value="4.8.1"/>
<property name="version.maven" value="2.2.1"/>
<property name="version.slf4j" value="1.5.8"/>
- <property name="version.stax" value="1.0.1"/>
<property name="version.transaction.api" value="1.0.1.GA"/>
<property name="version.validation-api" value="1.0.0.GA"/>
Modified: projects/jboss-jca/trunk/ivy.xml
===================================================================
--- projects/jboss-jca/trunk/ivy.xml 2010-10-04 16:42:11 UTC (rev 108429)
+++ projects/jboss-jca/trunk/ivy.xml 2010-10-04 16:42:38 UTC (rev 108430)
@@ -97,12 +97,9 @@
<dependency org="com.github.fungal" name="fungal" rev="${version.fungal}" conf="sjc,ironjacamar-depchain,ironjacamar-deployers-fungal,ironjacamar-embedded"/>
<dependency org="com.github.fungal" name="fungal-cli" rev="${version.fungal}" conf="sjc,ironjacamar-depchain"/>
<dependency org="com.h2database" name="h2" rev="${version.h2}" conf="test"/>
- <dependency org="com.sun.xml.bind" name="jaxb-impl" rev="${version.jaxb.impl}" conf="common,ironjacamar-depchain"/>
<dependency org="dom4j" name="dom4j" rev="${version.dom4j}" conf="jetty,tools"/>
<dependency org="javassist" name="javassist" rev="${version.javassist}" conf="common,ironjacamar-depchain"/>
- <dependency org="javax.activation" name="activation" rev="${version.activation}" conf="common,ironjacamar-depchain"/>
<dependency org="javax.validation" name="validation-api" rev="${version.validation-api}" conf="common,ironjacamar-core-impl,ironjacamar-depchain,ironjacamar-deployers-fungal"/>
- <dependency org="javax.xml.bind" name="jaxb-api" rev="${version.jaxb.api}" conf="common,ironjacamar-depchain,ironjacamar-codegenerator"/>
<dependency org="jdepend" name="jdepend" rev="${version.jdepend}" conf="tools"/>
<dependency org="junit" name="junit" rev="${version.junit}" conf="test"/>
<dependency org="log4j" name="log4j" rev="${version.apache-log4j}" conf="common,ironjacamar-depchain"/>
@@ -122,8 +119,6 @@
<dependency org="org.eclipse.jetty" name="jetty-xml" rev="${version.jetty}" conf="jetty"/>
<dependency org="org.hibernate" name="hibernate-validator" rev="${version.hibernate-validator}" conf="common,ironjacamar-depchain"/>
<dependency org="org.jboss" name="jboss-common-core" rev="${version.jboss.common}" conf="common,ironjacamar-common-impl,ironjacamar-core-impl,ironjacamar-depchain"/>
- <dependency org="org.jboss" name="jboss-reflect" rev="${version.jboss.reflect}" conf="common,ironjacamar-depchain"/>
- <dependency org="org.jboss" name="jbossxb" rev="${version.jboss.xb}" conf="common,ironjacamar-common-impl,ironjacamar-depchain"/>
<dependency org="org.jboss.apiviz" name="apiviz" rev="${version.apiviz}" conf="tools"/>
<dependency org="org.jboss.arquillian" name="arquillian-api" rev="${version.arquillian}" conf="arquillian,ironjacamar-depchain,ironjacamar-embedded-arquillian"/>
<dependency org="org.jboss.arquillian" name="arquillian-impl-base" rev="${version.arquillian}" conf="arquillian,ironjacamar-depchain,ironjacamar-embedded-arquillian"/>
@@ -153,8 +148,6 @@
<dependency org="org.picketbox" name="picketbox-bare" rev="${version.jboss.picketbox}" conf="common,ironjacamar-depchain"/>
<dependency org="org.slf4j" name="jcl-over-slf4j" rev="${version.slf4j}" conf="common,ironjacamar-depchain"/>
<dependency org="org.slf4j" name="slf4j-api" rev="${version.slf4j}" conf="common,ironjacamar-depchain"/>
- <dependency org="stax" name="stax-api" rev="${version.stax}" conf="common,ironjacamar-common-impl,ironjacamar-depchain"/>
- <dependency org="xerces" name="xercesImpl" rev="${version.apache-xerces}" conf="common,ironjacamar-depchain"/>
</dependencies>
</ivy-module>
Modified: projects/jboss-jca/trunk/sjc/build.xml
===================================================================
--- projects/jboss-jca/trunk/sjc/build.xml 2010-10-04 16:42:11 UTC (rev 108429)
+++ projects/jboss-jca/trunk/sjc/build.xml 2010-10-04 16:42:38 UTC (rev 108430)
@@ -198,9 +198,6 @@
<copy todir="${target.dir}/sjc/lib">
<fileset dir="${lib.dir}/common">
<include name="*.jar"/>
- <exclude name="jaxb-api.jar"/>
- <exclude name="xercesImpl.jar"/>
- <exclude name="stax-api.jar"/>
</fileset>
</copy>
@@ -222,21 +219,7 @@
</fileset>
</copy>
- <copy todir="${target.dir}/sjc/lib/endorsed">
- <fileset dir="${lib.dir}/common">
- <include name="jaxb-api.jar"/>
- <include name="xercesImpl.jar"/>
- <include name="stax-api.jar"/>
- </fileset>
- </copy>
-
<copy todir="${target.dir}/sjc/lib/jetty">
- <fileset dir="${lib.dir}/common">
- <include name="dom4j.jar"/>
- </fileset>
- </copy>
-
- <copy todir="${target.dir}/sjc/lib/jetty">
<fileset dir="${lib.dir}/jetty">
<include name="*.jar"/>
</fileset>
More information about the jboss-cvs-commits
mailing list