Author: cbrisson
Date: Sun Oct 16 07:30:32 2016
New Revision: 1765120
URL: http://svn.apache.org/viewvc?rev=1765120&view=rev
Log:
[tools] more library upgrading and pom cleaning
- upgrade maven plugins versions
- junit, slf4j and surefire versions factorization
- servlet api version factorization
- upgrade to servlet api 3.0.1 (implies a few fixes in ParameterTool,
CookieToolTests and LinkToolTests)
Modified:
velocity/tools/trunk/pom.xml
velocity/tools/trunk/velocity-tools-assembly/pom.xml
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-struts/pom.xml
velocity/tools/trunk/velocity-tools-generic/pom.xml
velocity/tools/trunk/velocity-tools-struts/pom.xml
velocity/tools/trunk/velocity-tools-view-jsp/pom.xml
velocity/tools/trunk/velocity-tools-view/pom.xml
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ParameterTool.java
velocity/tools/trunk/velocity-tools-view/src/test/java/org/apache/velocity/tools/test/blackbox/CookieToolTests.java
velocity/tools/trunk/velocity-tools-view/src/test/java/org/apache/velocity/tools/test/blackbox/LinkToolTests.java
velocity/tools/trunk/velocity-tools-xml/pom.xml
Modified: velocity/tools/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/pom.xml?rev=1765120&r1=1765119&r2=1765120&view=diff
==============================================================================
--- velocity/tools/trunk/pom.xml (original)
+++ velocity/tools/trunk/pom.xml Sun Oct 16 07:30:32 2016
@@ -44,7 +44,11 @@
<inceptionYear>2002</inceptionYear>
<properties>
- <slf4j.version>1.7.21</slf4j.version>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <junit.version>4.12</junit.version>
+ <slf4j.version>1.7.21</slf4j.version>
+ <surefire.plugin.version>2.19.1</surefire.plugin.version>
+ <servlet.api.version>3.0.1</servlet.api.version>
</properties>
<build>
Modified: velocity/tools/trunk/velocity-tools-assembly/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-assembly/pom.xml?rev=1765120&r1=1765119&r2=1765120&view=diff
==============================================================================
--- velocity/tools/trunk/velocity-tools-assembly/pom.xml (original)
+++ velocity/tools/trunk/velocity-tools-assembly/pom.xml Sun Oct 16 07:30:32
2016
@@ -37,7 +37,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-5</version>
+ <version>2.6</version>
<configuration>
<descriptors>
<descriptor>src/main/assembly/all.xml</descriptor>
@@ -49,7 +49,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.5.2</version>
<configuration>
<createChecksum>true</createChecksum>
</configuration>
@@ -115,7 +115,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-5</version>
+ <version>2.6</version>
<executions>
<execution>
<id>make-assembly</id>
@@ -142,7 +142,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
+ <version>1.8</version>
<executions>
<execution>
<phase>deploy</phase>
@@ -174,6 +174,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>wagon-maven-plugin</artifactId>
+ <version>1.0</version>
<executions>
<execution>
<phase>deploy</phase>
Modified:
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-struts/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-struts/pom.xml?rev=1765120&r1=1765119&r2=1765120&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-struts/pom.xml
(original)
+++
velocity/tools/trunk/velocity-tools-examples/velocity-tools-examples-struts/pom.xml
Sun Oct 16 07:30:32 2016
@@ -37,8 +37,8 @@
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>${servlet.api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: velocity/tools/trunk/velocity-tools-generic/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/pom.xml?rev=1765120&r1=1765119&r2=1765120&view=diff
==============================================================================
--- velocity/tools/trunk/velocity-tools-generic/pom.xml (original)
+++ velocity/tools/trunk/velocity-tools-generic/pom.xml Sun Oct 16 07:30:32 2016
@@ -54,13 +54,14 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.12</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${slf4j.version}</version>
+ <scope>test</scope>
</dependency>
</dependencies>
</project>
Modified: velocity/tools/trunk/velocity-tools-struts/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-struts/pom.xml?rev=1765120&r1=1765119&r2=1765120&view=diff
==============================================================================
--- velocity/tools/trunk/velocity-tools-struts/pom.xml (original)
+++ velocity/tools/trunk/velocity-tools-struts/pom.xml Sun Oct 16 07:30:32 2016
@@ -43,8 +43,8 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>${servlet.api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: velocity/tools/trunk/velocity-tools-view-jsp/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view-jsp/pom.xml?rev=1765120&r1=1765119&r2=1765120&view=diff
==============================================================================
--- velocity/tools/trunk/velocity-tools-view-jsp/pom.xml (original)
+++ velocity/tools/trunk/velocity-tools-view-jsp/pom.xml Sun Oct 16 07:30:32
2016
@@ -38,8 +38,8 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>${servlet.api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: velocity/tools/trunk/velocity-tools-view/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/pom.xml?rev=1765120&r1=1765119&r2=1765120&view=diff
==============================================================================
--- velocity/tools/trunk/velocity-tools-view/pom.xml (original)
+++ velocity/tools/trunk/velocity-tools-view/pom.xml Sun Oct 16 07:30:32 2016
@@ -36,6 +36,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.plugin.version}</version>
<configuration>
<includes>
<include>**/Test*.java</include>
@@ -55,14 +56,14 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>${servlet.api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.12</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified:
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ParameterTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ParameterTool.java?rev=1765120&r1=1765119&r2=1765120&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ParameterTool.java
(original)
+++
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ParameterTool.java
Sun Oct 16 07:30:32 2016
@@ -195,7 +195,7 @@ public class ParameterTool extends Value
Array.getLength(value) == 1);
}
- private Map<String,Object> expandSingletonArrays(Map<String,Object>
original)
+ private Map<String,Object> expandSingletonArrays(Map<String,String[]>
original)
{
Map<String,Object> expanded = new HashMap<String,Object>(original);
for (Map.Entry<String,Object> entry : expanded.entrySet())
Modified:
velocity/tools/trunk/velocity-tools-view/src/test/java/org/apache/velocity/tools/test/blackbox/CookieToolTests.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/test/java/org/apache/velocity/tools/test/blackbox/CookieToolTests.java?rev=1765120&r1=1765119&r2=1765120&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-view/src/test/java/org/apache/velocity/tools/test/blackbox/CookieToolTests.java
(original)
+++
velocity/tools/trunk/velocity-tools-view/src/test/java/org/apache/velocity/tools/test/blackbox/CookieToolTests.java
Sun Oct 16 07:30:32 2016
@@ -40,16 +40,20 @@ import org.junit.Test;
*/
public class CookieToolTests
{
- private CookieTool newCookieTool(InvocationHandler handler)
+ private CookieTool newCookieTool(InvocationHandler requestHandler,
InvocationHandler responseHandler)
{
- Object proxy
+ Object requestProxy
= Proxy.newProxyInstance(this.getClass().getClassLoader(),
- new Class[] { HttpServletRequest.class,
- HttpServletResponse.class },
- handler);
+ new Class[] { HttpServletRequest.class },
+ requestHandler);
- HttpServletRequest request = (HttpServletRequest)proxy;
- HttpServletResponse response = (HttpServletResponse)proxy;
+ Object responseProxy
+ = Proxy.newProxyInstance(this.getClass().getClassLoader(),
+ new Class[] { HttpServletResponse.class },
+ responseHandler);
+
+ HttpServletRequest request = (HttpServletRequest)requestProxy;
+ HttpServletResponse response = (HttpServletResponse)responseProxy;
CookieTool cookies = new CookieTool();
cookies.setRequest(request);
@@ -59,7 +63,7 @@ public class CookieToolTests
private CookieTool newCookieTool(Map cookies)
{
- return newCookieTool(new ServletAdaptor(cookies));
+ return newCookieTool(new RequestAdaptor(cookies), new
ResponseAdaptor(cookies));
}
private CookieTool newCookieTool(String name, Object value)
@@ -132,11 +136,12 @@ public class CookieToolTests
{
Map jar = new LinkedHashMap();
jar.put("a", "b");
- ServletAdaptor proxy = new ServletAdaptor(jar);
- CookieTool cookies = newCookieTool(proxy);
+ RequestAdaptor requestProxy = new RequestAdaptor(jar);
+ ResponseAdaptor responseProxy = new ResponseAdaptor(jar);
+ CookieTool cookies = newCookieTool(requestProxy, responseProxy);
assertEquals("", cookies.add("a","b"));
- cookies = newCookieTool(proxy);
+ cookies = newCookieTool(requestProxy, responseProxy);
assertNotNull(cookies.get("a"));
assertEquals("b", cookies.get("a").getValue());
}
@@ -145,11 +150,12 @@ public class CookieToolTests
{
Map jar = new LinkedHashMap();
jar.put("a", "b");
- ServletAdaptor proxy = new ServletAdaptor(jar);
- CookieTool cookies = newCookieTool(proxy);
+ RequestAdaptor requestProxy = new RequestAdaptor(jar);
+ ResponseAdaptor responseProxy = new ResponseAdaptor(jar);
+ CookieTool cookies = newCookieTool(requestProxy, responseProxy);
assertEquals("", cookies.add("a","b", 10));
- cookies = newCookieTool(proxy);
+ cookies = newCookieTool(requestProxy, responseProxy);
Cookie c = cookies.get("a");
assertNotNull(c);
assertEquals("b", c.getValue());
@@ -160,12 +166,13 @@ public class CookieToolTests
{
Map jar = new LinkedHashMap();
jar.put("a", "b");
- ServletAdaptor proxy = new ServletAdaptor(jar);
- CookieTool cookies = newCookieTool(proxy);
+ RequestAdaptor requestProxy = new RequestAdaptor(jar);
+ ResponseAdaptor responseProxy = new ResponseAdaptor(jar);
+ CookieTool cookies = newCookieTool(requestProxy, responseProxy);
assertEquals("b", cookies.get("a").toString());
cookies.delete("a");
- cookies = newCookieTool(proxy);
+ cookies = newCookieTool(requestProxy, responseProxy);
assertNull(cookies.get("a"));
}
}
Modified:
velocity/tools/trunk/velocity-tools-view/src/test/java/org/apache/velocity/tools/test/blackbox/LinkToolTests.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/test/java/org/apache/velocity/tools/test/blackbox/LinkToolTests.java?rev=1765120&r1=1765119&r2=1765120&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-view/src/test/java/org/apache/velocity/tools/test/blackbox/LinkToolTests.java
(original)
+++
velocity/tools/trunk/velocity-tools-view/src/test/java/org/apache/velocity/tools/test/blackbox/LinkToolTests.java
Sun Oct 16 07:30:32 2016
@@ -46,16 +46,20 @@ public class LinkToolTests
ConfigValues() { setReadOnly(false); }
}
- private LinkTool newLinkTool(InvocationHandler handler)
+ private LinkTool newLinkTool(InvocationHandler requestHandler,
InvocationHandler responseHandler)
{
- Object proxy
+ Object requestProxy
= Proxy.newProxyInstance(this.getClass().getClassLoader(),
- new Class[] { HttpServletRequest.class,
- HttpServletResponse.class },
- handler);
+ new Class[] { HttpServletRequest.class },
+ requestHandler);
- HttpServletRequest request = (HttpServletRequest)proxy;
- HttpServletResponse response = (HttpServletResponse)proxy;
+ Object responseProxy
+ = Proxy.newProxyInstance(this.getClass().getClassLoader(),
+ new Class[] { HttpServletResponse.class },
+ responseHandler);
+
+ HttpServletRequest request = (HttpServletRequest)requestProxy;
+ HttpServletResponse response = (HttpServletResponse)responseProxy;
LinkTool link = new LinkTool();
ValueParser properties = new ConfigValues();
@@ -67,7 +71,7 @@ public class LinkToolTests
private LinkTool newLinkTool(Map params)
{
- return newLinkTool(new ServletAdaptor("/test","/link.vm", params));
+ return newLinkTool(new RequestAdaptor("/test","/link.vm", params), new
ResponseAdaptor(params));
}
private LinkTool newLinkTool(String key, Object value)
Modified: velocity/tools/trunk/velocity-tools-xml/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-xml/pom.xml?rev=1765120&r1=1765119&r2=1765120&view=diff
==============================================================================
--- velocity/tools/trunk/velocity-tools-xml/pom.xml (original)
+++ velocity/tools/trunk/velocity-tools-xml/pom.xml Sun Oct 16 07:30:32 2016
@@ -49,7 +49,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.12</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
