[infinispan-commits] Infinispan SVN: r1973 - in branches/4.1.x: demos/gridfs-webdav and 6 other directories.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Mon Jul 5 06:53:44 EDT 2010
Author: manik.surtani at jboss.com
Date: 2010-07-05 06:53:43 -0400 (Mon, 05 Jul 2010)
New Revision: 1973
Modified:
branches/4.1.x/core/pom.xml
branches/4.1.x/demos/gridfs-webdav/pom.xml
branches/4.1.x/demos/gui/pom.xml
branches/4.1.x/demos/lucene-directory-demo/pom.xml
branches/4.1.x/jopr-plugin/src/main/resources/META-INF/rhq-plugin.xml
branches/4.1.x/parent/pom.xml
branches/4.1.x/server/core/pom.xml
branches/4.1.x/src/main/resources/assemblies/all.xml
branches/4.1.x/src/main/resources/assemblies/bin.xml
Log:
[ISPN-525] (Consider shipping log4j jar in root lib/ directory)
Modified: branches/4.1.x/core/pom.xml
===================================================================
--- branches/4.1.x/core/pom.xml 2010-07-05 10:03:22 UTC (rev 1972)
+++ branches/4.1.x/core/pom.xml 2010-07-05 10:53:43 UTC (rev 1973)
@@ -18,7 +18,7 @@
<properties>
<version.jboss.common.core>2.2.14.GA</version.jboss.common.core>
<version.jboss.marshalling>1.2.1.GA</version.jboss.marshalling>
- <version.jgroups>2.10.0.Beta2</version.jgroups>
+ <version.jgroups>2.10.0.CR1</version.jgroups>
<version.jta>1.0.1.GA</version.jta>
<version.org.jboss.naming>5.0.3.GA</version.org.jboss.naming>
<version.rhq.pluginAnnotations>1.4.0.B01</version.rhq.pluginAnnotations>
@@ -26,7 +26,7 @@
<dependencies>
<dependency>
- <groupId>jgroups</groupId>
+ <groupId>org.jgroups</groupId>
<artifactId>jgroups</artifactId>
<version>${version.jgroups}</version>
</dependency>
Modified: branches/4.1.x/demos/gridfs-webdav/pom.xml
===================================================================
--- branches/4.1.x/demos/gridfs-webdav/pom.xml 2010-07-05 10:03:22 UTC (rev 1972)
+++ branches/4.1.x/demos/gridfs-webdav/pom.xml 2010-07-05 10:53:43 UTC (rev 1973)
@@ -32,14 +32,7 @@
<version>${version.webdav.servlet}</version>
</dependency>
- <!-- required by Webdav-Servlet -->
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- </dependency>
-
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>${version.javax.servlet}</version>
Modified: branches/4.1.x/demos/gui/pom.xml
===================================================================
--- branches/4.1.x/demos/gui/pom.xml 2010-07-05 10:03:22 UTC (rev 1972)
+++ branches/4.1.x/demos/gui/pom.xml 2010-07-05 10:53:43 UTC (rev 1973)
@@ -18,7 +18,6 @@
<properties>
<version.jgoodies.forms>1.0.5</version.jgoodies.forms>
<version.com.intellij.forms_rt>6.0.5</version.com.intellij.forms_rt>
- <version.apache.log4j>1.2.14</version.apache.log4j>
</properties>
<dependencies>
@@ -37,11 +36,6 @@
<artifactId>forms_rt</artifactId>
<version>${version.com.intellij.forms_rt}</version>
</dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${version.apache.log4j}</version>
- </dependency>
</dependencies>
<build>
Modified: branches/4.1.x/demos/lucene-directory-demo/pom.xml
===================================================================
--- branches/4.1.x/demos/lucene-directory-demo/pom.xml 2010-07-05 10:03:22 UTC (rev 1972)
+++ branches/4.1.x/demos/lucene-directory-demo/pom.xml 2010-07-05 10:53:43 UTC (rev 1973)
@@ -45,11 +45,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- </dependency>
- <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>infinispan-core</artifactId>
<version>${project.version}</version>
Modified: branches/4.1.x/jopr-plugin/src/main/resources/META-INF/rhq-plugin.xml
===================================================================
--- branches/4.1.x/jopr-plugin/src/main/resources/META-INF/rhq-plugin.xml 2010-07-05 10:03:22 UTC (rev 1972)
+++ branches/4.1.x/jopr-plugin/src/main/resources/META-INF/rhq-plugin.xml 2010-07-05 10:53:43 UTC (rev 1973)
@@ -61,32 +61,17 @@
>
- <operation name="CacheLoader.resetStatistics" displayName="[CacheLoader] Reset Statistics" description="Resets statistics gathered by this component">
+ <operation name="Activation.resetStatistics" displayName="[Activation] Reset statistics" description="Resets statistics gathered by this component">
</operation>
- <operation name="Cache.start" displayName="[Cache] Starts cache." description="Starts the cache.">
+ <operation name="RpcManager.resetStatistics" displayName="[RpcManager] Reset statistics" description="Resets statistics gathered by this component">
</operation>
- <operation name="Cache.stop" displayName="[Cache] Stops cache." description="Stops the cache.">
- </operation>
- <operation name="Transactions.resetStatistics" displayName="[Transactions] Reset Statistics" description="Resets statistics gathered by this component">
- </operation>
- <operation name="Transactions.setStatisticsEnabled" displayName="[Transactions] Enable/disable statistics" description="Enable/disable statistics">
+ <operation name="RpcManager.setStatisticsEnabled" displayName="[RpcManager] Enable/disable statistics" description="Enable/disable statistics">
<parameters>
<c:simple-property name="enabled" description="Whether statistics should be enabled or disabled (true/false)"/>
</parameters>
</operation>
- <operation name="Invalidation.resetStatistics" displayName="[Invalidation] Reset statistics" description="Resets statistics gathered by this component">
+ <operation name="CacheLoader.resetStatistics" displayName="[CacheLoader] Reset Statistics" description="Resets statistics gathered by this component">
</operation>
- <operation name="Invalidation.setStatisticsEnabled" displayName="[Invalidation] Enable/disable statistics" description="Enable/disable statistics">
- <parameters>
- <c:simple-property name="enabled" description="Whether statistics should be enabled or disabled (true/false)"/>
- </parameters>
- </operation>
- <operation name="Statistics.resetStatistics" displayName="[Statistics] Reset Statistics (Statistics)" description="Resets statistics gathered by this component">
- </operation>
- <operation name="DeadlockDetectingLockManager.resetStatistics" displayName="[DeadlockDetectingLockManager] Reset statistics" description="Resets statistics gathered by this component">
- </operation>
- <operation name="CacheStore.resetStatistics" displayName="[CacheStore] Reset statistics" description="Resets statistics gathered by this component">
- </operation>
<operation name="DistributionManager.isAffectedByRehash" displayName="[DistributionManager] Could key be affected by reshah?" description="Determines whether a given key is affected by an ongoing rehash, if any.">
<parameters>
<c:simple-property name="key" description="Key to check"/>
@@ -111,34 +96,89 @@
<c:simple-property name="operationResult" />
</results>
</operation>
- <operation name="Activation.resetStatistics" displayName="[Activation] Reset statistics" description="Resets statistics gathered by this component">
+ <operation name="DeadlockDetectingLockManager.resetStatistics" displayName="[DeadlockDetectingLockManager] Reset statistics" description="Resets statistics gathered by this component">
</operation>
<operation name="Passivation.resetStatistics" displayName="[Passivation] Reset statistics" description="Resets statistics gathered by this component">
</operation>
- <operation name="RpcManager.resetStatistics" displayName="[RpcManager] Reset statistics" description="Resets statistics gathered by this component">
+ <operation name="Invalidation.resetStatistics" displayName="[Invalidation] Reset statistics" description="Resets statistics gathered by this component">
</operation>
- <operation name="RpcManager.setStatisticsEnabled" displayName="[RpcManager] Enable/disable statistics" description="Enable/disable statistics">
+ <operation name="Invalidation.setStatisticsEnabled" displayName="[Invalidation] Enable/disable statistics" description="Enable/disable statistics">
<parameters>
<c:simple-property name="enabled" description="Whether statistics should be enabled or disabled (true/false)"/>
</parameters>
</operation>
+ <operation name="Statistics.resetStatistics" displayName="[Statistics] Reset Statistics (Statistics)" description="Resets statistics gathered by this component">
+ </operation>
+ <operation name="Cache.start" displayName="[Cache] Starts cache." description="Starts the cache.">
+ </operation>
+ <operation name="Cache.stop" displayName="[Cache] Stops cache." description="Stops the cache.">
+ </operation>
+ <operation name="CacheStore.resetStatistics" displayName="[CacheStore] Reset statistics" description="Resets statistics gathered by this component">
+ </operation>
+ <operation name="Transactions.resetStatistics" displayName="[Transactions] Reset Statistics" description="Resets statistics gathered by this component">
+ </operation>
+ <operation name="Transactions.setStatisticsEnabled" displayName="[Transactions] Enable/disable statistics" description="Enable/disable statistics">
+ <parameters>
+ <c:simple-property name="enabled" description="Whether statistics should be enabled or disabled (true/false)"/>
+ </parameters>
+ </operation>
+ <metric property="Activation.Activations" displayName="[Activation] Number of cache entries activated" displayType="detail" units="none" dataType="measurement"
+ description="Number of activation events" />
+ <metric property="Activation.CacheLoaderLoads" displayName="[Activation] Number of cache store loads" displayType="detail" units="none" dataType="measurement"
+ description="Number of entries loaded from cache store" />
+ <metric property="Activation.CacheLoaderMisses" displayName="[Activation] Number of cache store load misses" displayType="detail" units="none" dataType="measurement"
+ description="Number of entries that did not exist in cache store" />
+ <metric property="LockManager.ConcurrencyLevel" displayName="[LockManager] Concurrency level" displayType="detail" units="none" dataType="trait"
+ description="The concurrency level that the MVCC Lock Manager has been configured with." />
+ <metric property="LockManager.NumberOfLocksHeld" displayName="[LockManager] Number of locks held" displayType="detail" units="none" dataType="measurement"
+ description="The number of exclusive locks that are held." />
+ <metric property="LockManager.NumberOfLocksAvailable" displayName="[LockManager] Number of locks available" displayType="detail" units="none" dataType="measurement"
+ description="The number of exclusive locks that are available." />
+ <metric property="RpcManager.Members" displayName="[RpcManager] Cluster members" displayType="summary" units="none" dataType="trait"
+ description="List of members in the cluster" />
+ <metric property="RpcManager.StatisticsEnabled" displayName="[RpcManager] Statistics enabled" displayType="detail" units="none" dataType="trait"
+ description="Statistics enabled" />
+ <metric property="RpcManager.ReplicationCount" displayName="[RpcManager] Number of successfull replications" displayType="summary" units="none" dataType="measurement"
+ description="Number of successful replications" />
+ <metric property="RpcManager.ReplicationFailures" displayName="[RpcManager] Number of failed replications" displayType="summary" units="none" dataType="measurement"
+ description="Number of failed replications" />
+ <metric property="RpcManager.NodeAddress" displayName="[RpcManager] Network address" displayType="summary" units="none" dataType="trait"
+ description="The network address associated with this instance" />
+ <metric property="RpcManager.PhysicalAddresses" displayName="[RpcManager] Physical network addresses" displayType="summary" units="none" dataType="trait"
+ description="The physical network addresses associated with this instance" />
+ <metric property="RpcManager.ClusterSize" displayName="[RpcManager] Cluster size" displayType="summary" units="none" dataType="measurement"
+ description="Size of the cluster in number of nodes" />
+ <metric property="RpcManager.SuccessRatioFloatingPoint" displayName="[RpcManager] Successful replication ratio" displayType="summary" units="percentage" dataType="measurement"
+ description="Successful replications as a ratio of total replications in numeric double format" />
+ <metric property="RpcManager.AverageReplicationTime" displayName="[RpcManager] Average time spent in the transport layer" displayType="summary" units="milliseconds" dataType="measurement"
+ description="The average time spent in the transport layer, in milliseconds" />
<metric property="CacheLoader.CacheLoaderLoads" displayName="[CacheLoader] Number of cache store loads" displayType="detail" units="none" dataType="measurement"
description="Number of entries loaded from cache store" />
<metric property="CacheLoader.CacheLoaderMisses" displayName="[CacheLoader] Number of cache store load misses" displayType="detail" units="none" dataType="measurement"
description="Number of entries that did not exist in cache store" />
- <metric property="Cache.CacheStatus" displayName="[Cache] Cache status" displayType="summary" units="none" dataType="trait"
- description="Returns the cache status" />
- <metric property="Cache.CacheName" displayName="[Cache] Cache name" displayType="summary" units="none" dataType="trait"
- description="Returns the cache name" />
- <metric property="Transactions.StatisticsEnabled" displayName="[Transactions] Statistics enabled" displayType="detail" units="none" dataType="trait"
- description="Statistics enabled" />
- <metric property="Transactions.Prepares" displayName="[Transactions] Prepares" displayType="summary" units="none" dataType="measurement"
- description="Number of transaction prepares performed since last reset" />
- <metric property="Transactions.Commits" displayName="[Transactions] Commits" displayType="summary" units="none" dataType="measurement"
- description="Number of transaction commits performed since last reset" />
- <metric property="Transactions.Rollbacks" displayName="[Transactions] Rollbacks" displayType="summary" units="none" dataType="measurement"
- description="Number of transaction rollbacks performed since last reset" />
+ <metric property="DistributionManager.RehashInProgress" displayName="[DistributionManager] Is rehash in progress?" displayType="detail" units="none" dataType="trait"
+ description="Checks whether the node is involved in a rehash." />
+ <metric property="DistributionManager.JoinComplete" displayName="[DistributionManager] Is join completed?" displayType="detail" units="none" dataType="trait"
+ description="If true, the node has successfully joined the grid and is considered to hold state. If false, the join process is still in progress." />
+ <metric property="DeadlockDetectingLockManager.OverlapWithNotDeadlockAwareLockOwners" displayName="[DeadlockDetectingLockManager] Number of unsolvable deadlock situations" displayType="detail" units="none" dataType="measurement"
+ description="Number of situtations when we try to determine a deadlock and the other lock owner is e.g. a local tx. In this scenario we cannot run the deadlock detection mechanism" />
+ <metric property="DeadlockDetectingLockManager.LocallyInterruptedTransactions" displayName="[DeadlockDetectingLockManager] Number of interrupted local transactions" displayType="detail" units="none" dataType="measurement"
+ description="Number of locally originated transactions that were interrupted as a deadlock situation was detected" />
+ <metric property="DeadlockDetectingLockManager.DetectedRemoteDeadlocks" displayName="[DeadlockDetectingLockManager] Number of detected remote deadlocks" displayType="detail" units="none" dataType="measurement"
+ description="Number of remote deadlocks detected" />
+ <metric property="DeadlockDetectingLockManager.DetectedLocalDeadlocks" displayName="[DeadlockDetectingLockManager] Number of detected local deadlocks" displayType="detail" units="none" dataType="measurement"
+ description="Number of local detected deadlocks" />
+ <metric property="DeadlockDetectingLockManager.TotalNumberOfDetectedDeadlocks" displayName="[DeadlockDetectingLockManager] Number of total detected deadlocks" displayType="detail" units="none" dataType="measurement"
+ description="Total number of local detected deadlocks" />
+ <metric property="DeadlockDetectingLockManager.ConcurrencyLevel" displayName="[DeadlockDetectingLockManager] Concurrency level" displayType="detail" units="none" dataType="trait"
+ description="The concurrency level that the MVCC Lock Manager has been configured with." />
+ <metric property="DeadlockDetectingLockManager.NumberOfLocksHeld" displayName="[DeadlockDetectingLockManager] Number of locks held" displayType="detail" units="none" dataType="measurement"
+ description="The number of exclusive locks that are held." />
+ <metric property="DeadlockDetectingLockManager.NumberOfLocksAvailable" displayName="[DeadlockDetectingLockManager] Number of locks available" displayType="detail" units="none" dataType="measurement"
+ description="The number of exclusive locks that are available." />
+ <metric property="Passivation.Passivations" displayName="[Passivation] Number of cache passivations" displayType="detail" units="none" dataType="measurement"
+ description="Number of passivation events" />
<metric property="Invalidation.StatisticsEnabled" displayName="[Invalidation] Statistics enabled" displayType="detail" units="none" dataType="trait"
description="Statistics enabled" />
<metric property="Invalidation.Invalidations" displayName="[Invalidation] Number of invalidations" displayType="detail" units="none" dataType="measurement"
@@ -169,60 +209,20 @@
description="Number of seconds since cache started" />
<metric property="Statistics.TimeSinceReset" displayName="[Statistics] Seconds since cache statistics were reset" displayType="summary" units="seconds" dataType="measurement"
description="Number of seconds since the cache statistics were last reset" />
- <metric property="DeadlockDetectingLockManager.OverlapWithNotDeadlockAwareLockOwners" displayName="[DeadlockDetectingLockManager] Number of unsolvable deadlock situations" displayType="detail" units="none" dataType="measurement"
- description="Number of situtations when we try to determine a deadlock and the other lock owner is e.g. a local tx. In this scenario we cannot run the deadlock detection mechanism" />
- <metric property="DeadlockDetectingLockManager.LocallyInterruptedTransactions" displayName="[DeadlockDetectingLockManager] Number of interrupted local transactions" displayType="detail" units="none" dataType="measurement"
- description="Number of locally originated transactions that were interrupted as a deadlock situation was detected" />
- <metric property="DeadlockDetectingLockManager.DetectedRemoteDeadlocks" displayName="[DeadlockDetectingLockManager] Number of detected remote deadlocks" displayType="detail" units="none" dataType="measurement"
- description="Number of remote deadlocks detected" />
- <metric property="DeadlockDetectingLockManager.DetectedLocalDeadlocks" displayName="[DeadlockDetectingLockManager] Number of detected local deadlocks" displayType="detail" units="none" dataType="measurement"
- description="Number of local detected deadlocks" />
- <metric property="DeadlockDetectingLockManager.TotalNumberOfDetectedDeadlocks" displayName="[DeadlockDetectingLockManager] Number of total detected deadlocks" displayType="detail" units="none" dataType="measurement"
- description="Total number of local detected deadlocks" />
- <metric property="DeadlockDetectingLockManager.ConcurrencyLevel" displayName="[DeadlockDetectingLockManager] Concurrency level" displayType="detail" units="none" dataType="trait"
- description="The concurrency level that the MVCC Lock Manager has been configured with." />
- <metric property="DeadlockDetectingLockManager.NumberOfLocksHeld" displayName="[DeadlockDetectingLockManager] Number of locks held" displayType="detail" units="none" dataType="measurement"
- description="The number of exclusive locks that are held." />
- <metric property="DeadlockDetectingLockManager.NumberOfLocksAvailable" displayName="[DeadlockDetectingLockManager] Number of locks available" displayType="detail" units="none" dataType="measurement"
- description="The number of exclusive locks that are available." />
+ <metric property="Cache.CacheStatus" displayName="[Cache] Cache status" displayType="summary" units="none" dataType="trait"
+ description="Returns the cache status" />
+ <metric property="Cache.CacheName" displayName="[Cache] Cache name" displayType="summary" units="none" dataType="trait"
+ description="Returns the cache name" />
<metric property="CacheStore.CacheLoaderStores" displayName="[CacheStore] Number of cache stores" displayType="detail" units="none" dataType="measurement"
description="number of cache loader stores" />
- <metric property="DistributionManager.RehashInProgress" displayName="[DistributionManager] Is rehash in progress?" displayType="detail" units="none" dataType="trait"
- description="Checks whether the node is involved in a rehash." />
- <metric property="DistributionManager.JoinComplete" displayName="[DistributionManager] Is join completed?" displayType="detail" units="none" dataType="trait"
- description="If true, the node has successfully joined the grid and is considered to hold state. If false, the join process is still in progress." />
- <metric property="Activation.Activations" displayName="[Activation] Number of cache entries activated" displayType="detail" units="none" dataType="measurement"
- description="Number of activation events" />
- <metric property="Activation.CacheLoaderLoads" displayName="[Activation] Number of cache store loads" displayType="detail" units="none" dataType="measurement"
- description="Number of entries loaded from cache store" />
- <metric property="Activation.CacheLoaderMisses" displayName="[Activation] Number of cache store load misses" displayType="detail" units="none" dataType="measurement"
- description="Number of entries that did not exist in cache store" />
- <metric property="Passivation.Passivations" displayName="[Passivation] Number of cache passivations" displayType="detail" units="none" dataType="measurement"
- description="Number of passivation events" />
- <metric property="LockManager.ConcurrencyLevel" displayName="[LockManager] Concurrency level" displayType="detail" units="none" dataType="trait"
- description="The concurrency level that the MVCC Lock Manager has been configured with." />
- <metric property="LockManager.NumberOfLocksHeld" displayName="[LockManager] Number of locks held" displayType="detail" units="none" dataType="measurement"
- description="The number of exclusive locks that are held." />
- <metric property="LockManager.NumberOfLocksAvailable" displayName="[LockManager] Number of locks available" displayType="detail" units="none" dataType="measurement"
- description="The number of exclusive locks that are available." />
- <metric property="RpcManager.Address" displayName="[RpcManager] Network address" displayType="summary" units="none" dataType="trait"
- description="The network address associated with this instance" />
- <metric property="RpcManager.Members" displayName="[RpcManager] Cluster members" displayType="summary" units="none" dataType="trait"
- description="List of members in the cluster" />
- <metric property="RpcManager.StatisticsEnabled" displayName="[RpcManager] Statistics enabled" displayType="detail" units="none" dataType="trait"
+ <metric property="Transactions.StatisticsEnabled" displayName="[Transactions] Statistics enabled" displayType="detail" units="none" dataType="trait"
description="Statistics enabled" />
- <metric property="RpcManager.ReplicationCount" displayName="[RpcManager] Number of successfull replications" displayType="summary" units="none" dataType="measurement"
- description="Number of successful replications" />
- <metric property="RpcManager.ReplicationFailures" displayName="[RpcManager] Number of failed replications" displayType="summary" units="none" dataType="measurement"
- description="Number of failed replications" />
- <metric property="RpcManager.PhysicalAddresses" displayName="[RpcManager] Physical network addresses" displayType="summary" units="none" dataType="trait"
- description="The physical network addresses associated with this instance" />
- <metric property="RpcManager.ClusterSize" displayName="[RpcManager] Cluster size" displayType="summary" units="none" dataType="measurement"
- description="Size of the cluster in number of nodes" />
- <metric property="RpcManager.SuccessRatioFloatingPoint" displayName="[RpcManager] Successful replication ratio" displayType="summary" units="percentage" dataType="measurement"
- description="Successful replications as a ratio of total replications in numeric double format" />
- <metric property="RpcManager.AverageReplicationTime" displayName="[RpcManager] Average time spent in the transport layer" displayType="summary" units="milliseconds" dataType="measurement"
- description="The average time spent in the transport layer, in milliseconds" />
+ <metric property="Transactions.Prepares" displayName="[Transactions] Prepares" displayType="summary" units="none" dataType="measurement"
+ description="Number of transaction prepares performed since last reset" />
+ <metric property="Transactions.Commits" displayName="[Transactions] Commits" displayType="summary" units="none" dataType="measurement"
+ description="Number of transaction commits performed since last reset" />
+ <metric property="Transactions.Rollbacks" displayName="[Transactions] Rollbacks" displayType="summary" units="none" dataType="measurement"
+ description="Number of transaction rollbacks performed since last reset" />
</service>
Modified: branches/4.1.x/parent/pom.xml
===================================================================
--- branches/4.1.x/parent/pom.xml 2010-07-05 10:03:22 UTC (rev 1972)
+++ branches/4.1.x/parent/pom.xml 2010-07-05 10:53:43 UTC (rev 1973)
@@ -71,75 +71,84 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<defaultTestGroup>functional,unit</defaultTestGroup>
<testNGListener>org.infinispan.test.fwk.UnitTestTestNGListener</testNGListener>
- <jboss.releases.repo.url>https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/
- </jboss.releases.repo.url>
- <jboss.snapshots.repo.url>https://repository.jboss.org/nexus/content/repositories/snapshots/
- </jboss.snapshots.repo.url>
- <version.scala>2.8.0.RC7</version.scala>
+ <jboss.releases.repo.url>https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/</jboss.releases.repo.url>
+ <jboss.snapshots.repo.url>https://repository.jboss.org/nexus/content/repositories/snapshots/</jboss.snapshots.repo.url>
+
+ <!-- Versions for dependencies -->
+ <version.scala>2.8.0.RC7</version.scala>
+ <version.testng>5.11</version.testng>
+ <version.jcipannotations>1.0</version.jcipannotations>
+ <version.easymockclassext>2.4</version.easymockclassext>
+ <version.easymock>2.4</version.easymock>
+ <version.jbossjta>4.9.0.GA</version.jbossjta>
+ <version.jbossjts>4.9.0.GA</version.jbossjts>
+ <version.jbossts-common>4.6.1.GA</version.jbossts-common>
+ <version.commons-logging>1.1.1</version.commons-logging>
+ <version.log4j>1.2.16</version.log4j>
+ <version.xstream>1.3.1</version.xstream>
</properties>
<dependencies>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>5.11</version>
+ <version>${version.testng}</version>
<scope>test</scope>
<classifier>jdk15</classifier>
</dependency>
<dependency>
<groupId>net.jcip</groupId>
<artifactId>jcip-annotations</artifactId>
- <version>1.0</version>
+ <version>${version.jcipannotations}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymockclassextension</artifactId>
- <version>2.4</version>
+ <version>${version.easymockclassext}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>2.4</version>
+ <version>${version.easymock}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>jboss.jbossts</groupId>
<artifactId>jbossjta</artifactId>
- <version>4.9.0.GA</version>
+ <version>${version.jbossjta}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>jboss.jbossts</groupId>
<artifactId>jbossjts</artifactId>
- <version>4.9.0.GA</version>
+ <version>${version.jbossjts}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1</version>
+ <version>${version.commons-logging}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>jboss.jbossts</groupId>
<artifactId>jbossts-common</artifactId>
- <version>4.6.1.GA</version>
+ <version>${version.jbossts-common}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.14</version>
- <scope>provided</scope>
+ <version>${version.log4j}</version>
</dependency>
<!-- used to serialize non-serializable objects for a dummy marshaller -->
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
- <version>1.3.1</version>
+ <version>${version.xstream}</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: branches/4.1.x/server/core/pom.xml
===================================================================
--- branches/4.1.x/server/core/pom.xml 2010-07-05 10:03:22 UTC (rev 1972)
+++ branches/4.1.x/server/core/pom.xml 2010-07-05 10:53:43 UTC (rev 1973)
@@ -17,7 +17,6 @@
<properties>
<version.netty>3.2.0.Final</version.netty>
<version.gnu.getopt>1.0.13</version.gnu.getopt>
- <version.apache.log4j>1.2.15</version.apache.log4j>
</properties>
<dependencies>
Modified: branches/4.1.x/src/main/resources/assemblies/all.xml
===================================================================
--- branches/4.1.x/src/main/resources/assemblies/all.xml 2010-07-05 10:03:22 UTC (rev 1972)
+++ branches/4.1.x/src/main/resources/assemblies/all.xml 2010-07-05 10:53:43 UTC (rev 1973)
@@ -249,6 +249,7 @@
<exclude>org.infinispan:infinispan-core</exclude>
<exclude>org.infinispan:infinispan-server-rest</exclude>
<exclude>org.infinispan:infinispan-gridfs-webdav</exclude>
+ <exclude>log4j:log4j</exclude>
</excludes>
<useTransitiveDependencies>true</useTransitiveDependencies>
<useTransitiveFiltering>true</useTransitiveFiltering>
Modified: branches/4.1.x/src/main/resources/assemblies/bin.xml
===================================================================
--- branches/4.1.x/src/main/resources/assemblies/bin.xml 2010-07-05 10:03:22 UTC (rev 1972)
+++ branches/4.1.x/src/main/resources/assemblies/bin.xml 2010-07-05 10:53:43 UTC (rev 1973)
@@ -218,6 +218,7 @@
<exclude>net.jcip:jcip-annotations</exclude>
<exclude>org.rhq.helpers:rhq-pluginAnnotations</exclude>
<exclude>javax.transaction:jta</exclude>
+ <exclude>log4j:log4j</exclude>
</excludes>
<useTransitiveDependencies>true</useTransitiveDependencies>
<useTransitiveFiltering>true</useTransitiveFiltering>
More information about the infinispan-commits
mailing list