Browse files

'Release Script: update versions for 6.0.0.Alpha2'

  • Loading branch information...
1 parent 18ca28e commit f4816e94f637c0f8c6a787f9136406b3142acd4b EC2 Default User committed Aug 2, 2013
Showing with 326 additions and 455 deletions.
  1. +4 −4 as-modules/pom.xml
  2. +7 −9 bom/pom.xml
  3. +6 −10 cachestore/jdbc/pom.xml
  4. +4 −6 cachestore/pom.xml
  5. +4 −6 cachestore/remote/pom.xml
  6. +15 −17 cdi/extension/pom.xml
  7. +4 −4 cli/cli-client/pom.xml
  8. +5 −5 cli/cli-server/pom.xml
  9. +4 −6 client/hotrod-client/pom.xml
  10. +4 −8 commons/pom.xml
  11. +8 −13 core/pom.xml
  12. +2 −2 core/src/main/java/org/infinispan/Version.java
  13. +4 −6 demos/directory/pom.xml
  14. +4 −4 demos/distexec/pom.xml
  15. +4 −4 demos/ec2-ui/pom.xml
  16. +4 −4 demos/ec2/pom.xml
  17. +5 −6 demos/gridfs-webdav/pom.xml
  18. +4 −6 demos/gui/pom.xml
  19. +7 −10 demos/lucene-directory-demo/pom.xml
  20. +11 −22 demos/nearcache-client/pom.xml
  21. +5 −7 demos/nearcache/pom.xml
  22. +4 −6 extended-statistics/pom.xml
  23. +7 −8 integrationtests/as-integration/pom.xml
  24. +3 −4 integrationtests/compatibility-mode-it/pom.xml
  25. +4 −5 integrationtests/luceneintegration/pom.xml
  26. +9 −13 jcache/pom.xml
  27. +9 −16 jcache/src/it/tck-runner/pom.xml
  28. +7 −7 license/pom.xml
  29. +6 −7 lucene/lucene-directory/pom.xml
  30. +4 −5 lucene/lucene-v3/pom.xml
  31. +4 −5 lucene/lucene-v4/pom.xml
  32. +4 −6 lucene/pom.xml
  33. +41 −42 parent/pom.xml
  34. +28 −33 pom.xml
  35. +6 −10 query/pom.xml
  36. +17 −54 rhq-plugin/pom.xml
  37. +5 −7 server/core/pom.xml
  38. +4 −6 server/hotrod/pom.xml
  39. +4 −6 server/memcached/pom.xml
  40. +4 −6 server/pom.xml
  41. +6 −8 server/rest/pom.xml
  42. +4 −5 server/websocket/pom.xml
  43. +19 −19 spring/pom.xml
  44. +4 −6 tools/pom.xml
  45. +4 −6 tree/pom.xml
  46. +4 −6 upgrade-tools/pom.xml
