You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wink.apache.org by rf...@apache.org on 2011/04/28 18:54:46 UTC
svn commit: r1097545 - in /incubator/wink/trunk: ./
wink-component-test-support/
wink-component-test-support/src/main/java/org/apache/wink/test/mock/
wink-examples/apps/HelloWorld/ wink-examples/apps/QADefect/
wink-examples/apps/SimpleDefects/ wink-exa...
Author: rfeng
Date: Thu Apr 28 16:54:45 2011
New Revision: 1097545
URL: http://svn.apache.org/viewvc?rev=1097545&view=rev
Log:
Update dependencies
Modified:
incubator/wink/trunk/pom.xml
incubator/wink/trunk/wink-component-test-support/pom.xml
incubator/wink/trunk/wink-component-test-support/src/main/java/org/apache/wink/test/mock/ServletContextMock.java
incubator/wink/trunk/wink-examples/apps/HelloWorld/pom.xml
incubator/wink/trunk/wink-examples/apps/QADefect/pom.xml
incubator/wink/trunk/wink-examples/apps/SimpleDefects/pom.xml
incubator/wink/trunk/wink-examples/core/Jaxb/pom.xml
incubator/wink/trunk/wink-examples/core/Preconditions/pom.xml
incubator/wink/trunk/wink-examples/ext/History/pom.xml
incubator/wink/trunk/wink-examples/ext/MultiPart/pom.xml
incubator/wink/trunk/wink-examples/ext/RuntimeRegistration/pom.xml
incubator/wink/trunk/wink-guice-server/pom.xml
incubator/wink/trunk/wink-providers/wink-abdera-provider/pom.xml
incubator/wink/trunk/wink-providers/wink-jackson-provider/pom.xml
incubator/wink/trunk/wink-providers/wink-jettison-provider/pom.xml
incubator/wink/trunk/wink-providers/wink-json-provider/pom.xml
incubator/wink/trunk/wink-providers/wink-json4j-provider/pom.xml
incubator/wink/trunk/wink-providers/wink-protobuf-provider/pom.xml
incubator/wink/trunk/wink-providers/wink-thrift-provider/pom.xml
incubator/wink/trunk/wink-server/pom.xml
incubator/wink/trunk/wink-spring-support/pom.xml
incubator/wink/trunk/wink-webdav/pom.xml
Modified: incubator/wink/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/pom.xml?rev=1097545&r1=1097544&r2=1097545&view=diff
==============================================================================
--- incubator/wink/trunk/pom.xml (original)
+++ incubator/wink/trunk/pom.xml Thu Apr 28 16:54:45 2011
@@ -555,8 +555,19 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- <version>2.5</version>
+ <artifactId>spring-context</artifactId>
+ <version>3.0.5.RELEASE</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>3.0.5.RELEASE</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -568,7 +579,7 @@
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<scope>test</scope>
- <version>2.5</version>
+ <version>3.0.5.RELEASE</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -611,8 +622,8 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee_1.4_spec</artifactId>
- <version>1.1</version>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <version>1.2</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: incubator/wink/trunk/wink-component-test-support/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-component-test-support/pom.xml?rev=1097545&r1=1097544&r2=1097545&view=diff
==============================================================================
--- incubator/wink/trunk/wink-component-test-support/pom.xml (original)
+++ incubator/wink/trunk/wink-component-test-support/pom.xml Thu Apr 28 16:54:45 2011
@@ -30,7 +30,11 @@
<dependencies>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
+ <artifactId>spring-context</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -48,7 +52,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee_1.4_spec</artifactId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: incubator/wink/trunk/wink-component-test-support/src/main/java/org/apache/wink/test/mock/ServletContextMock.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-component-test-support/src/main/java/org/apache/wink/test/mock/ServletContextMock.java?rev=1097545&r1=1097544&r2=1097545&view=diff
==============================================================================
--- incubator/wink/trunk/wink-component-test-support/src/main/java/org/apache/wink/test/mock/ServletContextMock.java (original)
+++ incubator/wink/trunk/wink-component-test-support/src/main/java/org/apache/wink/test/mock/ServletContextMock.java Thu Apr 28 16:54:45 2011
@@ -30,7 +30,7 @@ import javax.servlet.Servlet;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
-@SuppressWarnings( {"unchecked", "deprecation"})
+@SuppressWarnings( {"deprecation", "rawtypes"})
public class ServletContextMock implements ServletContext {
private final ServletContext servletContext;
@@ -134,5 +134,9 @@ public class ServletContextMock implemen
public void setAttribute(String arg0, Object arg1) {
servletContext.setAttribute(arg0, arg1);
}
+
+ public String getContextPath() {
+ return servletContext.getContextPath();
+ }
}
Modified: incubator/wink/trunk/wink-examples/apps/HelloWorld/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/apps/HelloWorld/pom.xml?rev=1097545&r1=1097544&r2=1097545&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/apps/HelloWorld/pom.xml (original)
+++ incubator/wink/trunk/wink-examples/apps/HelloWorld/pom.xml Thu Apr 28 16:54:45 2011
@@ -68,7 +68,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee_1.4_spec</artifactId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: incubator/wink/trunk/wink-examples/apps/QADefect/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/apps/QADefect/pom.xml?rev=1097545&r1=1097544&r2=1097545&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/apps/QADefect/pom.xml (original)
+++ incubator/wink/trunk/wink-examples/apps/QADefect/pom.xml Thu Apr 28 16:54:45 2011
@@ -61,7 +61,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee_1.4_spec</artifactId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.wink</groupId>
Modified: incubator/wink/trunk/wink-examples/apps/SimpleDefects/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/apps/SimpleDefects/pom.xml?rev=1097545&r1=1097544&r2=1097545&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/apps/SimpleDefects/pom.xml (original)
+++ incubator/wink/trunk/wink-examples/apps/SimpleDefects/pom.xml Thu Apr 28 16:54:45 2011
@@ -46,7 +46,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee_1.4_spec</artifactId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.wink</groupId>
Modified: incubator/wink/trunk/wink-examples/core/Jaxb/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/core/Jaxb/pom.xml?rev=1097545&r1=1097544&r2=1097545&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/core/Jaxb/pom.xml (original)
+++ incubator/wink/trunk/wink-examples/core/Jaxb/pom.xml Thu Apr 28 16:54:45 2011
@@ -59,7 +59,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee_1.4_spec</artifactId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: incubator/wink/trunk/wink-examples/core/Preconditions/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/core/Preconditions/pom.xml?rev=1097545&r1=1097544&r2=1097545&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/core/Preconditions/pom.xml (original)
+++ incubator/wink/trunk/wink-examples/core/Preconditions/pom.xml Thu Apr 28 16:54:45 2011
@@ -60,7 +60,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee_1.4_spec</artifactId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
</dependency>
<dependency>
<groupId>woodstox</groupId>
Modified: incubator/wink/trunk/wink-examples/ext/History/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/ext/History/pom.xml?rev=1097545&r1=1097544&r2=1097545&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/ext/History/pom.xml (original)
+++ incubator/wink/trunk/wink-examples/ext/History/pom.xml Thu Apr 28 16:54:45 2011
@@ -70,7 +70,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee_1.4_spec</artifactId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
</dependency>
<dependency>
<groupId>woodstox</groupId>
Modified: incubator/wink/trunk/wink-examples/ext/MultiPart/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/ext/MultiPart/pom.xml?rev=1097545&r1=1097544&r2=1097545&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/ext/MultiPart/pom.xml (original)
+++ incubator/wink/trunk/wink-examples/ext/MultiPart/pom.xml Thu Apr 28 16:54:45 2011
@@ -61,7 +61,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee_1.4_spec</artifactId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
</dependency>
<dependency>
<groupId>woodstox</groupId>
Modified: incubator/wink/trunk/wink-examples/ext/RuntimeRegistration/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/ext/RuntimeRegistration/pom.xml?rev=1097545&r1=1097544&r2=1097545&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/ext/RuntimeRegistration/pom.xml (original)
+++ incubator/wink/trunk/wink-examples/ext/RuntimeRegistration/pom.xml Thu Apr 28 16:54:45 2011
@@ -45,7 +45,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee_1.4_spec</artifactId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
</dependency>
</dependencies>
</project>
Modified: incubator/wink/trunk/wink-guice-server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-guice-server/pom.xml?rev=1097545&r1=1097544&r2=1097545&view=diff
==============================================================================
--- incubator/wink/trunk/wink-guice-server/pom.xml (original)
+++ incubator/wink/trunk/wink-guice-server/pom.xml Thu Apr 28 16:54:45 2011
@@ -39,7 +39,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee_1.4_spec</artifactId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: incubator/wink/trunk/wink-providers/wink-abdera-provider/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-providers/wink-abdera-provider/pom.xml?rev=1097545&r1=1097544&r2=1097545&view=diff
==============================================================================
--- incubator/wink/trunk/wink-providers/wink-abdera-provider/pom.xml (original)
+++ incubator/wink/trunk/wink-providers/wink-abdera-provider/pom.xml Thu Apr 28 16:54:45 2011
@@ -84,7 +84,7 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
+ <artifactId>spring-context</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -94,7 +94,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee_1.4_spec</artifactId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: incubator/wink/trunk/wink-providers/wink-jackson-provider/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-providers/wink-jackson-provider/pom.xml?rev=1097545&r1=1097544&r2=1097545&view=diff
==============================================================================
--- incubator/wink/trunk/wink-providers/wink-jackson-provider/pom.xml (original)
+++ incubator/wink/trunk/wink-providers/wink-jackson-provider/pom.xml Thu Apr 28 16:54:45 2011
@@ -64,7 +64,7 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
+ <artifactId>spring-context</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -74,7 +74,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee_1.4_spec</artifactId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: incubator/wink/trunk/wink-providers/wink-jettison-provider/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-providers/wink-jettison-provider/pom.xml?rev=1097545&r1=1097544&r2=1097545&view=diff
==============================================================================
--- incubator/wink/trunk/wink-providers/wink-jettison-provider/pom.xml (original)
+++ incubator/wink/trunk/wink-providers/wink-jettison-provider/pom.xml Thu Apr 28 16:54:45 2011
@@ -54,7 +54,7 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
+ <artifactId>spring-context</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -64,7 +64,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee_1.4_spec</artifactId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: incubator/wink/trunk/wink-providers/wink-json-provider/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-providers/wink-json-provider/pom.xml?rev=1097545&r1=1097544&r2=1097545&view=diff
==============================================================================
--- incubator/wink/trunk/wink-providers/wink-json-provider/pom.xml (original)
+++ incubator/wink/trunk/wink-providers/wink-json-provider/pom.xml Thu Apr 28 16:54:45 2011
@@ -38,7 +38,7 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
+ <artifactId>spring-context</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -52,7 +52,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee_1.4_spec</artifactId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: incubator/wink/trunk/wink-providers/wink-json4j-provider/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-providers/wink-json4j-provider/pom.xml?rev=1097545&r1=1097544&r2=1097545&view=diff
==============================================================================
--- incubator/wink/trunk/wink-providers/wink-json4j-provider/pom.xml (original)
+++ incubator/wink/trunk/wink-providers/wink-json4j-provider/pom.xml Thu Apr 28 16:54:45 2011
@@ -42,7 +42,7 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
+ <artifactId>spring-context</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -51,7 +51,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee_1.4_spec</artifactId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: incubator/wink/trunk/wink-providers/wink-protobuf-provider/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-providers/wink-protobuf-provider/pom.xml?rev=1097545&r1=1097544&r2=1097545&view=diff
==============================================================================
--- incubator/wink/trunk/wink-providers/wink-protobuf-provider/pom.xml (original)
+++ incubator/wink/trunk/wink-providers/wink-protobuf-provider/pom.xml Thu Apr 28 16:54:45 2011
@@ -51,7 +51,7 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
+ <artifactId>spring-context</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -61,7 +61,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee_1.4_spec</artifactId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: incubator/wink/trunk/wink-providers/wink-thrift-provider/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-providers/wink-thrift-provider/pom.xml?rev=1097545&r1=1097544&r2=1097545&view=diff
==============================================================================
--- incubator/wink/trunk/wink-providers/wink-thrift-provider/pom.xml (original)
+++ incubator/wink/trunk/wink-providers/wink-thrift-provider/pom.xml Thu Apr 28 16:54:45 2011
@@ -35,11 +35,10 @@
<artifactId>wink-common</artifactId>
</dependency>
- <!-- [rfeng] The official thift jar is not in maven repo, see https://issues.apache.org/jira/browse/THRIFT-363 -->
<dependency>
- <groupId>org.apache.hadoop</groupId>
+ <groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
- <version>0.5.0.0</version>
+ <version>0.6.1</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -60,7 +59,7 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
+ <artifactId>spring-context</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -70,7 +69,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee_1.4_spec</artifactId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: incubator/wink/trunk/wink-server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/pom.xml?rev=1097545&r1=1097544&r2=1097545&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/pom.xml (original)
+++ incubator/wink/trunk/wink-server/pom.xml Thu Apr 28 16:54:45 2011
@@ -47,11 +47,11 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee_1.4_spec</artifactId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
+ <artifactId>spring-context</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: incubator/wink/trunk/wink-spring-support/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-spring-support/pom.xml?rev=1097545&r1=1097544&r2=1097545&view=diff
==============================================================================
--- incubator/wink/trunk/wink-spring-support/pom.xml (original)
+++ incubator/wink/trunk/wink-spring-support/pom.xml Thu Apr 28 16:54:45 2011
@@ -33,7 +33,11 @@
<dependencies>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
+ <artifactId>spring-context</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -55,7 +59,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee_1.4_spec</artifactId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.wink</groupId>
Modified: incubator/wink/trunk/wink-webdav/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-webdav/pom.xml?rev=1097545&r1=1097544&r2=1097545&view=diff
==============================================================================
--- incubator/wink/trunk/wink-webdav/pom.xml (original)
+++ incubator/wink/trunk/wink-webdav/pom.xml Thu Apr 28 16:54:45 2011
@@ -67,7 +67,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee_1.4_spec</artifactId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
<scope>test</scope>
</dependency>
<dependency>