Skip to content
Browse files

'Release Script: update versions for 4.2.0.CR2'

  • Loading branch information...
1 parent 8980b10 commit 2569e13c39470a6c6099b667c9658736f8c85edc @mmarkus mmarkus committed Nov 25, 2010
View
10 cachestore/bdbje/pom.xml
@@ -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.2.0-SNAPSHOT</version>
+ <version>4.2.0.CR2</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -44,4 +42,4 @@
</plugin>
</plugins>
</build>
-</project>
+</project>
View
9 cachestore/cassandra/pom.xml
@@ -1,11 +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.2.0-SNAPSHOT</version>
+ <version>4.2.0.CR2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>infinispan-cachestore-cassandra</artifactId>
@@ -79,4 +78,4 @@
</snapshots>
</repository>
</repositories>
-</project>
+</project>
View
16 cachestore/cloud/pom.xml
@@ -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.2.0-SNAPSHOT</version>
+ <version>4.2.0.CR2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>infinispan-cachestore-cloud</artifactId>
@@ -35,16 +33,16 @@
<version>${version.jclouds}</version>
</dependency>
- <!-- =========================================================== -->
- <!-- optional cloud provider plug-ins. You'd need at least one! -->
+
+
<dependency>
<groupId>org.jclouds</groupId>
<artifactId>jclouds-allblobstore</artifactId>
<version>${version.jclouds}</version>
<scope>optional</scope>
</dependency>
- <!-- =========================================================== -->
+
<dependency>
<groupId>org.apache.commons</groupId>
@@ -121,4 +119,4 @@
</properties>
</profile>
</profiles>
-</project>
+</project>
View
12 cachestore/jdbc/pom.xml
@@ -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.2.0-SNAPSHOT</version>
+ <version>4.2.0.CR2</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -29,7 +27,7 @@
<scope>test</scope>
</dependency>
- <!-- for testing against MySQL -->
+
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
@@ -53,4 +51,4 @@
</plugin>
</plugins>
</build>
-</project>
+</project>
View
12 cachestore/jdbm/pom.xml
@@ -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.2.0-SNAPSHOT</version>
+ <version>4.2.0.CR2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>infinispan-cachestore-jdbm</artifactId>
@@ -18,7 +16,7 @@
<dependencies>
<dependency>
- <!-- Contains fixes not officially released by JDBM group -->
+
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-jdbm</artifactId>
<version>${version.apacheds.jdbm}</version>
@@ -50,4 +48,4 @@
</plugin>
</plugins>
</build>
-</project>
+</project>
View
10 cachestore/pom.xml
@@ -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.2.0-SNAPSHOT</version>
+ <version>4.2.0.CR2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<artifactId>infinispan-cachestore-parent</artifactId>
@@ -28,4 +26,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-</project>
+</project>
View
10 cachestore/remote/pom.xml
@@ -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.2.0-SNAPSHOT</version>
+ <version>4.2.0.CR2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>infinispan-cachestore-remote</artifactId>
@@ -59,4 +57,4 @@
</plugin>
</plugins>
</build>
-</project>
+</project>
View
10 client/hotrod-client/pom.xml
@@ -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.2.0-SNAPSHOT</version>
+ <version>4.2.0.CR2</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
@@ -75,4 +73,4 @@
</plugin>
</plugins>
</build>
-</project>
+</project>
View
21 core/pom.xml
@@ -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.2.0-SNAPSHOT</version>
+ <version>4.2.0.CR2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
@@ -23,10 +21,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>
@@ -81,11 +76,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>
@@ -107,4 +98,4 @@
</plugin>
</plugins>
</build>
-</project>
+</project>
View
4 core/src/main/java/org/infinispan/Version.java
@@ -39,10 +39,10 @@
// -----------------------------------------------------------------------------------------------------------------
public static final String major = "4.2";
- public static final String version = major + ".0-SNAPSHOT";
+ public static final String version = major + ".0.CR2";
public static final String codename = "Ursus";
public static final String projectName = "Infinispan";
- static final byte[] version_id = {'0', '4', '2', '0', 'S'};
+ static final byte[] version_id = {'4', '2', '0', 'C', 'R', '2'};
private static final int MAJOR_SHIFT = 11;
private static final int MINOR_SHIFT = 6;
private static final int MAJOR_MASK = 0x00f800;
View
10 demos/directory/pom.xml
@@ -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.2.0-SNAPSHOT</version>
+ <version>4.2.0.CR2</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
@@ -45,4 +43,4 @@
</dependency>
</dependencies>
-</project>
+</project>
View
8 demos/ec2-ui/pom.xml
@@ -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.2.0-SNAPSHOT</version>
+ <version>4.2.0.CR2</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
@@ -53,4 +53,4 @@
</plugin>
</plugins>
</build>
-</project>
+</project>
View
8 demos/ec2/pom.xml
@@ -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.2.0-SNAPSHOT</version>
+ <version>4.2.0.CR2</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
@@ -63,4 +63,4 @@
</plugin>
</plugins>
</build>
-</project>
+</project>
View
10 demos/gridfs-webdav/pom.xml
@@ -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.2.0-SNAPSHOT</version>
+ <version>4.2.0.CR2</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
@@ -27,7 +27,7 @@
<version>${version.webdav.servlet}</version>
</dependency>
- <!-- required by Webdav-Servlet -->
+
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
@@ -38,4 +38,4 @@
</dependencies>
-</project>
+</project>
View
10 demos/gui/pom.xml
@@ -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.2.0-SNAPSHOT</version>
+ <version>4.2.0.CR2</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
@@ -53,4 +51,4 @@
</plugin>
</plugins>
</build>
-</project>
+</project>
View
13 demos/lucene-directory-demo/pom.xml
@@ -1,12 +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.2.0-SNAPSHOT</version>
+ <version>4.2.0.CR2</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
@@ -32,7 +31,7 @@
<build>
<plugins>
- <!-- Creates executable scripts -->
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>appassembler-maven-plugin</artifactId>
@@ -49,7 +48,7 @@
</configuration>
</plugin>
- <!-- Testing Configuration -->
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -75,4 +74,4 @@
</plugins>
</build>
-</project>
+</project>
View
69 jopr-plugin/pom.xml
@@ -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.2.0-SNAPSHOT</version>
+ <version>4.2.0.CR2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
@@ -53,14 +50,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>
@@ -69,7 +59,7 @@
<scope>provided</scope>
</dependency>
- <!-- TODO: This is beyond horrible. Surely we don't need these dependencies!! -->
+
<dependency>
<groupId>org.hibernate</groupId>
@@ -92,7 +82,7 @@
<scope>provided</scope>
</dependency>
- <!-- END unnenessary deps -->
+
<dependency>
<groupId>${project.groupId}</groupId>
@@ -159,7 +149,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>
@@ -194,24 +184,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>
@@ -241,11 +214,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>
@@ -258,18 +230,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>
@@ -283,10 +251,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>
@@ -302,4 +269,4 @@
</profile>
</profiles>
-</project>
+</project>
View
9 lucene-directory/pom.xml
@@ -1,12 +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.2.0-SNAPSHOT</version>
+ <version>4.2.0.CR2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
@@ -86,4 +85,4 @@
</plugins>
</build>
-</project>
+</project>
View
38 parent/pom.xml
@@ -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.2.0-SNAPSHOT</version>
+ <version>4.2.0.CR2</version>
<name>Infinispan Common Parent</name>
<description>Infinispan common parent POM module</description>
<url>http://www.infinispan.org</url>
@@ -74,7 +73,7 @@
<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.apacheds.jdbm>1.5.4</version.apacheds.jdbm>
<version.bdbje>4.0.92</version.bdbje>
<version.c3p0>0.9.1.2</version.c3p0>
@@ -113,10 +112,7 @@
<version.netty>3.2.3.Final</version.netty>
<version.org.jboss.naming>5.0.3.GA</version.org.jboss.naming>
<version.resteasy>2.0-beta-2</version.resteasy>
-<!--
- <version.rhq.pluginAnnotations>4.0.0-SNAPSHOT</version.rhq.pluginAnnotations>
- <version.rhq.plugingen>4.0.0-SNAPSHOT</version.rhq.plugingen>
--->
+
<version.rhq.pluginAnnotations>3.0.1</version.rhq.pluginAnnotations>
<version.rhq.plugingen>3.0.1</version.rhq.plugingen>
<version.rhq>3.0.0</version.rhq>
@@ -186,7 +182,7 @@
<optional>true</optional>
</dependency>
- <!-- used to serialize non-serializable objects for a dummy marshaller -->
+
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
@@ -197,7 +193,7 @@
<build>
<plugins>
- <!-- enforce java 1.6 and maven 2.1.0 -->
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
@@ -221,7 +217,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>
@@ -263,7 +259,7 @@
</configuration>
</plugin>
- <!-- ensure parallel test execution -->
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -299,7 +295,7 @@
</properties>
</configuration>
</plugin>
- <!-- eclipse project file generation -->
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
@@ -309,7 +305,7 @@
<buildOutputDirectory>${basedir}/eclipse-output</buildOutputDirectory>
</configuration>
</plugin>
- <!-- IntelliJ project file generation -->
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-idea-plugin</artifactId>
@@ -318,7 +314,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>
@@ -380,7 +376,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>
@@ -479,8 +475,8 @@
</properties>
</profile>
<profile>
- <!-- Used to start the tests using the latest stable version of Lucene, use: -->
- <!-- mvn clean test -P useLatestLuceneVersion,test-functional -->
+
+
<id>useLatestLuceneVersion</id>
<activation>
<activeByDefault>false</activeByDefault>
@@ -490,7 +486,7 @@
</properties>
</profile>
<profile>
- <!-- define the Lucene version used in release package, and as reference target -->
+
<id>useReferenceLuceneVersion</id>
<activation>
<activeByDefault>true</activeByDefault>
@@ -500,4 +496,4 @@
</properties>
</profile>
</profiles>
-</project>
+</project>
View
57 pom.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.2.0-SNAPSHOT</version>
+ <version>4.2.0.CR2</version>
<relativePath>parent/pom.xml</relativePath>
</parent>
@@ -77,18 +77,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'>
+&lt;script type='text/javascript'&gt;
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'>
+&lt;/script&gt;
+&lt;script type='text/javascript'&gt;
try {
var pageTracker = _gat._getTracker("UA-8601422-4");
pageTracker._trackPageview();
-} catch(err) {}</script>
- ]]></footer>
+} catch(err) {}&lt;/script&gt;
+ </footer>
</configuration>
</execution>
</executions>
@@ -133,8 +133,7 @@ pageTracker._trackPageview();
</build>
</profile>
- <!-- This profile is an scaled down version of the distribution profile which should only be used to speed up
- testing of distribution zip files. It doesn't generate any documentation and only generates the -all.zip distribution -->
+
<profile>
<id>minimal-distribution</id>
<activation>
@@ -181,7 +180,7 @@ pageTracker._trackPageview();
</build>
</profile>
- <!-- TODO somehow combine this with the 'distribution' profile so all docs are built together -->
+
<profile>
<id>jmxdoc</id>
<activation>
@@ -202,18 +201,18 @@ pageTracker._trackPageview();
<artifactId>infinispan-tools</artifactId>
<version>${project.version}</version>
</docletArtifact>
- <footer><![CDATA[
- <!-- Google Analytics -->
-<script type='text/javascript'>
+ <footer>
+ &lt;!-- Google Analytics --&gt;
+&lt;script type='text/javascript'&gt;
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'>
+&lt;/script&gt;
+&lt;script type='text/javascript'&gt;
try {
var pageTracker = _gat._getTracker("UA-8601422-4");
pageTracker._trackPageview();
-} catch(err) {}</script>
- ]]></footer>
+} catch(err) {}&lt;/script&gt;
+ </footer>
</configuration>
<executions>
<execution>
@@ -229,7 +228,7 @@ pageTracker._trackPageview();
</build>
</profile>
- <!-- TODO somehow combine this with the 'distribution' profile so all docs are built together -->
+
<profile>
<id>configdoc</id>
<activation>
@@ -250,18 +249,18 @@ pageTracker._trackPageview();
<artifactId>infinispan-tools</artifactId>
<version>${project.version}</version>
</docletArtifact>
- <footer><![CDATA[
- <!-- Google Analytics -->
-<script type='text/javascript'>
+ <footer>
+ &lt;!-- Google Analytics --&gt;
+&lt;script type='text/javascript'&gt;
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'>
+&lt;/script&gt;
+&lt;script type='text/javascript'&gt;
try {
var pageTracker = _gat._getTracker("UA-8601422-4");
pageTracker._trackPageview();
-} catch(err) {}</script>
- ]]></footer>
+} catch(err) {}&lt;/script&gt;
+ </footer>
</configuration>
<executions>
<execution>
@@ -286,7 +285,7 @@ pageTracker._trackPageview();
</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>
@@ -297,4 +296,4 @@ pageTracker._trackPageview();
</profile>
</profiles>
-</project>
+</project>
View
10 query/pom.xml
@@ -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.2.0-SNAPSHOT</version>
+ <version>4.2.0.CR2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
@@ -66,4 +64,4 @@
</plugin>
</plugins>
</build>
-</project>
+</project>
View
10 server/core/pom.xml
@@ -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-server-parent</artifactId>
- <version>4.2.0-SNAPSHOT</version>
+ <version>4.2.0.CR2</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -77,4 +75,4 @@
</plugin>
</plugins>
</build>
-</project>
+</project>
View
10 server/hotrod/pom.xml
@@ -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-server-parent</artifactId>
- <version>4.2.0-SNAPSHOT</version>
+ <version>4.2.0.CR2</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -78,4 +76,4 @@
</plugin>
</plugins>
</build>
-</project>
+</project>
View
10 server/memcached/pom.xml
@@ -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-server-parent</artifactId>
- <version>4.2.0-SNAPSHOT</version>
+ <version>4.2.0.CR2</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -91,4 +89,4 @@
</repository>
</repositories>
-</project>
+</project>
View
10 server/pom.xml
@@ -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.2.0-SNAPSHOT</version>
+ <version>4.2.0.CR2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
@@ -35,4 +33,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-</project>
+</project>
View
10 server/rest/pom.xml
@@ -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-server-parent</artifactId>
- <version>4.2.0-SNAPSHOT</version>
+ <version>4.2.0.CR2</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -90,7 +90,7 @@
<version>${project.version}</version>
</dependency>
- <!-- and now for unit and integration tests -->
+
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-embedded</artifactId>
@@ -112,4 +112,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-</project>
+</project>
View
8 server/websocket/pom.xml
@@ -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-server-parent</artifactId>
- <version>4.2.0-SNAPSHOT</version>
+ <version>4.2.0.CR2</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -45,4 +45,4 @@
</plugin>
</plugins>
</build>
-</project>
+</project>
View
12 tools/pom.xml
@@ -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.2.0-SNAPSHOT</version>
+ <version>4.2.0.CR2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
@@ -52,7 +50,7 @@
</dependency>
</dependencies>
- <!-- needed for XSOM -->
+
<repositories>
<repository>
<id>download.java.net</id>
@@ -96,4 +94,4 @@
</plugin>
</plugins>
</build>
-</project>
+</project>
View
10 tree/pom.xml
@@ -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.2.0-SNAPSHOT</version>
+ <version>4.2.0.CR2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
@@ -45,4 +43,4 @@
</plugin>
</plugins>
</build>
-</project>
+</project>

0 comments on commit 2569e13

Please sign in to comment.
Something went wrong with that request. Please try again.