diff --git a/build-spring-framework/resources/changelog.txt b/build-spring-framework/resources/changelog.txt
index 2f113687375..dec648b210f 100644
--- a/build-spring-framework/resources/changelog.txt
+++ b/build-spring-framework/resources/changelog.txt
@@ -3,6 +3,13 @@ SPRING FRAMEWORK CHANGELOG
http://www.springsource.org
+Changes in version 3.0.2 (2010-03-11)
+-------------------------------------
+
+* fixed cross-module version ranges in OSGi manifests
+* upgraded to Hibernate Validator 4.0.2 and Jackson 1.4.2
+
+
Changes in version 3.0.1 (2010-02-18)
-------------------------------------
@@ -12,7 +19,7 @@ Changes in version 3.0.1 (2010-02-18)
* support for Hibernate 3.5 (as native Hibernate API and as JPA 2.0 provider)
* support for Tiles 2.2.1 (preserving compatibility with Tiles 2.1.2 and above)
* consistent treatment of unresolvable placeholders for Resource and Resource array properties
-* ConversionFailedException exposes offending value through public "getValue()" method
+* ConversionFailedException exDLBFposes offending value through public "getValue()" method
* fixed BeanFactory's "getBeansWithAnnotation" to ignore beans with non-determinable type
* widened FactoryBean's "getObjectType" signature to return any Class (Class>)
* do not ever consider Object as a candidate type for autowiring by type (autowire="byType")
diff --git a/org.springframework.context/ivy.xml b/org.springframework.context/ivy.xml
index c314fe1d220..9519b0587e0 100644
--- a/org.springframework.context/ivy.xml
+++ b/org.springframework.context/ivy.xml
@@ -62,7 +62,7 @@
-
+
diff --git a/org.springframework.web.servlet/ivy.xml b/org.springframework.web.servlet/ivy.xml
index 47bbebf7523..2d37efd4a8e 100644
--- a/org.springframework.web.servlet/ivy.xml
+++ b/org.springframework.web.servlet/ivy.xml
@@ -62,7 +62,7 @@
conf="optional, velocity->compile"/>
-
@@ -100,7 +100,7 @@
conf="test->compile"/>
-
+
diff --git a/org.springframework.web.servlet/template.mf b/org.springframework.web.servlet/template.mf
index ec0cb26f9d7..e68cb7c7da4 100644
--- a/org.springframework.web.servlet/template.mf
+++ b/org.springframework.web.servlet/template.mf
@@ -21,7 +21,7 @@ Import-Template:
org.apache.tiles.*;version="[2.1.2, 3.0.0)";resolution:=optional,
org.apache.velocity.*;version="[1.5.0, 2.0.0)";resolution:=optional,
org.apache.velocity.tools.*;version="[1.4.0, 3.0.0)";resolution:=optional,
- org.codehaus.jackson.*;version="[1.0.0, 1.1.0)";resolution:=optional,
+ org.codehaus.jackson.*;version="[1.0.0, 2.0.0)";resolution:=optional,
org.springframework.beans.*;version=${spring.osgi.range},
org.springframework.context.*;version=${spring.osgi.range},
org.springframework.core.*;version=${spring.osgi.range},
diff --git a/org.springframework.web/ivy.xml b/org.springframework.web/ivy.xml
index d64953bd4e2..eba5db88746 100644
--- a/org.springframework.web/ivy.xml
+++ b/org.springframework.web/ivy.xml
@@ -57,7 +57,7 @@
conf="compile, commons-logging->compile"/>
-
diff --git a/org.springframework.web/template.mf b/org.springframework.web/template.mf
index 8fdc0a46073..ab7a3e6d534 100644
--- a/org.springframework.web/template.mf
+++ b/org.springframework.web/template.mf
@@ -4,7 +4,7 @@ Bundle-Vendor: SpringSource
Bundle-ManifestVersion: 2
Import-Template:
com.caucho.*;version="[3.2.0, 5.0.0)";resolution:=optional,
- org.codehaus.jackson.*;version="[1.0.0, 1.1.0)";resolution:=optional,
+ org.codehaus.jackson.*;version="[1.0.0, 2.0.0)";resolution:=optional,
com.sun.net.*;version="0";resolution:=optional,
javax.el.*;version="[1.0.0, 3.0.0)";resolution:=optional,
javax.faces.*;version="[1.1.0, 3.0.0)";resolution:=optional,