510631 - Move forward to AspectJ weaver 1.8.10
* update hard wired version in integration test
diff --git a/org.eclipse.virgo.util.integrationtest/src/test/java/org/eclipse/virgo/util/test/UtilBundlesResolutionPaxExamTests.java b/org.eclipse.virgo.util.integrationtest/src/test/java/org/eclipse/virgo/util/test/UtilBundlesResolutionPaxExamTests.java
index eced596..cd5945f 100644
--- a/org.eclipse.virgo.util.integrationtest/src/test/java/org/eclipse/virgo/util/test/UtilBundlesResolutionPaxExamTests.java
+++ b/org.eclipse.virgo.util.integrationtest/src/test/java/org/eclipse/virgo/util/test/UtilBundlesResolutionPaxExamTests.java
@@ -91,7 +91,7 @@
return options( //
bundle("mvn:org.slf4j/slf4j-api/1.7.22"), // CQ 12462
bundle("mvn:org.slf4j/slf4j-nop/1.7.22").noStart(), // CQ 12540
- bundle("wrap:mvn:org.aspectj/aspectjrt/1.7.2$Export-Package=org.aspectj.*;version=1.7.2"), //
+ bundle("wrap:mvn:org.aspectj/aspectjrt/1.8.10$Export-Package=org.aspectj.*;version=1.8.10"), //
utilBundles, //
junitBundles() //
);
diff --git a/org.eclipse.virgo.util.jmx/template.mf b/org.eclipse.virgo.util.jmx/template.mf
index 6861252..ed2fd94 100644
--- a/org.eclipse.virgo.util.jmx/template.mf
+++ b/org.eclipse.virgo.util.jmx/template.mf
@@ -2,9 +2,9 @@
Bundle-Name: Jmx utility code
Bundle-SymbolicName: org.eclipse.virgo.util.jmx
Bundle-Version: ${version}
-Import-Template:
+Import-Template:
javax.annotation.*;version="0",
- org.aspectj.*;version="${orgAspectjVersion:[=.=.=, +1)}",
+ org.aspectj.*;version="${aspectjVersion:[=.=.=, +1)}",
org.slf4j.*;version="${slf4jVersion:[=.=.=, +1)}"
-Excluded-Exports:
+Excluded-Exports:
org.eclipse.virgo.util.jmx.internal.*