Streamline AspectJ versions
Also switch to dependencyManagement for AspectJ libraries.
Change-Id: I3f5b8e9fa1709b75d0861eedfee57c3c86ff0d6e
diff --git a/build.gradle b/build.gradle
index 7bf20d2..2e820a8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,8 +20,6 @@
apply plugin: VirgoToolsPlugin
ext {
- aspectjVersion = "1.9.3"
-
javaProjects = [
project(':nano:org.eclipse.virgo.nano.authentication'),
project(':nano:org.eclipse.virgo.nano.shutdown'),
@@ -418,23 +416,6 @@
}
}
-configure(aspectjProjects) {
- configurations {
- ajtools {
- transitive = false
- description = "AspectJ tools runtime"
- }
- }
-
- apply plugin: AspectJPlugin
-
- dependencies {
- implementation "org.aspectj:aspectjrt:${aspectjVersion}"
-
- ajtools "org.aspectj:aspectjtools:${aspectjVersion}"
- }
-}
-
configure(javaProjects + osgiProjects) {
assemble.doLast {
println '|--> Assembled Jar File: ' + jar.archivePath
@@ -562,6 +543,9 @@
dependency "javax.servlet.jsp:javax.servlet.jsp-api:${javaxServletJspVersion}"
dependency "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:${javaxServletJspJstlVersion}"
+ dependency "org.aspectj:aspectjrt:${aspectjVersion}" // used by AspectJ compiler
+ dependency "org.aspectj:aspectjtools:${aspectjVersion}" // used by AspectJ compiler -> configuration ajtools
+
dependencySet(group:'org.springframework', version: springframeworkVersion) {
entry 'spring-aspects'
entry 'spring-aop'
@@ -677,8 +661,19 @@
}
configure(aspectjProjects) {
- configurations.compile.dependencies.each { dep ->
+ configurations {
+ ajtools {
+ transitive = false
+ description = "AspectJ tools runtime"
+ }
+ }
+
+ apply plugin: AspectJPlugin
+
+ configurations.compile.dependencies.each { Dependency dep ->
+ println dep.class
if (dep.hasProperty("dependencyProject")) {
+ println "Has property dependencyProject" + dep.class
println "dependent project: ${dep}"
iajcClasspath += ":" + dep.dependencyProject.buildDir + "/bundles/release/classes.jar"
} else {
@@ -704,11 +699,10 @@
}
dependencies {
- compile "org.aspectj:aspectjrt:${project.aspectjVersion}"
- ajtools "org.aspectj:aspectjtools:${project.aspectjVersion}"
- }
+ implementation 'org.aspectj:aspectjrt'
- apply plugin: AspectJPlugin
+ ajtools 'org.aspectj:aspectjtools'
+ }
// Add nature and buildCommand
eclipse.project {
diff --git a/gradle.properties b/gradle.properties
index 70eac2f..b840f2d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -305,7 +305,8 @@
# CQ 13683
jolokiaVersion = 1.3.6
-aspectjVersion = 1.8.10
+aspectjVersion = 1.9.3
+# TODO - may be outdated - 1.8.x
aspectjHash = 1a14fe9e912f6e8bdbb5429b78b4090d8b47bc1
jettyVersion = 8.1.16.v20140903
diff --git a/kernel/org.eclipse.virgo.kernel.agent.dm/build.gradle b/kernel/org.eclipse.virgo.kernel.agent.dm/build.gradle
index 11a2647..5bd6b9c 100644
--- a/kernel/org.eclipse.virgo.kernel.agent.dm/build.gradle
+++ b/kernel/org.eclipse.virgo.kernel.agent.dm/build.gradle
@@ -1,7 +1,7 @@
dependencies {
testCompile project(':test:org.eclipse.virgo.test.stubs')
- testRuntime "org.aspectj:aspectjrt:${project.aspectjVersion}"
+ testRuntime 'org.aspectj:aspectjrt'
compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi.services", version: osgiServicesVersion, configuration: "compile", ext: "jar"
diff --git a/kernel/org.eclipse.virgo.kernel.deployer.dm/build.gradle b/kernel/org.eclipse.virgo.kernel.deployer.dm/build.gradle
index 5d38dae..18eaa8b 100644
--- a/kernel/org.eclipse.virgo.kernel.deployer.dm/build.gradle
+++ b/kernel/org.eclipse.virgo.kernel.deployer.dm/build.gradle
@@ -2,7 +2,7 @@
testCompile project(':medic:org.eclipse.virgo.medic.test')
testCompile project(':test:org.eclipse.virgo.test.stubs')
- testRuntime "org.aspectj:aspectjrt:${project.aspectjVersion}"
+ testRuntime 'org.aspectj:aspectjrt'
compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
diff --git a/kernel/org.eclipse.virgo.kernel.deployer.test/build.gradle b/kernel/org.eclipse.virgo.kernel.deployer.test/build.gradle
index e386158..22b3d95 100644
--- a/kernel/org.eclipse.virgo.kernel.deployer.test/build.gradle
+++ b/kernel/org.eclipse.virgo.kernel.deployer.test/build.gradle
@@ -24,7 +24,7 @@
// some the libraries are used by configuration items during integration tests -> testRuntime
// @see org.eclipse.virgo.kernel.userregion.properties and others
testRuntimeOnly 'org.slf4j:jcl-over-slf4j'
- testRuntime "org.aspectj:aspectjrt:${project.aspectjVersion}"
+ testRuntimeOnly 'org.aspectj:aspectjrt'
testCompile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
testCompile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi.services", version: osgiServicesVersion, configuration: "compile", ext: "jar"
diff --git a/kernel/org.eclipse.virgo.kernel.deployer/build.gradle b/kernel/org.eclipse.virgo.kernel.deployer/build.gradle
index 5ee8f5f..22bf143 100644
--- a/kernel/org.eclipse.virgo.kernel.deployer/build.gradle
+++ b/kernel/org.eclipse.virgo.kernel.deployer/build.gradle
@@ -2,7 +2,7 @@
testCompile project(':medic:org.eclipse.virgo.medic.test')
testCompile project(':test:org.eclipse.virgo.test.stubs')
- testRuntime "org.aspectj:aspectjrt:${project.aspectjVersion}"
+ testRuntime 'org.aspectj:aspectjrt'
testRuntime group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.region", version: equinoxRegionVersion, configuration: "compile", ext: "jar"
compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
diff --git a/kernel/org.eclipse.virgo.kernel.equinox.extensions/build.gradle b/kernel/org.eclipse.virgo.kernel.equinox.extensions/build.gradle
index b5e5253..9f408c6 100644
--- a/kernel/org.eclipse.virgo.kernel.equinox.extensions/build.gradle
+++ b/kernel/org.eclipse.virgo.kernel.equinox.extensions/build.gradle
@@ -1,6 +1,6 @@
dependencies {
testCompile project(':test:org.eclipse.virgo.test.stubs')
- testRuntime "org.aspectj:aspectjrt:${project.aspectjVersion}"
+ testRuntime 'org.aspectj:aspectjrt'
compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
}
diff --git a/kernel/org.eclipse.virgo.kernel.services/build.gradle b/kernel/org.eclipse.virgo.kernel.services/build.gradle
index c27f917..ad27767 100644
--- a/kernel/org.eclipse.virgo.kernel.services/build.gradle
+++ b/kernel/org.eclipse.virgo.kernel.services/build.gradle
@@ -16,7 +16,7 @@
testCompile project(':test:org.eclipse.virgo.test.stubs')
testCompile project(':medic:org.eclipse.virgo.medic.test')
- testRuntime "org.aspectj:aspectjrt:${project.aspectjVersion}"
+ testRuntime 'org.aspectj:aspectjrt'
compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
diff --git a/kernel/org.eclipse.virgo.kernel.test/build.gradle b/kernel/org.eclipse.virgo.kernel.test/build.gradle
index d8125f1..07e3f03 100644
--- a/kernel/org.eclipse.virgo.kernel.test/build.gradle
+++ b/kernel/org.eclipse.virgo.kernel.test/build.gradle
@@ -26,7 +26,7 @@
testImplementation 'org.springframework:spring-context'
- testRuntimeOnly "org.aspectj:aspectjrt:${project.aspectjVersion}"
+ testRuntimeOnly 'org.aspectj:aspectjrt'
testCompile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
testCompile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi.services", version: osgiServicesVersion, configuration: "compile", ext: "jar"
diff --git a/kernel/org.eclipse.virgo.kernel.userregion/build.gradle b/kernel/org.eclipse.virgo.kernel.userregion/build.gradle
index e0ab0c6..3e38869 100644
--- a/kernel/org.eclipse.virgo.kernel.userregion/build.gradle
+++ b/kernel/org.eclipse.virgo.kernel.userregion/build.gradle
@@ -5,9 +5,9 @@
testImplementation 'org.springframework:spring-beans'
testImplementation 'org.springframework:spring-core'
- testRuntime "org.aspectj:aspectjrt:${project.aspectjVersion}"
-
testRuntimeOnly 'org.slf4j:slf4j-nop' // used in EquinoxOsgiFrameworkTests
+ testRuntimeOnly 'org.slf4j:jcl-over-slf4j'
+ testRuntimeOnly 'org.aspectj:aspectjrt'
compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi.services", version: osgiServicesVersion, configuration: "compile", ext: "jar"
diff --git a/kernel/org.eclipse.virgo.kernel.userregionfactory/build.gradle b/kernel/org.eclipse.virgo.kernel.userregionfactory/build.gradle
index 697c338..bd9be46 100644
--- a/kernel/org.eclipse.virgo.kernel.userregionfactory/build.gradle
+++ b/kernel/org.eclipse.virgo.kernel.userregionfactory/build.gradle
@@ -1,7 +1,7 @@
dependencies {
testCompile project(':test:org.eclipse.virgo.test.stubs')
- testRuntime "org.aspectj:aspectjrt:${project.aspectjVersion}"
+ testRuntime 'org.aspectj:aspectjrt'
compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi.services", version: osgiServicesVersion, configuration: "compile", ext: "jar"
diff --git a/kernel/org.eclipse.virgo.shell.command/build.gradle b/kernel/org.eclipse.virgo.shell.command/build.gradle
index 269e61f..84824d4 100644
--- a/kernel/org.eclipse.virgo.shell.command/build.gradle
+++ b/kernel/org.eclipse.virgo.shell.command/build.gradle
@@ -2,7 +2,7 @@
testImplementation 'org.slf4j:slf4j-nop'
testCompile project(':test:org.eclipse.virgo.test.stubs')
- testRuntime "org.aspectj:aspectjrt:${project.aspectjVersion}"
+ testRuntime 'org.aspectj:aspectjrt'
compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi.services", version: osgiServicesVersion, configuration: "compile", ext: "jar"
