Apply patch for root reporitory
diff --git a/build.gradle b/build.gradle
index 4f6195f..925d1d6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -237,6 +237,7 @@
'OSGI.SERVICES.VERSION' : osgiServicesVersion, // used in oev.kernel.userregion.properties
'OSGI.ENTERPRISE.VERSION' : osgiEnterpriseVersion,
+ 'OSGI.COMPATIBILITY.STATE.VERSION': osgiCompatibilityStateVersion,
'EQUINOX.HTTP.JETTY.VERSION' : equinoxHttpJettyVersion,
'EQUINOX.APP.VERSION' : equinoxAppVersion,
diff --git a/gradle.properties b/gradle.properties
index d9fc9ab..d6c6a70 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -28,6 +28,36 @@
# CQ 13635 - Logback Core Version: 1.2.3
logbackVersion = 1.2.3
+# Eclipse Juno (4.2)
+# equinoxVersion = 3.8.2.v20130124-134944
+# Eclipse Kepler 4.3.2 (SR2)
+#equinoxVersion = 3.9.1.v20140110-1610
+# Eclipse Mars
+equinoxVersion = 3.10.2.v20150203-1939
+
+#osgiServicesVersion = 3.3.100.v20130513-1956
+# Eclipse Mars
+osgiServicesVersion = 3.5.0.v20150519-2006
+# equinox.compatibility.state
+osgiCompatibilityStateVersion = 1.0.1.v20140709-1414
+osgiEnterpriseVersion = 4.2.0.v201108120515
+
+equinoxAppVersion = 1.3.100.v20130327-1442
+# ConfigAdminService
+#equinoxCmVersion = 1.0.400.v20130327-1442
+# Eclipse Mars.2
+# requires 'package org.osgi.framework 1.8.0'
+equinoxCmVersion = 1.1.0.v20131021-1936
+
+equinoxCommonVersion = 3.6.200.v20130402-1505
+# DeclarativeService
+#equinoxDsVersion = 1.4.101.v20130813-1853
+# Mars
+equinoxDsVersion = 1.4.200.v20131126-2331
+equinoxConsoleVersion = 1.0.100.v20130429-0953
+equinoxConsoleSshVersion = 1.0.0.v20130515-2026
+equinoxEventVersion = 1.3.0.v20130327-1442
+
# Eclipse Kepler 4.3.2 (SR2)
equinoxVersion = 3.9.1.v20140110-1610
osgiServicesVersion = 3.3.100.v20130513-1956
@@ -56,14 +86,20 @@
equinoxHttpServletVersion = 1.1.400.v20130418-1354
# Note: Used by Virgo Build Tools, too
-equinoxLauncherVersion = 1.3.0.v20130327-1440
+#equinoxLauncherVersion = 1.3.0.v20130327-1440
+# Eclipse Mars
+equinoxLauncherVersion = 1.3.0.v20140415-2008
+
equinoxPreferencesVersion = 3.5.100.v20130422-1538
-equinoxRegionVersion = 1.1.101.v20130722-1314
+# Eclipse Mars
+#equinoxRegionVersion = 1.1.101.v20130722-1314
+equinoxRegionVersion = 1.2.0.v20140128-1636
equinoxRegionExportedPackageVersion = 1.1.0
equinoxRegistryVersion = 3.5.301.v20130717-1549
equinoxSecurityVersion = 1.2.0.v20130424-1801
equinoxSimpleConfiguratorVersion = 1.0.400.v20130327-2119
equinoxSimpleConfiguratorManipulatorVersion = 2.0.0.v20130327-2119
+# Mars ready?
equinoxUtilVersion = 1.0.500.v20130404-1337
eclipseCoreContenttypeVersion = 3.4.200.v20130326-1255
@@ -130,6 +166,19 @@
#CQ 13705 org.springframework.webmvc.portlet
#CQ 13706 org.springframework.websocket
springframeworkVersion = 4.3.9.RELEASE
+springframeworkGroupId = org.eclipse.virgo.mirrored
+springframeworkArtifactPrefix = org.springframework.
+springContextSupportPostfix = context.support
+springTransactionPostfix = transaction
+springWebmvcPortletPostfix = webmvc.portlet
+
+# Let's try servicemix due to usage constraints...
+#springframeworkVersion = 4.2.4.RELEASE_1
+#springframeworkGroupId = org.apache.servicemix.bundles
+#springframeworkArtifactPrefix = org.apache.servicemix.bundles.spring-
+#springContextSupportPostfix = context-support
+#springTransactionPostfix = tx
+#springWebmvcPortletPostfix = webmvc-portlet
geminiManagementVersion = 1.0.5.RELEASE
geminiWebVersion = 3.0.3.RELEASE
diff --git a/org.eclipse.virgo.site/build.gradle b/org.eclipse.virgo.site/build.gradle
index 04f8dcd..937cf4d 100644
--- a/org.eclipse.virgo.site/build.gradle
+++ b/org.eclipse.virgo.site/build.gradle
@@ -129,6 +129,10 @@
localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.ds')
signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi.services", version: osgiServicesVersion, configuration: "compile", ext: "jar"
+
+ // Provides deprecated PlatformAdminImpl (has been removed from oerg.eclipse.osgi)
+ signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi.compatibility.state", version: osgiCompatibilityStateVersion, configuration: "compile", ext: "jar"
+
signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.common", version: equinoxCommonVersion, configuration: "compile", ext: "jar"
signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.ds", version: equinoxDsVersion, configuration: "compile", ext: "jar"
signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.event", version: equinoxEventVersion, configuration: "compile", ext: "jar"
@@ -165,7 +169,7 @@
signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "javax.servlet", version: javaxServletVersion, configuration: "runtime", ext: "jar"
localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.kernel.springintegration')
- signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.springframework.expression", version: springframeworkVersion, ext: "jar"
+ signedExternalPlugin group: springframeworkGroupId, name: springframeworkArtifactPrefix + "expression", version: springframeworkVersion, ext: "jar"
localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.management')
signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "osgi.enterprise", version: osgiEnterpriseVersion, configuration: "compile", ext: "jar"
@@ -198,10 +202,11 @@
// TODO - rename feature to org.eclipse.gemini.blueprint
localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.springdm')
signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "oevm.org.aopalliance", version: orgAopAllianceVersion, ext: "jar"
- signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.springframework.aop", version: springframeworkVersion, ext: "jar"
- signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.springframework.beans", version: springframeworkVersion, ext: "jar"
- signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.springframework.context", version: springframeworkVersion, ext: "jar"
- signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.springframework.core", version: springframeworkVersion, ext: "jar"
+ signedExternalPlugin group: springframeworkGroupId, name: springframeworkArtifactPrefix + "aop", version: springframeworkVersion, ext: "jar"
+ signedExternalPlugin group: springframeworkGroupId, name: springframeworkArtifactPrefix + "expression", version: springframeworkVersion, ext: "jar"
+ signedExternalPlugin group: springframeworkGroupId, name: springframeworkArtifactPrefix + "beans", version: springframeworkVersion, ext: "jar"
+ signedExternalPlugin group: springframeworkGroupId, name: springframeworkArtifactPrefix + "context", version: springframeworkVersion, ext: "jar"
+ signedExternalPlugin group: springframeworkGroupId, name: springframeworkArtifactPrefix + "core", version: springframeworkVersion, ext: "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"
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.kernel.springintegration/feature.xml b/org.eclipse.virgo.site/org.eclipse.virgo.kernel.springintegration/feature.xml
index e206df0..e4f0874 100755
--- a/org.eclipse.virgo.site/org.eclipse.virgo.kernel.springintegration/feature.xml
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.kernel.springintegration/feature.xml
@@ -25,4 +25,13 @@
version="0.0.0"
unpack="false"/>
+<!--
+ <plugin
+ id="org.apache.servicemix.bundles.spring-expression"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+-->
+
</feature>
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.kernel/feature.xml b/org.eclipse.virgo.site/org.eclipse.virgo.kernel/feature.xml
index 99e893b..54c6e91 100755
--- a/org.eclipse.virgo.site/org.eclipse.virgo.kernel/feature.xml
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.kernel/feature.xml
@@ -23,6 +23,15 @@
<import feature="org.eclipse.equinox.regions" version="0.0.0"/>
</requires>
+ <!-- TODO - merge with above into org.eclipse.equinox.feature? -->
+ <plugin
+ id="org.eclipse.osgi.compatibility.state"
+ download-size="0"
+ install-size="0"
+ version="@OSGI.COMPATIBILITY.STATE.VERSION@"
+ unpack="false"
+ autostart="true"/>
+
<plugin
id="org.eclipse.virgo.kernel.deployer"
download-size="0"
diff --git a/org.eclipse.virgo.site/publish_resources/products/kernel-base/kernel-base.product b/org.eclipse.virgo.site/publish_resources/products/kernel-base/kernel-base.product
index ae13b01..fbd283a 100755
--- a/org.eclipse.virgo.site/publish_resources/products/kernel-base/kernel-base.product
+++ b/org.eclipse.virgo.site/publish_resources/products/kernel-base/kernel-base.product
@@ -28,6 +28,7 @@
<property name="org.osgi.service.http.port" value="8080"/>
<property name="org.jolokia.listenForHttpService" value="false"/>
<property name="org.jolokia.useRestrictorService" value="true"/>
+ <property name="org.osgi.framework.executionenvironment" value="OSGi/Minimum-1.0,OSGi/Minimum-1.1,OSGi/Minimum-1.2,CDC-1.1/Foundation-1.1,JRE-1.1,J2SE-1.2,J2SE-1.3,J2SE-1.4,J2SE-1.5,JavaSE-1.5,JavaSE-1.6,JavaSE-1.7"/>
</configurations>
</product>
