Upgrade Spring Framework to 4.3.9.RELEASE and Gemin Blueprint to 2.1
diff --git a/jetty-server/src/main/dist/repository/ext/org.eclipse.virgo.kernel.userregion.blueprint.plan b/jetty-server/src/main/dist/repository/ext/org.eclipse.virgo.kernel.userregion.blueprint.plan
index 3d116a1..5efb538 100644
--- a/jetty-server/src/main/dist/repository/ext/org.eclipse.virgo.kernel.userregion.blueprint.plan
+++ b/jetty-server/src/main/dist/repository/ext/org.eclipse.virgo.kernel.userregion.blueprint.plan
@@ -3,12 +3,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.eclipse.org/virgo/schema/plan http://www.eclipse.org/virgo/schema/plan/eclipse-virgo-plan.xsd">
- <artifact type="bundle" name="org.eclipse.gemini.blueprint.core" version="[1.0.0.RELEASE, 3)"/>
- <artifact type="bundle" name="org.eclipse.gemini.blueprint.extender" version="[1.0.0.RELEASE, 3)"/>
- <artifact type="bundle" name="org.eclipse.gemini.blueprint.io" version="[1.0.0.RELEASE, 3)"/>
- <!--<artifact type="bundle" name="org.eclipse.gemini.blueprint.extensions" version="[1.0.0.RELEASE, 3)"/>-->
- <artifact type="bundle" name="org.eclipse.virgo.kernel.agent.dm" version="[3.6, 4.0)"/>
- <artifact type="bundle" name="org.eclipse.virgo.kernel.deployer.dm" version="[3.6, 4.0)"/>
+ <artifact type="bundle" name="org.eclipse.gemini.blueprint.core" version="[2.1, 3)"/>
+ <artifact type="bundle" name="org.eclipse.gemini.blueprint.extender" version="[2.1, 3)"/>
+ <artifact type="bundle" name="org.eclipse.gemini.blueprint.io" version="[2.1, 3)"/>
+ <artifact type="bundle" name="org.eclipse.gemini.blueprint.extensions" version="[2.1, 3)"/>
+ <artifact type="bundle" name="org.eclipse.virgo.kernel.agent.dm" version="[3.7.1, 4.0)"/>
+ <artifact type="bundle" name="org.eclipse.virgo.kernel.deployer.dm" version="[3.7.1, 4.0)"/>
<artifact type="bundle" name="org.eclipse.equinox.ds" version="0.0.0"/>
<artifact type="bundle" name="org.eclipse.equinox.util" version="0.0.0"/>
<artifact type="configuration" name="osgi.console" version="0"/>
diff --git a/jetty-server/src/main/dist/repository/ext/org.springframework.spring-library-4.2.9.RELEASE.libd b/jetty-server/src/main/dist/repository/ext/org.springframework.spring-library-4.2.9.RELEASE.libd
deleted file mode 100644
index 7e81731..0000000
--- a/jetty-server/src/main/dist/repository/ext/org.springframework.spring-library-4.2.9.RELEASE.libd
+++ /dev/null
@@ -1,22 +0,0 @@
-Library-SymbolicName: org.springframework.spring
-Library-Version: 4.2.9.RELEASE
-Library-Name: Spring Framework
-Import-Bundle:
- org.springframework.aop;version="[4.2.9, 4.2.10)",
- org.springframework.aspects;version="[4.2.9, 4.2.10)",
- org.springframework.beans;version="[4.2.9, 4.2.10)",
- org.springframework.context;version="[4.2.9, 4.2.10)",
- org.springframework.context.support;version="[4.2.9, 4.2.10)",
- org.springframework.core;version="[4.2.9, 4.2.10)",
- org.springframework.expression;version="[4.2.9, 4.2.10)",
- org.springframework.jdbc;version="[4.2.9, 4.2.10)",
- org.springframework.jms;version="[4.2.9, 4.2.10)",
- org.springframework.orm;version="[4.2.9, 4.2.10)",
- org.springframework.oxm;version="[4.2.9, 4.2.10)",
- org.springframework.transaction;version="[4.2.9, 4.2.10)",
- org.springframework.web;version="[4.2.9, 4.2.10)",
- org.springframework.webmvc;version="[4.2.9, 4.2.10)",
- org.springframework.webmvc.portlet;version="[4.2.9, 4.2.10)",
- org.springframework.websocket;version="[4.2.9, 4.2.10)",
- oevm.org.aopalliance;version="[1.0.0, 1.0.0]",
- javax.jms;version="[1,2)"
diff --git a/jetty-server/src/main/dist/repository/ext/org.springframework.spring-library-4.3.9.RELEASE.libd b/jetty-server/src/main/dist/repository/ext/org.springframework.spring-library-4.3.9.RELEASE.libd
new file mode 100644
index 0000000..804b661
--- /dev/null
+++ b/jetty-server/src/main/dist/repository/ext/org.springframework.spring-library-4.3.9.RELEASE.libd
@@ -0,0 +1,22 @@
+Library-SymbolicName: org.springframework.spring
+Library-Version: 4.3.9.RELEASE
+Library-Name: Spring Framework
+Import-Bundle:
+ org.springframework.aop;version="[4.3.9, 4.3.9]",
+ org.springframework.aspects;version="[4.3.9, 4.3.9]",
+ org.springframework.beans;version="[4.3.9, 4.3.9]",
+ org.springframework.context;version="[4.3.9, 4.3.9]",
+ org.springframework.context.support;version="[4.3.9, 4.3.9]",
+ org.springframework.core;version="[4.3.9, 4.3.9]",
+ org.springframework.expression;version="[4.3.9, 4.3.9]",
+ org.springframework.jdbc;version="[4.3.9, 4.3.9]",
+ org.springframework.jms;version="[4.3.9, 4.3.9]",
+ org.springframework.orm;version="[4.3.9, 4.3.9]",
+ org.springframework.oxm;version="[4.3.9, 4.3.9]",
+ org.springframework.transaction;version="[4.3.9, 4.3.9]",
+ org.springframework.web;version="[4.3.9, 4.3.9]",
+ org.springframework.webmvc;version="[4.3.9, 4.3.9]",
+ org.springframework.webmvc.portlet;version="[4.3.9, 4.3.9]",
+ org.springframework.websocket;version="[4.3.9, 4.3.9]",
+ oevm.org.aopalliance;version="[1.0.0, 1.0.0]",
+ javax.jms;version="[1,2)"
diff --git a/kernel/src/main/dist/repository/ext/org.eclipse.virgo.kernel.userregion.blueprint.plan b/kernel/src/main/dist/repository/ext/org.eclipse.virgo.kernel.userregion.blueprint.plan
index 3d116a1..5efb538 100644
--- a/kernel/src/main/dist/repository/ext/org.eclipse.virgo.kernel.userregion.blueprint.plan
+++ b/kernel/src/main/dist/repository/ext/org.eclipse.virgo.kernel.userregion.blueprint.plan
@@ -3,12 +3,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.eclipse.org/virgo/schema/plan http://www.eclipse.org/virgo/schema/plan/eclipse-virgo-plan.xsd">
- <artifact type="bundle" name="org.eclipse.gemini.blueprint.core" version="[1.0.0.RELEASE, 3)"/>
- <artifact type="bundle" name="org.eclipse.gemini.blueprint.extender" version="[1.0.0.RELEASE, 3)"/>
- <artifact type="bundle" name="org.eclipse.gemini.blueprint.io" version="[1.0.0.RELEASE, 3)"/>
- <!--<artifact type="bundle" name="org.eclipse.gemini.blueprint.extensions" version="[1.0.0.RELEASE, 3)"/>-->
- <artifact type="bundle" name="org.eclipse.virgo.kernel.agent.dm" version="[3.6, 4.0)"/>
- <artifact type="bundle" name="org.eclipse.virgo.kernel.deployer.dm" version="[3.6, 4.0)"/>
+ <artifact type="bundle" name="org.eclipse.gemini.blueprint.core" version="[2.1, 3)"/>
+ <artifact type="bundle" name="org.eclipse.gemini.blueprint.extender" version="[2.1, 3)"/>
+ <artifact type="bundle" name="org.eclipse.gemini.blueprint.io" version="[2.1, 3)"/>
+ <artifact type="bundle" name="org.eclipse.gemini.blueprint.extensions" version="[2.1, 3)"/>
+ <artifact type="bundle" name="org.eclipse.virgo.kernel.agent.dm" version="[3.7.1, 4.0)"/>
+ <artifact type="bundle" name="org.eclipse.virgo.kernel.deployer.dm" version="[3.7.1, 4.0)"/>
<artifact type="bundle" name="org.eclipse.equinox.ds" version="0.0.0"/>
<artifact type="bundle" name="org.eclipse.equinox.util" version="0.0.0"/>
<artifact type="configuration" name="osgi.console" version="0"/>
diff --git a/tomcat-server/src/main/dist/repository/ext/org.eclipse.virgo.kernel.userregion.blueprint.plan b/tomcat-server/src/main/dist/repository/ext/org.eclipse.virgo.kernel.userregion.blueprint.plan
index fb4838e..e7e9754 100644
--- a/tomcat-server/src/main/dist/repository/ext/org.eclipse.virgo.kernel.userregion.blueprint.plan
+++ b/tomcat-server/src/main/dist/repository/ext/org.eclipse.virgo.kernel.userregion.blueprint.plan
@@ -1,15 +1,15 @@
<plan name="org.eclipse.virgo.kernel.userregion.blueprint" version="3.7.1" scoped="false" atomic="false"
- xmlns="http://www.eclipse.org/virgo/schema/plan"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.eclipse.org/virgo/schema/plan http://www.eclipse.org/virgo/schema/plan/eclipse-virgo-plan.xsd">
+ xmlns="http://www.eclipse.org/virgo/schema/plan"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.eclipse.org/virgo/schema/plan http://www.eclipse.org/virgo/schema/plan/eclipse-virgo-plan.xsd">
- <artifact type="bundle" name="org.eclipse.gemini.blueprint.core" version="[1.0.0.RELEASE, 3)"/>
- <artifact type="bundle" name="org.eclipse.gemini.blueprint.extender" version="[1.0.0.RELEASE, 3)"/>
- <artifact type="bundle" name="org.eclipse.gemini.blueprint.io" version="[1.0.0.RELEASE, 3)"/>
- <!--<artifact type="bundle" name="org.eclipse.gemini.blueprint.extensions" version="[1.0.0.RELEASE, 3)"/>-->
- <artifact type="bundle" name="org.eclipse.virgo.kernel.agent.dm" version="[3.6, 4.0)"/>
- <artifact type="bundle" name="org.eclipse.virgo.kernel.deployer.dm" version="[3.6, 4.0)"/>
- <artifact type="bundle" name="org.eclipse.equinox.ds" version="0.0.0"/>
- <artifact type="bundle" name="org.eclipse.equinox.util" version="0.0.0"/>
- <artifact type="configuration" name="osgi.console" version="0"/>
+ <artifact type="bundle" name="org.eclipse.gemini.blueprint.core" version="[2.1, 3)"/>
+ <artifact type="bundle" name="org.eclipse.gemini.blueprint.extender" version="[2.1, 3)"/>
+ <artifact type="bundle" name="org.eclipse.gemini.blueprint.io" version="[2.1, 3)"/>
+ <artifact type="bundle" name="org.eclipse.gemini.blueprint.extensions" version="[2.1, 3)"/>
+ <artifact type="bundle" name="org.eclipse.virgo.kernel.agent.dm" version="[3.7.1, 4.0)"/>
+ <artifact type="bundle" name="org.eclipse.virgo.kernel.deployer.dm" version="[3.7.1, 4.0)"/>
+ <artifact type="bundle" name="org.eclipse.equinox.ds" version="0.0.0"/>
+ <artifact type="bundle" name="org.eclipse.equinox.util" version="0.0.0"/>
+ <artifact type="configuration" name="osgi.console" version="0"/>
</plan>
diff --git a/tomcat-server/src/main/dist/repository/ext/org.springframework.spring-library-4.2.9.RELEASE.libd b/tomcat-server/src/main/dist/repository/ext/org.springframework.spring-library-4.2.9.RELEASE.libd
deleted file mode 100644
index 7e81731..0000000
--- a/tomcat-server/src/main/dist/repository/ext/org.springframework.spring-library-4.2.9.RELEASE.libd
+++ /dev/null
@@ -1,22 +0,0 @@
-Library-SymbolicName: org.springframework.spring
-Library-Version: 4.2.9.RELEASE
-Library-Name: Spring Framework
-Import-Bundle:
- org.springframework.aop;version="[4.2.9, 4.2.10)",
- org.springframework.aspects;version="[4.2.9, 4.2.10)",
- org.springframework.beans;version="[4.2.9, 4.2.10)",
- org.springframework.context;version="[4.2.9, 4.2.10)",
- org.springframework.context.support;version="[4.2.9, 4.2.10)",
- org.springframework.core;version="[4.2.9, 4.2.10)",
- org.springframework.expression;version="[4.2.9, 4.2.10)",
- org.springframework.jdbc;version="[4.2.9, 4.2.10)",
- org.springframework.jms;version="[4.2.9, 4.2.10)",
- org.springframework.orm;version="[4.2.9, 4.2.10)",
- org.springframework.oxm;version="[4.2.9, 4.2.10)",
- org.springframework.transaction;version="[4.2.9, 4.2.10)",
- org.springframework.web;version="[4.2.9, 4.2.10)",
- org.springframework.webmvc;version="[4.2.9, 4.2.10)",
- org.springframework.webmvc.portlet;version="[4.2.9, 4.2.10)",
- org.springframework.websocket;version="[4.2.9, 4.2.10)",
- oevm.org.aopalliance;version="[1.0.0, 1.0.0]",
- javax.jms;version="[1,2)"
diff --git a/tomcat-server/src/main/dist/repository/ext/org.springframework.spring-library-4.3.9.RELEASE.libd b/tomcat-server/src/main/dist/repository/ext/org.springframework.spring-library-4.3.9.RELEASE.libd
new file mode 100644
index 0000000..804b661
--- /dev/null
+++ b/tomcat-server/src/main/dist/repository/ext/org.springframework.spring-library-4.3.9.RELEASE.libd
@@ -0,0 +1,22 @@
+Library-SymbolicName: org.springframework.spring
+Library-Version: 4.3.9.RELEASE
+Library-Name: Spring Framework
+Import-Bundle:
+ org.springframework.aop;version="[4.3.9, 4.3.9]",
+ org.springframework.aspects;version="[4.3.9, 4.3.9]",
+ org.springframework.beans;version="[4.3.9, 4.3.9]",
+ org.springframework.context;version="[4.3.9, 4.3.9]",
+ org.springframework.context.support;version="[4.3.9, 4.3.9]",
+ org.springframework.core;version="[4.3.9, 4.3.9]",
+ org.springframework.expression;version="[4.3.9, 4.3.9]",
+ org.springframework.jdbc;version="[4.3.9, 4.3.9]",
+ org.springframework.jms;version="[4.3.9, 4.3.9]",
+ org.springframework.orm;version="[4.3.9, 4.3.9]",
+ org.springframework.oxm;version="[4.3.9, 4.3.9]",
+ org.springframework.transaction;version="[4.3.9, 4.3.9]",
+ org.springframework.web;version="[4.3.9, 4.3.9]",
+ org.springframework.webmvc;version="[4.3.9, 4.3.9]",
+ org.springframework.webmvc.portlet;version="[4.3.9, 4.3.9]",
+ org.springframework.websocket;version="[4.3.9, 4.3.9]",
+ oevm.org.aopalliance;version="[1.0.0, 1.0.0]",
+ javax.jms;version="[1,2)"
