510631 - Move forward to AspectJ weaver 1.8.10511015_slf4japifragment3.7.0.M04

9 files changed, 33 insertions, 33 deletions

diff --git a/org.eclipse.virgo.kernel.agent.dm/template.mf b/org.eclipse.virgo.kernel.agent.dm/template.mf
index c25b9454..e2d9bf95 100644
--- a/org.eclipse.virgo.kernel.agent.dm/template.mf
+++ b/org.eclipse.virgo.kernel.agent.dm/template.mf
@@ -3,9 +3,9 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Virgo Kernel Agent Spring DM integration

 Bundle-SymbolicName: org.eclipse.virgo.kernel.agent.dm

 Bundle-Version: ${version}

-Excluded-Exports: 

+Excluded-Exports:

  *.internal.*

-Import-Template: 

+Import-Template:

  org.eclipse.virgo.kernel.*;version="${version:[=.=.=, =.+1)}",

  org.eclipse.virgo.util.*;version="${version:[=.=.=, =.+1)}",

  org.eclipse.virgo.nano.*;version="${version:[=.=.=, =.+1)}",

@@ -13,7 +13,7 @@ Import-Template:
  org.springframework.*;version="${springframeworkVersion:[2.5.6, +1)}",

  org.eclipse.gemini.blueprint.*;version="${geminiBlueprintVersion:[=.=.=, +1)}",

  org.eclipse.equinox.region.*;version="${equinoxRegionExportedPackageVersion:[=.=.=, =.+1)}",

- org.aspectj.*;version="${orgAspectjVersion:[=.=.=.=, +1)}",

+ org.aspectj.*;version="${aspectjVersion:[=.=.=, +1)}",

  org.osgi.*;version="0",

  org.slf4j.*;version="${slf4jVersion:[=.=.=, +1)}",

  org.osgi.*;version="0",

diff --git a/org.eclipse.virgo.kernel.deployer.dm/template.mf b/org.eclipse.virgo.kernel.deployer.dm/template.mf
index d14f2f0c..4b6da548 100644
--- a/org.eclipse.virgo.kernel.deployer.dm/template.mf
+++ b/org.eclipse.virgo.kernel.deployer.dm/template.mf
@@ -3,12 +3,12 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Virgo Kernel Deployer Spring DM Integration
 Bundle-SymbolicName: org.eclipse.virgo.kernel.deployer.dm
 Bundle-Version: ${version}
-Import-Template: 
+Import-Template:
  org.eclipse.virgo.kernel.*;version="${version:[=.=.=, =.+1)}",
  org.eclipse.virgo.nano.*;version="${version:[=.=.=, =.+1)}",
  org.eclipse.virgo.medic.*;version="${version:[=.=.=, =.+1)}",
  org.slf4j.*;version="${slf4jVersion:[=.=.=, +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.eclipse.gemini.blueprint.*;version="${geminiBlueprintVersion:[=.=.=, +1)}"
diff --git a/org.eclipse.virgo.kernel.deployer/template.mf b/org.eclipse.virgo.kernel.deployer/template.mf
index 81286c0e..7f4accb9 100644
--- a/org.eclipse.virgo.kernel.deployer/template.mf
+++ b/org.eclipse.virgo.kernel.deployer/template.mf
@@ -3,14 +3,14 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Virgo Kernel Deployer
 Bundle-SymbolicName: org.eclipse.virgo.kernel.deployer
 Bundle-Version: ${version}
-Import-Template: 
+Import-Template:
  org.eclipse.virgo.kernel.*;version="${version:[=.=.=, =.+1)}",
  org.eclipse.virgo.nano.*;version="${version:[=.=.=, =.+1)}",
  org.eclipse.virgo.util.*;version="${version:[=.=.=, =.+1)}",
  org.eclipse.virgo.repository.*;version="${version:[=.=.=, =.+1)}",
  org.eclipse.virgo.medic.*;version="${version:[=.=.=, =.+1)}",
  org.slf4j.*;version="${slf4jVersion:[=.=.=, +1)}",
