Author: taylor
Date: Tue Dec 30 01:26:39 2014
New Revision: 1648460
URL: http://svn.apache.org/r1648460
Log:
JS2-1306: updating dependencies for Velocity 1.7
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-cm/pom.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/mocks/BaseMockServletContext.java
portals/jetspeed-2/portal/trunk/components/jetspeed-db-tools/pom.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/pom.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/pom.xml
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/mockobjects/MockHttpServletRequest.java
portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/pom.xml
portals/jetspeed-2/portal/trunk/pom.xml
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-cm/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-cm/pom.xml?rev=1648460&r1=1648459&r2=1648460&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-cm/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-cm/pom.xml Tue Dec 30
01:26:39 2014
@@ -115,7 +115,7 @@
</dependency>
<dependency>
<groupId>com.mockrunner</groupId>
- <artifactId>mockrunner-jdk1.5-j2ee1.3</artifactId>
+ <artifactId>mockrunner-servlet</artifactId>
<scope>provided</scope>
</dependency>
<!--
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/mocks/BaseMockServletContext.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/mocks/BaseMockServletContext.java?rev=1648460&r1=1648459&r2=1648460&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/mocks/BaseMockServletContext.java
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/mocks/BaseMockServletContext.java
Tue Dec 30 01:26:39 2014
@@ -16,12 +16,11 @@
*/
package org.apache.jetspeed.mocks;
-import java.util.HashMap;
-import java.util.Map;
+import com.mockrunner.mock.web.MockServletContext;
import javax.servlet.ServletContext;
-
-import com.mockrunner.mock.web.MockServletContext;
+import java.util.HashMap;
+import java.util.Map;
@SuppressWarnings("deprecation")
public abstract class BaseMockServletContext extends MockServletContext
implements ServletContext
@@ -179,4 +178,8 @@ public abstract class BaseMockServletCon
throw new UnsupportedOperationException("The method called has not
been implemented.");
}
+ @Override
+ public synchronized boolean setInitParameter(String s, String s1) {
+ return super.setInitParameter(s, s1);
+ }
}
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-db-tools/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-db-tools/pom.xml?rev=1648460&r1=1648459&r2=1648460&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-db-tools/pom.xml
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-db-tools/pom.xml Tue
Dec 30 01:26:39 2014
@@ -39,9 +39,9 @@
<!-- Runtime container dependencies (for commandline or standalone maven
plugin executions) -->
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.4_spec</artifactId>
- <version>${geronimo-servlet_2.4_spec.version}</version>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>${javax.servlet.version}</version>
</dependency>
<dependency>
<groupId>org.apache.portals</groupId>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml?rev=1648460&r1=1648459&r2=1648460&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml Tue Dec
30 01:26:39 2014
@@ -254,7 +254,7 @@
</dependency>
<dependency>
<groupId>com.mockrunner</groupId>
- <artifactId>mockrunner-jdk1.5-j2ee1.3</artifactId>
+ <artifactId>mockrunner-servlet</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/pom.xml?rev=1648460&r1=1648459&r2=1648460&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/pom.xml
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/pom.xml
Tue Dec 30 01:26:39 2014
@@ -77,7 +77,7 @@
</dependency>
<dependency>
<groupId>com.mockrunner</groupId>
- <artifactId>mockrunner-jdk1.5-j2ee1.3</artifactId>
+ <artifactId>mockrunner-servlet</artifactId>
<scope>test</scope>
</dependency>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/pom.xml?rev=1648460&r1=1648459&r2=1648460&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/pom.xml
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/pom.xml Tue
Dec 30 01:26:39 2014
@@ -81,7 +81,7 @@
</dependency>
<dependency>
<groupId>com.mockrunner</groupId>
- <artifactId>mockrunner-jdk1.5-j2ee1.3</artifactId>
+ <artifactId>mockrunner-servlet</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified:
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/mockobjects/MockHttpServletRequest.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/mockobjects/MockHttpServletRequest.java?rev=1648460&r1=1648459&r2=1648460&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/mockobjects/MockHttpServletRequest.java
(original)
+++
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/mockobjects/MockHttpServletRequest.java
Tue Dec 30 01:26:39 2014
@@ -15,20 +15,28 @@
* limitations under the License.
*/
package org.apache.jetspeed.mockobjects;
+import javax.servlet.AsyncContext;
+import javax.servlet.DispatcherType;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletInputStream;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import javax.servlet.http.Part;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.security.Principal;
+import java.util.Collection;
import java.util.Enumeration;
import java.util.Locale;
import java.util.Map;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
/**
* @author <a href="mailto:swea...@einnovation.com";>Scott T. Weaver</a>
*
@@ -520,4 +528,64 @@ public class MockHttpServletRequest impl
// TODO Auto-generated method stub
return 0;
}
+
+ @Override
+ public boolean authenticate(HttpServletResponse httpServletResponse)
throws IOException, ServletException {
+ return false;
+ }
+
+ @Override
+ public void login(String s, String s1) throws ServletException {
+
+ }
+
+ @Override
+ public void logout() throws ServletException {
+
+ }
+
+ @Override
+ public Collection<Part> getParts() throws IOException, ServletException {
+ return null;
+ }
+
+ @Override
+ public Part getPart(String s) throws IOException, ServletException {
+ return null;
+ }
+
+ @Override
+ public ServletContext getServletContext() {
+ return null;
+ }
+
+ @Override
+ public AsyncContext startAsync() throws IllegalStateException {
+ return null;
+ }
+
+ @Override
+ public AsyncContext startAsync(ServletRequest servletRequest,
ServletResponse servletResponse) throws IllegalStateException {
+ return null;
+ }
+
+ @Override
+ public boolean isAsyncStarted() {
+ return false;
+ }
+
+ @Override
+ public boolean isAsyncSupported() {
+ return false;
+ }
+
+ @Override
+ public AsyncContext getAsyncContext() {
+ return null;
+ }
+
+ @Override
+ public DispatcherType getDispatcherType() {
+ return null;
+ }
}
Modified:
portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/pom.xml?rev=1648460&r1=1648459&r2=1648460&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/pom.xml
(original)
+++
portals/jetspeed-2/portal/trunk/jetspeed-archetype/src/main/resources/archetype-resources/pom.xml
Tue Dec 30 01:26:39 2014
@@ -36,8 +36,9 @@
<org.apache.portals.applications.apa-logging.version>1.0</org.apache.portals.applications.apa-logging.version>
<ccpp.version>1.0</ccpp.version>
<org.apache.portals.bridges.common.version>2.0</org.apache.portals.bridges.common.version>
-
<geronimo-servlet_2.4_spec.version>1.1.1</geronimo-servlet_2.4_spec.version>
<portals.portlet2-api-spec.version>1.0</portals.portlet2-api-spec.version>
+ <javax.servlet.version>3.0.1</javax.servlet.version>
+ <javax.servlet.jsp.version>2.2.1</javax.servlet.jsp.version>
<javax.servlet.jstl.version>1.2</javax.servlet.jstl.version>
<portal.context.name>${artifactId}</portal.context.name>
<org.apache.jetspeed.server.home>/opt/apache-tomcat-6.0.33/</org.apache.jetspeed.server.home>
@@ -51,9 +52,9 @@
<version>${dollar}{portals.portlet2-api-spec.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.4_spec</artifactId>
- <version>${dollar}{geronimo-servlet_2.4_spec.version}</version>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>${dollar}{javax.servlet.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -66,8 +67,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.4_spec</artifactId>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
@@ -80,8 +81,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.7</source>
+ <target>1.7</target>
<debug>true</debug>
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
Modified: portals/jetspeed-2/portal/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/pom.xml?rev=1648460&r1=1648459&r2=1648460&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/pom.xml Tue Dec 30 01:26:39 2014
@@ -212,7 +212,7 @@
<jmock.version>1.2.0</jmock.version>
<jmock-cglib.version>1.1.0</jmock-cglib.version>
<junit.version>3.8.1</junit.version>
- <mockrunner.version>0.4</mockrunner.version>
+ <mockrunner.version>1.0.5</mockrunner.version>
<org.apache.maven.artifact.ant.version>2.0.5</org.apache.maven.artifact.ant.version>
<!--
Bug: using specific version of surefire plugin
@@ -253,8 +253,8 @@
<geronimo-javamail_1.4_spec.version>1.6</geronimo-javamail_1.4_spec.version>
<geronimo-javamail_1.4_provider.version>1.7</geronimo-javamail_1.4_provider.version>
<javax.servlet.jstl.version>1.1.2</javax.servlet.jstl.version>
-
<geronimo-servlet_2.4_spec.version>1.1.1</geronimo-servlet_2.4_spec.version>
- <geronimo-jsp_2.0_spec.version>1.1</geronimo-jsp_2.0_spec.version>
+ <javax.servlet.version>3.0.1</javax.servlet.version>
+ <javax.servlet.jsp.version>2.2.1</javax.servlet.jsp.version>
<javax.sql.version>2.0</javax.sql.version>
<geronimo-jta_1.1_spec.version>1.1</geronimo-jta_1.1_spec.version>
<javax.ws.rs.version>1.0</javax.ws.rs.version>
@@ -273,15 +273,15 @@
<ojb.version>1.0.3</ojb.version>
<org.apache.derby.version>10.3.2.1</org.apache.derby.version>
<org.apache.pluto.version>2.0.3</org.apache.pluto.version>
-
<org.apache.portals.bridges.common.version>2.0</org.apache.portals.bridges.common.version>
+
<org.apache.portals.bridges.common.version>2.1-SNAPSHOT</org.apache.portals.bridges.common.version>
<org.apache.portals.bridges.frameworks.version>1.0.4</org.apache.portals.bridges.frameworks.version>
-
<org.apache.portals.bridges.velocity.version>2.0</org.apache.portals.bridges.velocity.version>
+
<org.apache.portals.bridges.velocity.version>2.1-SNAPSHOT</org.apache.portals.bridges.velocity.version>
<org.apache.portals.bridges.groovy.version>1.0.4</org.apache.portals.bridges.groovy.version>
<org.apache.portals.bridges.portletfilter.version>1.0.4</org.apache.portals.bridges.portletfilter.version>
<org.apache.portals.applications.apa-demo.version>1.2</org.apache.portals.applications.apa-demo.version>
<org.apache.portals.applications.apa-gems.version>1.1</org.apache.portals.applications.apa-gems.version>
<org.apache.portals.applications.apa-logging.version>1.0</org.apache.portals.applications.apa-logging.version>
-
<org.apache.portals.applications.apa-rss.version>1.2</org.apache.portals.applications.apa-rss.version>
+
<org.apache.portals.applications.apa-rss.version>1.3-SNAPSHOT</org.apache.portals.applications.apa-rss.version>
<org.apache.portals.applications.apa-webcontent2.version>2.0-SNAPSHOT</org.apache.portals.applications.apa-webcontent2.version>
<org.apache.portals.applications.apa-dbbrowser.version>1.2</org.apache.portals.applications.apa-dbbrowser.version>
<org.openid4java.version>0.9.5</org.openid4java.version>
@@ -298,7 +298,7 @@
<taglibs-request.version>1.0.1</taglibs-request.version>
<taglibs-standard.version>1.1.2</taglibs-standard.version>
<velocity-tools.version>1.3</velocity-tools.version>
- <velocity.version>1.6.3</velocity.version>
+ <velocity.version>1.7</velocity.version>
<xalan.version>2.4.1</xalan.version>
<xerces.version>2.8.1</xerces.version>
<xml-apis.version>2.0.2</xml-apis.version>
@@ -562,14 +562,16 @@
<version>${portals.portlet2-api-spec.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.4_spec</artifactId>
- <version>${geronimo-servlet_2.4_spec.version}</version>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>${javax.servlet.version}</version>
+ <!--<scope>provided</scope>-->
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsp_2.0_spec</artifactId>
- <version>${geronimo-jsp_2.0_spec.version}</version>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>javax.servlet.jsp-api</artifactId>
+ <version>${javax.servlet.jsp.version}</version>
+ <!--<scope>provided</scope>-->
</dependency>
<dependency>
<groupId>javax.ccpp</groupId>
@@ -1126,7 +1128,7 @@
</dependency>
<dependency>
<groupId>com.mockrunner</groupId>
- <artifactId>mockrunner-jdk1.5-j2ee1.3</artifactId>
+ <artifactId>mockrunner-servlet</artifactId>
<version>${mockrunner.version}</version>
<scope>test</scope>
<exclusions>
@@ -1530,13 +1532,13 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.4_spec</artifactId>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsp_2.0_spec</artifactId>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>javax.servlet.jsp-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscr...@portals.apache.org
For additional commands, e-mail: jetspeed-dev-h...@portals.apache.org
