Replace outdated Spring versions in template.mf
This commit replaces the hard-wired versions with the expansion
pattern symbol "="
diff --git a/apps/org.eclipse.virgo.apps.repository.web/template.mf b/apps/org.eclipse.virgo.apps.repository.web/template.mf
index f3829e0..eecb9ee 100644
--- a/apps/org.eclipse.virgo.apps.repository.web/template.mf
+++ b/apps/org.eclipse.virgo.apps.repository.web/template.mf
@@ -8,10 +8,10 @@
Import-Template:
org.eclipse.virgo.apps.repository.*;version="${version:[=.=.=, =.=.+1)}",
javax.servlet.*;version="${javaxServletVersion:[2.5.0,+1)}",
- org.springframework.*;version="${springframeworkVersion:[2.5.6, +1)}",
+ org.springframework.*;version="${springframeworkVersion:[=.=.=.=, +1)}",
org.osgi.framework.*;version="0"
Import-Package:
- org.springframework.web.context;version="${springframeworkVersion:[2.5.6, +1)}",
- org.springframework.web.servlet;version="${springframeworkVersion:[2.5.6, +1)}",
+ org.springframework.web.context;version="${springframeworkVersion:[=.=.=.=, +1)}",
+ org.springframework.web.servlet;version="${springframeworkVersion:[=.=.=.=, +1)}",
org.eclipse.virgo.web.dm;version="${version:[=.=.=, +1)}",
- org.springframework.beans.factory.xml;version="${springframeworkVersion:[2.5.6, +1)}"
+ org.springframework.beans.factory.xml;version="${springframeworkVersion:[=.=.=.=, +1)}"
diff --git a/kernel/org.eclipse.virgo.kernel.agent.dm/template.mf b/kernel/org.eclipse.virgo.kernel.agent.dm/template.mf
index e2d9bf9..2ce5607 100644
--- a/kernel/org.eclipse.virgo.kernel.agent.dm/template.mf
+++ b/kernel/org.eclipse.virgo.kernel.agent.dm/template.mf
@@ -10,7 +10,7 @@
org.eclipse.virgo.util.*;version="${version:[=.=.=, =.+1)}",
org.eclipse.virgo.nano.*;version="${version:[=.=.=, =.+1)}",
org.eclipse.virgo.medic.*;version="${version:[=.=.=, =.+1)}",
- org.springframework.*;version="${springframeworkVersion:[2.5.6, +1)}",
+ org.springframework.*;version="${springframeworkVersion:[=.=.=.=, +1)}",
org.eclipse.gemini.blueprint.*;version="${geminiBlueprintVersion:[=.=.=, +1)}",
org.eclipse.equinox.region.*;version="${equinoxRegionExportedPackageVersion:[=.=.=, =.+1)}",
org.aspectj.*;version="${aspectjVersion:[=.=.=, +1)}",
diff --git a/kernel/org.eclipse.virgo.kernel.artifact/template.mf b/kernel/org.eclipse.virgo.kernel.artifact/template.mf
index 5ec7b8c..4a28bee 100644
--- a/kernel/org.eclipse.virgo.kernel.artifact/template.mf
+++ b/kernel/org.eclipse.virgo.kernel.artifact/template.mf
@@ -12,7 +12,7 @@
org.eclipse.virgo.medic.*;version="${version:[=.=.=, =.+1)}",
org.osgi.framework.*;version="0",
org.osgi.service.cm.*;version="0",
- org.springframework.*;version="${springframeworkVersion:[2.5.6, +1)}",
+ org.springframework.*;version="${springframeworkVersion:[=.=.=.=, +1)}",
javax.xml.*;version="0",
org.xml.*;version="0",
org.w3c.*;version="0"
diff --git a/kernel/org.eclipse.virgo.kernel.deployer.dm/template.mf b/kernel/org.eclipse.virgo.kernel.deployer.dm/template.mf
index 4b6da54..30d1a10 100644
--- a/kernel/org.eclipse.virgo.kernel.deployer.dm/template.mf
+++ b/kernel/org.eclipse.virgo.kernel.deployer.dm/template.mf
@@ -10,5 +10,5 @@
org.slf4j.*;version="${slf4jVersion:[=.=.=, +1)}",
org.aspectj.*;version="${aspectjVersion:[=.=.=, +1)}",
org.osgi.framework.*;version="0",
- org.springframework.*;version="${springframeworkVersion:[2.5.6, +1)}",
+ org.springframework.*;version="${springframeworkVersion:[=.=.=.=, +1)}",
org.eclipse.gemini.blueprint.*;version="${geminiBlueprintVersion:[=.=.=, +1)}"
diff --git a/kernel/org.eclipse.virgo.kernel.deployer/template.mf b/kernel/org.eclipse.virgo.kernel.deployer/template.mf
index 7f4accb..2eef318 100644
--- a/kernel/org.eclipse.virgo.kernel.deployer/template.mf
+++ b/kernel/org.eclipse.virgo.kernel.deployer/template.mf
@@ -11,7 +11,7 @@
org.eclipse.virgo.medic.*;version="${version:[=.=.=, =.+1)}",
org.slf4j.*;version="${slf4jVersion:[=.=.=, +1)}",
org.aspectj.*;version="${aspectjVersion:[=.=.=, +1)}",
- org.springframework.*;version="${springframeworkVersion:[2.5.6, +1)}",
+ org.springframework.*;version="${springframeworkVersion:[=.=.=.=, +1)}",
org.eclipse.gemini.blueprint.*;version="${geminiBlueprintVersion:[=.=.=, +1]}",
org.osgi.framework.*;version="0",
org.eclipse.osgi.*;version="0",
diff --git a/kernel/org.eclipse.virgo.kernel.dmfragment/template.mf b/kernel/org.eclipse.virgo.kernel.dmfragment/template.mf
index 2566f08..20fc42c 100644
--- a/kernel/org.eclipse.virgo.kernel.dmfragment/template.mf
+++ b/kernel/org.eclipse.virgo.kernel.dmfragment/template.mf
@@ -14,7 +14,7 @@
org.aspectj.*;version="${aspectjVersion:[=.=.=, +1)}",
javax.management.*;version="0",
org.osgi.framework.*;version="0",
- org.springframework.*;version="${springframeworkVersion:[2.5.6, +1)}"
+ org.springframework.*;version="${springframeworkVersion:[=.=.=.=, +1)}"
Excluded-Imports:
org.eclipse.gemini.blueprint.*
Excluded-Exports:
diff --git a/kernel/org.eclipse.virgo.kernel.model/template.mf b/kernel/org.eclipse.virgo.kernel.model/template.mf
index 6d2a481..5e8a79d 100644
--- a/kernel/org.eclipse.virgo.kernel.model/template.mf
+++ b/kernel/org.eclipse.virgo.kernel.model/template.mf
@@ -9,7 +9,7 @@
org.eclipse.virgo.util.*;version="${version:[=.=.=, =.+1)}",
org.eclipse.virgo.medic.*;version="${version:[=.=.=, =.+1)}",
org.aspectj.*;version="${aspectjVersion:[=.=.=, +1)}",
- org.springframework.*;version="${springframeworkVersion:[2.5.6, +1)}",
+ org.springframework.*;version="${springframeworkVersion:[=.=.=.=, +1)}",
javax.annotation.*;version="0",
javax.management.*;version="0",
org.osgi.framework.*;version="0",
diff --git a/kernel/org.eclipse.virgo.kernel.osgi/template.mf b/kernel/org.eclipse.virgo.kernel.osgi/template.mf
index b03f252..db9219a 100644
--- a/kernel/org.eclipse.virgo.kernel.osgi/template.mf
+++ b/kernel/org.eclipse.virgo.kernel.osgi/template.mf
@@ -21,5 +21,5 @@
org.osgi.service.*;version="0",
org.osgi.util.*;version="0",
org.slf4j.*;version="${slf4jVersion:[=.=.=, +1)}",
- org.springframework.*;version="${springframeworkVersion:[2.5.6, +1)}",
+ org.springframework.*;version="${springframeworkVersion:[=.=.=.=, +1)}",
javax.management;version="0"
diff --git a/kernel/org.eclipse.virgo.kernel.services/template.mf b/kernel/org.eclipse.virgo.kernel.services/template.mf
index e573e63..c25154e 100644
--- a/kernel/org.eclipse.virgo.kernel.services/template.mf
+++ b/kernel/org.eclipse.virgo.kernel.services/template.mf
@@ -15,7 +15,7 @@
org.slf4j.*;version="${slf4jVersion:[=.=.=, +1)}",
org.osgi.framework.*;version="0",
org.osgi.service.cm.*;version="0",
- org.springframework.*;version="${springframeworkVersion:[2.5.6, +1)}",
+ org.springframework.*;version="${springframeworkVersion:[=.=.=.=, +1)}",
javax.management.*;version="0",
javax.xml.*;version="0",
org.xml.*;version="0",
diff --git a/kernel/org.eclipse.virgo.kernel.userregion/template.mf b/kernel/org.eclipse.virgo.kernel.userregion/template.mf
index bb26e58..216ee95 100644
--- a/kernel/org.eclipse.virgo.kernel.userregion/template.mf
+++ b/kernel/org.eclipse.virgo.kernel.userregion/template.mf
@@ -18,7 +18,7 @@
org.eclipse.virgo.util.*;version="${version:[=.=.=, =.+1)}",
org.aspectj.*;version="${aspectjVersion:[=.=.=, +1)}",
org.slf4j.*;version="${slf4jVersion:[=.=.=, +1)}",
- org.springframework.*;version="${springframeworkVersion:[2.5.6, +1)}",
+ org.springframework.*;version="${springframeworkVersion:[=.=.=.=, +1)}",
org.eclipse.osgi.*;version="0",
org.osgi.framework.*;version="0",
org.osgi.service.*;version="0",
diff --git a/kernel/org.eclipse.virgo.shell.command/template.mf b/kernel/org.eclipse.virgo.shell.command/template.mf
index 067051e..0aee721 100644
--- a/kernel/org.eclipse.virgo.shell.command/template.mf
+++ b/kernel/org.eclipse.virgo.shell.command/template.mf
@@ -9,7 +9,7 @@
org.eclipse.virgo.util.*;version="${version:[=.=.=, =.+1)}",
org.eclipse.virgo.medic.*;version="${version:[=.=.=, =.+1)}",
org.eclipse.virgo.repository.*;version="${version:[=.=.=, =.+1)}",
- org.springframework.*;version="${springframeworkVersion:[2.5.6, +1)}",
+ org.springframework.*;version="${springframeworkVersion:[=.=.=.=, +1)}",
org.slf4j.*;version="${slf4jVersion:[=.=.=, +1)}",
org.aspectj.*;version="${aspectjVersion:[=.=.=, +1)}",
javax.crypto.*;version="0",
diff --git a/web/org.eclipse.virgo.web.dm/template.mf b/web/org.eclipse.virgo.web.dm/template.mf
index f4525a6..b7f021b 100644
--- a/web/org.eclipse.virgo.web.dm/template.mf
+++ b/web/org.eclipse.virgo.web.dm/template.mf
@@ -9,7 +9,7 @@
org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
org.aspectj.*;version="${aspectjVersion:[=.=.=, +1)}",
org.osgi.framework.*;version="0",
- org.springframework.*;version="${springframeworkVersion:[3.1, +1)}",
+ org.springframework.*;version="${springframeworkVersion:[=.=.=.=, +1)}",
org.eclipse.gemini.blueprint.*;version="${geminiBlueprintVersion:[=.=.=, +1)}",
org.eclipse.virgo.medic.*;version="${version:[=.=.=, +1)}",
org.slf4j.*;version="${slf4jVersion:[=.=.=, +1)}"
diff --git a/web/org.eclipse.virgo.web.test/template.mf b/web/org.eclipse.virgo.web.test/template.mf
index b122729..b392fb3 100644
--- a/web/org.eclipse.virgo.web.test/template.mf
+++ b/web/org.eclipse.virgo.web.test/template.mf
@@ -14,7 +14,7 @@
org.apache.commons.httpclient.*;version="${org.apache.commons.httpclient:[=.=.=, +1)}",
org.aspectj.*;version="${aspectjVersion:[=.=.=, +1)}",
org.osgi.framework.*;version="0",
- org.springframework.*;version="${springframeworkVersion:[2.5.6, +1)}",
+ org.springframework.*;version="${springframeworkVersion:[=.=.=.=, +1)}",
org.osgi.service.cm.*;version="0",
org.osgi.service.component.*;version="0",
org.osgi.service.log.*;version="0",
