Merge pull request #4 from alibaba/master

merge

pom.xml

@@ -28,22 +28,9 @@
 		<jdk.version>1.5</jdk.version>
 	</properties>
 
-	<developers>
-		<developer>
-			<id>wenshao</id>
-			<name>wenshao</name>
-			<email>szujobs@hotmail.com</email>
-		</developer>
-		<developer>
-			<id>axmanwang</id>
-			<name>axmanwang</name>
-			<email>iamaxman@hotmail.com</email>
-		</developer>
-	</developers>
-
 	<scm>
-		<url>https://wenshao@github.com/alibaba/fastjson.git</url>
-		<connection>scm:git:https://wenshao@github.com/alibaba/fastjson.git</connection>
+		<url>https://github.com/alibaba/fastjson</url>
+		<connection>scm:git:https://git@github.com/alibaba/fastjson.git</connection>
 	</scm>
 
 	<repositories>
@@ -81,7 +68,7 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 
-				<version>2.5.1</version>
+				<version>3.5.1</version>
 				<configuration>
 					<encoding>UTF-8</encoding>
 					<source>${jdk.version}</source>
@@ -91,15 +78,14 @@
 					<dependency>
 						<groupId>org.codehaus.plexus</groupId>
 						<artifactId>plexus-compiler-javac</artifactId>
-						<version>1.8.1</version>
+						<version>2.7</version>
 					</dependency>
 				</dependencies>
 			</plugin>
 
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
-				<version>2.1.1</version>
 				<executions>
 					<execution>
 						<id>attach-sources</id>
@@ -164,22 +150,20 @@
 	</build>
 
 	<dependencies>
-<!--
 		<dependency>
 			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-			<version>2.5</version>
+			<artifactId>javax.servlet-api</artifactId>
+			<version>3.1.0</version>
 			<scope>provided</scope>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>javax.ws.rs</groupId>
-			<artifactId>jsr311-api</artifactId>
-			<version>1.1.1</version>
+			<artifactId>javax.ws.rs-api</artifactId>
+			<version>2.0.1</version>
 			<scope>provided</scope>
 			<optional>true</optional>
 		</dependency>
--->
 
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
@@ -199,14 +183,14 @@
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-server</artifactId>
 			<version>8.1.8.v20121106</version>
-			<scope>provided</scope>
+			<scope>test</scope>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-webapp</artifactId>
 			<version>8.1.8.v20121106</version>
-			<scope>provided</scope>
+			<scope>test</scope>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
@@ -227,13 +211,13 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<version>2.7.0</version>
+			<version>2.7.3</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.module</groupId>
 			<artifactId>jackson-module-afterburner</artifactId>
-			<version>2.7.0</version>
+			<version>2.7.3</version>
 			<scope>test</scope>
 		</dependency>
 
@@ -247,7 +231,7 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.jaxrs</groupId>
 			<artifactId>jackson-jaxrs-json-provider</artifactId>
-			<version>2.7.0</version>
+			<version>2.7.3</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>