Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlyn Normington2012-04-30 07:02:42 -0400
committerGlyn Normington2012-04-30 07:02:42 -0400
commit8993288b49345505f208e3160e32cae20b458f4d (patch)
treeb5263fbba636d099fb88c2f6d3d761183cbe0f72
parent86b993c848ccb4e77070b428db96d71534761c50 (diff)
parentb2b2b5feb3279059b41df528605cafa8cd0d6e2c (diff)
downloadorg.eclipse.virgo.kernel-8993288b49345505f208e3160e32cae20b458f4d.tar.gz
org.eclipse.virgo.kernel-8993288b49345505f208e3160e32cae20b458f4d.tar.xz
org.eclipse.virgo.kernel-8993288b49345505f208e3160e32cae20b458f4d.zip
Merge branch 'bug373595-upgrade-gogo'
Conflicts: build.versions
-rw-r--r--build.versions6
-rw-r--r--org.eclipse.virgo.kernel.osgicommand/.classpath6
-rw-r--r--org.eclipse.virgo.kernel.test/ivy.xml4
-rw-r--r--org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties6
4 files changed, 13 insertions, 9 deletions
diff --git a/build.versions b/build.versions
index 964f684f..62c63c60 100644
--- a/build.versions
+++ b/build.versions
@@ -22,9 +22,9 @@ org.springframework.osgi=1.2.1
org.springframework=3.0.5.RELEASE
com.springsource.org.apache.mina.core=2.0.2
com.springsource.org.apache.sshd.core=0.5.0
-org.apache.felix.gogo.shell=0.8.0.v201107131313
-org.apache.felix.gogo.runtime=0.8.0.v201105062003
-org.apache.felix.gogo.command=0.8.0.v201105062003
+org.apache.felix.gogo.shell=0.10.0
+org.apache.felix.gogo.runtime=0.10.0
+org.apache.felix.gogo.command=0.10.0
org.eclipse.virgo.nano=3.5.0.M04
org.eclipse.virgo.build.tools=1.2.1.RELEASE
org.eclipse.equinox.launcher=1.3.0.v20111003-1644
diff --git a/org.eclipse.virgo.kernel.osgicommand/.classpath b/org.eclipse.virgo.kernel.osgicommand/.classpath
index ed1faa4c..292228d1 100644
--- a/org.eclipse.virgo.kernel.osgicommand/.classpath
+++ b/org.eclipse.virgo.kernel.osgicommand/.classpath
@@ -12,8 +12,8 @@
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-3.7.1.R37x_v20110808-1106.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-sources-3.7.1.R37x_v20110808-1106.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.5.0.M04/org.eclipse.virgo.util.osgi-3.5.0.M04.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.5.0.M04/org.eclipse.virgo.util.osgi-sources-3.5.0.M04.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/KERNEL_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.apache.felix/org.apache.felix.gogo.runtime/0.8.0.v201105062003/org.apache.felix.gogo.runtime-0.8.0.v201105062003.jar" sourcepath="/KERNEL_IVY_CACHE/org.apache.felix/org.apache.felix.gogo.runtime/0.8.0.v201107131313/org.apache.felix.gogo.runtime-sources-0.8.0.v201107131313.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.apache.felix/org.apache.felix.gogo.shell/0.8.0.v201107131313/org.apache.felix.gogo.shell-0.8.0.v201107131313.jar" sourcepath="/KERNEL_IVY_CACHE/org.apache.felix/org.apache.felix.gogo.shell/0.8.0.v201107131313/org.apache.felix.gogo.shell-sources-0.8.0.v201107131313.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.apache.felix/org.apache.felix.gogo.command/0.8.0.v201105062003/org.apache.felix.gogo.command-0.8.0.v201105062003.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.apache.felix/org.apache.felix.gogo.runtime/0.10.0/org.apache.felix.gogo.runtime-0.10.0.jar" sourcepath="/KERNEL_IVY_CACHE/org.apache.felix/org.apache.felix.gogo.runtime/0.8.0.v201107131313/org.apache.felix.gogo.runtime-sources-0.8.0.v201107131313.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.apache.felix/org.apache.felix.gogo.shell/0.10.0/org.apache.felix.gogo.shell-0.10.0.jar" sourcepath="/KERNEL_IVY_CACHE/org.apache.felix/org.apache.felix.gogo.shell/0.10.0/org.apache.felix.gogo.shell-sources-0.10.0.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.apache.felix/org.apache.felix.gogo.command/0.10.0/org.apache.felix.gogo.command-0.10.0.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.virgo.kernel.test/ivy.xml b/org.eclipse.virgo.kernel.test/ivy.xml
index 22e8e385..e76911b3 100644
--- a/org.eclipse.virgo.kernel.test/ivy.xml
+++ b/org.eclipse.virgo.kernel.test/ivy.xml
@@ -65,6 +65,10 @@
<!-- Allow Equinox to be upgraded point-wise before rippling -->
<override org="org.aspectj" rev="${org.aspectj}" />
<override org="org.eclipse.osgi" module="org.eclipse.osgi" rev="${org.eclipse.osgi}"/>
+
+ <!-- Override dependency from org.eclipse.equinox.console.supportability -->
+ <override org="org.apache.felix" module="org.apache.felix.gogo.runtime" rev="${org.apache.felix.gogo.runtime}"/>
+
</dependencies>
</ivy-module>
diff --git a/org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties b/org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
index d4151626..aab6d75f 100644
--- a/org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
+++ b/org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
@@ -19,9 +19,9 @@ baseBundles =\
file:../org.eclipse.virgo.kernel.userregion/target/classes@start,\
file:../org.eclipse.virgo.kernel.osgicommand/target/classes@start,\
file:../ivy-cache/repository/org.apache.mina/com.springsource.org.apache.mina.core/2.0.2/com.springsource.org.apache.mina.core-2.0.2.jar@start,\
- file:../ivy-cache/repository/org.apache.felix/org.apache.felix.gogo.command/0.8.0.v201105062003/org.apache.felix.gogo.command-0.8.0.v201105062003.jar@start,\
- file:../ivy-cache/repository/org.apache.felix/org.apache.felix.gogo.runtime/0.8.0.v201105062003/org.apache.felix.gogo.runtime-0.8.0.v201105062003.jar@start,\
- file:../ivy-cache/repository/org.apache.felix/org.apache.felix.gogo.shell/0.8.0.v201107131313/org.apache.felix.gogo.shell-0.8.0.v201107131313.jar@start,\
+ file:../ivy-cache/repository/org.apache.felix/org.apache.felix.gogo.command/0.10.0/org.apache.felix.gogo.command-0.10.0.jar@start,\
+ file:../ivy-cache/repository/org.apache.felix/org.apache.felix.gogo.runtime/0.10.0/org.apache.felix.gogo.runtime-0.10.0.jar@start,\
+ file:../ivy-cache/repository/org.apache.felix/org.apache.felix.gogo.shell/0.10.0/org.apache.felix.gogo.shell-0.10.0.jar@start,\
file:../ivy-cache/repository/org.eclipse.osgi/org.eclipse.equinox.console.supportability/1.0.0.N20110815-2000/org.eclipse.equinox.console.supportability-1.0.0.N20110815-2000.jar@start,\
file:../ivy-cache/repository/org.apache.mina/com.springsource.org.apache.sshd.core/0.5.0/com.springsource.org.apache.sshd.core-0.5.0.jar@start

Back to the top