Merge branch 'use-same-version-of-jackson' of https://github.com/martin-g/FrameworkBenchmarks into PR640

Conflicts:
	netty/README.md
	netty/pom.xml

finagle/build.sbt

@@ -2,7 +2,7 @@ name := "finagle"
 
 organization := "com.falmarri"
 
-scalaVersion := "2.10.0"
+scalaVersion := "2.10.3"
 
 version := "1.0"
 
@@ -10,5 +10,5 @@ libraryDependencies ++= Seq(
                 "com.twitter" %% "finagle-http" % "6.+",
                 "com.twitter" %% "finagle-mysql" % "6.+",
                 "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.+",
-		"com.fasterxml.jackson.core" % "jackson-databind" % "2.2.1"
-                )
+				"com.fasterxml.jackson.core" % "jackson-databind" % "2.3.0"
+            )

grizzly-bm/README.md

@@ -18,7 +18,7 @@ This is the Grizzly portion of a [benchmarking test suite](../) comparing a vari
 
 * [Java OpenJDK 1.7.0_09](http://openjdk.java.net/)
 * [Grizzly 2.3.3](http://grizzly.java.net/)
-* [Jackson 2.2.2](http://wiki.fasterxml.com/JacksonHome)
+* [Jackson 2.3.0](http://wiki.fasterxml.com/JacksonHome)
 
 ## Test URLs
 

grizzly-bm/pom.xml

@@ -73,7 +73,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.2.2</version>
+            <version>2.3.0</version>
         </dependency>
     </dependencies>
     <!-- <repositories>

grizzly-jersey/README.md

@@ -16,7 +16,7 @@ This is the Grizzly+Jersey portion of a [benchmarking test suite](../) comparing
 * [Java OpenJDK 1.7.0_09](http://openjdk.java.net/)
 * [Jersey 1.17.1](http://jersey.java.net/)
 * [Grizzly 2.3.2](http://grizzly.java.net/)
-* [Jackson 2.2.1](http://wiki.fasterxml.com/JacksonHome)
+* [Jackson 2.3.0](http://wiki.fasterxml.com/JacksonHome)
 * [Mustache.java 0.8.12](https://github.com/spullara/mustache.java)
 * [Jersey Mustache 1.0.0](https://github.com/trautonen/jersey-mustache)
 * [Hibernate 4.2.1](http://www.hibernate.org/)

grizzly-jersey/pom.xml

@@ -17,7 +17,7 @@
     <grizzly.version>2.3.2</grizzly.version>
     <jersey.version>1.17.1</jersey.version>
     <jersey-mustache.version>1.0.0</jersey-mustache.version>
-    <jackson.version>2.2.1</jackson.version>
+    <jackson.version>2.3.0</jackson.version>
     <mustache.version>0.8.12</mustache.version>
     <hibernate.version>4.2.1.Final</hibernate.version>
     <mysql-connector.version>5.1.25</mysql-connector.version>

netty/README.md

@@ -9,6 +9,7 @@ This is the netty portion of a [benchmarking test suite](../) comparing a variet
 
 * [Java OpenJDK 1.7.0_09](http://openjdk.java.net/)
 * [Netty 4.0.14.Beta1](http://netty.io/)
+* [Jackson 2.3.0](http://wiki.fasterxml.com/JacksonHome)
 
 ## References
 * https://github.com/netty/netty/tree/master/example/src/main/java/io/netty/example/http/snoop

netty/pom.xml

@@ -14,6 +14,11 @@
       <artifactId>netty-codec-http</artifactId>
       <version>4.0.14.Beta1</version>
     </dependency>
+	 <dependency>
+		<groupId>com.fasterxml.jackson.core</groupId>
+		<artifactId>jackson-databind</artifactId>
+		<version>2.3.0</version>
+	 </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>

plain/build.sbt

@@ -44,7 +44,7 @@ libraryDependencies ++= Seq(
   "com.googlecode.concurrentlinkedhashmap" % "concurrentlinkedhashmap-lru" % "1.3.2",
   "net.jpountz.lz4" % "lz4" % "1.2.0",
   "net.lingala.zip4j" % "zip4j" % "1.3.1", 
-  "com.fasterxml.jackson.core" % "jackson-databind" % "2.2.3",
+  "com.fasterxml.jackson.core" % "jackson-databind" % "2.3.0",
   "com.sun.jersey" % "jersey-json" % "1.17.1",
   "org.jvnet.mimepull" % "mimepull" % "1.9.3",
   "mysql" % "mysql-connector-java" % "5.1.27"

servlet/README.md

@@ -15,7 +15,7 @@ The tests were run with:
 
 * [Java OpenJDK 1.7.0_09](http://openjdk.java.net/)
 * [Resin 4.0.34](http://www.caucho.com/)
-* [Jackson 2.1.1](http://wiki.fasterxml.com/JacksonHome)
+* [Jackson 2.3.0](http://wiki.fasterxml.com/JacksonHome)
 * [MySQL 5.5.29](https://dev.mysql.com/)
 
 ## Test URLs

servlet/pom.xml

@@ -27,7 +27,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.1.2</version>
+            <version>2.3.0</version>
         </dependency>
 
 	<dependency>

tapestry/README.md

@@ -22,6 +22,7 @@ Use [Hibernate](https://tapestry.apache.org/using-tapestry-with-hibernate.html)
 * [MySQL 5.5.29](http://dev.mysql.com/)
 * [Maven 2.2.1](https://maven.apache.org/)
 * [Resin 4.0.34](http://www.caucho.com/)
+* [Jackson 2.3.0](http://wiki.fasterxml.com/JacksonHome)
 
 ## Test URLs
 

tapestry/hello/build.gradle

@@ -40,7 +40,7 @@ dependencies {
     compile "mysql:mysql-connector-java:5.1.19"
     compile "org.hibernate:hibernate-core:3.6.3.Final"
     compile "org.apache.tapestry:tapestry-hibernate:5.3.6"
-    compile "com.fasterxml.jackson.core:jackson-databind:2.1.4"
+    compile "com.fasterxml.jackson.core:jackson-databind:2.3.0"
 
     // This adds automatic compression of JavaScript and CSS in production mode:
     compile "org.apache.tapestry:tapestry-yuicompressor:5.3.6"

tapestry/hello/pom.xml

@@ -80,11 +80,11 @@ of testing facilities designed for use with TestNG (http://testng.org/), so it's
             <version>${tapestry-release-version}</version>
             <scope>provided</scope>
         </dependency>
-   		 <dependency>
-   			<groupId>com.fasterxml.jackson.core</groupId>
-   			<artifactId>jackson-databind</artifactId>
-   			<version>2.1.1</version>
-   		</dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.3.0</version>
+        </dependency>
 
     </dependencies>
     <build>
@@ -115,15 +115,9 @@ of testing facilities designed for use with TestNG (http://testng.org/), so it's
             <!-- Run the application using "mvn jetty:run" -->
             <plugin>
                 <groupId>org.mortbay.jetty</groupId>
-                <artifactId>maven-jetty-plugin</artifactId>
-                <version>6.1.16</version>
+                <artifactId>jetty-maven-plugin</artifactId>
+                <version>7.5.0.v20110901</version>
                 <configuration>
-                    <!-- Log to the console. -->
-                    <requestLog implementation="org.mortbay.jetty.NCSARequestLog">
-                        <!-- This doesn't do anything for Jetty, but is a workaround for a Maven bug
-                             that prevents the requestLog from being set. -->
-                        <append>true</append>
-                    </requestLog>
                     <systemProperties>
                         <systemProperty>
                             <name>tapestry.execution-mode</name>

undertow/pom.xml

@@ -57,17 +57,17 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.2.0</version>
+            <version>2.3.0</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>2.2.0</version>
+            <version>2.3.0</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>2.2.0</version>
+            <version>2.3.0</version>
         </dependency>
         <!-- HTML templates -->
         <dependency>

wicket/README.md

@@ -20,6 +20,7 @@ Use [Hibernate](http://www.hibernate.org/) for interaction with MySQL database.
 * [MySQL 5.5.29](http://dev.mysql.com/)
 * [Maven 2.2.1](https://maven.apache.org/)
 * [Resin 4.0.34](http://www.caucho.com/)
+* [Jackson 2.3.0](http://wiki.fasterxml.com/JacksonHome)
 
 ## Test URLs
 

wicket/pom.xml

@@ -69,7 +69,7 @@
 		 <dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<version>2.1.1</version>
+			<version>2.3.0</version>
 		</dependency>
 		            
 		<dependency>