[infinispan-commits] Infinispan SVN: r859 - in trunk: cachestore/bdbje and 7 other directories.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Fri Sep 25 10:55:22 EDT 2009
Author: manik.surtani at jboss.com
Date: 2009-09-25 10:55:22 -0400 (Fri, 25 Sep 2009)
New Revision: 859
Modified:
trunk/cachestore/bdbje/pom.xml
trunk/cachestore/jdbc/pom.xml
trunk/cachestore/jdbm/pom.xml
trunk/cachestore/s3/pom.xml
trunk/core/pom.xml
trunk/parent/pom.xml
trunk/pom.xml
trunk/server/rest/pom.xml
trunk/src/main/resources/assemblies/bin.xml
Log:
Updated POMs
Modified: trunk/cachestore/bdbje/pom.xml
===================================================================
--- trunk/cachestore/bdbje/pom.xml 2009-09-25 14:35:59 UTC (rev 858)
+++ trunk/cachestore/bdbje/pom.xml 2009-09-25 14:55:22 UTC (rev 859)
@@ -14,19 +14,11 @@
<name>Infinispan BDBJE CacheStore</name>
<description>Infinispan BerkeleyDB JavaEdition CacheStore module</description>
<dependencies>
-
<dependency>
<groupId>com.sleepycat</groupId>
<artifactId>je</artifactId>
<version>3.3.75</version>
</dependency>
-
- <dependency>
- <groupId>xstream</groupId>
- <artifactId>xstream</artifactId>
- <scope>test</scope>
- </dependency>
-
</dependencies>
<repositories>
Modified: trunk/cachestore/jdbc/pom.xml
===================================================================
--- trunk/cachestore/jdbc/pom.xml 2009-09-25 14:35:59 UTC (rev 858)
+++ trunk/cachestore/jdbc/pom.xml 2009-09-25 14:55:22 UTC (rev 859)
@@ -22,23 +22,10 @@
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>1.1.117</version>
<scope>test</scope>
</dependency>
-
- <!-- used to serialize non-serializable objects for a dummy marshaller -->
- <dependency>
- <groupId>xstream</groupId>
- <artifactId>xstream</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
Modified: trunk/cachestore/jdbm/pom.xml
===================================================================
--- trunk/cachestore/jdbm/pom.xml 2009-09-25 14:35:59 UTC (rev 858)
+++ trunk/cachestore/jdbm/pom.xml 2009-09-25 14:55:22 UTC (rev 859)
@@ -16,7 +16,6 @@
</properties>
<dependencies>
-
<dependency>
<!-- Contains fixes not officially released by JDBM group -->
<groupId>org.apache.directory.server</groupId>
@@ -33,14 +32,6 @@
</exclusion>
</exclusions>
</dependency>
-
- <!-- used to serialize non-serializable objects for a dummy marshaller -->
- <dependency>
- <groupId>xstream</groupId>
- <artifactId>xstream</artifactId>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
Modified: trunk/cachestore/s3/pom.xml
===================================================================
--- trunk/cachestore/s3/pom.xml 2009-09-25 14:35:59 UTC (rev 858)
+++ trunk/cachestore/s3/pom.xml 2009-09-25 14:55:22 UTC (rev 859)
@@ -38,20 +38,6 @@
<artifactId>jclouds-log4j</artifactId>
<version>${version.jclouds}</version>
</dependency>
-
- <!-- used to serialize non-serializable objects for a dummy marshaller -->
- <dependency>
- <groupId>xstream</groupId>
- <artifactId>xstream</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>test</scope>
- </dependency>
-
</dependencies>
<repositories>
<repository>
Modified: trunk/core/pom.xml
===================================================================
--- trunk/core/pom.xml 2009-09-25 14:35:59 UTC (rev 858)
+++ trunk/core/pom.xml 2009-09-25 14:55:22 UTC (rev 859)
@@ -65,20 +65,6 @@
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <optional>true</optional>
- </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>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.1.3</version>
Modified: trunk/parent/pom.xml
===================================================================
--- trunk/parent/pom.xml 2009-09-25 14:35:59 UTC (rev 858)
+++ trunk/parent/pom.xml 2009-09-25 14:55:22 UTC (rev 859)
@@ -94,42 +94,39 @@
<version>2.4</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>jboss.jbossts</groupId>
+ <artifactId>jbossjta</artifactId>
+ <version>4.4.0.GA</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jboss.jbossts</groupId>
+ <artifactId>jbossjts</artifactId>
+ <version>4.6.1.GA</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jboss.jbossts</groupId>
+ <artifactId>jbossts-common</artifactId>
+ <version>4.6.1.GA</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</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>
+ <scope>test</scope>
+ </dependency>
</dependencies>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>jboss.jbossts</groupId>
- <artifactId>jbossjta</artifactId>
- <version>4.4.0.GA</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>jboss.jbossts</groupId>
- <artifactId>jbossjts</artifactId>
- <version>4.6.1.GA</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>jboss.jbossts</groupId>
- <artifactId>jbossts-common</artifactId>
- <version>4.6.1.GA</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- </dependency>
- <dependency>
- <groupId>xstream</groupId>
- <artifactId>xstream</artifactId>
- <version>1.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<build>
<plugins>
<!-- enforce java 1.5 and maven 2.1.0 -->
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-09-25 14:35:59 UTC (rev 858)
+++ trunk/pom.xml 2009-09-25 14:55:22 UTC (rev 859)
@@ -97,6 +97,7 @@
<fileset dir="cachestore/jdbm/target/classes"/>
<fileset dir="core/target/classes"/>
<fileset dir="tree/target/classes"/>
+ <fileset dir="query/target/classes"/>
<manifest>
<attribute name="Main-Class" value="org.infinispan.Version"/>
</manifest>
Modified: trunk/server/rest/pom.xml
===================================================================
--- trunk/server/rest/pom.xml 2009-09-25 14:35:59 UTC (rev 858)
+++ trunk/server/rest/pom.xml 2009-09-25 14:55:22 UTC (rev 859)
@@ -1,132 +1,139 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-server-rest</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <packaging>war</packaging>
- <name>Infinispan REST server</name>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <repositories>
- <repository>
- <id>scala-tools.org</id>
- <name>Scala-tools Maven2 Repository</name>
- <url>http://scala-tools.org/repo-releases</url>
- </repository>
- <repository>
- <id>jboss</id>
- <url>http://repository.jboss.org/maven2/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
+ <parent>
+ <groupId>org.infinispan</groupId>
+ <artifactId>infinispan-parent</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
+ </parent>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>scala-tools.org</id>
- <name>Scala-tools Maven2 Repository</name>
- <url>http://scala-tools.org/repo-releases</url>
- </pluginRepository>
- </pluginRepositories>
+ <artifactId>infinispan-server-rest</artifactId>
+ <packaging>war</packaging>
+ <name>Infinispan REST Server</name>
+ <description>REST interface for Infinispan, packaged as a WAR file for deployment in a servlet container
+ </description>
+ <repositories>
+ <repository>
+ <id>scala-tools.org</id>
+ <name>Scala-tools Maven2 Repository</name>
+ <url>http://scala-tools.org/repo-releases</url>
+ </repository>
+ <repository>
+ <id>jboss</id>
+ <url>http://repository.jboss.org/maven2/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>scala-tools.org</id>
+ <name>Scala-tools Maven2 Repository</name>
+ <url>http://scala-tools.org/repo-releases</url>
+ </pluginRepository>
+ </pluginRepositories>
- <build>
- <finalName>infinispan</finalName>
- <sourceDirectory>src/main/scala</sourceDirectory>
- <testSourceDirectory>src/test/scala</testSourceDirectory>
- <plugins>
- <plugin>
- <groupId>org.scala-tools</groupId>
- <artifactId>maven-scala-plugin</artifactId>
- <executions>
- <execution>
- <id>compile</id>
- <goals>
- <goal>compile</goal>
- </goals>
- <phase>compile</phase>
- </execution>
- <execution>
- <id>test-compile</id>
- <goals>
- <goal>testCompile</goal>
- </goals>
- <phase>test-compile</phase>
- </execution>
- <execution>
- <phase>process-resources</phase>
- <goals>
- <goal>compile</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
+ <build>
+ <finalName>infinispan</finalName>
+ <sourceDirectory>src/main/scala</sourceDirectory>
+ <testSourceDirectory>src/test/scala</testSourceDirectory>
+
+ <plugins>
+ <plugin>
+ <groupId>org.scala-tools</groupId>
+ <artifactId>maven-scala-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>compile</id>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ <phase>compile</phase>
+ </execution>
+ <execution>
+ <id>test-compile</id>
+ <goals>
+ <goal>testCompile</goal>
+ </goals>
+ <phase>test-compile</phase>
+ </execution>
+ <execution>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- </plugin>
- </plugins>
+ </plugin>
+ </plugins>
- </build>
+ </build>
- <dependencies>
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-library</artifactId>
- <version>2.7.5</version>
- </dependency>
+ <dependencies>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ <version>2.7.5</version>
+ </dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-core</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- </dependency>
+ <dependency>
+ <groupId>org.infinispan</groupId>
+ <artifactId>infinispan-core</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </dependency>
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jaxrs</artifactId>
- <version>1.1.GA</version>
- </dependency>
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-jaxrs</artifactId>
+ <version>1.1.GA</version>
+ </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <version>0.9.9-6</version>
- </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <version>0.9.9-6</version>
+ </dependency>
- <dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- <version>1.3.1</version>
- </dependency>
+ <dependency>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <version>1.3.1</version>
+ </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
- <!-- and now for unit and integration tests -->
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-embedded</artifactId>
- <version>6.1.15</version>
- <scope>test</scope>
- </dependency>
+ <!-- and now for unit and integration tests -->
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-embedded</artifactId>
+ <version>6.1.15</version>
+ <scope>test</scope>
+ </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.1</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
@@ -137,6 +144,6 @@
<classifier>jdk15</classifier>
</dependency>
- </dependencies>
+ </dependencies>
</project>
Modified: trunk/src/main/resources/assemblies/bin.xml
===================================================================
--- trunk/src/main/resources/assemblies/bin.xml 2009-09-25 14:35:59 UTC (rev 858)
+++ trunk/src/main/resources/assemblies/bin.xml 2009-09-25 14:55:22 UTC (rev 859)
@@ -114,6 +114,8 @@
<include>org.infinispan:infinispan-gui-demo</include>
<include>org.infinispan:infinispan-jopr-plugin</include>
<include>org.infinispan:infinispan-tree</include>
+ <include>org.infinispan:infinispan-query</include>
+ <include>org.infinispan:infinispan-server-rest</include>
</includes>
<sources>
<includeModuleDirectory>false</includeModuleDirectory>
More information about the infinispan-commits
mailing list