- org.aspectj.*;version="${orgAspectjVersion:[=.=.=.=, +1)}",
+ org.aspectj.*;version="${aspectjVersion:[=.=.=, +1)}",
  org.springframework.*;version="${springframeworkVersion:[2.5.6, +1)}",
  org.eclipse.gemini.blueprint.*;version="${geminiBlueprintVersion:[=.=.=, +1]}",
  org.osgi.framework.*;version="0",
@@ -23,9 +23,9 @@ Import-Template:
  javax.xml.*;version="0",
  org.xml.*;version="0",
  org.w3c.*;version="0"
-Excluded-Imports: 
+Excluded-Imports:
  org.eclipse.virgo.kernel.equinox.*,
  org.eclipse.virgo.nano.deployer.hotenabler
-Excluded-Exports: 
+Excluded-Exports:
  org.eclipse.virgo.nano.deployer.*,
  *.internal.*
diff --git a/org.eclipse.virgo.kernel.dmfragment/template.mf b/org.eclipse.virgo.kernel.dmfragment/template.mf
index bf089dd4..2566f080 100644
--- a/org.eclipse.virgo.kernel.dmfragment/template.mf
+++ b/org.eclipse.virgo.kernel.dmfragment/template.mf
@@ -4,18 +4,18 @@ Bundle-Name: Virgo Kernel User Region OSGi Spring DM Fragment
 Fragment-Host: org.eclipse.gemini.blueprint.extender

 Bundle-SymbolicName: org.eclipse.virgo.kernel.dmfragment

 Bundle-Version: ${version}

-Import-Package: 

+Import-Package:

  org.eclipse.virgo.kernel.agent.dm;version="${version:[=.=.=, =.+1)}",

  org.eclipse.virgo.nano.shim.serviceability;version="${version:[=.=.=, =.+1)}"

-Import-Template: 

+Import-Template:

  org.eclipse.virgo.kernel.*;version="${version:[=.=.=, =.+1)}",

  org.eclipse.virgo.medic.*;version="${version:[=.=.=, =.+1)}",

  org.slf4j.*;version="${slf4jVersion:[=.=.=, +1)}",

- org.aspectj.*;version="${orgAspectjVersion:[=.=.=.=, +1)}",

+ org.aspectj.*;version="${aspectjVersion:[=.=.=, +1)}",

  javax.management.*;version="0",

  org.osgi.framework.*;version="0",

  org.springframework.*;version="${springframeworkVersion:[2.5.6, +1)}"

-Excluded-Imports: 

+Excluded-Imports:

  org.eclipse.gemini.blueprint.*

-Excluded-Exports: 

+Excluded-Exports:

  org.eclipse.virgo.kernel.dmfragment.internal.*

diff --git a/org.eclipse.virgo.kernel.model/template.mf b/org.eclipse.virgo.kernel.model/template.mf
index 5ee74b7d..6d2a4817 100644
--- a/org.eclipse.virgo.kernel.model/template.mf
+++ b/org.eclipse.virgo.kernel.model/template.mf
@@ -3,12 +3,12 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Virgo Kernel Runtime Artifact Model
 Bundle-SymbolicName: org.eclipse.virgo.kernel.model
 Bundle-Version: ${version}
-Import-Template: 
+Import-Template:
  org.eclipse.virgo.kernel.*;version="${version:[=.=.=, =.+1)}",
  org.eclipse.virgo.nano.*;version="${version:[=.=.=, =.+1)}",
  org.eclipse.virgo.util.*;version="${version:[=.=.=, =.+1)}",
  org.eclipse.virgo.medic.*;version="${version:[=.=.=, =.+1)}",
