Permalink
Browse files

Updated to Jackson 1.9.7

  • Loading branch information...
1 parent 9657451 commit 2db027a86d09c0952c365829a7ea798a09149b2d @royclarkson royclarkson committed May 8, 2012
@@ -25,7 +25,7 @@
<spring-social-version>1.0.2.RELEASE</spring-social-version>
<spring-social-facebook-version>1.0.1.RELEASE</spring-social-facebook-version>
<spring-security-crypto-version>3.1.0.RELEASE</spring-security-crypto-version>
- <jackson-version>1.9.5</jackson-version>
+ <jackson-version>1.9.7</jackson-version>
<gson-version>2.1</gson-version>
<simple-version>2.6.2</simple-version>
</properties>
@@ -18,7 +18,7 @@
<org.springframework-version>3.1.1.RELEASE</org.springframework-version>
<org.aspectj-version>1.6.10</org.aspectj-version>
<org.slf4j-version>1.6.1</org.slf4j-version>
- <org.codehaus.jackson-version>1.9.5</org.codehaus.jackson-version>
+ <org.codehaus.jackson-version>1.9.7</org.codehaus.jackson-version>
<log4j-version>1.2.16</log4j-version>
<javax.xml.bind-version>2.2.2</javax.xml.bind-version>
<javax.inject-version>1</javax.inject-version>
@@ -0,0 +1,20 @@
+# To enable ProGuard in your project, edit project.properties
+# to define the proguard.config property as described in that file.
+#
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in ${sdk.dir}/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the ProGuard
+# include property in project.properties.
+#
+# For more details, see
+# http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+# public *;
+#}

0 comments on commit 2db027a

Please sign in to comment.