View
8 as-modules/pom.xml
@@ -1,10 +1,10 @@
-<?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>6.0.0-SNAPSHOT</version>
+ <version>6.0.0.Alpha2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
@@ -84,4 +84,4 @@
</plugin>
</plugins>
</build>
-</project>
+</project>
View
16 bom/pom.xml
@@ -1,10 +1,9 @@
-<?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>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-bom</artifactId>
- <version>6.0.0-SNAPSHOT</version>
+ <version>6.0.0.Alpha2</version>
<packaging>pom</packaging>
<name>Infinispan BOM</name>
<description>Infinispan BOM module</description>
@@ -53,7 +52,7 @@
</issueManagement>
<properties>
- <!-- Versions for dependencies -->
+
<version.aesh>0.33.1</version.aesh>
<version.antlr>3.4</version.antlr>
<version.jboss.marshalling>1.3.15.GA</version.jboss.marshalling>
@@ -82,7 +81,7 @@
<dependencyManagement>
<dependencies>
- <!-- Infinispan module versions -->
+
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>infinispan-cachestore-jdbc</artifactId>
@@ -174,7 +173,7 @@
<artifactId>infinispan-jcache</artifactId>
<version>${project.version}</version>
</dependency>
- <!-- Infinispan core modules dependencies -->
+
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
@@ -253,5 +252,4 @@
</dependency>
</dependencies>
</dependencyManagement>
-</project>
-
+</project>
View
16 cachestore/jdbc/pom.xml
@@ -1,12 +1,10 @@
-<?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-cachestore-parent</artifactId>
- <version>6.0.0-SNAPSHOT</version>
+ <version>6.0.0.Alpha2</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -28,7 +26,7 @@
<scope>test</scope>
</dependency>
- <!-- for testing against MySQL -->
+
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
@@ -52,14 +50,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <!-- Run the test with a single thread, otherwise the suite might hang due to a
- concurrency issue in c3p0: https://sourceforge.net/p/c3p0/bugs/119/. Once this is fixed
- this can be switched back to parallel execution -->
+
<configuration>
<threadCount>1</threadCount>
</configuration>
</plugin>
</plugins>
</build>
-</project>
+</project>
View
10 cachestore/pom.xml
@@ -1,12 +1,10 @@
-<?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>6.0.0-SNAPSHOT</version>
+ <version>6.0.0.Alpha2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<artifactId>infinispan-cachestore-parent</artifactId>
@@ -26,4 +24,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-</project>
+</project>
View
10 cachestore/remote/pom.xml
@@ -1,12 +1,10 @@
-<?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-cachestore-parent</artifactId>
- <version>6.0.0-SNAPSHOT</version>
+ <version>6.0.0.Alpha2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>infinispan-cachestore-remote</artifactId>
@@ -59,4 +57,4 @@
</plugin>
</plugins>
</build>
-</project>
+</project>
View
32 cdi/extension/pom.xml
@@ -1,14 +1,12 @@
-<?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>6.0.0-SNAPSHOT</version>
+ <version>6.0.0.Alpha2</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
@@ -32,15 +30,15 @@
</developer>
</developers>
- <!--<properties>-->
- <!--&lt;!&ndash; Version 0.6 version has this issue:-->
- <!--https://github.com/jsr107/jsr107spec/pull/59-->
+
+
+
- <!--Upgrade to 0.6 once that issue has been fixed-->
- <!--See https://issues.jboss.org/browse/ISPN-2855-->
- <!--&ndash;&gt;-->
- <!--<version.javax.cache>0.4</version.javax.cache>-->
- <!--</properties>-->
+
+
+
+
+
<dependencies>
<dependency>
@@ -64,13 +62,13 @@
<artifactId>infinispan-jcache</artifactId>
</dependency>
- <!-- Logging dependency -->
+
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</dependency>
- <!-- Test dependencies -->
+
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
@@ -117,7 +115,7 @@
</dependencies>
<build>
<plugins>
- <!-- Disable parallel execution of tests ARQ-127 -->
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -214,4 +212,4 @@
</dependencies>
</profile>
</profiles>
-</project>
+</project>
View
8 cli/cli-client/pom.xml
@@ -1,10 +1,10 @@
-<?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>6.0.0-SNAPSHOT</version>
+ <version>6.0.0.Alpha2</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
@@ -67,4 +67,4 @@
</plugin>
</plugins>
</build>
-</project>
+</project>
View
10 cli/cli-server/pom.xml
@@ -1,10 +1,10 @@
-<?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>6.0.0-SNAPSHOT</version>
+ <version>6.0.0.Alpha2</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
@@ -13,7 +13,7 @@
<name>Infinispan CLI Server</name>
<description>Infinispan CLI Server module</description>
- <!-- This module declares components that either has lifecycle (@Start or @Stop) or uses @Inject to retrieve dependencies -->
+
<properties>
<module.skipComponentMetaDataProcessing>false</module.skipComponentMetaDataProcessing>
</properties>
@@ -118,4 +118,4 @@
</plugin>
</plugins>
</build>
-</project>
+</project>
View
10 client/hotrod-client/pom.xml
@@ -1,12 +1,10 @@
-<?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>6.0.0-SNAPSHOT</version>
+ <version>6.0.0.Alpha2</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
@@ -97,4 +95,4 @@
</plugin>
</plugins>
</build>
-</project>
+</project>
View
12 commons/pom.xml
@@ -1,13 +1,10 @@
-<?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>6.0.0-SNAPSHOT</version>
+ <version>6.0.0.Alpha2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
@@ -54,5 +51,4 @@
</plugin>
</plugins>
</build>
-</project>
-
+</project>
View
21 core/pom.xml
@@ -1,13 +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>6.0.0-SNAPSHOT</version>
+ <version>6.0.0.Alpha2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
@@ -31,10 +29,7 @@
<artifactId>jgroups</artifactId>
</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.spec.javax.transaction</groupId>
<artifactId>jboss-transaction-api_1.1_spec</artifactId>
@@ -96,7 +91,7 @@
<pluginManagement>
<plugins>
<plugin>
- <!-- This plugin's configuration is used in m2e only. -->
+
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
@@ -113,7 +108,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore />
</action>
</pluginExecution>
<pluginExecution>
@@ -130,7 +125,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore />
</action>
</pluginExecution>
</pluginExecutions>
@@ -154,4 +149,4 @@
</plugins>
</build>
-</project>
+</project>
View
4 core/src/main/java/org/infinispan/Version.java
@@ -16,8 +16,8 @@
private static final String MAJOR = "6";
private static final String MINOR = "0";
private static final String MICRO = "0";
- private static final String MODIFIER = "SNAPSHOT";
- private static final boolean SNAPSHOT = true;
+ private static final String MODIFIER = "Alpha2";
+ private static final boolean SNAPSHOT = false;
public static final String VERSION = String.format("%s.%s.%s%s%s", MAJOR, MINOR, MICRO, SNAPSHOT ? "-" : ".", MODIFIER);
public static final String CODENAME = "Infinium";
View
10 demos/directory/pom.xml
@@ -1,13 +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>6.0.0-SNAPSHOT</version>
+ <version>6.0.0.Alpha2</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
@@ -43,4 +41,4 @@
</dependency>
</dependencies>
-</project>
+</project>
View
8 demos/distexec/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/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>6.0.0-SNAPSHOT</version>
+ <version>6.0.0.Alpha2</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
@@ -50,4 +50,4 @@
</plugin>
</plugins>
</build>
-</project>
+</project>
View
8 demos/ec2-ui/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/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>6.0.0-SNAPSHOT</version>
+ <version>6.0.0.Alpha2</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
@@ -48,4 +48,4 @@
</plugin>
</plugins>
</build>
-</project>
+</project>
View
8 demos/ec2/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/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>6.0.0-SNAPSHOT</version>
+ <version>6.0.0.Alpha2</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
@@ -59,4 +59,4 @@
</plugin>
</plugins>
</build>
-</project>
+</project>
View
11 demos/gridfs-webdav/pom.xml
@@ -1,12 +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>6.0.0-SNAPSHOT</version>
+ <version>6.0.0.Alpha2</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
<artifactId>infinispan-gridfs-webdav</artifactId>
@@ -22,7 +21,7 @@
<groupId>net.sf.webdav-servlet</groupId>
<artifactId>webdav-servlet</artifactId>
</dependency>
- <!-- required by Webdav-Servlet -->
+
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
@@ -33,4 +32,4 @@
<artifactId>log4j</artifactId>
</dependency>
</dependencies>
-</project>
+</project>
View
10 demos/gui/pom.xml
@@ -1,13 +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>6.0.0-SNAPSHOT</version>
+ <version>6.0.0.Alpha2</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
@@ -50,4 +48,4 @@
</plugin>
</plugins>
</build>
-</project>
+</project>
View
17 demos/lucene-directory-demo/pom.xml
@@ -1,12 +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>6.0.0-SNAPSHOT</version>
+ <version>6.0.0.Alpha2</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
@@ -25,9 +24,7 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
- <!-- Hack to make Eclipse happy when opening multiple modules at once:
- the eclipse project related to infinispan-lucene-directory does not
- contain the actual classes packaged in its jar -->
+
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>infinispan-lucene-v3</artifactId>
@@ -38,7 +35,7 @@
<build>
<plugins>
- <!-- Creates executable scripts -->
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>appassembler-maven-plugin</artifactId>
@@ -54,7 +51,7 @@
</configuration>
</plugin>
- <!-- Testing Configuration -->
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -68,4 +65,4 @@
</plugins>
</build>
-</project>
+</project>
View
33 demos/nearcache-client/pom.xml
@@ -1,13 +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>6.0.0-SNAPSHOT</version>
+ <version>6.0.0.Alpha2</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
@@ -77,15 +75,8 @@
<dependencyManagement>
<dependencies>
- <!-- Define the version of JBoss' Java EE 6 APIs we want to use -->
- <!-- JBoss distributes a complete set of Java EE 6 APIs including
- a Bill of Materials (BOM). A BOM specifies the versions of a "stack" (or
- a collection) of artifacts. We use this here so that we always get the correct
- versions of artifacts. Here we use the jboss-javaee-web-6.0 stack (you can
- read this as the JBoss stack of the Java EE 6 Web Profile APIs), and we use
- version 2.0.0.Final which is the latest release of the stack. You can actually
- use this stack with any version of JBoss AS that implements Java EE 6, not
- just JBoss AS 7! -->
+
+
<dependency>
<groupId>org.jboss.spec</groupId>
<artifactId>jboss-javaee-web-6.0</artifactId>
@@ -94,7 +85,7 @@
<scope>import</scope>
</dependency>
- <!-- Define the versions of Arquillian dependencies we want to use -->
+
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-bom</artifactId>
@@ -106,14 +97,13 @@
</dependencyManagement>
<build>
- <!-- Set the name of the war, used as the context root when the app
- is deployed -->
+
<finalName>infinispan-nearcache</finalName>
<plugins>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<configuration>
- <!-- No web.xml needed in Java EE 6 -->
+
<failOnMissingWebXml>false</failOnMissingWebXml>
<archive>
<manifest>
@@ -123,15 +113,14 @@
</configuration>
</plugin>
- <!-- JBoss AS plugin to deploy war -->
+
<plugin>
<groupId>org.jboss.as.plugins</groupId>
<artifactId>jboss-as-maven-plugin</artifactId>
<version>7.1.0.Beta1b</version>
</plugin>
- <!-- Compiler plugin enforces Java 1.6 compatibility and activates
- annotation processors -->
+
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
@@ -143,4 +132,4 @@
</plugins>
</build>
-</project>
+</project>
View
12 demos/nearcache/pom.xml
@@ -1,13 +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>6.0.0-SNAPSHOT</version>
+ <version>6.0.0.Alpha2</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
@@ -39,7 +37,7 @@
<artifactId>netty</artifactId>
</dependency>
- <!-- HornetQ dependencies -->
+
<dependency>
<groupId>org.hornetq</groupId>
<artifactId>hornetq-bootstrap</artifactId>
@@ -82,4 +80,4 @@
</dependencies>
-</project>
+</project>
View
10 extended-statistics/pom.xml
@@ -1,12 +1,10 @@
-<?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>6.0.0-SNAPSHOT</version>
+ <version>6.0.0.Alpha2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
@@ -34,4 +32,4 @@
<version>2.2.0</version>
</dependency>
</dependencies>
-</project>
+</project>
View
15 integrationtests/as-integration/pom.xml
@@ -1,12 +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>6.0.0-SNAPSHOT</version>
+ <version>6.0.0.Alpha2</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
@@ -15,7 +14,7 @@
<description>Integration tests: AS Module Integration Tests</description>
<properties>
- <eap.dir></eap.dir>
+ <eap.dir />
</properties>
<dependencies>
@@ -88,7 +87,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
- <!-- Force use of JUnit, since TestNG+Arquillian break in wonderful ways -->
+
<testNGArtifactName>none:none</testNGArtifactName>
</configuration>
<executions>
@@ -142,7 +141,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
- <!-- Copy the AS configuration files so we can use our custom configurations -->
+
<execution>
<id>configure-as-node</id>
<phase>pre-integration-test</phase>
@@ -164,4 +163,4 @@
</plugins>
</build>
-</project>
+</project>
View
7 integrationtests/compatibility-mode-it/pom.xml
@@ -1,12 +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>6.0.0-SNAPSHOT</version>
+ <version>6.0.0.Alpha2</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
View
9 integrationtests/luceneintegration/pom.xml
@@ -1,12 +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>6.0.0-SNAPSHOT</version>
+ <version>6.0.0.Alpha2</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
@@ -38,4 +37,4 @@
</dependency>
</dependencies>
-</project>
+</project>
View
22 jcache/pom.xml
@@ -1,12 +1,10 @@
-<?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>6.0.0-SNAPSHOT</version>
+ <version>6.0.0.Alpha2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
@@ -15,8 +13,7 @@
<name>Infinispan JCACHE (JSR-107) implementation</name>
<description>JCACHE (JSR-107) implementation using Infinispan</description>
- <!-- This module declares components that either has lifecycle (@Start or
- @Stop) or uses @Inject to retrieve dependencies -->
+
<properties>
<module.skipComponentMetaDataProcessing>false</module.skipComponentMetaDataProcessing>
</properties>
@@ -80,7 +77,7 @@
</configuration>
</plugin>
- <!-- Disable parallel execution of tests ARQ-127 -->
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -90,8 +87,7 @@
</configuration>
</plugin>
- <!-- Use invoker plugin to run TCK tests once Infinispan JSR-107
- implementation has been built and installed in the repo -->
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
@@ -109,10 +105,10 @@
<goal>package</goal>
</goals>
<properties>
- <!-- Skip tests parent's tests are skipped -->
+
<maven.test.skip.exec>${maven.test.skip.exec}</maven.test.skip.exec>
<skipTests>${skipTests}</skipTests>
- <!-- If logging enabled by client, pass it on -->
+
<log4j.configuration>${log4j.configuration}</log4j.configuration>
</properties>
</configuration>
@@ -167,4 +163,4 @@
</profile>
</profiles>
-</project>
+</project>
View
25 jcache/src/it/tck-runner/pom.xml
@@ -1,13 +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>6.0.0-SNAPSHOT</version>
+ <version>6.0.0.Alpha2</version>
<relativePath>../../../../parent/pom.xml</relativePath>
</parent>
@@ -32,10 +30,7 @@
<scope>test</scope>
</dependency>
- <!--
- Order is important here! hamcrest-library needs to be defined before cache-tests:
- http://stackoverflow.com/questions/7869711/getting-nosuchmethoderror-org-hamcrest-matcher-describemismatch-when-running
- -->
+
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
@@ -75,7 +70,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
- <!--Required because JUnit will not detect tests simply included in a dep-->
+
<execution>
<id>copy-cache-tests</id>
<goals>
@@ -150,10 +145,9 @@
<profiles>
- <!--To run all tests do not specify any profile-->
+
- <!-- Profile for running basic tests.
- Use mvn -P test-basic-cache clean install -->
+
<profile>
<id>test-basic-cache</id>
<build>
@@ -174,8 +168,7 @@
</build>
</profile>
- <!-- Profile for running optional tests.
- Use mvn -P test-optional-cache clean install -->
+
<profile>
<id>test-optional-cache</id>
<build>
@@ -195,4 +188,4 @@
</profiles>
-</project>
+</project>
View
14 license/pom.xml
@@ -1,6 +1,6 @@
-<?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/maven-v4_0_0.xsd">
- <version>2-SNAPSHOT</version>
+<?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">
+ <version>6.0.0.Alpha2</version>
<modelVersion>4.0.0</modelVersion>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-license</artifactId>
@@ -28,7 +28,7 @@
</plugins>
<pluginManagement>
<plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
@@ -50,7 +50,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore />
</action>
</pluginExecution>
</pluginExecutions>
@@ -61,7 +61,7 @@
</pluginManagement>
</build>
- <!-- SCM and Distribution Management -->
+
<scm>
<connection>scm:git:git://github.com/infinispan/infinispan.git</connection>
@@ -83,4 +83,4 @@
</distributionManagement>
-</project>
+</project>
View
13 lucene/lucene-directory/pom.xml
@@ -1,12 +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-lucene-parent</artifactId>
- <version>6.0.0-SNAPSHOT</version>
+ <version>6.0.0.Alpha2</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -24,13 +23,13 @@
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-lucene-v3</artifactId>
- <!-- Not actually needed: we just want to make sure the reactor builds it first -->
+
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-lucene-v4</artifactId>
- <!-- Not actually needed: we just want to make sure the reactor builds it first -->
+
<scope>test</scope>
</dependency>
</dependencies>
@@ -82,4 +81,4 @@
</plugins>
</build>
-</project>
+</project>
View
9 lucene/lucene-v3/pom.xml
@@ -1,12 +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-lucene-parent</artifactId>
- <version>6.0.0-SNAPSHOT</version>
+ <version>6.0.0.Alpha2</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -46,4 +45,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-</project>
+</project>
View
9 lucene/lucene-v4/pom.xml
@@ -1,12 +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-lucene-parent</artifactId>
- <version>6.0.0-SNAPSHOT</version>
+ <version>6.0.0.Alpha2</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -64,4 +63,4 @@
</dependency>
</dependencies>
-</project>
+</project>
View
10 lucene/pom.xml
@@ -1,12 +1,10 @@
-<?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>6.0.0-SNAPSHOT</version>
+ <version>6.0.0.Alpha2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<artifactId>infinispan-lucene-parent</artifactId>
@@ -46,4 +44,4 @@
</plugins>
</build>
-</project>
+</project>
View
83 parent/pom.xml
@@ -1,9 +1,9 @@
-<?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>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-parent</artifactId>
- <version>6.0.0-SNAPSHOT</version>
+ <version>6.0.0.Alpha2</version>
<packaging>pom</packaging>
<name>Infinispan Common Parent</name>
<description>Infinispan common parent POM module</description>
@@ -85,7 +85,7 @@
<packaging>jar</packaging>
<module.skipComponentMetaDataProcessing>true</module.skipComponentMetaDataProcessing>
<module.metadata.isCoreModule>false</module.metadata.isCoreModule>
- <!-- Versions for dependencies -->
+
<version.protostream>1.0.0.Alpha2</version.protostream>
<version.aesh>0.33.1</version.aesh>
<version.antlr>3.4</version.antlr>
@@ -675,7 +675,7 @@
</dependencies>
</dependencyManagement>
<dependencies>
- <!-- used to serialize non-serializable objects for a dummy marshaller -->
+
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
@@ -970,7 +970,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <!-- See also reporting plugins -->
+
<version>2.7.1</version>
<configuration>
<minimumTokens>100</minimumTokens>
@@ -1006,7 +1006,7 @@
<artifactId>ideauidesigner-maven-plugin</artifactId>
<version>1.0-beta-1</version>
</plugin>
- <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
@@ -1025,7 +1025,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore />
</action>
</pluginExecution>
<pluginExecution>
@@ -1038,7 +1038,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore />
</action>
</pluginExecution>
<pluginExecution>
@@ -1051,7 +1051,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore />
</action>
</pluginExecution>
<pluginExecution>
@@ -1064,7 +1064,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore />
</action>
</pluginExecution>
<pluginExecution>
@@ -1078,7 +1078,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore />
</action>
</pluginExecution>
<pluginExecution>
@@ -1091,7 +1091,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore />
</action>
</pluginExecution>
</pluginExecutions>
@@ -1121,7 +1121,7 @@
</plugins>
</pluginManagement>
<plugins>
- <!-- enforce java 1.6 and maven 2.1.0 -->
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
@@ -1198,7 +1198,7 @@
</instructions>
</configuration>
</plugin>
- <!-- Copy the resulting persisted metadata into the build directory for packaging into the jar -->
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
@@ -1213,13 +1213,13 @@
<configuration>
<skip>${module.skipComponentMetaDataProcessing}</skip>
<target>
- <copy file="${basedir}/src/main/resources/${project.artifactId}-component-metadata.dat" todir="${project.build.outputDirectory}"></copy>
+ <copy file="${basedir}/src/main/resources/${project.artifactId}-component-metadata.dat" todir="${project.build.outputDirectory}" />
</target>
</configuration>
</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>
@@ -1231,7 +1231,7 @@
<compilerArgument>-AtranslationFilesPath=${project.basedir}/target/generated-translation-files</compilerArgument>
</configuration>
</plugin>
- <!-- eclipse project file generation -->
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
@@ -1241,7 +1241,7 @@
<buildOutputDirectory>${basedir}/eclipse-output</buildOutputDirectory>
</configuration>
</plugin>
- <!-- IntelliJ project file generation -->
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-idea-plugin</artifactId>
@@ -1302,7 +1302,7 @@
<encoding>UTF-8</encoding>
</configuration>
</plugin>
- <!-- ensure parallel test execution -->
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -1326,11 +1326,11 @@
<value>${testNGListener}</value>
</property>
</properties>
- <!-- -Dsun.nio.ch.bugLevel needed because of http://bugs.sun.com/view_bug.do?bug_id=6427854 -->
+
<argLine>-Xmx1024m -XX:MaxPermSize=256m -Dsun.nio.ch.bugLevel</argLine>
</configuration>
</plugin>
- <!-- Scan module for components and persist these into a data file, for use at runtime -->
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
@@ -1362,19 +1362,19 @@
</build>
<reporting>
<plugins>
- <!-- PMD report -->
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <!-- Needs to be re-defined and configured in pluginManagement section -->
+
<version>2.7.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
<version>2.12.2</version>
</plugin>
- <!-- Findbugs report -->
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
@@ -1396,7 +1396,7 @@
<build>
<plugins>
- <!-- generate target/runtime-classpath.txt, to be included in bundle -->
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
@@ -1427,7 +1427,7 @@
</activation>
<build>
<plugins>
- <!-- Make sure we generate src jars too -->
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
@@ -1446,7 +1446,7 @@
</plugins>
</build>
<properties>
- <!-- By default create OSGI bundles -->
+
<packaging>bundle</packaging>
</properties>
</profile>
@@ -1466,7 +1466,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemPropertyVariables>
- <!-- this is picked up in the log4j xml which prepends it to each module's log file-->
+
<infinispan.module-name>${project.artifactId}</infinispan.module-name>
</systemPropertyVariables>
</configuration>
@@ -1541,8 +1541,7 @@
</activation>
<build>
<plugins>
- <!-- Redefine surefire plugin to avoid external log4j settings
- not being discovered when passed as command line arguments -->
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -1573,7 +1572,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
- <!-- Copy the ant tasks jar. Needed for ts.jacoco.report-ant . -->
+
<execution>
<id>jacoco-dependency-ant</id>
<goals>
@@ -1611,7 +1610,7 @@
</executions>
</plugin>
- <!-- Starting jacoco agent for recording code coverage. -->
+
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
@@ -1627,7 +1626,7 @@
</configuration>
</plugin>
- <!-- Overriding surefire configuration, for attaching jacoco agent to command line. -->
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -1672,8 +1671,8 @@
</goals>
<configuration>
<target combine.self="override">
- <!-- Execute an ant task within maven -->
- <taskdef name="report" classname="org.jacoco.ant.ReportTask">
+
+ <taskdef classname="org.jacoco.ant.ReportTask" name="report">
<classpath path="${basedir}/target/jacoco-jars/org.jacoco.ant.jar" />
<classpath path="target/jacoco-jars/org.jacoco.core.jar" />
<classpath path="target/jacoco-jars/org.jacoco.report.jar" />
@@ -1688,12 +1687,12 @@
<echo message="Generating JaCoCo Reports" />
<report>
- <!-- Specifying the execution data files locations. -->
+
<executiondata>
<fileset dir="${dir.ispn}" includes="**/target/jacoco.exec" />
</executiondata>
- <!-- Defining the report structure with class and source files. -->
+
<structure name="${reportTitle}">
<classfiles>
<fileset dir="${dir.ispn}">
@@ -1703,13 +1702,13 @@
<sourcefiles encoding="UTF-8">
<mappedresources>
<fileset dir="${dir.ispn}" includes="**/src/main/java/**/*.java" />
- <mapper type="regexp" from="^(.*/java/)(.*)$" to="\2"/>
+ <mapper from="^(.*/java/)(.*)$" to="\2" type="regexp" />
</mappedresources>
</sourcefiles>
</structure>
- <!-- Only HTML report is generated with specified path. -->
+
<html destdir="${dir.report}" />
</report>
</target>
@@ -1853,7 +1852,7 @@
<value>${testNGListener}</value>
</property>
</properties>
- <!-- -Dsun.nio.ch.bugLevel needed because of http://bugs.sun.com/view_bug.do?bug_id=6427854 -->
+
<argLine>-Xmx1024m -XX:MaxPermSize=256m -Dsun.nio.ch.bugLevel</argLine>
</configuration>
</plugin>
@@ -1862,4 +1861,4 @@
</profile>
</profiles>
-</project>
+</project>
View
61 pom.xml
@@ -1,13 +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>6.0.0-SNAPSHOT</version>
+ <version>6.0.0.Alpha2</version>
<relativePath>parent/pom.xml</relativePath>
</parent>
@@ -79,30 +77,28 @@
</goals>
<configuration>
<quiet>true</quiet>
- <!-- In case anyone needs to trace javadoc issues
- <additionalJOption>-J-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</additionalJOption>
- -->
+
<stylesheetfile>${basedir}/src/javadoc/stylesheet.css</stylesheetfile>
<javadocDirectory>${basedir}/src/javadoc</javadocDirectory>
<docfilessubdirs>true</docfilessubdirs>
<links>
<link>http://java.sun.com/javase/6/docs/api/</link>
<link>http://java.sun.com/javaee/5/docs/api/</link>
</links>
- <footer><![CDATA[
--->
- <!-- Google Analytics -->
-<!--
-<script type='text/javascript'>
+ <footer>
+--&gt;
+ &lt;!-- Google Analytics --&gt;
+&lt;!--
+&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>
@@ -139,16 +135,15 @@ pageTracker._trackPageview();
<outputDirectory>${buildDirectory}/distribution</outputDirectory>
<workDirectory>${buildDirectory}/assembly/work</workDirectory>
- <!-- Do not attach ZIP files to the Maven repository -->
+
<attach>false</attach>
</configuration>
</plugin>
</plugins>
</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>
@@ -194,7 +189,7 @@ pageTracker._trackPageview();
</build>
</profile>
- <!-- TODO somehow combine this with the 'distribution' profile so all docs are built together -->
+
<profile>
<id>jmxdoc</id>
<activation>
@@ -215,18 +210,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>
@@ -250,14 +245,14 @@ pageTracker._trackPageview();
</goals>
<configuration>
<target>
- <property name="plugin_classpath" refid="maven.plugin.classpath"/>
+ <property name="plugin_classpath" refid="maven.plugin.classpath" />
<path id="xsd.fileset.path">
- <fileset dir="${basedir}" casesensitive="yes">
- <include name="core/src/main/resources/schema/*.xsd" /> <!-- make sure core comes first -->
+ <fileset casesensitive="yes" dir="${basedir}">
+ <include name="core/src/main/resources/schema/*.xsd" />
<include name="cachestore/*/src/main/resources/schema/*.xsd" />
</fileset>
</path>
- <pathconvert property="xsd.fileset" refid="xsd.fileset.path" pathsep=" "/>
+ <pathconvert pathsep=" " property="xsd.fileset" refid="xsd.fileset.path" />
<echo message="xsds ${xsd.fileset}" />
<java classname="org.infinispan.tools.xsd.XSDoc">
<arg value="-o" />
@@ -288,4 +283,4 @@ pageTracker._trackPageview();
</build>
</profile>
</profiles>
-</project>
+</project>
View
16 query/pom.xml
@@ -1,12 +1,10 @@
-<?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>6.0.0-SNAPSHOT</version>
+ <version>6.0.0.Alpha2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
@@ -15,7 +13,7 @@
<name>Infinispan Query API</name>
<description>Infinispan Query API module</description>
- <!-- This module declares components that either has lifecycle (@Start or @Stop) or uses @Inject to retrieve dependencies -->
+
<properties>
<module.skipComponentMetaDataProcessing>false</module.skipComponentMetaDataProcessing>
</properties>
@@ -56,9 +54,7 @@
<artifactId>infinispan-lucene-directory</artifactId>
</dependency>
- <!-- Hack to make Eclipse happy when opening multiple modules at once:
- the eclipse project related to infinispan-lucene-directory does not
- contain the actual classes packaged in its jar -->
+
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>infinispan-lucene-v3</artifactId>
@@ -88,4 +84,4 @@
</plugin>
</plugins>
</build>
-</project>
+</project>
View
71 rhq-plugin/pom.xml
@@ -1,16 +1,12 @@
-<?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/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>6.0.0-SNAPSHOT</version>
+ <version>6.0.0.Alpha2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
@@ -67,7 +63,7 @@
<scope>provided</scope>
</dependency>
- <!-- We need to force the version defined in parent pom for this indirect dependency -->
+
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
@@ -80,7 +76,7 @@
<scope>provided</scope>
</dependency>
- <!-- Dependencies for plugin descriptor generation -->
+
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>infinispan-core</artifactId>
@@ -140,41 +136,14 @@
</executions>
</plugin>
- <!-- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-infinispan-rhq-plugin-jar</id>
- <phase>process-resources</phase>
- <goals>
- <goal>copy</goal>
- </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>
- <version>${project.version}</version>
- </artifactItem>
- <artifactItem>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging</artifactId>
- <version>${version.jboss.logging}</version>
- </artifactItem>
- </artifactItems>
- <outputDirectory>${project.build.outputDirectory}/lib</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin> -->
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<doclet>org.infinispan.tools.rhq.RhqPluginXmlGenerator</doclet>
- <!--<additionalJOption>-J-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y</additionalJOption>-->
+
<docletArtifact>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-tools</artifactId>
@@ -219,11 +188,10 @@
<phase>compile</phase>
<configuration>