[infinispan-commits] Infinispan SVN: r1052 - in tags/4.0.0.CR1: cachestore and 14 other directories.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Wed Oct 28 14:33:34 EDT 2009
Author: manik.surtani at jboss.com
Date: 2009-10-28 14:33:32 -0400 (Wed, 28 Oct 2009)
New Revision: 1052
Modified:
tags/4.0.0.CR1/cachestore/bdbje/pom.xml
tags/4.0.0.CR1/cachestore/jdbc/pom.xml
tags/4.0.0.CR1/cachestore/jdbm/pom.xml
tags/4.0.0.CR1/cachestore/pom.xml
tags/4.0.0.CR1/cachestore/s3/pom.xml
tags/4.0.0.CR1/core/pom.xml
tags/4.0.0.CR1/core/src/main/java/org/infinispan/Version.java
tags/4.0.0.CR1/demos/gui/pom.xml
tags/4.0.0.CR1/jopr-plugin/pom.xml
tags/4.0.0.CR1/lucene-directory/pom.xml
tags/4.0.0.CR1/parent/pom.xml
tags/4.0.0.CR1/pom.xml
tags/4.0.0.CR1/query/pom.xml
tags/4.0.0.CR1/server/rest/pom.xml
tags/4.0.0.CR1/tools/pom.xml
tags/4.0.0.CR1/tree/pom.xml
Log:
Infinispan Release Script: Updated version numbers
Modified: tags/4.0.0.CR1/cachestore/bdbje/pom.xml
===================================================================
--- tags/4.0.0.CR1/cachestore/bdbje/pom.xml 2009-10-28 18:32:10 UTC (rev 1051)
+++ tags/4.0.0.CR1/cachestore/bdbje/pom.xml 2009-10-28 18:33:32 UTC (rev 1052)
@@ -1,12 +1,10 @@
-<?xml version="1.0"?>
-<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/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-cachestore-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.CR1</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -28,4 +26,4 @@
</repository>
</repositories>
-</project>
+</project>
\ No newline at end of file
Modified: tags/4.0.0.CR1/cachestore/jdbc/pom.xml
===================================================================
--- tags/4.0.0.CR1/cachestore/jdbc/pom.xml 2009-10-28 18:32:10 UTC (rev 1051)
+++ tags/4.0.0.CR1/cachestore/jdbc/pom.xml 2009-10-28 18:33:32 UTC (rev 1052)
@@ -1,12 +1,10 @@
-<?xml version="1.0"?>
-<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/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-cachestore-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.CR1</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -28,4 +26,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-</project>
+</project>
\ No newline at end of file
Modified: tags/4.0.0.CR1/cachestore/jdbm/pom.xml
===================================================================
--- tags/4.0.0.CR1/cachestore/jdbm/pom.xml 2009-10-28 18:32:10 UTC (rev 1051)
+++ tags/4.0.0.CR1/cachestore/jdbm/pom.xml 2009-10-28 18:33:32 UTC (rev 1052)
@@ -1,12 +1,10 @@
-<?xml version="1.0"?>
-<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/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-cachestore-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.CR1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>infinispan-cachestore-jdbm</artifactId>
@@ -17,7 +15,7 @@
<dependencies>
<dependency>
- <!-- Contains fixes not officially released by JDBM group -->
+
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-jdbm</artifactId>
<version>1.5.4</version>
@@ -34,4 +32,4 @@
</dependency>
</dependencies>
-</project>
+</project>
\ No newline at end of file
Modified: tags/4.0.0.CR1/cachestore/pom.xml
===================================================================
--- tags/4.0.0.CR1/cachestore/pom.xml 2009-10-28 18:32:10 UTC (rev 1051)
+++ tags/4.0.0.CR1/cachestore/pom.xml 2009-10-28 18:33:32 UTC (rev 1052)
@@ -1,12 +1,10 @@
-<?xml version="1.0"?>
-<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/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.CR1</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<artifactId>infinispan-cachestore-parent</artifactId>
Modified: tags/4.0.0.CR1/cachestore/s3/pom.xml
===================================================================
--- tags/4.0.0.CR1/cachestore/s3/pom.xml 2009-10-28 18:32:10 UTC (rev 1051)
+++ tags/4.0.0.CR1/cachestore/s3/pom.xml 2009-10-28 18:33:32 UTC (rev 1052)
@@ -1,12 +1,10 @@
-<?xml version="1.0"?>
-<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/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-cachestore-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.CR1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>infinispan-cachestore-s3</artifactId>
@@ -14,8 +12,8 @@
<description>Infinispan Amazon S3 CacheStore module</description>
<properties>
- <jclouds.aws.accesskeyid></jclouds.aws.accesskeyid>
- <jclouds.aws.secretaccesskey></jclouds.aws.secretaccesskey>
+ <jclouds.aws.accesskeyid />
+ <jclouds.aws.secretaccesskey />
<version.jclouds>1.0-beta-2</version.jclouds>
<version.commons.io>1.4</version.commons.io>
</properties>
@@ -69,4 +67,4 @@
</plugins>
</build>
-</project>
+</project>
\ No newline at end of file
Modified: tags/4.0.0.CR1/core/pom.xml
===================================================================
--- tags/4.0.0.CR1/core/pom.xml 2009-10-28 18:32:10 UTC (rev 1051)
+++ tags/4.0.0.CR1/core/pom.xml 2009-10-28 18:33:32 UTC (rev 1052)
@@ -1,13 +1,11 @@
-<?xml version="1.0"?>
-<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/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.CR1</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
@@ -31,10 +29,7 @@
<version>${version.jgroups}</version>
</dependency>
- <!--
- For the JTA 1.1 API; consuming projects can safely
- exclude this and replace with any valid source of this API, such as a Java EE app server.
- -->
+
<dependency>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-transaction-api</artifactId>
@@ -82,11 +77,7 @@
</dependencies>
<build>
<plugins>
- <!--
- Generates XML schema for Infinispan configuration files
- Run with mvn exec:java
- For more details see:
- http://mojo.codehaus.org/exec-maven-plugin/usage.html -->
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
@@ -108,4 +99,4 @@
</plugin>
</plugins>
</build>
-</project>
+</project>
\ No newline at end of file
Modified: tags/4.0.0.CR1/core/src/main/java/org/infinispan/Version.java
===================================================================
--- tags/4.0.0.CR1/core/src/main/java/org/infinispan/Version.java 2009-10-28 18:32:10 UTC (rev 1051)
+++ tags/4.0.0.CR1/core/src/main/java/org/infinispan/Version.java 2009-10-28 18:33:32 UTC (rev 1052)
@@ -31,10 +31,10 @@
*/
@Immutable
public class Version {
- public static final String version = "4.0.0.SNAPSHOT";
+ public static final String version = "4.0.0.CR1";
public static final String codename = "Starobrno";
public static final String projectName = "Infinispan";
- static final byte[] version_id = {'0', '4', '0', '0', 'S'};
+ static final byte[] version_id = {'4', '0', '0', 'C', 'R', '1'};
private static final int MAJOR_SHIFT = 11;
private static final int MINOR_SHIFT = 6;
private static final int MAJOR_MASK = 0x00f800;
Modified: tags/4.0.0.CR1/demos/gui/pom.xml
===================================================================
--- tags/4.0.0.CR1/demos/gui/pom.xml 2009-10-28 18:32:10 UTC (rev 1051)
+++ tags/4.0.0.CR1/demos/gui/pom.xml 2009-10-28 18:33:32 UTC (rev 1052)
@@ -1,18 +1,16 @@
-<?xml version="1.0"?>
-<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/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.CR1</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
<artifactId>infinispan-gui-demo</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.CR1</version>
<name>Infinispan GUI Demo</name>
<description>Infinispan - GUI Demo</description>
<dependencies>
@@ -53,4 +51,4 @@
</plugin>
</plugins>
</build>
-</project>
+</project>
\ No newline at end of file
Modified: tags/4.0.0.CR1/jopr-plugin/pom.xml
===================================================================
--- tags/4.0.0.CR1/jopr-plugin/pom.xml 2009-10-28 18:32:10 UTC (rev 1051)
+++ tags/4.0.0.CR1/jopr-plugin/pom.xml 2009-10-28 18:33:32 UTC (rev 1052)
@@ -1,15 +1,12 @@
-<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"
- >
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.CR1</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
@@ -50,14 +47,7 @@
<scope>provided</scope>
</dependency>
-<!--
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-pluginGen</artifactId>
- <version>${version.rhq.plugingen}</version>
- <scope>provided</scope>
- </dependency>
- -->
+
<dependency>
<groupId>mc4j</groupId>
@@ -66,7 +56,7 @@
<scope>provided</scope>
</dependency>
- <!-- TODO: This is beyond horrible. Surely we don't need these dependencies!! -->
+
<dependency>
<groupId>org.hibernate</groupId>
@@ -89,7 +79,7 @@
<scope>provided</scope>
</dependency>
- <!-- END unnenessary deps -->
+
<dependency>
<groupId>${project.groupId}</groupId>
@@ -156,8 +146,7 @@
</goals>
<configuration>
<artifactItems>
- <!-- TODO include other needed external jars
- that should go into your jar file -->
+
<artifactItem>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-core</artifactId>
@@ -192,24 +181,7 @@
</executions>
</plugin>
- <!--
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <phase>process-classes</phase>
- <goals>
- <goal>java</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <mainClass>org.infinispan.jopr.util.RhqPluginDescriptorGenerator</mainClass>
- </configuration>
- </plugin>
- -->
+
</plugins>
</build>
@@ -239,11 +211,10 @@
<phase>compile</phase>
<configuration>
<tasks>
- <mkdir dir="${rhq.deploymentDir}"/>
- <property name="deployment.file"
- location="${rhq.deploymentDir}/${project.build.finalName}.jar"/>
+ <mkdir dir="${rhq.deploymentDir}" />
+ <property location="${rhq.deploymentDir}/${project.build.finalName}.jar" name="deployment.file" />
<echo>*** Updating ${deployment.file}...</echo>
- <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}"/>
+ <jar basedir="${project.build.outputDirectory}" destfile="${deployment.file}" />
</tasks>
</configuration>
<goals>
@@ -256,18 +227,14 @@
<phase>package</phase>
<configuration>
<tasks>
- <property name="deployment.file"
- location="${rhq.deploymentDir}/${project.build.finalName}.jar"/>
+ <property location="${rhq.deploymentDir}/${project.build.finalName}.jar" name="deployment.file" />
<echo>*** Updating META-INF dir in ${deployment.file}...</echo>
- <unjar src="${project.build.directory}/${project.build.finalName}.jar"
- dest="${project.build.outputDirectory}">
+ <unjar dest="${project.build.outputDirectory}" src="${project.build.directory}/${project.build.finalName}.jar">
<patternset>
- <include name="META-INF/**"/>
+ <include name="META-INF/**" />
</patternset>
</unjar>
- <jar destfile="${deployment.file}"
- manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF"
- update="true">
+ <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true">
</jar>
</tasks>
</configuration>
@@ -281,10 +248,9 @@
<phase>clean</phase>
<configuration>
<tasks>
- <property name="deployment.file"
- location="${rhq.deploymentDir}/${project.build.finalName}.jar"/>
+ <property location="${rhq.deploymentDir}/${project.build.finalName}.jar" name="deployment.file" />
<echo>*** Deleting ${deployment.file}...</echo>
- <delete file="${deployment.file}"/>
+ <delete file="${deployment.file}" />
</tasks>
</configuration>
<goals>
@@ -300,4 +266,4 @@
</profile>
</profiles>
-</project>
+</project>
\ No newline at end of file
Modified: tags/4.0.0.CR1/lucene-directory/pom.xml
===================================================================
--- tags/4.0.0.CR1/lucene-directory/pom.xml 2009-10-28 18:32:10 UTC (rev 1051)
+++ tags/4.0.0.CR1/lucene-directory/pom.xml 2009-10-28 18:33:32 UTC (rev 1052)
@@ -1,13 +1,11 @@
-<?xml version="1.0"?>
-<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/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.CR1</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
@@ -41,4 +39,4 @@
</dependency>
</dependencies>
-</project>
+</project>
\ No newline at end of file
Modified: tags/4.0.0.CR1/parent/pom.xml
===================================================================
--- tags/4.0.0.CR1/parent/pom.xml 2009-10-28 18:32:10 UTC (rev 1051)
+++ tags/4.0.0.CR1/parent/pom.xml 2009-10-28 18:33:32 UTC (rev 1052)
@@ -1,10 +1,9 @@
-<?xml version="1.0"?>
-<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/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.CR1</version>
<name>Infinispan Common Parent</name>
<description>Infinispan common parent POM module</description>
<url>http://www.infinispan.org</url>
@@ -124,7 +123,7 @@
<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>
@@ -135,7 +134,7 @@
<build>
<plugins>
- <!-- enforce java 1.6 and maven 2.1.0 -->
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
@@ -158,7 +157,7 @@
</execution>
</executions>
</plugin>
- <!-- by default, compile to JDK 1.6 compatibility (individual modules and/or user can override) -->
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
@@ -177,7 +176,7 @@
</configuration>
</plugin>
- <!-- ensure parallel test execution -->
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -213,7 +212,7 @@
</properties>
</configuration>
</plugin>
- <!-- eclipse project file generation -->
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
@@ -222,7 +221,7 @@
<buildOutputDirectory>${basedir}/eclipse-output</buildOutputDirectory>
</configuration>
</plugin>
- <!-- IntelliJ project file generation -->
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-idea-plugin</artifactId>
@@ -230,7 +229,7 @@
<downloadSources>true</downloadSources>
</configuration>
</plugin>
- <!-- Make sure we generate src jars too -->
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
@@ -287,7 +286,7 @@
<artifactId>maven-surefire-report-plugin</artifactId>
<version>2.4.3-JBOSS</version>
</plugin>
- <!-- Findbugs report -->
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
@@ -302,7 +301,7 @@
</reporting>
<repositories>
- <!-- basic JBoss repository -->
+
<repository>
<id>repository.jboss.org</id>
<url>http://repository.jboss.org/maven2</url>
@@ -344,9 +343,9 @@
<distributionManagement>
<repository>
- <!-- Copy the dist to the local checkout of the JBoss maven2 repo ${maven.repository.root} -->
- <!-- It is anticipated that ${maven.repository.root} be set in user's settings.xml -->
- <!-- TODO : replace this with direct svn access once the svnkit providers are available -->
+
+
+
<id>repository.jboss.org</id>
<url>file://${maven.repository.root}</url>
</repository>
@@ -395,4 +394,4 @@
</properties>
</profile>
</profiles>
-</project>
+</project>
\ No newline at end of file
Modified: tags/4.0.0.CR1/pom.xml
===================================================================
--- tags/4.0.0.CR1/pom.xml 2009-10-28 18:32:10 UTC (rev 1051)
+++ tags/4.0.0.CR1/pom.xml 2009-10-28 18:33:32 UTC (rev 1052)
@@ -1,13 +1,11 @@
-<?xml version="1.0"?>
-<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/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.CR1</version>
<relativePath>parent/pom.xml</relativePath>
</parent>
@@ -57,18 +55,18 @@
<link>http://java.sun.com/javase/6/docs/api/</link>
<link>http://java.sun.com/javaee/5/docs/api/</link>
</links>
- <footer><![CDATA[
+ <footer>
Google Analytics
-<script type='text/javascript'>
+<script type='text/javascript'>
var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-</script>
-<script type='text/javascript'>
+</script>
+<script type='text/javascript'>
try {
var pageTracker = _gat._getTracker("UA-8601422-4");
pageTracker._trackPageview();
-} catch(err) {}</script>
- ]]></footer>
+} catch(err) {}</script>
+ </footer>
</configuration>
</execution>
</executions>
@@ -87,18 +85,18 @@
</goals>
<configuration>
<tasks>
- <!-- this is a dependency of single_jar assembly -->
- <mkdir dir="target"/>
+
+ <mkdir dir="target" />
<jar destfile="target/infinispan-all.jar">
- <fileset dir="cachestore/bdbje/target/classes"/>
- <fileset dir="cachestore/jdbc/target/classes"/>
- <fileset dir="cachestore/s3/target/classes"/>
- <fileset dir="cachestore/jdbm/target/classes"/>
- <fileset dir="core/target/classes"/>
- <fileset dir="tree/target/classes"/>
- <fileset dir="query/target/classes"/>
+ <fileset dir="cachestore/bdbje/target/classes" />
+ <fileset dir="cachestore/jdbc/target/classes" />
+ <fileset dir="cachestore/s3/target/classes" />
+ <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"/>
+ <attribute name="Main-Class" value="org.infinispan.Version" />
</manifest>
</jar>
</tasks>
@@ -112,14 +110,13 @@
</goals>
<configuration>
<tasks>
- <property name="file"
- value="${project.build.directory}/distribution/${artifactId}-${project.version}-single_jar.zip"/>
+ <property name="file" value="${project.build.directory}/distribution/${artifactId}-${project.version}-single_jar.zip" />
<zip destfile="${file}.new">
<zipfileset src="${file}">
- <exclude name="**/.ignore/**"/>
+ <exclude name="**/.ignore/**" />
</zipfileset>
</zip>
- <move file="${file}.new" tofile="${file}"/>
+ <move file="${file}.new" tofile="${file}" />
</tasks>
</configuration>
</execution>
@@ -165,7 +162,7 @@
</build>
</profile>
- <!-- TODO somehow combine this with the 'distribution' profile so all docs are built together -->
+
<profile>
<id>jmxdoc</id>
<activation>
@@ -183,18 +180,18 @@
<artifactId>infinispan-tools</artifactId>
<version>${project.version}</version>
</docletArtifact>
- <footer><![CDATA[
- <!-- Google Analytics -->
-<script type='text/javascript'>
+ <footer>
+ <!-- Google Analytics -->
+<script type='text/javascript'>
var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-</script>
-<script type='text/javascript'>
+</script>
+<script type='text/javascript'>
try {
var pageTracker = _gat._getTracker("UA-8601422-4");
pageTracker._trackPageview();
-} catch(err) {}</script>
- ]]></footer>
+} catch(err) {}</script>
+ </footer>
</configuration>
<executions>
<execution>
@@ -210,7 +207,7 @@
</build>
</profile>
- <!-- TODO somehow combine this with the 'distribution' profile so all docs are built together -->
+
<profile>
<id>configdoc</id>
<activation>
@@ -228,18 +225,18 @@
<artifactId>infinispan-tools</artifactId>
<version>${project.version}</version>
</docletArtifact>
- <footer><![CDATA[
- <!-- Google Analytics -->
-<script type='text/javascript'>
+ <footer>
+ <!-- Google Analytics -->
+<script type='text/javascript'>
var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-</script>
-<script type='text/javascript'>
+</script>
+<script type='text/javascript'>
try {
var pageTracker = _gat._getTracker("UA-8601422-4");
pageTracker._trackPageview();
-} catch(err) {}</script>
- ]]></footer>
+} catch(err) {}</script>
+ </footer>
</configuration>
<executions>
<execution>
@@ -264,7 +261,7 @@
</goals>
<configuration>
<tasks>
- <copy file="tools/src/main/resources/stylesheet2.css" todir="target/site/apidocs"/>
+ <copy file="tools/src/main/resources/stylesheet2.css" todir="target/site/apidocs" />
</tasks>
</configuration>
</execution>
@@ -275,4 +272,4 @@
</profile>
</profiles>
-</project>
+</project>
\ No newline at end of file
Modified: tags/4.0.0.CR1/query/pom.xml
===================================================================
--- tags/4.0.0.CR1/query/pom.xml 2009-10-28 18:32:10 UTC (rev 1051)
+++ tags/4.0.0.CR1/query/pom.xml 2009-10-28 18:33:32 UTC (rev 1052)
@@ -1,12 +1,10 @@
-<?xml version="1.0"?>
-<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/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.CR1</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
@@ -49,4 +47,4 @@
</dependency>
</dependencies>
-</project>
+</project>
\ No newline at end of file
Modified: tags/4.0.0.CR1/server/rest/pom.xml
===================================================================
--- tags/4.0.0.CR1/server/rest/pom.xml 2009-10-28 18:32:10 UTC (rev 1051)
+++ tags/4.0.0.CR1/server/rest/pom.xml 2009-10-28 18:33:32 UTC (rev 1052)
@@ -1,11 +1,11 @@
-<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">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.CR1</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
@@ -101,7 +101,7 @@
<scope>provided</scope>
</dependency>
- <!-- and now for unit and integration tests -->
+
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-embedded</artifactId>
@@ -116,4 +116,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-</project>
+</project>
\ No newline at end of file
Modified: tags/4.0.0.CR1/tools/pom.xml
===================================================================
--- tags/4.0.0.CR1/tools/pom.xml 2009-10-28 18:32:10 UTC (rev 1051)
+++ tags/4.0.0.CR1/tools/pom.xml 2009-10-28 18:33:32 UTC (rev 1052)
@@ -1,13 +1,11 @@
-<?xml version="1.0"?>
-<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/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.CR1</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
@@ -15,7 +13,7 @@
<name>Infinispan Tools</name>
<description>Infinispan - Tools for project</description>
- <!-- needed for XSOM -->
+
<repositories>
<repository>
<id>download.java.net</id>
@@ -85,4 +83,4 @@
</dependencies>
</profile>
</profiles>
-</project>
+</project>
\ No newline at end of file
Modified: tags/4.0.0.CR1/tree/pom.xml
===================================================================
--- tags/4.0.0.CR1/tree/pom.xml 2009-10-28 18:32:10 UTC (rev 1051)
+++ tags/4.0.0.CR1/tree/pom.xml 2009-10-28 18:33:32 UTC (rev 1052)
@@ -1,12 +1,10 @@
-<?xml version="1.0"?>
-<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/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.CR1</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
@@ -28,4 +26,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-</project>
+</project>
\ No newline at end of file
More information about the infinispan-commits
mailing list