You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by gm...@apache.org on 2013/07/11 18:18:37 UTC
svn commit: r1502266 - in /incubator/jspwiki/trunk: ./ jspwiki-war/
jspwiki-war/src/main/java/org/apache/wiki/ jspwiki-war/src/main/webapp/
jspwiki-war/src/main/webapp/WEB-INF/
Author: gmazza
Date: Thu Jul 11 16:18:36 2013
New Revision: 1502266
URL: http://svn.apache.org/r1502266
Log:
JSP updates
Removed:
incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/WEB-INF/jstl-fmt.tld
incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/WEB-INF/oscache.tld
Modified:
incubator/jspwiki/trunk/jspwiki-war/pom.xml
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/SisterSites.jsp
incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/rss.jsp
incubator/jspwiki/trunk/pom.xml
Modified: incubator/jspwiki/trunk/jspwiki-war/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/pom.xml?rev=1502266&r1=1502265&r2=1502266&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/pom.xml (original)
+++ incubator/jspwiki/trunk/jspwiki-war/pom.xml Thu Jul 11 16:18:36 2013
@@ -144,11 +144,6 @@
</dependency>
<dependency>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
- </dependency>
-
- <dependency>
<groupId>net.sourceforge.stripes</groupId>
<artifactId>stripes</artifactId>
</dependency>
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java?rev=1502266&r1=1502265&r2=1502266&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java Thu Jul 11 16:18:36 2013
@@ -75,7 +75,7 @@ public final class Release
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "15";
+ public static final String BUILD = "16";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/SisterSites.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/SisterSites.jsp?rev=1502266&r1=1502265&r2=1502266&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/SisterSites.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/SisterSites.jsp Thu Jul 11 16:18:36 2013
@@ -23,7 +23,7 @@
<%@ page import="org.apache.wiki.preferences.Preferences" %>
<%@ page import="org.apache.wiki.rss.*" %>
<%@ page import="org.apache.wiki.util.*" %>
-<%@ taglib uri="/WEB-INF/oscache.tld" prefix="oscache" %>
+<%@ taglib uri="http://www.opensymphony.com/oscache" prefix="oscache" %>
<%!
Logger log = Logger.getLogger("JSPWiki");
%>
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/rss.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/rss.jsp?rev=1502266&r1=1502265&r2=1502266&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/rss.jsp (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/rss.jsp Thu Jul 11 16:18:36 2013
@@ -26,7 +26,7 @@
<%@ page import="org.apache.wiki.rss.*" %>
<%@ page import="org.apache.wiki.util.*" %>
<%@ page import="com.opensymphony.oscache.base.*" %>
-<%@ taglib uri="/WEB-INF/oscache.tld" prefix="oscache" %>
+<%@ taglib uri="http://www.opensymphony.com/oscache" prefix="oscache" %>
<%!
Logger log = Logger.getLogger("JSPWiki");
Modified: incubator/jspwiki/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/pom.xml?rev=1502266&r1=1502265&r2=1502266&view=diff
==============================================================================
--- incubator/jspwiki/trunk/pom.xml (original)
+++ incubator/jspwiki/trunk/pom.xml Thu Jul 11 16:18:36 2013
@@ -103,7 +103,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
- <version>1.1.2</version>
+ <version>1.2</version>
</dependency>
<dependency>
@@ -249,12 +249,6 @@
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
- <version>1.1.2</version>
- <scope>runtime</scope>
- </dependency>
</dependencies>
</dependencyManagement>