4:39 a.m.
Author: pete.muir(a)jboss.org
Date: 2009-07-07 05:39:48 -0400 (Tue, 07 Jul 2009)
New Revision: 3012
Modified:
ri/trunk/jboss-as/build.properties
ri/trunk/jboss-as/build.xml
ri/trunk/version-matrix/pom.xml
Log:
WBRI-140, upgrade javassist in JBoss AS
Modified: ri/trunk/jboss-as/build.properties
===================================================================
--- ri/trunk/jboss-as/build.properties 2009-07-07 00:50:39 UTC (rev 3011)
+++ ri/trunk/jboss-as/build.properties 2009-07-07 09:39:48 UTC (rev 3012)
@@ -7,7 +7,7 @@
# maximum number of TCK tests to deploy before restarting JBoss AS
# jboss.deployments.restart = 25
-webbeans-ri-int.version=5.2.0-SNAPSHOT
+webbeans-deployer.version=5.2.0-SNAPSHOT
webbeans.version=1.0.0-SNAPSHOT
jboss-ejb3.version=1.0.0
-
+javassist.version=3.11.0.GA
Modified: ri/trunk/jboss-as/build.xml
===================================================================
--- ri/trunk/jboss-as/build.xml 2009-07-07 00:50:39 UTC (rev 3011)
+++ ri/trunk/jboss-as/build.xml 2009-07-07 09:39:48 UTC (rev 3012)
@@ -13,17 +13,17 @@
<delete dir="target" failonerror="false" />
</target>
- <target name="update" depends="install-webbeans.deployer"
description="Update JBoss 5 for the Web Beans RI" />
+ <target name="update" depends="install-webbeans.deployer,
install-javassist-update" description="Update JBoss 5.x or 6.x for Web
Beans" />
<target name="install-webbeans.deployer">
-
+ <echo message="Installing Web Beans ${webbeans.version} to ${jboss.home}"
/>
<fail unless="jboss.home" message="Please pass in
-Djboss.home=..." />
<delete dir="${jboss.home}/server/default/deployers/webbeans.deployer"
failonerror="false" />
<delete dir="target" failonerror="false" />
- <artifact:dependencies filesetId="webbeans.deployer.fileset"
versionsId="webbeans.deployer.versions" >
- <dependency groupId="org.jboss.webbeans.integration"
artifactId="webbeans-jboss-int-deployer"
version="${webbeans-ri-int.version}" type="zip" />
+ <artifact:dependencies filesetId="webbeans.deployer.fileset"
versionsId="webbeans.deployer.versions">
+ <dependency groupId="org.jboss.webbeans.integration"
artifactId="webbeans-jboss-int-deployer"
version="${webbeans-deployer.version}" type="zip" />
<dependency groupId="org.jboss.webbeans"
artifactId="webbeans-core" version="${webbeans.version}" />
<remoteRepository id="repository.jboss.org"
url="http://repository.jboss.org/maven2" />
<remoteRepository id="snapshots.jboss.org"
url="http://snapshots.jboss.org/maven2" />
@@ -39,13 +39,16 @@
</copy>
<unzip dest="target"
src="target/dependency/lib/webbeans-jboss-int-deployer.zip" />
-
- <copy todir="target/webbeans.deployer/lib-int/"
overwrite="true">
- <fileset dir="target/dependency/lib">
- <include name="webbeans-core.jar" />
- </fileset>
- </copy>
-
+
+ <copy todir="target/webbeans.deployer/lib-int/"
overwrite="true">
+ <fileset dir="target/dependency/lib">
+ <include name="webbeans-core.jar" />
+ <include name="webbeans-api.jar" />
+ <include name="jsr299-api.jar" />
+ <include name="webbeans-logger.jar" />
+ </fileset>
+ </copy>
+
<delete dir="target/dependency" />
<copy
todir="${jboss.home}/server/default/deployers/webbeans.deployer">
@@ -57,6 +60,32 @@
</target>
+ <target name="install-javassist-update">
+ <echo message="Upgrading Javassist to ${javassist.version} to
${jboss.home}" />
+ <fail unless="jboss.home" message="Please pass in
-Djboss.home=..." />
+
+ <artifact:dependencies filesetId="javassist.fileset"
versionsId="javassist.versions">
+ <dependency groupId="javassist" artifactId="javassist"
version="${javassist.version}" />
+ <remoteRepository id="repository.jboss.org"
url="http://repository.jboss.org/maven2" />
+ <remoteRepository id="snapshots.jboss.org"
url="http://snapshots.jboss.org/maven2" />
+ </artifact:dependencies>
+
+ <mkdir dir="target/dependency/lib" />
+ <copy todir="target/dependency/lib">
+ <fileset refid="javassist.fileset" />
+ <chainedmapper>
+ <flattenmapper />
+ <mapper classpathref="maven-ant-tasks.classpath"
classname="org.apache.maven.artifact.ant.VersionMapper"
from="${javassist.versions}" to="flatten" />
+ </chainedmapper>
+ </copy>
+
+ <copy todir="${jboss.home}/lib">
+ <fileset dir="target/dependency/lib">
+ <include name="javassist.jar" />
+ </fileset>
+ </copy>
+ </target>
+
<target name="install-jboss-ejb3-update">
<fail unless="jboss.home" message="Please pass in
-Djboss.home=..." />
Modified: ri/trunk/version-matrix/pom.xml
===================================================================
--- ri/trunk/version-matrix/pom.xml 2009-07-07 00:50:39 UTC (rev 3011)
+++ ri/trunk/version-matrix/pom.xml 2009-07-07 09:39:48 UTC (rev 3012)
@@ -103,7 +103,7 @@
<dependency>
<groupId>javassist</groupId>
<artifactId>javassist</artifactId>
- <version>3.8.1.GA</version>
+ <version>3.11.0.GA</version>
</dependency>
<dependency>