Reversioning to 2.5.0 after release of 2.4.0
diff --git a/.gitignore b/.gitignore
index e9353f5..b0d03cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
target
-ivy-cache
\ No newline at end of file
+ivy-cache
+integration-repo
\ No newline at end of file
diff --git a/build.properties b/build.properties
index a4951a4..8ba7be8 100644
--- a/build.properties
+++ b/build.properties
@@ -1,6 +1,5 @@
-version=2.4.0
-release.type=release
-build.stamp=RELEASE
+version=2.5.0
+release.type=integration
natural.name=greenpages
project.name=Virgo Greenpages Sample
project.key=VWSS
diff --git a/guide/filters.properties b/guide/filters.properties
index b4d3922..35b23de 100644
--- a/guide/filters.properties
+++ b/guide/filters.properties
@@ -13,7 +13,7 @@
greenpages=GreenPages
#The url and version for greenpages is finalised
-greenpages.version.number=2.4.0
+greenpages.version.number=2.5.0
greenpages.version=@greenpages.version.number@.RELEASE
greenpages.download.url=http://eclipse.org/virgo/download/
greenpages.zip.file=greenpages-@greenpages.version@.zip
diff --git a/solution/greenpages.db/pom.xml b/solution/greenpages.db/pom.xml
index be88bac..d0807b3 100644
--- a/solution/greenpages.db/pom.xml
+++ b/solution/greenpages.db/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.virgo</groupId>
<artifactId>greenpages.parent-solution</artifactId>
- <version>2.4.0.RELEASE</version>
+ <version>2.5.0.RELEASE</version>
<relativePath>../parent</relativePath>
</parent>
diff --git a/solution/greenpages.db/template.mf b/solution/greenpages.db/template.mf
index 4135246..7cdd63f 100644
--- a/solution/greenpages.db/template.mf
+++ b/solution/greenpages.db/template.mf
@@ -3,7 +3,7 @@
Bundle-Name: GreenPages DataSource
Bundle-SymbolicName: greenpages.db
Bundle-Vendor: SpringSource Inc.
-Bundle-Version: 2.4.0
+Bundle-Version: 2.5.0
Import-Package:
org.h2;version="[1.0.71, 1.0.71]"
Import-Template:
diff --git a/solution/greenpages.jpa/pom.xml b/solution/greenpages.jpa/pom.xml
index 8be7f4e..99bc395 100644
--- a/solution/greenpages.jpa/pom.xml
+++ b/solution/greenpages.jpa/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.virgo</groupId>
<artifactId>greenpages.parent-solution</artifactId>
- <version>2.4.0.RELEASE</version>
+ <version>2.5.0.RELEASE</version>
<relativePath>../parent</relativePath>
</parent>
diff --git a/solution/greenpages.jpa/template.mf b/solution/greenpages.jpa/template.mf
index 2b9a1e8..41bfcac 100644
--- a/solution/greenpages.jpa/template.mf
+++ b/solution/greenpages.jpa/template.mf
@@ -3,10 +3,10 @@
Bundle-Name: GreenPages JPA
Bundle-SymbolicName: greenpages.jpa
Bundle-Vendor: SpringSource Inc.
-Bundle-Version: 2.4.0
+Bundle-Version: 2.5.0
Import-Template:
org.springframework.*;version="[3.0, 3.1)",
- greenpages;version="[2.4, 2.5)",
+ greenpages;version="[2.5, 2.6)",
javax.persistence;version="[1.0.0, 1.0.0]",
org.apache.commons.dbcp.*;version="[1.2.2.osgi, 1.2.2.osgi]",
javax.sql;version="0"
diff --git a/solution/greenpages.web/pom.xml b/solution/greenpages.web/pom.xml
index a61912f..3fd71e6 100644
--- a/solution/greenpages.web/pom.xml
+++ b/solution/greenpages.web/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.virgo</groupId>
<artifactId>greenpages.parent-solution</artifactId>
- <version>2.4.0.RELEASE</version>
+ <version>2.5.0.RELEASE</version>
<relativePath>../parent</relativePath>
</parent>
diff --git a/solution/greenpages.web/template.mf b/solution/greenpages.web/template.mf
index 8086064..32b2dfc 100644
--- a/solution/greenpages.web/template.mf
+++ b/solution/greenpages.web/template.mf
@@ -2,12 +2,12 @@
Bundle-ManifestVersion: 2
Bundle-Name: GreenPages Web
Bundle-SymbolicName: greenpages.web
-Bundle-Version: 2.4.0
+Bundle-Version: 2.5.0
Bundle-ClassPath: .,WEB-INF/classes
Web-ContextPath: greenpages
Import-Template:
org.springframework.*;version="[3.0, 3.1)",
- greenpages.*;version="[2.4, 2.5)"
+ greenpages.*;version="[2.5, 2.6)"
Import-Package:
javax.servlet.jsp.jstl.core;version="[1.2.0, 2.0.0)",
javax.servlet;version="[3.0.0, 3.1.0)",
diff --git a/solution/greenpages/pom.xml b/solution/greenpages/pom.xml
index 87a6ea7..077cc8e 100644
--- a/solution/greenpages/pom.xml
+++ b/solution/greenpages/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.virgo</groupId>
<artifactId>greenpages.parent-solution</artifactId>
- <version>2.4.0.RELEASE</version>
+ <version>2.5.0.RELEASE</version>
<relativePath>../parent</relativePath>
</parent>
diff --git a/solution/parent/pom.xml b/solution/parent/pom.xml
index c12ac7d..119bd74 100644
--- a/solution/parent/pom.xml
+++ b/solution/parent/pom.xml
@@ -7,7 +7,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.virgo</groupId>
<artifactId>greenpages.parent-solution</artifactId>
- <version>2.4.0.RELEASE</version>
+ <version>2.5.0.RELEASE</version>
<name>greenpages.parent</name>
<packaging>pom</packaging>
diff --git a/solution/pom.xml b/solution/pom.xml
index 25a4a62..6f3004c 100644
--- a/solution/pom.xml
+++ b/solution/pom.xml
@@ -7,7 +7,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.virgo</groupId>
<artifactId>greenpages-top-level-solution</artifactId>
- <version>2.4.0.RELEASE</version>
+ <version>2.5.0.RELEASE</version>
<name>GreenPages App Build</name>
<packaging>pom</packaging>
<modules>
diff --git a/start/greenpages.jpa/pom.xml b/start/greenpages.jpa/pom.xml
index 6d4dc61..7d41c33 100644
--- a/start/greenpages.jpa/pom.xml
+++ b/start/greenpages.jpa/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.virgo</groupId>
<artifactId>greenpages.parent</artifactId>
- <version>2.4.0.RELEASE</version>
+ <version>2.5.0.RELEASE</version>
<relativePath>../parent</relativePath>
</parent>
diff --git a/start/greenpages.jpa/template.mf b/start/greenpages.jpa/template.mf
index 22e2b6a..e0b1263 100644
--- a/start/greenpages.jpa/template.mf
+++ b/start/greenpages.jpa/template.mf
@@ -3,10 +3,10 @@
Bundle-Name: GreenPages JPA
Bundle-SymbolicName: greenpages.jpa
Bundle-Vendor: SpringSource Inc.
-Bundle-Version: 2.4.0
+Bundle-Version: 2.5.0
Import-Template:
org.springframework.*;version="[3.0, 3.1)",
- greenpages;version="[2.4, 2.5)",
+ greenpages;version="[2.5, 2.6)",
javax.persistence;version="[1.0.0, 1.0.0]",
org.apache.commons.dbcp.*;version="[1.2.2.osgi, 1.2.2.osgi]",
javax.sql;version="0"
diff --git a/start/greenpages.web/pom.xml b/start/greenpages.web/pom.xml
index ba50b76..7374800 100644
--- a/start/greenpages.web/pom.xml
+++ b/start/greenpages.web/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.virgo</groupId>
<artifactId>greenpages.parent</artifactId>
- <version>2.4.0.RELEASE</version>
+ <version>2.5.0.RELEASE</version>
<relativePath>../parent</relativePath>
</parent>
diff --git a/start/greenpages.web/template.mf b/start/greenpages.web/template.mf
index 80c0f7c..d0e53f2 100644
--- a/start/greenpages.web/template.mf
+++ b/start/greenpages.web/template.mf
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: GreenPages Web
Bundle-SymbolicName: greenpages.web
-Bundle-Version: 2.4.0
+Bundle-Version: 2.5.0
Import-Package:
javax.servlet.jsp.jstl.core;version="[1.2.0, 2.0.0)",
org.eclipse.virgo.web.dm;version="[3.0.0, 4.0.0)",
diff --git a/start/parent/pom.xml b/start/parent/pom.xml
index 8da5a37..771b1f0 100644
--- a/start/parent/pom.xml
+++ b/start/parent/pom.xml
@@ -7,7 +7,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.virgo</groupId>
<artifactId>greenpages.parent</artifactId>
- <version>2.4.0.RELEASE</version>
+ <version>2.5.0.RELEASE</version>
<name>greenpages.parent</name>
<packaging>pom</packaging>
diff --git a/start/pom.xml b/start/pom.xml
index 7db9398..7caf77f 100644
--- a/start/pom.xml
+++ b/start/pom.xml
@@ -7,7 +7,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.virgo</groupId>
<artifactId>greenpages-top-level</artifactId>
- <version>2.4.0.RELEASE</version>
+ <version>2.5.0.RELEASE</version>
<name>GreenPages App Build</name>
<packaging>pom</packaging>
<modules>