- org.aspectj.*;version="${orgAspectjVersion:[=.=.=.=, +1)}",
+ org.aspectj.*;version="${aspectjVersion:[=.=.=, +1)}",
  org.springframework.*;version="${springframeworkVersion:[2.5.6, +1)}",
  javax.annotation.*;version="0",
  javax.management.*;version="0",
@@ -17,5 +17,5 @@ Import-Template:
  org.osgi.util.tracker.*;version="0",
  org.eclipse.equinox.region.*;version="${equinoxRegionExportedPackageVersion:[=.=.=, =.+1)}",
  org.slf4j.*;version="${slf4jVersion:[=.=.=, +1)}"
-Excluded-Exports: 
+Excluded-Exports:
  *.internal.*
diff --git a/org.eclipse.virgo.kernel.osgi/template.mf b/org.eclipse.virgo.kernel.osgi/template.mf
index a69edc3a..b03f2525 100644
--- a/org.eclipse.virgo.kernel.osgi/template.mf
+++ b/org.eclipse.virgo.kernel.osgi/template.mf
@@ -3,18 +3,18 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Virgo Kernel OSGi integration
 Bundle-SymbolicName: org.eclipse.virgo.kernel.osgi
 Bundle-Version: ${version}
-Excluded-Exports: 
+Excluded-Exports:
  *.internal.*
-Excluded-Imports: 
+Excluded-Imports:
  org.eclipse.virgo.kernel.services.repository.internal.*,
  org.eclipse.virgo.repository.internal
-Import-Template: 
+Import-Template:
  org.eclipse.virgo.kernel.*;version="${version:[=.=.=, =.+1)}",
  org.eclipse.virgo.nano.*;version="${version:[=.=.=, =.+1)}",
  org.eclipse.virgo.medic.*;version="${version:[=.=.=, =.+1)}",
  org.eclipse.virgo.repository.*;version="${version:[=.=.=, =.+1)}",
  org.eclipse.virgo.util.*;version="${version:[=.=.=, =.+1)}",
- org.aspectj.*;version="${orgAspectjVersion:[=.=.=.=, +1)}",
+ org.aspectj.*;version="${aspectjVersion:[=.=.=, +1)}",
  org.eclipse.osgi.*;version="0",
  org.eclipse.equinox.region.*;version="${equinoxRegionExportedPackageVersion:[=.=.=, =.+1)}",
  org.osgi.framework.*;version="0",
diff --git a/org.eclipse.virgo.kernel.services/template.mf b/org.eclipse.virgo.kernel.services/template.mf
index 6588fe53..e573e63e 100644
--- a/org.eclipse.virgo.kernel.services/template.mf
+++ b/org.eclipse.virgo.kernel.services/template.mf
@@ -3,15 +3,15 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Virgo Kernel Services
 Bundle-SymbolicName: org.eclipse.virgo.kernel.services
 Bundle-Version: ${version}
-Excluded-Exports: 
+Excluded-Exports:
  *.internal.*
-Import-Template: 
+Import-Template:
  org.eclipse.virgo.kernel.*;version="${version:[=.=.=, =.+1)}",
  org.eclipse.virgo.util.*;version="${version:[=.=.=, =.+1)}",
  org.eclipse.virgo.nano.*;version="${version:[=.=.=, =.+1)}",
  org.eclipse.virgo.repository.*;version="${version:[=.=.=, =.+1)}",
  org.eclipse.virgo.medic.*;version="${version:[=.=.=, =.+1)}",
- org.aspectj.*;version="${orgAspectjVersion:[=.=.=.=, +1)}",
+ org.aspectj.*;version="${aspectjVersion:[=.=.=, +1)}",
  org.slf4j.*;version="${slf4jVersion:[=.=.=, +1)}",
  org.osgi.framework.*;version="0",
  org.osgi.service.cm.*;version="0",
