510631 - Move forward to AspectJ weaver 1.8.10
diff --git a/org.eclipse.virgo.web.core/template.mf b/org.eclipse.virgo.web.core/template.mf
index 472f656..db0fea9 100644
--- a/org.eclipse.virgo.web.core/template.mf
+++ b/org.eclipse.virgo.web.core/template.mf
@@ -3,7 +3,7 @@
Bundle-Name: Virgo Web Support Core
Bundle-SymbolicName: org.eclipse.virgo.web.core
Bundle-Version: ${version}
-Import-Template:
+Import-Template:
org.eclipse.virgo.kernel.*;version="${version:[=.=.=, +1)}",
org.eclipse.virgo.nano.*;version="${version:[=.=.=, +1)}",
org.eclipse.gemini.web.*;version="${geminiWebVersion:[=.=.=, +1)}",
@@ -12,14 +12,13 @@
org.eclipse.virgo.medic.*;version="${version:[=.=.=, +1)}",
org.eclipse.virgo.kernel.equinox.*;version="${version:[=.=.=, +1)}",
javax.servlet.*;version="${javaxServletVersion:[-1.6.=, +1)}",
- org.aspectj.*;version="${orgAspectjVersion:[=.=.=, +1)}",
+ org.aspectj.*;version="${aspectjVersion:[=.=.=, +1)}",
org.eclipse.osgi.*;version="0",
org.osgi.framework.*;version="0",
org.osgi.util.*;version="0",
org.osgi.service.*;version="0",
org.slf4j.*;version="${slf4jVersion:[=.=.=, +1)}"
-Excluded-Exports:
+Excluded-Exports:
org.eclipse.virgo.web.core.internal.*
-Excluded-Imports:
+Excluded-Imports:
org.eclipse.virgo.web.core.internal.*
-
diff --git a/org.eclipse.virgo.web.dm/template.mf b/org.eclipse.virgo.web.dm/template.mf
index c52d898..f4525a6 100644
--- a/org.eclipse.virgo.web.dm/template.mf
+++ b/org.eclipse.virgo.web.dm/template.mf
@@ -3,11 +3,11 @@
Bundle-Name: Virgo Web Spring DM Support
Bundle-SymbolicName: org.eclipse.virgo.web.dm
Bundle-Version: ${version}
-Import-Template:
+Import-Template:
org.eclipse.virgo.kernel.*;version="${version:[=.=.=, +1)}",
javax.servlet.*;version="${javaxServletVersion:[-1.5.=, +1)}",
org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
- org.aspectj.*;version="${orgAspectjVersion:[=.=.=, +1)}",
+ org.aspectj.*;version="${aspectjVersion:[=.=.=, +1)}",
org.osgi.framework.*;version="0",
org.springframework.*;version="${springframeworkVersion:[3.1, +1)}",
org.eclipse.gemini.blueprint.*;version="${geminiBlueprintVersion:[=.=.=, +1)}",
diff --git a/org.eclipse.virgo.web.test/template.mf b/org.eclipse.virgo.web.test/template.mf
index ae076cd..b122729 100644
--- a/org.eclipse.virgo.web.test/template.mf
+++ b/org.eclipse.virgo.web.test/template.mf
@@ -3,7 +3,7 @@
Bundle-Name: Virgo Web Test Bundle
Bundle-SymbolicName: org.eclipse.virgo.web.test
Bundle-Version: ${version}
-Import-Template:
+Import-Template:
org.eclipse.virgo.kernel.*;version="${org.eclipse.virgo.kernel:[=.=.=, +1)}",
org.eclipse.virgo.util.*;version="${version:[=.=.=, +1)}",
org.eclipse.virgo.kernel.equinox.*;version="${org.eclipse.virgo.kernel:[=.=.=, +1)}",
@@ -12,7 +12,7 @@
javax.servlet.*;version="${javax.servlet:[-1.6.=, +1)}",
org.apache.commons.logging.*;version="${org.apache.commons.logging:[=.=.=, +1)}",
org.apache.commons.httpclient.*;version="${org.apache.commons.httpclient:[=.=.=, +1)}",
- org.aspectj.*;version="${orgAspectjVersion:[=.=.=, +1)}",
+ org.aspectj.*;version="${aspectjVersion:[=.=.=, +1)}",
org.osgi.framework.*;version="0",
org.springframework.*;version="${springframeworkVersion:[2.5.6, +1)}",
org.osgi.service.cm.*;version="0",
@@ -25,14 +25,13 @@
org.eclipse.osgi.util.*;version="0",
org.osgi.util.tracker.*;version="0",
org.eclipse.gemini.blueprint.*;version="${geminiBlueprintVersion:[=.=.=, +1)}"
-Excluded-Imports:
+Excluded-Imports:
org.eclipse.virgo,
org.eclipse.virgo.test.*,
org.eclipse.gemini.web.tomcat.config,
org.eclipse.virgo.server
-Excluded-Exports:
+Excluded-Exports:
org.eclipse.virgo.kernel.*,
org.eclipse.virgo.util.*,
config,
config.management
-
diff --git a/org.eclipse.virgo.web.tomcat.support/template.mf b/org.eclipse.virgo.web.tomcat.support/template.mf
index 816c643..c42ce65 100644
--- a/org.eclipse.virgo.web.tomcat.support/template.mf
+++ b/org.eclipse.virgo.web.tomcat.support/template.mf
@@ -4,7 +4,7 @@
Bundle-SymbolicName: org.eclipse.virgo.web.tomcat.support
Fragment-Host: org.eclipse.gemini.web.tomcat
Bundle-Version: ${version}
-Import-Template:
+Import-Template:
org.eclipse.virgo.kernel.*;version="${version:[=.=.=, +1)}",
org.eclipse.virgo.nano.*;version="${version:[=.=.=, +1)}",
org.eclipse.gemini.web.*;version="${geminiWebVersion:[=.=.=, +1)}",
@@ -13,9 +13,9 @@
org.eclipse.virgo.util.*;version="${version:[=.=.=, +1)}",
org.apache.catalina.*;version="${apacheCatalinaVersion:[=.=.=, =.+1)}",
javax.servlet.*;version="${javaxServletVersion:[-1.6.=, +1)}",
- org.aspectj.*;version="${orgAspectjVersion:[=.=.=, +1)}",
+ org.aspectj.*;version="${aspectjVersion:[=.=.=, +1)}",
org.osgi.framework.*;version="0"
-Import-Package:
+Import-Package:
org.apache.catalina.ha;version="${apacheCatalinaVersion:[=.=.=, =.+1)}";resolution:=optional,
org.apache.catalina.ha.tcp;version="${apacheCatalinaVersion:[=.=.=, =.+1)}";resolution:=optional,
org.apache.catalina.ha.session;version="${apacheCatalinaVersion:[=.=.=, =.+1)}";resolution:=optional,
@@ -28,5 +28,5 @@
org.apache.catalina.tribes.transport;version="${apacheCatalinaVersion:[=.=.=, =.+1)}";resolution:=optional,
org.apache.catalina.tribes.group.interceptors;version="${apacheCatalinaVersion:[=.=.=, =.+1)}";resolution:=optional,
javax.websocket;version="${javaxWebsocketVersion:[=.=.=, =.+1)}";resolution:=optional
-Excluded-Exports:
+Excluded-Exports:
*
