[jboss-cvs] JBossAS SVN: r107941 - in branches/infinispan-int: component-matrix and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Sep 1 16:34:47 EDT 2010
Author: pferraro
Date: 2010-09-01 16:34:46 -0400 (Wed, 01 Sep 2010)
New Revision: 107941
Modified:
branches/infinispan-int/build/build.xml
branches/infinispan-int/component-matrix/pom.xml
branches/infinispan-int/depchain/pom.xml
Log:
Add rhq-pluginAnnotations
Upgrade ejb3 as6-depchain
Modified: branches/infinispan-int/build/build.xml
===================================================================
--- branches/infinispan-int/build/build.xml 2010-09-01 20:33:26 UTC (rev 107940)
+++ branches/infinispan-int/build/build.xml 2010-09-01 20:34:46 UTC (rev 107941)
@@ -2069,9 +2069,7 @@
<fileset refid="org.jboss.cluster:jboss-ha-client:jar"/>
<fileset refid="org.jboss.cluster:jboss-ha-server-api:jar"/>
<fileset refid="org.jboss.cluster:jboss-ha-server-core:jar"/>
- <fileset refid="org.jboss.cluster:jboss-ha-server-ispn:jar"/>
<fileset refid="org.jboss.cluster:jboss-ha-server-cache-spi:jar"/>
- <fileset refid="org.jboss.cluster:jboss-ha-server-cache-ispn:jar"/>
<fileset refid="org.jboss.integration:jboss-integration:jar"/>
<fileset refid="org.jboss.metadata:jboss-metadata-common:jar"/>
<fileset refid="org.jboss.metadata:jboss-metadata-client:jar"/>
@@ -2106,7 +2104,7 @@
<fileset refid="org.jboss.ejb3:jboss-ejb3-common:jar"/>
<fileset refid="org.jboss.ejb3.async:jboss-ejb3-async-spi:jar"/>
<fileset refid="org.jboss.ejb3.async:jboss-ejb3-async-impl:jar"/>
- <fileset refid="org.jboss.ejb3.concurrency:jboss-ejb3-concurrency-aop:jar"/>
+ <fileset refid="org.jboss.ejb3.concurrency:jboss-ejb3-concurrency-aop:jar"/>
<fileset refid="org.jboss.ejb3.concurrency:jboss-ejb3-concurrency-impl:jar"/>
<fileset refid="org.jboss.ejb3.container:jboss-ejb3-container-spi:jar"/>
<fileset refid="org.jboss.ejb3.context:jboss-ejb3-context-base:jar"/>
@@ -2144,7 +2142,7 @@
<fileset refid="org.jboss.ejb3.instantiator:jboss-ejb3-instantiator-impl:jar"/>
<fileset refid="org.jboss.ejb3.proxy:proxy-spi:jar"/>
<fileset refid="org.jboss.ejb3.proxy:proxy-javassist:jar"/>
- <fileset refid="org.jboss.ejb3.proxy:proxy-reflect:jar"/>
+ <fileset refid="org.jboss.ejb3.proxy:proxy-reflect:jar"/>
<fileset refid="org.jboss.ejb3.timeout:jboss-ejb3-timeout-spi:jar"/>
<fileset refid="org.jboss.ejb3.timeout:jboss-ejb3-timeout-3.1:jar"/>
<fileset refid="org.jboss.ejb3.timerservice:ejb31-calendar-expr-parser:jar"/>
@@ -2154,14 +2152,14 @@
<fileset refid="org.jboss.ejb3.tx2:jboss-ejb3-tx2-spi:jar"/>
<fileset refid="org.jboss.ejb3.vfs:jboss-ejb3-vfs-spi:jar"/>
<fileset refid="org.jboss.ejb3.vfs:jboss-ejb3-vfs-impl-vfs3:jar"/>
- <fileset refid="org.jboss.embedded:jboss-embedded-api:jar" />
- <fileset refid="org.jboss.embedded:jboss-embedded-core:jar" />
+ <fileset refid="org.jboss.embedded:jboss-embedded-api:jar" />
+ <fileset refid="org.jboss.embedded:jboss-embedded-core:jar" />
<fileset refid="org.jboss.reloaded:jboss-reloaded-naming:jar"/>
<fileset refid="org.jboss.reloaded:jboss-reloaded-naming-deployers:jar"/>
- <fileset refid="org.jboss.shrinkwrap:shrinkwrap-api:jar" />
- <fileset refid="org.jboss.shrinkwrap:shrinkwrap-impl-base:jar" />
- <fileset refid="org.jboss.shrinkwrap:shrinkwrap-spi:jar" />
- <fileset refid="org.jboss.shrinkwrap:shrinkwrap-extension-vfs3:jar" />
+ <fileset refid="org.jboss.shrinkwrap:shrinkwrap-api:jar" />
+ <fileset refid="org.jboss.shrinkwrap:shrinkwrap-impl-base:jar" />
+ <fileset refid="org.jboss.shrinkwrap:shrinkwrap-spi:jar" />
+ <fileset refid="org.jboss.shrinkwrap:shrinkwrap-extension-vfs3:jar" />
<fileset refid="org.hibernate:hibernate-core:jar"/>
<fileset refid="org.hibernate:hibernate-commons-annotations:jar"/>
<fileset refid="org.hibernate:hibernate-entitymanager:jar"/>
@@ -2232,7 +2230,11 @@
<fileset refid="org.hibernate:hibernate-infinispan:jar"/>
<fileset refid="org.infinispan:infinispan-core:jar"/>
<fileset refid="org.infinispan:infinispan-tree:jar"/>
- <mapper refid="remove-versions" />
+ <fileset refid="org.jboss.cluster:jboss-ha-server-ispn:jar"/>
+ <fileset refid="org.jboss.cluster:jboss-ha-server-cache-ispn:jar"/>
+ <fileset refid="org.rhq.helpers:rhq-pluginAnnotations"/>
+ <!--fileset refid="i18nlog:i18nlog"/-->
+ <mapper refid="remove-versions"/>
</copy>
<!-- Copy the generated libraries to lib-->
@@ -2240,10 +2242,10 @@
<copy todir="${install.lib}" filtering="no">
<fileset refid="javassist:javassist:jar"/>
<fileset refid="org.jboss.aop:jboss-aop:jar"/>
- <fileset refid="org.jboss.bootstrap:jboss-bootstrap-api:jar"/>
- <fileset refid="org.jboss.bootstrap:jboss-bootstrap-api-mc:jar"/>
- <fileset refid="org.jboss.bootstrap:jboss-bootstrap-api-as:jar"/>
- <fileset refid="org.jboss.bootstrap:jboss-bootstrap-spi:jar"/>
+ <fileset refid="org.jboss.bootstrap:jboss-bootstrap-api:jar"/>
+ <fileset refid="org.jboss.bootstrap:jboss-bootstrap-api-mc:jar"/>
+ <fileset refid="org.jboss.bootstrap:jboss-bootstrap-api-as:jar"/>
+ <fileset refid="org.jboss.bootstrap:jboss-bootstrap-spi:jar"/>
<fileset refid="org.jboss.bootstrap:jboss-bootstrap-spi-mc:jar"/>
<fileset refid="org.jboss.bootstrap:jboss-bootstrap-spi-as:jar"/>
<fileset refid="org.jboss.bootstrap:jboss-bootstrap-impl-base:jar"/>
Modified: branches/infinispan-int/component-matrix/pom.xml
===================================================================
--- branches/infinispan-int/component-matrix/pom.xml 2010-09-01 20:33:26 UTC (rev 107940)
+++ branches/infinispan-int/component-matrix/pom.xml 2010-09-01 20:34:46 UTC (rev 107941)
@@ -108,7 +108,7 @@
<version.org.jboss.cluster.server.ispn>1.0.0.Alpha10</version.org.jboss.cluster.server.ispn>
<version.org.jboss.common.core>2.2.17.GA</version.org.jboss.common.core>
<version.org.jboss.deployers>2.2.0.Alpha6</version.org.jboss.deployers>
- <version.org.jboss.ejb3.depchain>1.0.0-SNAPSHOT</version.org.jboss.ejb3.depchain>
+ <version.org.jboss.ejb3.depchain>1.0.0-alpha-3</version.org.jboss.ejb3.depchain>
<!-- This to move into the EJB3 BOM -->
<version.org.jboss.ejb3.embedded>1.0.0-alpha-1</version.org.jboss.ejb3.embedded>
<version.org.jboss.ejb.api>1.0-alpha-1</version.org.jboss.ejb.api>
@@ -852,6 +852,11 @@
<artifactId>rhq-jmx-plugin</artifactId>
<version>${version.rhq}</version>
</dependency>
+ <dependency>
+ <groupId>org.rhq.helpers</groupId>
+ <artifactId>rhq-pluginAnnotations</artifactId>
+ <version>${version.rhq}</version>
+ </dependency>
<dependency>
<groupId>org.hornetq</groupId>
@@ -2477,6 +2482,19 @@
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-transaction-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.rhq.helpers</groupId>
+ <artifactId>rhq-pluginAnnotations</artifactId>
+ </exclusion>
+ <!-- Legacy JBoss Marshalling artifacts -->
+ <exclusion>
+ <groupId>org.jboss.marshalling</groupId>
+ <artifactId>marshalling-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.marshalling</groupId>
+ <artifactId>river</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
Modified: branches/infinispan-int/depchain/pom.xml
===================================================================
--- branches/infinispan-int/depchain/pom.xml 2010-09-01 20:33:26 UTC (rev 107940)
+++ branches/infinispan-int/depchain/pom.xml 2010-09-01 20:34:46 UTC (rev 107941)
@@ -1115,6 +1115,14 @@
<groupId>org.infinispan</groupId>
<artifactId>infinispan-tree</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.rhq.helpers</groupId>
+ <artifactId>rhq-pluginAnnotations</artifactId>
+ </dependency>
+ <!--dependency>
+ <groupId>i18nlog</groupId>
+ <artifactId>i18nlog</artifactId>
+ </dependency-->
<!-- End dist dependencies -->
</dependencies>
More information about the jboss-cvs-commits
mailing list