diff --git a/org.eclipse.virgo.kernel.userregion/template.mf b/org.eclipse.virgo.kernel.userregion/template.mf
index c3bad17b..bb26e582 100644
--- a/org.eclipse.virgo.kernel.userregion/template.mf
+++ b/org.eclipse.virgo.kernel.userregion/template.mf
@@ -3,20 +3,20 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Virgo Kernel user region management
 Bundle-SymbolicName: org.eclipse.virgo.kernel.userregion
 Bundle-Version: ${version}
-Excluded-Exports: 
+Excluded-Exports:
  *.internal.*
-Excluded-Imports: 
+Excluded-Imports:
  org.eclipse.virgo.kernel.services.repository.internal.*,
  org.eclipse.virgo.kernel.userregion.internal.*,
  org.eclipse.virgo.repository.internal
-Import-Template: 
+Import-Template:
  org.eclipse.equinox.region.*;version="${equinoxRegionExportedPackageVersion:[=.=.=, =.+1)}",
  org.eclipse.virgo.kernel.*;version="${version:[=.=.=, =.+1)}",
  org.eclipse.virgo.medic.*;version="${version:[=.=.=, =.+1)}",
  org.eclipse.virgo.nano.*;version="${version:[=.=.=, =.+1)}",
  org.eclipse.virgo.repository.*;version="${version:[=.=.=, =.+1)}",
  org.eclipse.virgo.util.*;version="${version:[=.=.=, =.+1)}",
- org.aspectj.*;version="${orgAspectjVersion:[=.=.=.=, +1)}",
+ org.aspectj.*;version="${aspectjVersion:[=.=.=, +1)}",
  org.slf4j.*;version="${slf4jVersion:[=.=.=, +1)}",
  org.springframework.*;version="${springframeworkVersion:[2.5.6, +1)}",
  org.eclipse.osgi.*;version="0",
diff --git a/org.eclipse.virgo.shell.command/template.mf b/org.eclipse.virgo.shell.command/template.mf
index 4a91dac0..067051e9 100644
--- a/org.eclipse.virgo.shell.command/template.mf
+++ b/org.eclipse.virgo.shell.command/template.mf
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Virgo Admin Shell
 Bundle-SymbolicName: org.eclipse.virgo.shell.command
 Bundle-Version: ${version}
-Import-Template: 
+Import-Template:
  org.eclipse.virgo.kernel.*;version="${version:[=.=.=, =.+1)}",
  org.eclipse.virgo.nano.*;version="${version:[=.=.=, =.+1)}",
  org.eclipse.virgo.util.*;version="${version:[=.=.=, =.+1)}",
@@ -11,7 +11,7 @@ Import-Template:
  org.eclipse.virgo.repository.*;version="${version:[=.=.=, =.+1)}",
  org.springframework.*;version="${springframeworkVersion:[2.5.6, +1)}",
  org.slf4j.*;version="${slf4jVersion:[=.=.=, +1)}",
- org.aspectj.*;version="${orgAspectjVersion:[=.=.=.=, +1)}",
+ org.aspectj.*;version="${aspectjVersion:[=.=.=, +1)}",
  javax.crypto.*;version="0",
  javax.net.*;version="0",
  javax.security.*;version="0",
@@ -27,14 +27,14 @@ Import-Template:
  org.eclipse.osgi.framework.*;version="0",
  org.eclipse.osgi.service.resolver.*;version="0",
  org.apache.felix.service.command;status=provisional;version="${gogoRuntimeVersion:[=.=.=, =.+1)}"
-Export-Template: 
+Export-Template:
  org.eclipse.virgo.shell.osgicommand.helper.*;version="${version}"
 Bundle-Activator: org.eclipse.virgo.shell.osgicommand.Activator
-Excluded-Imports: 
+Excluded-Imports:
  org.eclipse.virgo.kernel.shell.*,
  com.jcraft.jzlib.*,
  org.bouncycastle.*,
  org.easymock
-Excluded-Exports: 
+Excluded-Exports:
  *.internal.*,
  org.apache.*