Rewrite Gemini Blueprint dependencies to use dependency management
Also don't break the build when smoke tests fail.
This allows the post-build investigation of the failed tests.
Change-Id: I12f11b5093e7ee190ca762901f5438679d9d1514
diff --git a/build.gradle b/build.gradle
index 8fd25d2..a8fc12e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -536,6 +536,27 @@
entry 'spring-test'
}
+ dependencySet(group:'org.eclipse.gemini.blueprint', version: geminiBlueprintVersion) {
+ entry ('gemini-blueprint-io') {
+ exclude group: 'org.apache.servicemix.bundles', name: 'org.apache.servicemix.bundles.spring-beans'
+ exclude group: 'org.apache.servicemix.bundles', name: 'org.apache.servicemix.bundles.spring-context'
+ exclude group: 'org.apache.servicemix.bundles', name: 'org.apache.servicemix.bundles.spring-core'
+ }
+ entry ('gemini-blueprint-core') {
+ exclude group: 'org.apache.servicemix.bundles', name: 'org.apache.servicemix.bundles.spring-aop'
+ exclude group: 'org.apache.servicemix.bundles', name: 'org.apache.servicemix.bundles.spring-beans'
+ exclude group: 'org.apache.servicemix.bundles', name: 'org.apache.servicemix.bundles.spring-context'
+ exclude group: 'org.apache.servicemix.bundles', name: 'org.apache.servicemix.bundles.spring-core'
+ exclude group: 'org.apache.servicemix.bundles', name: 'org.apache.servicemix.bundles.spring-expression'
+ }
+ entry 'gemini-blueprint-extender'
+ entry ('gemini-blueprint-extensions') {
+ exclude group: 'org.apache.servicemix.bundles', name: 'org.apache.servicemix.bundles.spring-beans'
+ exclude group: 'org.apache.servicemix.bundles', name: 'org.apache.servicemix.bundles.spring-context'
+ exclude group: 'org.apache.servicemix.bundles', name: 'org.apache.servicemix.bundles.spring-core'
+ }
+ }
+
dependency "com.squareup.okio:okio:${okioVersion}"
dependency "com.squareup.okhttp3:okhttp:${okhttp3Version}"
diff --git a/kernel/org.eclipse.virgo.kernel.agent.dm/build.gradle b/kernel/org.eclipse.virgo.kernel.agent.dm/build.gradle
index 5bd6b9c..84697f8 100644
--- a/kernel/org.eclipse.virgo.kernel.agent.dm/build.gradle
+++ b/kernel/org.eclipse.virgo.kernel.agent.dm/build.gradle
@@ -9,8 +9,8 @@
implementation 'org.springframework:spring-context'
- compile group: "org.eclipse.gemini.blueprint", name: "gemini-blueprint-core", version: geminiBlueprintVersion, ext: "jar"
- compile group: "org.eclipse.gemini.blueprint", name: "gemini-blueprint-extender", version: geminiBlueprintVersion, ext: "jar"
+ implementation 'org.eclipse.gemini.blueprint:gemini-blueprint-core'
+ implementation 'org.eclipse.gemini.blueprint:gemini-blueprint-extender'
compile project(':util:org.eclipse.virgo.util.osgi')
compile project(':medic:org.eclipse.virgo.medic')
diff --git a/kernel/org.eclipse.virgo.kernel.deployer.dm/build.gradle b/kernel/org.eclipse.virgo.kernel.deployer.dm/build.gradle
index 8d672a8..8f455de 100644
--- a/kernel/org.eclipse.virgo.kernel.deployer.dm/build.gradle
+++ b/kernel/org.eclipse.virgo.kernel.deployer.dm/build.gradle
@@ -8,7 +8,7 @@
implementation 'org.springframework:spring-context'
- compile group: "org.eclipse.gemini.blueprint", name: "gemini-blueprint-core", version: geminiBlueprintVersion, ext: "jar"
+ implementation 'org.eclipse.gemini.blueprint:gemini-blueprint-core'
compile project(':kernel:org.eclipse.virgo.kernel.agent.dm')
compile project(':kernel:org.eclipse.virgo.kernel.deployer')
diff --git a/kernel/org.eclipse.virgo.kernel.deployer/build.gradle b/kernel/org.eclipse.virgo.kernel.deployer/build.gradle
index a982ae9..96e77a4 100644
--- a/kernel/org.eclipse.virgo.kernel.deployer/build.gradle
+++ b/kernel/org.eclipse.virgo.kernel.deployer/build.gradle
@@ -10,7 +10,7 @@
implementation 'org.springframework:spring-context'
- compile group: "org.eclipse.gemini.blueprint", name: "gemini-blueprint-core", version: geminiBlueprintVersion, ext: "jar"
+ implementation 'org.eclipse.gemini.blueprint:gemini-blueprint-core'
compile project(':kernel:org.eclipse.virgo.kernel.artifact')
compile project(':kernel:org.eclipse.virgo.kernel.osgi')
diff --git a/kernel/org.eclipse.virgo.kernel.dmfragment/build.gradle b/kernel/org.eclipse.virgo.kernel.dmfragment/build.gradle
index 0fe0000..b3c804e 100644
--- a/kernel/org.eclipse.virgo.kernel.dmfragment/build.gradle
+++ b/kernel/org.eclipse.virgo.kernel.dmfragment/build.gradle
@@ -3,7 +3,8 @@
implementation 'org.springframework:spring-context-support'
- compile group: "org.eclipse.gemini.blueprint", name: "gemini-blueprint-core", version: geminiBlueprintVersion, ext: "jar"
+ implementation 'org.eclipse.gemini.blueprint:gemini-blueprint-core'
+ implementation 'org.eclipse.gemini.blueprint:gemini-blueprint-extender'
compile project(':kernel:org.eclipse.virgo.kernel.agent.dm')
compile project(':kernel:org.eclipse.virgo.kernel.osgi')
diff --git a/kernel/org.eclipse.virgo.kernel.test/build.gradle b/kernel/org.eclipse.virgo.kernel.test/build.gradle
index 07e3f03..da7fbe5 100644
--- a/kernel/org.eclipse.virgo.kernel.test/build.gradle
+++ b/kernel/org.eclipse.virgo.kernel.test/build.gradle
@@ -25,6 +25,7 @@
testCompile project(':test:org.eclipse.virgo.test.framework')
testImplementation 'org.springframework:spring-context'
+ testImplementation 'org.eclipse.gemini.blueprint:gemini-blueprint-core'
testRuntimeOnly 'org.aspectj:aspectjrt'
diff --git a/org.eclipse.virgo.site/build.gradle b/org.eclipse.virgo.site/build.gradle
index c2f2681..4a2ac00 100644
--- a/org.eclipse.virgo.site/build.gradle
+++ b/org.eclipse.virgo.site/build.gradle
@@ -191,9 +191,9 @@
signedExternalPlugin files("../3rd-party/build/plugins/oevm.org.springframework.core_${springframeworkVersion}.jar")
signedExternalPlugin files("../3rd-party/build/plugins/oevm.org.springframework.expression_${springframeworkVersion}.jar")
- signedExternalPlugin group: "org.eclipse.gemini.blueprint", name: "gemini-blueprint-io", version: geminiBlueprintVersion, ext: "jar"
- signedExternalPlugin group: "org.eclipse.gemini.blueprint", name: "gemini-blueprint-core", version: geminiBlueprintVersion, ext: "jar"
- signedExternalPlugin group: "org.eclipse.gemini.blueprint", name: "gemini-blueprint-extender", version: geminiBlueprintVersion, ext: "jar"
+ signedExternalPlugin 'org.eclipse.gemini.blueprint:gemini-blueprint-io'
+ signedExternalPlugin 'org.eclipse.gemini.blueprint:gemini-blueprint-core'
+ signedExternalPlugin 'org.eclipse.gemini.blueprint:gemini-blueprint-extender'
// nano base
// TODO - merge to oev.nano.services ?
diff --git a/packaging/build.gradle b/packaging/build.gradle
index fd26d83..73ec3b4 100644
--- a/packaging/build.gradle
+++ b/packaging/build.gradle
@@ -66,10 +66,10 @@
repositoryExt files("../../3rd-party/build/plugins/oevm.com.squareup.okio_${okioVersion}.jar")
repositoryExt files("../../3rd-party/build/plugins/oevm.com.squareup.okhttp3_${okhttp3Version}.jar")
- repositoryExt group: "org.eclipse.gemini.blueprint", name: "gemini-blueprint-io", version: geminiBlueprintVersion, ext: "jar"
- repositoryExt group: "org.eclipse.gemini.blueprint", name: "gemini-blueprint-core", version: geminiBlueprintVersion, ext: "jar"
- repositoryExt group: "org.eclipse.gemini.blueprint", name: "gemini-blueprint-extender", version: geminiBlueprintVersion, ext: "jar"
- repositoryExt group: "org.eclipse.gemini.blueprint", name: "gemini-blueprint-extensions", version: geminiBlueprintVersion, ext: "jar"
+ repositoryExt 'org.eclipse.gemini.blueprint:gemini-blueprint-io'
+ repositoryExt 'org.eclipse.gemini.blueprint:gemini-blueprint-core'
+ repositoryExt 'org.eclipse.gemini.blueprint:gemini-blueprint-extender'
+ repositoryExt 'org.eclipse.gemini.blueprint:gemini-blueprint-extensions'
repositoryExt group: "org.eclipse.virgo.mirrored", name: "org.eclipse.gemini.management", version: geminiManagementVersion, configuration: "compile", ext: "jar"
repositoryExt project(':kernel:org.eclipse.virgo.management.fragment')
diff --git a/packaging/kernel/org.eclipse.virgo.kernel.smoketest/build.gradle b/packaging/kernel/org.eclipse.virgo.kernel.smoketest/build.gradle
index dea900a..26684c5 100644
--- a/packaging/kernel/org.eclipse.virgo.kernel.smoketest/build.gradle
+++ b/packaging/kernel/org.eclipse.virgo.kernel.smoketest/build.gradle
@@ -26,6 +26,10 @@
classpath = sourceSets.smokeTest.runtimeClasspath
shouldRunAfter test
+
+ if (System.properties['ci.build'] == 'true') {
+ ignoreFailures = true
+ }
}
dependencies {
diff --git a/packaging/nano/org.eclipse.virgo.nano.smoketest/build.gradle b/packaging/nano/org.eclipse.virgo.nano.smoketest/build.gradle
index 634ac7f..55ff78e 100644
--- a/packaging/nano/org.eclipse.virgo.nano.smoketest/build.gradle
+++ b/packaging/nano/org.eclipse.virgo.nano.smoketest/build.gradle
@@ -27,6 +27,10 @@
classpath = sourceSets.smokeTest.runtimeClasspath
shouldRunAfter test
+
+ if (System.properties['ci.build'] == 'true') {
+ ignoreFailures = true
+ }
}
dependencies {
diff --git a/packaging/tomcat-server/org.eclipse.virgo.tomcat.smoketest/build.gradle b/packaging/tomcat-server/org.eclipse.virgo.tomcat.smoketest/build.gradle
index e231bae..643ada0 100644
--- a/packaging/tomcat-server/org.eclipse.virgo.tomcat.smoketest/build.gradle
+++ b/packaging/tomcat-server/org.eclipse.virgo.tomcat.smoketest/build.gradle
@@ -26,6 +26,10 @@
classpath = sourceSets.smokeTest.runtimeClasspath
shouldRunAfter test
+
+ if (System.properties['ci.build'] == 'true') {
+ ignoreFailures = true
+ }
}
dependencies {
diff --git a/web/org.eclipse.virgo.web.dm/build.gradle b/web/org.eclipse.virgo.web.dm/build.gradle
index fc5c32b..9591dbd 100644
--- a/web/org.eclipse.virgo.web.dm/build.gradle
+++ b/web/org.eclipse.virgo.web.dm/build.gradle
@@ -5,9 +5,9 @@
compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
implementation 'javax.servlet:javax.servlet-api'
- compile group: "org.eclipse.gemini.blueprint", name: "gemini-blueprint-io", version: geminiBlueprintVersion, ext: "jar"
- compile group: "org.eclipse.gemini.blueprint", name: "gemini-blueprint-core", version: geminiBlueprintVersion, ext: "jar"
- compile group: "org.eclipse.gemini.blueprint", name: "gemini-blueprint-extender", version: geminiBlueprintVersion, ext: "jar"
+ implementation 'org.eclipse.gemini.blueprint:gemini-blueprint-io'
+ implementation 'org.eclipse.gemini.blueprint:gemini-blueprint-core'
+ implementation 'org.eclipse.gemini.blueprint:gemini-blueprint-extender'
implementation 'org.springframework:spring-aop'
implementation 'org.springframework:spring-beans'
