Streamline slf4j, logback and test dependencies
Change-Id: I995b6cd9d1f78f626dfc34899ffaa7333f174ff1
diff --git a/apps/org.eclipse.virgo.apps.repository.core/build.gradle b/apps/org.eclipse.virgo.apps.repository.core/build.gradle
index 8a97168..46932a1 100644
--- a/apps/org.eclipse.virgo.apps.repository.core/build.gradle
+++ b/apps/org.eclipse.virgo.apps.repository.core/build.gradle
@@ -2,8 +2,6 @@
aspectpath project(':medic:org.eclipse.virgo.medic')
aspectpath project(':util:org.eclipse.virgo.util.jmx')
- compile group: "org.slf4j", name: "slf4j-api", version: slf4jVersion
-
compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
implementation group: "org.eclipse.gemini", name: "org.eclipse.gemini.web.core", version: geminiWebVersion, configuration: "compile", ext: "jar"
@@ -16,6 +14,5 @@
implementation project(':repository:org.eclipse.virgo.repository')
implementation project(':kernel:org.eclipse.virgo.kernel.services')
- testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
testImplementation project(':medic:org.eclipse.virgo.medic.test')
}
diff --git a/apps/org.eclipse.virgo.apps.repository.web/build.gradle b/apps/org.eclipse.virgo.apps.repository.web/build.gradle
index 25fc739..e64239c 100644
--- a/apps/org.eclipse.virgo.apps.repository.web/build.gradle
+++ b/apps/org.eclipse.virgo.apps.repository.web/build.gradle
@@ -13,6 +13,5 @@
implementation project(':util:org.eclipse.virgo.util.io')
implementation project(':apps:org.eclipse.virgo.apps.repository.core')
- testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
testImplementation 'org.springframework:spring-test'
}
diff --git a/apps/org.eclipse.virgo.apps.splash/build.gradle b/apps/org.eclipse.virgo.apps.splash/build.gradle
index 76052b5..2069682 100644
--- a/apps/org.eclipse.virgo.apps.splash/build.gradle
+++ b/apps/org.eclipse.virgo.apps.splash/build.gradle
@@ -3,6 +3,5 @@
)
dependencies {
- compile group: "org.slf4j", name: "slf4j-api", version: slf4jVersion
implementation 'javax.servlet:javax.servlet-api'
}
diff --git a/build.gradle b/build.gradle
index fac7e04..7bf20d2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -237,11 +237,6 @@
'CATALINA.VERSION' : apacheCatalinaVersion,
'ASPECTJ' : aspectjVersion,
- 'LOGBACK.CLASSIC.VERSION' : logbackVersion,
- 'LOGBACK.CORE.VERSION' : logbackVersion,
- 'SLF4J.API' : slf4jVersion,
- 'SLF4J.JCL' : slf4jVersion,
- 'SLF4J.LOG4J' : slf4jVersion,
'C.FILEUPLOAD.VERSION' : commonsFileuploadVersion,
'C.IO.VERSION' : commonsIoVersion,
@@ -408,7 +403,11 @@
dependencies {
ecj group: "org.eclipse.jdt.core.compiler", name: "ecj", version: ecjVersion
+ implementation 'org.slf4j:slf4j-api'
+
testImplementation 'junit:junit'
+ testImplementation 'org.hamcrest:hamcrest-core'
+ testImplementation 'org.easymock:easymock'
}
eclipse {
@@ -536,6 +535,7 @@
dependency "org.glassfish.hk2.external:javax.inject:${glassfishJavaxInjectVersion}"
dependencySet(group:'org.slf4j', version: slf4jVersion) {
entry 'jcl-over-slf4j'
+ entry 'log4j-over-slf4j'
entry 'jul-to-slf4j'
entry 'slf4j-api'
entry 'slf4j-nop'
@@ -589,6 +589,8 @@
// testing
dependency "junit:junit:${junitVersion}"
+ dependency "org.hamcrest:hamcrest-core:${hamcrestCoreVersion}"
+ dependency "org.easymock:easymock:${easymockVersion}"
dependency "org.ops4j.pax.exam:pax-exam-junit4:${paxExamJunit4Version}"
dependency "org.ops4j.pax.exam:pax-exam-container-native:${paxExamContainerNativeVersion}"
@@ -747,7 +749,6 @@
testImplementation 'org.glassfish.hk2.external:javax.inject'
// PaxExam
- testRuntime group: "org.slf4j", name: "slf4j-api", version: slf4jVersion
testCompile group: "org.ops4j.pax.exam", name: "pax-exam-junit4", version: paxExamJunit4Version
testRuntime group: "org.ops4j.pax.exam", name: "pax-exam-container-native", version: paxExamContainerNativeVersion
testRuntime group: "org.ops4j.pax.exam", name: "pax-exam-link-mvn", version: paxExamLinkMvnVersion
diff --git a/gradle.properties b/gradle.properties
index d87008f..70eac2f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,8 +6,10 @@
# CQ4129 (PB CQ3480) JUnit Version 4.7
junitVersion = 4.12
-# CQ4132 (PB CQ1887)
-easymockVersion = 2.3
+hamcrestCoreVersion = 2.2
+
+# CQ4132 (PB CQ1887) for version 2.3
+easymockVersion = 4.0.2
# PaxExam
# CQ8541 for version 4.1.0, ...
@@ -22,10 +24,10 @@
# CQ 13680 SLF4J log4j-over-slf4j Version: 1.7.25
# CQ 13637 SLF4J slf4j-api Version: 1.7.25
# CQ 12540 SLF4J slf4j-nop version 1.7.22 and later (incl. 1.7.25)
-slf4jVersion = 1.7.25
-slf4jApiHash = da76ca59f6a57ee3102f8f9bd9cee742973efa8a
-slf4jJulToSlf4jHash = af5364cd6679bfffb114f0dec8a157aaa283b76
-slf4jJclOverSlf4jHash = f8c32b13ff142a513eeb5b6330b1588dcb2c0461
+slf4jVersion = 1.7.28
+slf4jApiHash = 2cd9b264f76e3d087ee21bfc99305928e1bdb443
+slf4jJulToSlf4jHash = c6f06c420ad62d3824b38a06dfdce9fb55ba81ef
+slf4jJclOverSlf4jHash = 523cba836932d499fac5eb4f565437642769569a
# CQ 13636 - Logback Classic Version 1.2.3
# CQ 13635 - Logback Core Version: 1.2.3
diff --git a/kernel/org.eclipse.virgo.kernel.agent.dm/build.gradle b/kernel/org.eclipse.virgo.kernel.agent.dm/build.gradle
index cb1512b..11a2647 100644
--- a/kernel/org.eclipse.virgo.kernel.agent.dm/build.gradle
+++ b/kernel/org.eclipse.virgo.kernel.agent.dm/build.gradle
@@ -1,11 +1,8 @@
dependencies {
- testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
testCompile project(':test:org.eclipse.virgo.test.stubs')
testRuntime "org.aspectj:aspectjrt:${project.aspectjVersion}"
- compile group: "org.slf4j", name: "slf4j-api", version: slf4jVersion
-
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"
compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.region", version: equinoxRegionVersion, configuration: "compile", ext: "jar"
diff --git a/kernel/org.eclipse.virgo.kernel.artifact/build.gradle b/kernel/org.eclipse.virgo.kernel.artifact/build.gradle
index 41a34f9..a126dcf 100644
--- a/kernel/org.eclipse.virgo.kernel.artifact/build.gradle
+++ b/kernel/org.eclipse.virgo.kernel.artifact/build.gradle
@@ -1,9 +1,6 @@
dependencies {
- testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
testRuntime group: "org.eclipse.virgo.mirrored", name: "org.apache.commons.dbcp", version: commonsDbcpVersion, configuration: "compile", ext: "jar"
- compile group: "org.slf4j", name: "slf4j-api", version: slf4jVersion
-
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 e61437b..5d38dae 100644
--- a/kernel/org.eclipse.virgo.kernel.deployer.dm/build.gradle
+++ b/kernel/org.eclipse.virgo.kernel.deployer.dm/build.gradle
@@ -1,5 +1,4 @@
dependencies {
- testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
testCompile project(':medic:org.eclipse.virgo.medic.test')
testCompile project(':test:org.eclipse.virgo.test.stubs')
diff --git a/kernel/org.eclipse.virgo.kernel.deployer.test/build.gradle b/kernel/org.eclipse.virgo.kernel.deployer.test/build.gradle
index 7f1b2c3..e386158 100644
--- a/kernel/org.eclipse.virgo.kernel.deployer.test/build.gradle
+++ b/kernel/org.eclipse.virgo.kernel.deployer.test/build.gradle
@@ -18,13 +18,12 @@
}
dependencies {
- testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
testCompile project(':test:org.eclipse.virgo.test.stubs')
testCompile project(':test:org.eclipse.virgo.test.framework')
// some the libraries are used by configuration items during integration tests -> testRuntime
// @see org.eclipse.virgo.kernel.userregion.properties and others
- testRuntime group: "org.slf4j", name: "jcl-over-slf4j", version: slf4jVersion
+ testRuntimeOnly 'org.slf4j:jcl-over-slf4j'
testRuntime "org.aspectj:aspectjrt:${project.aspectjVersion}"
testCompile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, 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 769f7e5..5ee8f5f 100644
--- a/kernel/org.eclipse.virgo.kernel.deployer/build.gradle
+++ b/kernel/org.eclipse.virgo.kernel.deployer/build.gradle
@@ -1,13 +1,10 @@
dependencies {
- testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
testCompile project(':medic:org.eclipse.virgo.medic.test')
testCompile project(':test:org.eclipse.virgo.test.stubs')
testRuntime "org.aspectj:aspectjrt:${project.aspectjVersion}"
testRuntime group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.region", version: equinoxRegionVersion, configuration: "compile", ext: "jar"
- compile group: "org.slf4j", name: "slf4j-api", version: slf4jVersion
-
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.dmfragment/build.gradle b/kernel/org.eclipse.virgo.kernel.dmfragment/build.gradle
index c490771..e4025f1 100644
--- a/kernel/org.eclipse.virgo.kernel.dmfragment/build.gradle
+++ b/kernel/org.eclipse.virgo.kernel.dmfragment/build.gradle
@@ -1,6 +1,4 @@
dependencies {
- compile group: "org.slf4j", name: "slf4j-api", version: slf4jVersion
-
compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
implementation 'org.springframework:spring-context-support'
diff --git a/kernel/org.eclipse.virgo.kernel.equinox.extensions/build.gradle b/kernel/org.eclipse.virgo.kernel.equinox.extensions/build.gradle
index 667dffc..b5e5253 100644
--- a/kernel/org.eclipse.virgo.kernel.equinox.extensions/build.gradle
+++ b/kernel/org.eclipse.virgo.kernel.equinox.extensions/build.gradle
@@ -1,5 +1,4 @@
dependencies {
- testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
testCompile project(':test:org.eclipse.virgo.test.stubs')
testRuntime "org.aspectj:aspectjrt:${project.aspectjVersion}"
diff --git a/kernel/org.eclipse.virgo.kernel.model/build.gradle b/kernel/org.eclipse.virgo.kernel.model/build.gradle
index 924685d..1c87c54 100644
--- a/kernel/org.eclipse.virgo.kernel.model/build.gradle
+++ b/kernel/org.eclipse.virgo.kernel.model/build.gradle
@@ -1,6 +1,4 @@
dependencies {
- testCompile group: "org.slf4j", name: "slf4j-api", version: slf4jVersion
- testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
testImplementation 'org.springframework:spring-context'
testCompile project(':test:org.eclipse.virgo.test.stubs')
diff --git a/kernel/org.eclipse.virgo.kernel.osgi/build.gradle b/kernel/org.eclipse.virgo.kernel.osgi/build.gradle
index b62e4e9..174ec07 100644
--- a/kernel/org.eclipse.virgo.kernel.osgi/build.gradle
+++ b/kernel/org.eclipse.virgo.kernel.osgi/build.gradle
@@ -1,5 +1,4 @@
dependencies {
- compile group: "org.slf4j", name: "slf4j-api", version: slf4jVersion
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.services/build.gradle b/kernel/org.eclipse.virgo.kernel.services/build.gradle
index 07afc94..c27f917 100644
--- a/kernel/org.eclipse.virgo.kernel.services/build.gradle
+++ b/kernel/org.eclipse.virgo.kernel.services/build.gradle
@@ -13,14 +13,11 @@
}
dependencies {
- testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
testCompile project(':test:org.eclipse.virgo.test.stubs')
testCompile project(':medic:org.eclipse.virgo.medic.test')
testRuntime "org.aspectj:aspectjrt:${project.aspectjVersion}"
- compile group: "org.slf4j", name: "slf4j-api", version: slf4jVersion
-
compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
implementation 'org.springframework:spring-beans'
diff --git a/kernel/org.eclipse.virgo.kernel.test/build.gradle b/kernel/org.eclipse.virgo.kernel.test/build.gradle
index d53932f..d8125f1 100644
--- a/kernel/org.eclipse.virgo.kernel.test/build.gradle
+++ b/kernel/org.eclipse.virgo.kernel.test/build.gradle
@@ -22,7 +22,6 @@
processTestResources.dependsOn copyTestResources
dependencies {
- testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
testCompile project(':test:org.eclipse.virgo.test.framework')
testImplementation 'org.springframework:spring-context'
diff --git a/kernel/org.eclipse.virgo.kernel.userregion/build.gradle b/kernel/org.eclipse.virgo.kernel.userregion/build.gradle
index 80f6afe..e0ab0c6 100644
--- a/kernel/org.eclipse.virgo.kernel.userregion/build.gradle
+++ b/kernel/org.eclipse.virgo.kernel.userregion/build.gradle
@@ -1,5 +1,4 @@
dependencies {
- testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
testCompile project(':test:org.eclipse.virgo.test.stubs')
testCompile project(':medic:org.eclipse.virgo.medic.test')
testCompile project(':repository:org.eclipse.virgo.repository')
@@ -8,8 +7,7 @@
testImplementation 'org.springframework:spring-core'
testRuntime "org.aspectj:aspectjrt:${project.aspectjVersion}"
- compile group: "org.slf4j", name: "slf4j-api", version: slf4jVersion
- testRuntimeOnly group: "org.slf4j", name: "slf4j-nop", version: slf4jVersion // used in EquinoxOsgiFrameworkTests
+ testRuntimeOnly 'org.slf4j:slf4j-nop' // used in EquinoxOsgiFrameworkTests
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 dba5a17..697c338 100644
--- a/kernel/org.eclipse.virgo.kernel.userregionfactory/build.gradle
+++ b/kernel/org.eclipse.virgo.kernel.userregionfactory/build.gradle
@@ -1,5 +1,4 @@
dependencies {
- testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
testCompile project(':test:org.eclipse.virgo.test.stubs')
testRuntime "org.aspectj:aspectjrt:${project.aspectjVersion}"
diff --git a/kernel/org.eclipse.virgo.management.console/build.gradle b/kernel/org.eclipse.virgo.management.console/build.gradle
index bdb2795..ae9d855 100644
--- a/kernel/org.eclipse.virgo.management.console/build.gradle
+++ b/kernel/org.eclipse.virgo.management.console/build.gradle
@@ -3,7 +3,6 @@
)
dependencies {
- compile group: "org.slf4j", name: "slf4j-api", version: slf4jVersion
implementation 'javax.servlet:javax.servlet-api'
compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
@@ -14,8 +13,7 @@
compile group: "commons-fileupload", name: "commons-fileupload", version: commonsFileuploadVersion, ext: "jar"
compile group: "org.jolokia", name: "jolokia-osgi", version: jolokiaVersion, ext: "jar"
- testCompile group: "org.slf4j", name: "slf4j-nop", version: slf4jVersion
- testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
+ testImplementation 'org.slf4j:slf4j-nop'
testImplementation 'org.springframework:spring-core'
testImplementation 'org.springframework:spring-web'
testImplementation 'org.springframework:spring-test'
diff --git a/kernel/org.eclipse.virgo.management.fragment/build.gradle b/kernel/org.eclipse.virgo.management.fragment/build.gradle
index ee1e3e4..c84c615 100644
--- a/kernel/org.eclipse.virgo.management.fragment/build.gradle
+++ b/kernel/org.eclipse.virgo.management.fragment/build.gradle
@@ -1,6 +1,4 @@
dependencies {
- testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
-
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.equinox.region", version: equinoxRegionVersion, 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 1880425..269e61f 100644
--- a/kernel/org.eclipse.virgo.shell.command/build.gradle
+++ b/kernel/org.eclipse.virgo.shell.command/build.gradle
@@ -1,12 +1,9 @@
dependencies {
- testCompile group: "org.slf4j", name: "slf4j-nop", version: slf4jVersion
- testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
+ testImplementation 'org.slf4j:slf4j-nop'
testCompile project(':test:org.eclipse.virgo.test.stubs')
testRuntime "org.aspectj:aspectjrt:${project.aspectjVersion}"
- compile group: "org.slf4j", name: "slf4j-api", version: slf4jVersion
-
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"
compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.region", version: equinoxRegionVersion, configuration: "compile", ext: "jar"
diff --git a/medic/org.eclipse.virgo.medic.core/build.gradle b/medic/org.eclipse.virgo.medic.core/build.gradle
index c02f312..8b3a095 100644
--- a/medic/org.eclipse.virgo.medic.core/build.gradle
+++ b/medic/org.eclipse.virgo.medic.core/build.gradle
@@ -1,14 +1,12 @@
dependencies {
- compile group: "org.slf4j", name: "slf4j-api", version: slf4jVersion
- compile group: "org.slf4j", name: "jul-to-slf4j", version: slf4jVersion
- compile "ch.qos.logback:logback-core:${logbackVersion}"
- compile "ch.qos.logback:logback-classic:${logbackVersion}"
+ implementation 'org.slf4j:jul-to-slf4j'
+ implementation 'ch.qos.logback:logback-core'
+ implementation 'ch.qos.logback:logback-classic'
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"
compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.cm", version: equinoxCmVersion, configuration: "compile", ext: "jar"
- testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
testImplementation project(':test:org.eclipse.virgo.test.stubs')
implementation project(':util:org.eclipse.virgo.util.io')
diff --git a/medic/org.eclipse.virgo.medic.logbackclassicfragment/build.gradle b/medic/org.eclipse.virgo.medic.logbackclassicfragment/build.gradle
index 6dbe863..b059536 100644
--- a/medic/org.eclipse.virgo.medic.logbackclassicfragment/build.gradle
+++ b/medic/org.eclipse.virgo.medic.logbackclassicfragment/build.gradle
@@ -1,3 +1,3 @@
dependencies {
- compile "ch.qos.logback:logback-classic:${logbackVersion}"
+ implementation 'ch.qos.logback:logback-classic'
}
diff --git a/medic/org.eclipse.virgo.medic.logbackcorefragment/build.gradle b/medic/org.eclipse.virgo.medic.logbackcorefragment/build.gradle
index d7ca8f3..a8dae1c 100644
--- a/medic/org.eclipse.virgo.medic.logbackcorefragment/build.gradle
+++ b/medic/org.eclipse.virgo.medic.logbackcorefragment/build.gradle
@@ -1,3 +1,3 @@
dependencies {
- compile "ch.qos.logback:logback-core:${logbackVersion}"
+ implementation 'ch.qos.logback:logback-core'
}
diff --git a/medic/org.eclipse.virgo.medic/build.gradle b/medic/org.eclipse.virgo.medic/build.gradle
index 8257dc3..6946edc 100644
--- a/medic/org.eclipse.virgo.medic/build.gradle
+++ b/medic/org.eclipse.virgo.medic/build.gradle
@@ -1,5 +1,3 @@
dependencies {
compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
-
- compile group: "org.slf4j", name: "slf4j-api", version: slf4jVersion
}
diff --git a/nano/org.eclipse.virgo.nano.core/build.gradle b/nano/org.eclipse.virgo.nano.core/build.gradle
index 7f99641..f62eb74 100644
--- a/nano/org.eclipse.virgo.nano.core/build.gradle
+++ b/nano/org.eclipse.virgo.nano.core/build.gradle
@@ -1,6 +1,4 @@
dependencies {
- compile group: "org.slf4j", name: "slf4j-api", version: slf4jVersion
-
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"
compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.region", version: equinoxRegionVersion, configuration: "compile", ext: "jar"
@@ -10,7 +8,6 @@
implementation project(':util:org.eclipse.virgo.util.osgi')
implementation project(':medic:org.eclipse.virgo.medic')
- testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
testImplementation project(':test:org.eclipse.virgo.test.stubs')
testImplementation project(':medic:org.eclipse.virgo.medic.test')
}
diff --git a/nano/org.eclipse.virgo.nano.deployer.hot/build.gradle b/nano/org.eclipse.virgo.nano.deployer.hot/build.gradle
index cd555ae..1534533 100644
--- a/nano/org.eclipse.virgo.nano.deployer.hot/build.gradle
+++ b/nano/org.eclipse.virgo.nano.deployer.hot/build.gradle
@@ -1,5 +1,4 @@
dependencies {
- compile group: "org.slf4j", name: "slf4j-api", version: slf4jVersion
compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
implementation project(':util:org.eclipse.virgo.util.io')
@@ -7,6 +6,5 @@
implementation project(':nano:org.eclipse.virgo.nano.core')
implementation project(':nano:org.eclipse.virgo.nano.deployer.api')
- testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
testImplementation project(':medic:org.eclipse.virgo.medic.test')
}
diff --git a/nano/org.eclipse.virgo.nano.deployer/build.gradle b/nano/org.eclipse.virgo.nano.deployer/build.gradle
index 32540ff..fd97950 100644
--- a/nano/org.eclipse.virgo.nano.deployer/build.gradle
+++ b/nano/org.eclipse.virgo.nano.deployer/build.gradle
@@ -1,6 +1,4 @@
dependencies {
- compile group: "org.slf4j", name: "slf4j-api", version: slf4jVersion
-
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"
compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.simpleconfigurator", version: equinoxSimpleConfiguratorVersion, configuration: "compile", ext: "jar"
@@ -15,6 +13,5 @@
implementation project(':nano:org.eclipse.virgo.nano.deployer.api')
implementation project(':nano:org.eclipse.virgo.nano.deployer.hot')
- testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
testImplementation project(':medic:org.eclipse.virgo.medic.test')
}
diff --git a/nano/org.eclipse.virgo.nano.management/build.gradle b/nano/org.eclipse.virgo.nano.management/build.gradle
index 32e5b60..87a3dd2 100644
--- a/nano/org.eclipse.virgo.nano.management/build.gradle
+++ b/nano/org.eclipse.virgo.nano.management/build.gradle
@@ -1,6 +1,4 @@
dependencies {
- compile group: "org.slf4j", name: "slf4j-api", version: slf4jVersion
-
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/org.eclipse.virgo.site/build.gradle b/org.eclipse.virgo.site/build.gradle
index ff563a9..039caae 100644
--- a/org.eclipse.virgo.site/build.gradle
+++ b/org.eclipse.virgo.site/build.gradle
@@ -113,11 +113,11 @@
localPlugin project(':web:org.eclipse.virgo.web.war.deployer')
// TODO - review if all those signedExternalPlugins are signed
- signedExternalPlugin group: "org.slf4j", name: "slf4j-api", version: slf4jVersion
- signedExternalPlugin group: "org.slf4j", name: "jul-to-slf4j", version: slf4jVersion
+ signedExternalPlugin 'org.slf4j:slf4j-api'
+ signedExternalPlugin 'org.slf4j:jul-to-slf4j'
// exports package org.apache.commons.logging (jcl - Jakarta Commons Logging)
- signedExternalPlugin group: "org.slf4j", name: "jcl-over-slf4j", version: slf4jVersion
- signedExternalPlugin group: "org.slf4j", name: "log4j-over-slf4j", version: slf4jVersion
+ signedExternalPlugin 'org.slf4j:jcl-over-slf4j'
+ signedExternalPlugin 'org.slf4j:log4j-over-slf4j'
signedExternalPlugin files("../3rd-party/build/plugins/oevm.org.aspectj.weaver_${aspectjVersion}.jar")
@@ -158,8 +158,8 @@
signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.gemini.management", version: geminiManagementVersion, configuration: "compile", ext: "jar"
localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.medic.feature')
- signedExternalPlugin group: "ch.qos.logback", name: "logback-core", version: logbackVersion
- signedExternalPlugin group: "ch.qos.logback", name: "logback-classic", version: logbackVersion
+ signedExternalPlugin 'ch.qos.logback:logback-core'
+ signedExternalPlugin 'ch.qos.logback:logback-classic'
localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.nano.deployer.feature')
localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.nano.mbeans.feature')
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.enterprise.feature/feature.xml b/org.eclipse.virgo.site/org.eclipse.virgo.enterprise.feature/feature.xml
index 695fecf..e67b7a0 100755
--- a/org.eclipse.virgo.site/org.eclipse.virgo.enterprise.feature/feature.xml
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.enterprise.feature/feature.xml
Binary files differ
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.medic.feature/feature.xml b/org.eclipse.virgo.site/org.eclipse.virgo.medic.feature/feature.xml
index fdc1e5b..3ef4970 100755
--- a/org.eclipse.virgo.site/org.eclipse.virgo.medic.feature/feature.xml
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.medic.feature/feature.xml
@@ -47,18 +47,18 @@
id="ch.qos.logback.classic"
download-size="0"
install-size="0"
- version="@LOGBACK.CLASSIC.VERSION@"
+ version="0.0.0"
unpack="false"/>
<plugin
id="ch.qos.logback.core"
download-size="0"
install-size="0"
- version="@LOGBACK.CORE.VERSION@"
+ version="0.0.0"
unpack="false"/>
<plugin
id="slf4j.api"
download-size="0"
install-size="0"
- version="@SLF4J.API@"
+ version="0.0.0"
unpack="false"/>
</feature>
diff --git a/packaging/build.gradle b/packaging/build.gradle
index 777589e..cd0c3cb 100644
--- a/packaging/build.gradle
+++ b/packaging/build.gradle
@@ -153,13 +153,13 @@
// TODO - Equinox migration - rethink removal of taglibs.standard
// repositoryExt group: "org.eclipse.virgo.mirrored", name: "oevm.org.apache.taglibs.standard", version: apacheTaglibsStandardVersion, ext: "jar"
repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi.services", version: osgiServicesVersion, configuration: "compile", ext: "jar"
- repositoryExt group: "org.slf4j", name: "slf4j-api", version: slf4jVersion
- repositoryExt group: "org.slf4j", name: "jul-to-slf4j", version: slf4jVersion
- repositoryExt group: "org.slf4j", name: "jcl-over-slf4j", version: slf4jVersion
- repositoryExt group: "org.slf4j", name: "log4j-over-slf4j", version: slf4jVersion
- repositoryExt group: "org.slf4j", name: "slf4j-nop", version: slf4jVersion
- repositoryExt group: "ch.qos.logback", name: "logback-core", version: logbackVersion
- repositoryExt group: "ch.qos.logback", name: "logback-classic", version: logbackVersion
+ repositoryExt 'org.slf4j:slf4j-api'
+ repositoryExt 'org.slf4j:jul-to-slf4j'
+ repositoryExt 'org.slf4j:jcl-over-slf4j'
+ repositoryExt 'org.slf4j:log4j-over-slf4j'
+ repositoryExt 'org.slf4j:slf4j-nop'
+ repositoryExt 'ch.qos.logback:logback-core'
+ repositoryExt 'ch.qos.logback:logback-classic'
repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.eclipse.jdt.core.compiler.batch", version: eclipseJdtCoreCompilerBatchVersion, configuration: "compile", ext: "jar"
diff --git a/repository/org.eclipse.virgo.repository/build.gradle b/repository/org.eclipse.virgo.repository/build.gradle
index b9333ca..4cd2bda 100644
--- a/repository/org.eclipse.virgo.repository/build.gradle
+++ b/repository/org.eclipse.virgo.repository/build.gradle
@@ -1,7 +1,6 @@
import org.gradle.plugins.ide.eclipse.model.AccessRule
dependencies {
- compile group: "org.slf4j", name: "slf4j-api", version: slf4jVersion
compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
implementation "org.apache.httpcomponents:httpclient:${httpclientVersion}"
@@ -14,8 +13,6 @@
implementation project(':util:org.eclipse.virgo.util.osgi.manifest')
implementation project(':medic:org.eclipse.virgo.medic')
- testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
-
testImplementation project(':medic:org.eclipse.virgo.medic.test')
testImplementation project(':test:org.eclipse.virgo.test.stubs')
}
diff --git a/test/org.eclipse.virgo.test.launcher/build.gradle b/test/org.eclipse.virgo.test.launcher/build.gradle
index d6c7851..050a1d5 100644
--- a/test/org.eclipse.virgo.test.launcher/build.gradle
+++ b/test/org.eclipse.virgo.test.launcher/build.gradle
@@ -1,8 +1,8 @@
dependencies {
compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
- compile group: "ch.qos.logback", name: "logback-core", version: logbackVersion
- compile group: "ch.qos.logback", name: "logback-classic", version: logbackVersion
+ implementation 'ch.qos.logback:logback-core'
+ implementation 'ch.qos.logback:logback-classic'
implementation project(':util:org.eclipse.virgo.util.common')
implementation project(':util:org.eclipse.virgo.util.osgi')
diff --git a/util/org.eclipse.virgo.util.common/build.gradle b/util/org.eclipse.virgo.util.common/build.gradle
index f06f0bd..7d82dc7 100644
--- a/util/org.eclipse.virgo.util.common/build.gradle
+++ b/util/org.eclipse.virgo.util.common/build.gradle
@@ -1,3 +1,2 @@
dependencies {
- testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
}
diff --git a/util/org.eclipse.virgo.util.io/build.gradle b/util/org.eclipse.virgo.util.io/build.gradle
index 17c868c..503d96c 100644
--- a/util/org.eclipse.virgo.util.io/build.gradle
+++ b/util/org.eclipse.virgo.util.io/build.gradle
@@ -1,6 +1,4 @@
dependencies {
- compile group: "org.slf4j", name: "slf4j-api", version: slf4jVersion
-
implementation project(':util:org.eclipse.virgo.util.common')
implementation project(':util:org.eclipse.virgo.util.math')
}
diff --git a/util/org.eclipse.virgo.util.jmx/build.gradle b/util/org.eclipse.virgo.util.jmx/build.gradle
index 01276ed..7d82dc7 100644
--- a/util/org.eclipse.virgo.util.jmx/build.gradle
+++ b/util/org.eclipse.virgo.util.jmx/build.gradle
@@ -1,3 +1,2 @@
dependencies {
- compile group: "org.slf4j", name: "slf4j-api", version: slf4jVersion
}
diff --git a/util/org.eclipse.virgo.util.osgi/build.gradle b/util/org.eclipse.virgo.util.osgi/build.gradle
index 90caa48..98ae501 100644
--- a/util/org.eclipse.virgo.util.osgi/build.gradle
+++ b/util/org.eclipse.virgo.util.osgi/build.gradle
@@ -3,6 +3,4 @@
implementation project(':util:org.eclipse.virgo.util.common')
implementation project(':util:org.eclipse.virgo.util.parser.manifest')
-
- testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
}
diff --git a/web/org.eclipse.virgo.web.core/build.gradle b/web/org.eclipse.virgo.web.core/build.gradle
index 613b32b..fafb774 100644
--- a/web/org.eclipse.virgo.web.core/build.gradle
+++ b/web/org.eclipse.virgo.web.core/build.gradle
@@ -2,7 +2,6 @@
aspectpath project(':medic:org.eclipse.virgo.medic')
aspectpath project(':nano:org.eclipse.virgo.nano.core')
- compile group: "org.slf4j", name: "slf4j-api", version: slf4jVersion
implementation 'javax.servlet:javax.servlet-api'
compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
@@ -20,8 +19,6 @@
implementation project(':kernel:org.eclipse.virgo.kernel.deployer')
implementation project(':kernel:org.eclipse.virgo.kernel.equinox.extensions')
- testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
-
testImplementation 'org.springframework:spring-test'
testImplementation project(':util:org.eclipse.virgo.util.parser.manifest')
diff --git a/web/org.eclipse.virgo.web.dm/build.gradle b/web/org.eclipse.virgo.web.dm/build.gradle
index 10a750e..e4fbcf5 100644
--- a/web/org.eclipse.virgo.web.dm/build.gradle
+++ b/web/org.eclipse.virgo.web.dm/build.gradle
@@ -2,8 +2,6 @@
aspectpath project(':medic:org.eclipse.virgo.medic')
aspectpath project(':nano:org.eclipse.virgo.nano.core')
- compile group: "org.slf4j", name: "slf4j-api", version: slf4jVersion
-
compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
implementation 'javax.servlet:javax.servlet-api'
@@ -20,7 +18,5 @@
implementation project(':medic:org.eclipse.virgo.medic')
implementation project(':nano:org.eclipse.virgo.nano.core')
- testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
-
testImplementation 'org.springframework:spring-test'
}
diff --git a/web/org.eclipse.virgo.web.enterprise.javax.persistence.extension/build.gradle b/web/org.eclipse.virgo.web.enterprise.javax.persistence.extension/build.gradle
index 4f89241..9f6cb05 100644
--- a/web/org.eclipse.virgo.web.enterprise.javax.persistence.extension/build.gradle
+++ b/web/org.eclipse.virgo.web.enterprise.javax.persistence.extension/build.gradle
@@ -1,6 +1,4 @@
dependencies {
compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
compile group: "org.eclipse.virgo.mirrored", name: "javax.persistence", version: javaxPersistenceVersion, configuration: "compile", ext: "jar"
-
- testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
}
diff --git a/web/org.eclipse.virgo.web.enterprise.javax.persistence.provider.initializer/build.gradle b/web/org.eclipse.virgo.web.enterprise.javax.persistence.provider.initializer/build.gradle
index 6452a3f..1decea5 100644
--- a/web/org.eclipse.virgo.web.enterprise.javax.persistence.provider.initializer/build.gradle
+++ b/web/org.eclipse.virgo.web.enterprise.javax.persistence.provider.initializer/build.gradle
@@ -1,10 +1,6 @@
dependencies {
- compile group: "org.slf4j", name: "slf4j-api", version: slf4jVersion
-
compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
compile group: "org.eclipse.virgo.mirrored", name: "javax.persistence", version: javaxPersistenceVersion, configuration: "compile", ext: "jar"
compile project(':web:org.eclipse.virgo.web.enterprise.javax.persistence.extension')
-
- testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
}
diff --git a/web/org.eclipse.virgo.web.enterprise.jsf.support/build.gradle b/web/org.eclipse.virgo.web.enterprise.jsf.support/build.gradle
index 6f77d12..496ec22 100644
--- a/web/org.eclipse.virgo.web.enterprise.jsf.support/build.gradle
+++ b/web/org.eclipse.virgo.web.enterprise.jsf.support/build.gradle
@@ -1,6 +1,4 @@
dependencies {
- compile group: "org.slf4j", name: "slf4j-api", version: slf4jVersion
-
compile group: "org.eclipse.virgo.mirrored", name: "javax.ejb", version: javaxEjbVersion, configuration: "compile", ext: "jar"
compile group: "org.eclipse.virgo.mirrored", name: "javax.persistence", version: javaxPersistenceVersion, configuration: "compile", ext: "jar"
diff --git a/web/org.eclipse.virgo.web.enterprise.openwebbeans.initialiser/build.gradle b/web/org.eclipse.virgo.web.enterprise.openwebbeans.initialiser/build.gradle
index 7febd19..f746ab3 100644
--- a/web/org.eclipse.virgo.web.enterprise.openwebbeans.initialiser/build.gradle
+++ b/web/org.eclipse.virgo.web.enterprise.openwebbeans.initialiser/build.gradle
@@ -1,6 +1,4 @@
dependencies {
- compile group: "org.slf4j", name: "slf4j-api", version: slf4jVersion
-
implementation 'javax.servlet:javax.servlet-api'
implementation group: "org.eclipse.virgo.mirrored", name: "org.apache.catalina", version: apacheCatalinaVersion, configuration: "compile", ext: "jar"
diff --git a/web/org.eclipse.virgo.web.enterprise.persistence.openejb.classloading.hook/build.gradle b/web/org.eclipse.virgo.web.enterprise.persistence.openejb.classloading.hook/build.gradle
index a29fbd6..6946edc 100644
--- a/web/org.eclipse.virgo.web.enterprise.persistence.openejb.classloading.hook/build.gradle
+++ b/web/org.eclipse.virgo.web.enterprise.persistence.openejb.classloading.hook/build.gradle
@@ -1,5 +1,3 @@
dependencies {
compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
-
- testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
}
diff --git a/web/org.eclipse.virgo.web.enterprise.security/build.gradle b/web/org.eclipse.virgo.web.enterprise.security/build.gradle
index 27c4254..aed5562 100644
--- a/web/org.eclipse.virgo.web.enterprise.security/build.gradle
+++ b/web/org.eclipse.virgo.web.enterprise.security/build.gradle
@@ -1,6 +1,4 @@
dependencies {
- testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
-
testImplementation 'javax.servlet:javax.servlet-api'
testRuntime group: "commons-fileupload", name: "commons-fileupload", version: commonsFileuploadVersion, ext: "jar"
diff --git a/web/org.eclipse.virgo.web.enterprise.services.accessor/build.gradle b/web/org.eclipse.virgo.web.enterprise.services.accessor/build.gradle
index f4b2207..98dfc2e 100644
--- a/web/org.eclipse.virgo.web.enterprise.services.accessor/build.gradle
+++ b/web/org.eclipse.virgo.web.enterprise.services.accessor/build.gradle
@@ -1,5 +1,4 @@
dependencies {
- compile group: "org.slf4j", name: "slf4j-api", version: slf4jVersion
implementation 'javax.servlet:javax.servlet-api'
compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
@@ -13,6 +12,4 @@
compile project(':util:org.eclipse.virgo.util.osgi.manifest')
compile project(':kernel:org.eclipse.virgo.kernel.equinox.extensions')
-
- testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
}
diff --git a/web/org.eclipse.virgo.web.war.deployer/build.gradle b/web/org.eclipse.virgo.web.war.deployer/build.gradle
index 56030f0..3c0ec2d 100644
--- a/web/org.eclipse.virgo.web.war.deployer/build.gradle
+++ b/web/org.eclipse.virgo.web.war.deployer/build.gradle
@@ -1,6 +1,4 @@
dependencies {
- compile group: "org.slf4j", name: "slf4j-api", version: slf4jVersion
-
compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
compile group: "org.eclipse.gemini", name: "org.eclipse.gemini.web.core", version: geminiWebVersion, configuration: "compile", ext: "jar"
