Bug 512959 Update Felix Shell to 0.12.0
From this change on we consume the Gogo shell bundles from Maven Central
instead of our mirror.
Change-Id: Ib600fa6798b303ce2c65c38a1a54370b95b2e397
diff --git a/3rd-party/src/test/java/org/eclipse/virgo/ebr/GogoShellTest.java b/3rd-party/src/test/java/org/eclipse/virgo/ebr/GogoShellTest.java
index e0e003e..d6234d0 100644
--- a/3rd-party/src/test/java/org/eclipse/virgo/ebr/GogoShellTest.java
+++ b/3rd-party/src/test/java/org/eclipse/virgo/ebr/GogoShellTest.java
@@ -1,13 +1,11 @@
package org.eclipse.virgo.ebr;
-import org.junit.Ignore;
import org.junit.Test;
import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
import static org.ops4j.pax.exam.CoreOptions.*;
-@Ignore("TODO - reactivate when switching to bundles from Maven Central")
public class GogoShellTest extends AbstractBaseTest {
private static final String FELIX = "org.apache.felix";
diff --git a/build.gradle b/build.gradle
index f040a09..b5dc693 100644
--- a/build.gradle
+++ b/build.gradle
@@ -221,9 +221,9 @@
'MINA.CORE.VERSION' : minaCoreVersion,
'SSHD.CORE.VERSION' : apacheSshdCoreVersion,
- 'FELIX.GOGO.COMMAND.VERSION' : gogoCommandVersion,
- 'FELIX.GOGO.RUNTIME.VERSION' : gogoRuntimeVersion,
- 'FELIX.GOGO.SHELL.VERSION' : gogoShellVersion,
+ 'FELIX.GOGO.COMMAND.VERSION' : gogoCommandVersion, // used in oev.kernel.userregion.properties and oev.shell.feature/feature.xml
+ 'FELIX.GOGO.RUNTIME.VERSION' : gogoRuntimeVersion, // used in oev.kernel.userregion.properties and oev.shell.feature/feature.xml
+ 'FELIX.GOGO.SHELL.VERSION' : gogoShellVersion, // used in oev.kernel.userregion.properties and oev.shell.feature/feature.xml
'JOLOKIA.VERSION' : jolokiaVersion,
diff --git a/gradle.properties b/gradle.properties
index 97a6f2c..fe046f7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -112,18 +112,14 @@
#CQ5528
apacheSshdCoreVersion = 0.5.0.v201108120515
-#CQ6402 - command, shell and runtime
-#gogoVersion = 0.12.0
-#gogoCommandHash = 4d7fbb5a56b37c5ea63d05577742cf2941b7c648
-#gogoRuntimeHash = c7d5749671b313cc9881fe6d7bafda8cfebc83fa
-#gogoShellHash = 22c48992149ac6e41d2f8f646c0441e057bb4bcc
-gogoCommandVersion = 0.10.0.v201209301215
-gogoCommandHash = 23f6d421ef73380fd139961240339c771c747cd2
-gogoRuntimeVersion = 0.10.0.v201209301036
-gogoRuntimeHash = fa36cb68e67f5cd228ab5f16e80cba4bdba39940
-gogoShellVersion = 0.10.0.v201211091412
-gogoShellHash = 2ffe7a334f4953f80158dc438d72cf5eee2a8b42
+#CQ6402 - command, shell and runtime - for version 0.10
+gogoCommandVersion = 0.12.0
+gogoCommandHash = 4d7fbb5a56b37c5ea63d05577742cf2941b7c648
+gogoRuntimeVersion = 0.12.0
+gogoRuntimeHash = c7d5749671b313cc9881fe6d7bafda8cfebc83fa
+gogoShellVersion = 0.12.0
+gogoShellHash = 22c48992149ac6e41d2f8f646c0441e057bb4bcc
#CQ5527
minaCoreVersion = 2.0.2.v201108120515
diff --git a/kernel/org.eclipse.virgo.kernel.deployer.test/build.gradle b/kernel/org.eclipse.virgo.kernel.deployer.test/build.gradle
index 4263f43..7f1b2c3 100644
--- a/kernel/org.eclipse.virgo.kernel.deployer.test/build.gradle
+++ b/kernel/org.eclipse.virgo.kernel.deployer.test/build.gradle
@@ -36,9 +36,9 @@
testRuntime group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.util", version: equinoxUtilVersion, configuration: "compile", ext: "jar"
testCompile group: "org.hsqldb", name:"hsqldb", version: hsqldbVersion
- testRuntime group: "org.eclipse.virgo.mirrored", name: "org.apache.felix.gogo.command", version: gogoCommandVersion, configuration: "compile", ext: "jar"
- testRuntime group: "org.eclipse.virgo.mirrored", name: "org.apache.felix.gogo.runtime", version: gogoRuntimeVersion, configuration: "compile", ext: "jar"
- testRuntime group: "org.eclipse.virgo.mirrored", name: "org.apache.felix.gogo.shell", version: gogoShellVersion, configuration: "compile", ext: "jar"
+ testRuntimeOnly 'org.apache.felix:org.apache.felix.gogo.command'
+ testRuntimeOnly 'org.apache.felix:org.apache.felix.gogo.runtime'
+ testRuntimeOnly 'org.apache.felix:org.apache.felix.gogo.shell'
testImplementation 'org.springframework:spring-context'
testRuntimeOnly 'org.springframework:spring-expression'
diff --git a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/test.config.properties b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/test.config.properties
index 0bc4cdd..4b8e8b6 100644
--- a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/test.config.properties
+++ b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/test.config.properties
@@ -14,9 +14,9 @@
file:${gradle.cache}/org.eclipse.virgo.mirrored/org.eclipse.equinox.event/${equinoxEventVersion}/${equinoxEventHash}/org.eclipse.equinox.event-${equinoxEventVersion}.jar@start,\
file:${gradle.cache}/org.eclipse.virgo.mirrored/org.eclipse.equinox.util/${equinoxUtilVersion}/${equinoxUtilHash}/org.eclipse.equinox.util-${equinoxUtilVersion}.jar@start,\
file:${gradle.cache}/org.eclipse.virgo.mirrored/org.eclipse.equinox.ds/${equinoxDsVersion}/${equinoxDsHash}/org.eclipse.equinox.ds-${equinoxDsVersion}.jar@start,\
- file:${gradle.cache}/org.eclipse.virgo.mirrored/org.apache.felix.gogo.runtime/${gogoRuntimeVersion}/${gogoRuntimeHash}/org.apache.felix.gogo.runtime-${gogoRuntimeVersion}.jar@start,\
- file:${gradle.cache}/org.eclipse.virgo.mirrored/org.apache.felix.gogo.shell/${gogoShellVersion}/${gogoShellHash}/org.apache.felix.gogo.shell-${gogoShellVersion}.jar@start,\
- file:${gradle.cache}/org.eclipse.virgo.mirrored/org.apache.felix.gogo.command/${gogoCommandVersion}/${gogoCommandHash}/org.apache.felix.gogo.command-${gogoCommandVersion}.jar@start,\
+ file:${gradle.cache}/org.apache.felix/org.apache.felix.gogo.runtime/${gogoRuntimeVersion}/${gogoRuntimeHash}/org.apache.felix.gogo.runtime-${gogoRuntimeVersion}.jar@start,\
+ file:${gradle.cache}/org.apache.felix/org.apache.felix.gogo.shell/${gogoShellVersion}/${gogoShellHash}/org.apache.felix.gogo.shell-${gogoShellVersion}.jar@start,\
+ file:${gradle.cache}/org.apache.felix/org.apache.felix.gogo.command/${gogoCommandVersion}/${gogoCommandHash}/org.apache.felix.gogo.command-${gogoCommandVersion}.jar@start,\
file:${gradle.cache}/org.eclipse.virgo.mirrored/org.eclipse.equinox.console/${equinoxConsoleVersion}/${equinoxConsoleHash}/org.eclipse.equinox.console-${equinoxConsoleVersion}.jar@start,\
file:../../util/org.eclipse.virgo.util.common/build/libs/org.eclipse.virgo.util.common-${version}.jar@start,\
file:../../util/org.eclipse.virgo.util.math/build/libs/org.eclipse.virgo.util.math-${version}.jar@start,\
diff --git a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
index bf6179c..a79cba9 100644
--- a/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
+++ b/kernel/org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
@@ -22,12 +22,12 @@
equinoxDsVersion = 1.4.200.v20131126-2331
equinoxDsHash = 59f50a15546657c99dd8686d62b25317585b155
-gogoRuntimeVersion = 0.10.0.v201209301036
-gogoRuntimeHash = fa36cb68e67f5cd228ab5f16e80cba4bdba39940
-gogoShellVersion = 0.10.0.v201211091412
-gogoShellHash = 2ffe7a334f4953f80158dc438d72cf5eee2a8b42
-gogoCommandVersion = 0.10.0.v201209301215
-gogoCommandHash = 23f6d421ef73380fd139961240339c771c747cd2
+gogoCommandVersion = 0.12.0
+gogoCommandHash = 4d7fbb5a56b37c5ea63d05577742cf2941b7c648
+gogoRuntimeVersion = 0.12.0
+gogoRuntimeHash = c7d5749671b313cc9881fe6d7bafda8cfebc83fa
+gogoShellVersion = 0.12.0
+gogoShellHash = 22c48992149ac6e41d2f8f646c0441e057bb4bcc
equinoxConsoleVersion = 1.0.100.v20130429-0953
equinoxConsoleHash = 9bab65d301609309156f54cc83e17ed55efc5059
@@ -38,9 +38,9 @@
baseBundles =\
file:${gradle.cache}/org.eclipse.virgo.mirrored/org.eclipse.osgi.services/${osgiServicesVersion}/${osgiServicesHash}/org.eclipse.osgi.services-${osgiServicesVersion}.jar,\
file:${gradle.cache}/org.eclipse.virgo.mirrored/org.eclipse.equinox.cm/${equinoxCmVersion}/${equinoxCmHash}/org.eclipse.equinox.cm-${equinoxCmVersion}.jar@start,\
- file:${gradle.cache}/org.eclipse.virgo.mirrored/org.apache.felix.gogo.runtime/${gogoRuntimeVersion}/${gogoRuntimeHash}/org.apache.felix.gogo.runtime-${gogoRuntimeVersion}.jar@start,\
- file:${gradle.cache}/org.eclipse.virgo.mirrored/org.apache.felix.gogo.shell/${gogoShellVersion}/${gogoShellHash}/org.apache.felix.gogo.shell-${gogoShellVersion}.jar@start,\
- file:${gradle.cache}/org.eclipse.virgo.mirrored/org.apache.felix.gogo.command/${gogoCommandVersion}/${gogoCommandHash}/org.apache.felix.gogo.command-${gogoCommandVersion}.jar@start,\
+ file:${gradle.cache}/org.apache.felix/org.apache.felix.gogo.runtime/${gogoRuntimeVersion}/${gogoRuntimeHash}/org.apache.felix.gogo.runtime-${gogoRuntimeVersion}.jar@start,\
+ file:${gradle.cache}/org.apache.felix/org.apache.felix.gogo.shell/${gogoShellVersion}/${gogoShellHash}/org.apache.felix.gogo.shell-${gogoShellVersion}.jar@start,\
+ file:${gradle.cache}/org.apache.felix/org.apache.felix.gogo.command/${gogoCommandVersion}/${gogoCommandHash}/org.apache.felix.gogo.command-${gogoCommandVersion}.jar@start,\
file:${gradle.cache}/org.eclipse.virgo.mirrored/org.eclipse.equinox.console/${equinoxConsoleVersion}/${equinoxConsoleHash}/org.eclipse.equinox.console-${equinoxConsoleVersion}.jar@start,\
file:../org.eclipse.virgo.shell.command/build/libs/org.eclipse.virgo.shell.command-${version}.jar@start,\
file:../org.eclipse.virgo.kernel.osgi/build/libs/org.eclipse.virgo.kernel.osgi-${version}.jar@start,\
diff --git a/kernel/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/test.config.properties b/kernel/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/test.config.properties
index 91fd3d7..9100999 100644
--- a/kernel/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/test.config.properties
+++ b/kernel/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/test.config.properties
@@ -14,9 +14,9 @@
file:${gradle.cache}/org.eclipse.virgo.mirrored/org.eclipse.equinox.event/${equinoxEventVersion}/${equinoxEventHash}/org.eclipse.equinox.event-${equinoxEventVersion}.jar@start,\
file:${gradle.cache}/org.eclipse.virgo.mirrored/org.eclipse.equinox.util/${equinoxUtilVersion}/${equinoxUtilHash}/org.eclipse.equinox.util-${equinoxUtilVersion}.jar@start,\
file:${gradle.cache}/org.eclipse.virgo.mirrored/org.eclipse.equinox.ds/${equinoxDsVersion}/${equinoxDsHash}/org.eclipse.equinox.ds-${equinoxDsVersion}.jar@start,\
- file:${gradle.cache}/org.eclipse.virgo.mirrored/org.apache.felix.gogo.runtime/${gogoRuntimeVersion}/${gogoRuntimeHash}/org.apache.felix.gogo.runtime-${gogoRuntimeVersion}.jar@start,\
- file:${gradle.cache}/org.eclipse.virgo.mirrored/org.apache.felix.gogo.shell/${gogoShellVersion}/${gogoShellHash}/org.apache.felix.gogo.shell-${gogoShellVersion}.jar@start,\
- file:${gradle.cache}/org.eclipse.virgo.mirrored/org.apache.felix.gogo.command/${gogoCommandVersion}/${gogoCommandHash}/org.apache.felix.gogo.command-${gogoCommandVersion}.jar@start,\
+ file:${gradle.cache}/org.apache.felix/org.apache.felix.gogo.runtime/${gogoRuntimeVersion}/${gogoRuntimeHash}/org.apache.felix.gogo.runtime-${gogoRuntimeVersion}.jar@start,\
+ file:${gradle.cache}/org.apache.felix/org.apache.felix.gogo.shell/${gogoShellVersion}/${gogoShellHash}/org.apache.felix.gogo.shell-${gogoShellVersion}.jar@start,\
+ file:${gradle.cache}/org.apache.felix/org.apache.felix.gogo.command/${gogoCommandVersion}/${gogoCommandHash}/org.apache.felix.gogo.command-${gogoCommandVersion}.jar@start,\
file:${gradle.cache}/org.eclipse.virgo.mirrored/org.eclipse.equinox.console/${equinoxConsoleVersion}/${equinoxConsoleHash}/org.eclipse.equinox.console-${equinoxConsoleVersion}.jar@start,\
file:../../util/org.eclipse.virgo.util.common/build/libs/org.eclipse.virgo.util.common-${version}.jar@start,\
file:../../util/org.eclipse.virgo.util.math/build/libs/org.eclipse.virgo.util.math-${version}.jar@start,\
diff --git a/kernel/org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties b/kernel/org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
index 616d563..7712b55 100644
--- a/kernel/org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
+++ b/kernel/org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
@@ -23,12 +23,12 @@
equinoxDsVersion = 1.4.200.v20131126-2331
equinoxDsHash = 59f50a15546657c99dd8686d62b25317585b155
-gogoRuntimeVersion = 0.10.0.v201209301036
-gogoRuntimeHash = fa36cb68e67f5cd228ab5f16e80cba4bdba39940
-gogoShellVersion = 0.10.0.v201211091412
-gogoShellHash = 2ffe7a334f4953f80158dc438d72cf5eee2a8b42
-gogoCommandVersion = 0.10.0.v201209301215
-gogoCommandHash = 23f6d421ef73380fd139961240339c771c747cd2
+gogoCommandVersion = 0.12.0
+gogoCommandHash = 4d7fbb5a56b37c5ea63d05577742cf2941b7c648
+gogoRuntimeVersion = 0.12.0
+gogoRuntimeHash = c7d5749671b313cc9881fe6d7bafda8cfebc83fa
+gogoShellVersion = 0.12.0
+gogoShellHash = 22c48992149ac6e41d2f8f646c0441e057bb4bcc
equinoxConsoleVersion = 1.0.100.v20130429-0953
equinoxConsoleHash = 9bab65d301609309156f54cc83e17ed55efc5059
@@ -36,9 +36,9 @@
baseBundles =\
file:${gradle.cache}/org.eclipse.virgo.mirrored/org.eclipse.osgi.services/${osgiServicesVersion}/${osgiServicesHash}/org.eclipse.osgi.services-${osgiServicesVersion}.jar,\
file:${gradle.cache}/org.eclipse.virgo.mirrored/org.eclipse.equinox.cm/${equinoxCmVersion}/${equinoxCmHash}/org.eclipse.equinox.cm-${equinoxCmVersion}.jar@start,\
- file:${gradle.cache}/org.eclipse.virgo.mirrored/org.apache.felix.gogo.runtime/${gogoRuntimeVersion}/${gogoRuntimeHash}/org.apache.felix.gogo.runtime-${gogoRuntimeVersion}.jar@start,\
- file:${gradle.cache}/org.eclipse.virgo.mirrored/org.apache.felix.gogo.shell/${gogoShellVersion}/${gogoShellHash}/org.apache.felix.gogo.shell-${gogoShellVersion}.jar@start,\
- file:${gradle.cache}/org.eclipse.virgo.mirrored/org.apache.felix.gogo.command/${gogoCommandVersion}/${gogoCommandHash}/org.apache.felix.gogo.command-${gogoCommandVersion}.jar@start,\
+ file:${gradle.cache}/org.apache.felix/org.apache.felix.gogo.runtime/${gogoRuntimeVersion}/${gogoRuntimeHash}/org.apache.felix.gogo.runtime-${gogoRuntimeVersion}.jar@start,\
+ file:${gradle.cache}/org.apache.felix/org.apache.felix.gogo.shell/${gogoShellVersion}/${gogoShellHash}/org.apache.felix.gogo.shell-${gogoShellVersion}.jar@start,\
+ file:${gradle.cache}/org.apache.felix/org.apache.felix.gogo.command/${gogoCommandVersion}/${gogoCommandHash}/org.apache.felix.gogo.command-${gogoCommandVersion}.jar@start,\
file:${gradle.cache}/org.eclipse.virgo.mirrored/org.eclipse.equinox.console/${equinoxConsoleVersion}/${equinoxConsoleHash}/org.eclipse.equinox.console-${equinoxConsoleVersion}.jar@start,\
file:../org.eclipse.virgo.shell.command/build/libs/org.eclipse.virgo.shell.command-${version}.jar@start,\
file:../org.eclipse.virgo.kernel.osgi/build/libs/org.eclipse.virgo.kernel.osgi-${version}.jar@start,\
diff --git a/kernel/org.eclipse.virgo.shell.command/build.gradle b/kernel/org.eclipse.virgo.shell.command/build.gradle
index 82178cd..1880425 100644
--- a/kernel/org.eclipse.virgo.shell.command/build.gradle
+++ b/kernel/org.eclipse.virgo.shell.command/build.gradle
@@ -11,7 +11,7 @@
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"
- compile group: "org.eclipse.virgo.mirrored", name: "org.apache.felix.gogo.runtime", version: gogoRuntimeVersion, configuration: "compile", ext: "jar"
+ compile 'org.apache.felix:org.apache.felix.gogo.runtime'
implementation 'org.springframework:spring-core'
diff --git a/org.eclipse.virgo.site/build.gradle b/org.eclipse.virgo.site/build.gradle
index 5d1ec9e..877580b 100644
--- a/org.eclipse.virgo.site/build.gradle
+++ b/org.eclipse.virgo.site/build.gradle
@@ -170,9 +170,9 @@
signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.console.ssh", version: equinoxConsoleSshVersion, configuration: "compile", ext: "jar"
signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.mina.core", version: minaCoreVersion, configuration: "compile", ext: "jar"
signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.sshd.core", version: apacheSshdCoreVersion, configuration: "compile", ext: "jar"
- signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.felix.gogo.command", version: gogoCommandVersion, configuration: "compile", ext: "jar"
- signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.felix.gogo.runtime", version: gogoRuntimeVersion, configuration: "compile", ext: "jar"
- signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.felix.gogo.shell", version: gogoShellVersion, configuration: "compile", ext: "jar"
+ signedExternalPlugin 'org.apache.felix:org.apache.felix.gogo.command'
+ signedExternalPlugin 'org.apache.felix:org.apache.felix.gogo.runtime'
+ signedExternalPlugin 'org.apache.felix:org.apache.felix.gogo.shell'
localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.simpleconfigurator.feature')
signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.simpleconfigurator", version: equinoxSimpleConfiguratorVersion, configuration: "compile", 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 261e96c..7c80838 100644
--- a/web/org.eclipse.virgo.web.enterprise.services.accessor/build.gradle
+++ b/web/org.eclipse.virgo.web.enterprise.services.accessor/build.gradle
@@ -9,7 +9,7 @@
compile group: "org.eclipse.virgo.mirrored", name: "org.apache.tomcat.api", version: apacheCatalinaVersion, configuration: "compile", ext: "jar"
compile group: "org.eclipse.virgo.mirrored", name: "org.apache.tomcat.util.scan", version: apacheCatalinaVersion, configuration: "compile", ext: "jar"
- compile group: "org.eclipse.virgo.mirrored", name: "org.apache.felix.gogo.runtime", version: gogoRuntimeVersion, configuration: "compile", ext: "jar"
+ compile 'org.apache.felix:org.apache.felix.gogo.runtime'
compile project(':util:org.eclipse.virgo.util.osgi.manifest')
compile project(':kernel:org.eclipse.virgo.kernel.equinox.extensions')
