Use spring-web 3.0.1.RELEASE from maven central

echarles · dlinsin · commit 5f7e387bb073 · 2010-04-12T12:49:34.000+08:00
diff --git a/pom.xml b/pom.xml
@@ -9,18 +9,8 @@
     <dependencies>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.web</artifactId>
-            <version>3.0.0.M4</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.ws</groupId>
-            <artifactId>org.springframework.xml</artifactId>
-            <version>1.5.5.A</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.log4j</groupId>
-            <artifactId>com.springsource.org.apache.log4j</artifactId>
-            <version>1.2.15</version>
+            <artifactId>spring-web</artifactId>
+            <version>3.0.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.json</groupId>
@@ -58,22 +48,22 @@
         </plugins>
     </build>
 
-    <repositories>
-        <repository>
-            <id>s2-snapshot</id>
-            <url>http://repository.springsource.com/maven/bundles/snapshot</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>s2-release</id>
-            <url>http://repository.springsource.com/maven/bundles/release</url>
-        </repository>
-        <repository>
-            <id>s2-external</id>
-            <url>http://repository.springsource.com/maven/bundles/external</url>
-        </repository>
-    </repositories>
+<!--    <repositories>-->
+<!--        <repository>-->
+<!--            <id>s2-snapshot</id>-->
+<!--            <url>http://repository.springsource.com/maven/bundles/snapshot</url>-->
+<!--            <snapshots>-->
+<!--                <enabled>true</enabled>-->
+<!--            </snapshots>-->
+<!--        </repository>-->
+<!--        <repository>-->
+<!--            <id>s2-release</id>-->
+<!--            <url>http://repository.springsource.com/maven/bundles/release</url>-->
+<!--        </repository>-->
+<!--        <repository>-->
+<!--            <id>s2-external</id>-->
+<!--            <url>http://repository.springsource.com/maven/bundles/external</url>-->
+<!--        </repository>-->
+<!--    </repositories>-->
 
 </project>
diff --git a/src/main/java/de/linsin/github/rest/service/Browser.java b/src/main/java/de/linsin/github/rest/service/Browser.java
@@ -15,9 +15,11 @@
 
 package de.linsin.github.rest.service;
 
-import org.springframework.web.client.RestTemplate;
+import java.util.Arrays;
+
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.json.MappingJacksonHttpMessageConverter;
+import org.springframework.web.client.RestTemplate;
 
 /**
  * Base class containing methods used by all flavors of browsers
@@ -32,7 +34,8 @@ public abstract class Browser {
      */
     protected RestTemplate initTemplate() {
         RestTemplate template = new RestTemplate();
-        template.setMessageConverters(new HttpMessageConverter[] {new MappingJacksonHttpMessageConverter()});
+        HttpMessageConverter<?>[] httpMessageConverters = new HttpMessageConverter<?>[] {new MappingJacksonHttpMessageConverter()};
+        template.setMessageConverters(Arrays.asList(httpMessageConverters));
         return template;
     }
 }
