Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build.gradle5
-rw-r--r--org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/equinox/EquinoxOsgiFrameworkTests.java6
2 files changed, 7 insertions, 4 deletions
diff --git a/build.gradle b/build.gradle
index 7e44bc1e..fc488c1e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -316,7 +316,8 @@ project(':kernel:org.eclipse.virgo.kernel.userregion') {
testCompile project(':medic:org.eclipse.virgo.medic.test')
testCompile project(':repository:org.eclipse.virgo.repository')
- testRuntime group: "org.apache.commons", name: "com.springsource.org.apache.commons.logging", version: commonsLoggingVersion, configuration: "compile", ext: "jar"
+ testRuntime group: "org.eclipse.virgo.mirrored", name: "org.apache.commons.logging", version: commonsLoggingVersion, configuration: "compile", ext: "jar"
+ testRuntime group: "org.eclipse.virgo.mirrored", name: "org.apache.commons.codec", version: commonsCodecVersion, configuration: "compile", ext: "jar"
testRuntime group: "org.eclipse.virgo.mirrored", name: "org.springframework.beans", version: springframeworkVersion, configuration: "compile", ext: "jar"
testRuntime group: "org.eclipse.virgo.mirrored", name: "org.springframework.core", version: springframeworkVersion, configuration: "compile", ext: "jar"
testRuntime "org.aspectj:aspectjrt:${project.aspectjVersion}"
@@ -420,7 +421,7 @@ project(':kernel:org.eclipse.virgo.management.console') {
// we don't provide OSGi-ified version of org.springframework.test
testCompile group: "org.springframework", name: "spring-test", version: springframeworkVersion, configuration: "compile", ext: "jar"
testCompile group: "org.eclipse.virgo.mirrored", name: "org.mozilla.javascript", version: mozillaJavascriptVersion, configuration: "compile", ext: "jar"
- testCompile group: "org.apache.commons", name: "com.springsource.org.apache.commons.logging", version: commonsLoggingVersion, configuration: "compile", ext: "jar"
+ testCompile group: "org.eclipse.virgo.mirrored", name: "org.apache.commons.logging", version: commonsLoggingVersion, configuration: "compile", ext: "jar"
testCompile group: "org.apache.commons", name: "com.springsource.org.apache.commons.io", version: commonsIoVersion, configuration: "compile", ext: "jar"
compile group: "org.eclipse.virgo.mirrored", name: "org.slf4j.api", version: slf4jVersion, configuration: "compile", ext: "jar"
diff --git a/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/equinox/EquinoxOsgiFrameworkTests.java b/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/equinox/EquinoxOsgiFrameworkTests.java
index ccceb94d..0c3f4a05 100644
--- a/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/equinox/EquinoxOsgiFrameworkTests.java
+++ b/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/equinox/EquinoxOsgiFrameworkTests.java
@@ -96,7 +96,9 @@ public class EquinoxOsgiFrameworkTests extends AbstractOsgiFrameworkLaunchingTes
* @throws BundleException
*/
private Bundle installSpringCore(EquinoxOsgiFramework osgi) throws BundleException {
- osgi.getBundleContext().installBundle("file:///" + new File(System.getProperty("user.home") + "/.gradle/caches/modules-2/files-2.1/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/7657caf2c78e1d79c74d36f2ae128a115f7cc180/com.springsource.org.apache.commons.logging-1.1.1.jar").getAbsolutePath());
- return osgi.getBundleContext().installBundle("file:///" + new File(System.getProperty("user.home") + "/.gradle/caches/modules-2/files-2.1/org.eclipse.virgo.mirrored/org.springframework.core/3.2.10.RELEASE/47776685ca466021ad9121e336cc76c4321b7931/org.springframework.core-3.2.10.RELEASE.jar").getAbsolutePath());
+ osgi.getBundleContext().installBundle("file:///" + new File(System.getProperty("user.home") + "/.m2/repository/org/eclipse/virgo/mirrored/org.apache.commons.logging/1.2.0/org.apache.commons.logging-1.2.0.jar").getAbsolutePath());
+ osgi.getBundleContext().installBundle("file:///" + new File(System.getProperty("user.home") + "/.m2/repository/org/eclipse/virgo/mirrored/org.apache.commons.codec/1.10.0/org.apache.commons.codec-1.10.0.jar").getAbsolutePath());
+ return osgi.getBundleContext().installBundle("file:///" + new File(System.getProperty("user.home") + "/.m2/repository/org/eclipse/virgo/mirrored/org.springframework.core/4.2.1.RELEASE/org.springframework.core-4.2.1.RELEASE.jar").getAbsolutePath());
+// return osgi.getBundleContext().installBundle("file:///" + new File(System.getProperty("user.home") + "/.gradle/caches/modules-2/files-2.1/org.eclipse.virgo.mirrored/org.springframework.core/3.2.10.RELEASE/47776685ca466021ad9121e336cc76c4321b7931/org.springframework.core-3.2.10.RELEASE.jar").getAbsolutePath());
}
}

Back to the top