Merge branch 'master' of ssh://git.eclipse.org/gitroot/virgo/org.eclipse.virgo.sample-configuration-properties
diff --git a/build.versions b/build.versions
index 9a796c9..450428b 100644
--- a/build.versions
+++ b/build.versions
@@ -11,7 +11,7 @@
org.apache.taglibs.standard=1.1.2
org.apache.xmlcommons=1.3.3
org.aspectj=1.6.6.RELEASE
-org.eclipse.osgi=3.5.1.R35x_v20091005
+org.eclipse.osgi=3.6.1.R36x_v20100806
org.slf4j=1.5.10
org.springframework.js=2.0.8.RELEASE
org.springframework.osgi=1.2.1
diff --git a/org.eclipse.virgo.sample.configuration.properties.core/.classpath b/org.eclipse.virgo.sample.configuration.properties.core/.classpath
index ff64a30..1be891d 100644
--- a/org.eclipse.virgo.sample.configuration.properties.core/.classpath
+++ b/org.eclipse.virgo.sample.configuration.properties.core/.classpath
@@ -25,7 +25,7 @@
<classpathentry kind="var" path="CONFIGURATION_PROPERTIES_IVY_CACHE/org.springframework/org.springframework.context/3.0.0.RELEASE/org.springframework.context-3.0.0.RELEASE.jar" sourcepath="/CONFIGURATION_PROPERTIES_IVY_CACHE/org.springframework/org.springframework.context/3.0.0.RC1/org.springframework.context-sources-3.0.0.RC1.jar"/>
<classpathentry kind="var" path="CONFIGURATION_PROPERTIES_IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RELEASE/org.springframework.core-3.0.0.RELEASE.jar" sourcepath="/CONFIGURATION_PROPERTIES_IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RC1/org.springframework.core-sources-3.0.0.RC1.jar"/>
<classpathentry kind="var" path="CONFIGURATION_PROPERTIES_IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.RELEASE/org.springframework.beans-3.0.0.RELEASE.jar" sourcepath="/CONFIGURATION_PROPERTIES_IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.RC1/org.springframework.beans-sources-3.0.0.RC1.jar"/>
- <classpathentry kind="var" path="CONFIGURATION_PROPERTIES_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-3.5.1.R35x_v20091005.jar" sourcepath="/CONFIGURATION_PROPERTIES_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-sources-3.5.1.R35x_v20091005.jar"/>
+ <classpathentry kind="var" path="CONFIGURATION_PROPERTIES_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.6.1.R36x_v20100806/org.eclipse.osgi-3.6.1.R36x_v20100806.jar" sourcepath="/CONFIGURATION_PROPERTIES_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.6.1.R36x_v20100806/org.eclipse.osgi-sources-3.6.1.R36x_v20100806.jar"/>
<classpathentry kind="var" path="CONFIGURATION_PROPERTIES_IVY_CACHE/org.springframework.osgi/org.springframework.osgi.core/1.2.1/org.springframework.osgi.core-1.2.1.jar"/>
<classpathentry kind="var" path="CONFIGURATION_PROPERTIES_IVY_CACHE/org.apache.felix/org.apache.felix.configadmin/1.2.4/org.apache.felix.configadmin-1.2.4.jar" sourcepath="/CONFIGURATION_PROPERTIES_IVY_CACHE/org.apache.felix/org.apache.felix.configadmin/1.2.4/org.apache.felix.configadmin-sources-1.2.4.jar"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/org.eclipse.virgo.sample.configuration.properties.web/.classpath b/org.eclipse.virgo.sample.configuration.properties.web/.classpath
index f655d4a..695c08a 100644
--- a/org.eclipse.virgo.sample.configuration.properties.web/.classpath
+++ b/org.eclipse.virgo.sample.configuration.properties.web/.classpath
@@ -31,7 +31,7 @@
<classpathentry kind="var" path="CONFIGURATION_PROPERTIES_IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RELEASE/org.springframework.core-3.0.0.RELEASE.jar" sourcepath="/CONFIGURATION_PROPERTIES_IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RELEASE/org.springframework.core-sources-3.0.0.RELEASE.jar"/>
<classpathentry kind="var" path="CONFIGURATION_PROPERTIES_IVY_CACHE/org.springframework.webflow/org.springframework.js/2.0.8.RELEASE/org.springframework.js-2.0.8.RELEASE.jar" sourcepath="/CONFIGURATION_PROPERTIES_IVY_CACHE/org.springframework.webflow/org.springframework.js/2.0.8.RELEASE/org.springframework.js-sources-2.0.8.RELEASE.jar"/>
<classpathentry kind="var" path="CONFIGURATION_PROPERTIES_IVY_CACHE/org.apache.taglibs/com.springsource.org.apache.taglibs.standard/1.1.2/com.springsource.org.apache.taglibs.standard-1.1.2.jar"/>
- <classpathentry kind="var" path="CONFIGURATION_PROPERTIES_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-3.5.1.R35x_v20091005.jar" sourcepath="/CONFIGURATION_PROPERTIES_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-sources-3.5.1.R35x_v20091005.jar"/>
+ <classpathentry kind="var" path="CONFIGURATION_PROPERTIES_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.6.1.R36x_v20100806/org.eclipse.osgi-3.6.1.R36x_v20100806.jar" sourcepath="/CONFIGURATION_PROPERTIES_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.6.1.R36x_v20100806/org.eclipse.osgi-sources-3.6.1.R36x_v20100806.jar"/>
<classpathentry kind="var" path="CONFIGURATION_PROPERTIES_IVY_CACHE/org.apache.felix/org.apache.felix.configadmin/1.2.4/org.apache.felix.configadmin-1.2.4.jar" sourcepath="/CONFIGURATION_PROPERTIES_IVY_CACHE/org.apache.felix/org.apache.felix.configadmin/1.2.4/org.apache.felix.configadmin-sources-1.2.4.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.sample.configuration.properties.core"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
