Skip to content

Instantly share code, notes, and snippets.

Created October 17, 2010 20:26
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save anonymous/631241 to your computer and use it in GitHub Desktop.
Save anonymous/631241 to your computer and use it in GitHub Desktop.
Index: war/src/main/resources/META-INF/MANIFEST.MF
===================================================================
--- war/src/main/resources/META-INF/MANIFEST.MF (revision 2435)
+++ war/src/main/resources/META-INF/MANIFEST.MF (working copy)
@@ -19,20 +19,20 @@
org.apache.taglibs.standard.tag.rt.fmt;version="1.1.2",
org.apache.taglibs.standard.tei;version="1.1.2",
org.apache.taglibs.standard.tlv;version="1.1.2",
- org.springframework.beans.factory.annotation;version="2.5.6",
- org.springframework.core.io;version="2.5.6",
+ org.springframework.beans.factory.annotation;version="3.0.3",
+ org.springframework.core.io;version="3.0.3",
org.springframework.osgi.io;version="1.1.0",
org.springframework.osgi.util;version="1.1.0",
org.springframework.osgi.web.context.support;version="1.1.0",
- org.springframework.stereotype;version="2.5.6",
- org.springframework.validation;version="2.5.6",
- org.springframework.web.bind.annotation;version="2.5.6",
- org.springframework.web.context;version="2.5.6",
- org.springframework.ui;version="2.5.6",
- org.springframework.util;version="2.5.6",
- org.springframework.web.servlet;version="2.5.6",
- org.springframework.web.servlet.view;version="2.5.6",
- org.springframework.web.servlet.tags;version="2.5.6",
- org.springframework.web.servlet.tags.form;version="2.5.6",
+ org.springframework.stereotype;version="3.0.3",
+ org.springframework.validation;version="3.0.3",
+ org.springframework.web.bind.annotation;version="3.0.3",
+ org.springframework.web.context;version="3.0.3",
+ org.springframework.ui;version="3.0.3",
+ org.springframework.util;version="3.0.3",
+ org.springframework.web.servlet;version="3.0.3",
+ org.springframework.web.servlet.view;version="3.0.3",
+ org.springframework.web.servlet.tags;version="3.0.3",
+ org.springframework.web.servlet.tags.form;version="3.0.3",
org.osgi.framework;version="1.3",
org.osgi.service.packageadmin;version="1.2"
Index: war/src/main/webapp/WEB-INF/applicationContext.xml
===================================================================
--- war/src/main/webapp/WEB-INF/applicationContext.xml (revision 2435)
+++ war/src/main/webapp/WEB-INF/applicationContext.xml (working copy)
@@ -6,7 +6,7 @@
xmlns:osgi="http://www.springframework.org/schema/osgi"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd">
<!-- OSGi package admin service reference -->
@@ -15,4 +15,4 @@
<context:component-scan
base-package="org.springframework.osgi.samples.console.service" />
-</beans>
\ No newline at end of file
+</beans>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment