Mailing-List: contact commits-help@jspwiki.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@jspwiki.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1551727 - in /jspwiki/trunk: ChangeLog ReleaseNotes
 UPGRADING
 jspwiki-war/src/main/java/org/apache/wiki/Release.java
Date: Tue, 17 Dec 2013 21:39:33 -0000
To: commits@jspwiki.apache.org
From: juanpablo@apache.org
Message-Id: <20131217213934.266322388993@eris.apache.org>

Author: juanpablo
Date: Tue Dec 17 21:39:33 2013
New Revision: 1551727

URL: http://svn.apache.org/r1551727
Log:
basic testing seems ok, preparing first RC for 2.10.0

Modified:
    jspwiki/trunk/ChangeLog
    jspwiki/trunk/ReleaseNotes
    jspwiki/trunk/UPGRADING
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java

Modified: jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1551727&r1=1551726&r2=1551727&view=diff
==============================================================================
--- jspwiki/trunk/ChangeLog (original)
+++ jspwiki/trunk/ChangeLog Tue Dec 17 21:39:33 2013
@@ -1,5 +1,7 @@
 2013-12-17  Juan Pablo Santos (juanpablo AT apache DOT org)
 
+       * 2.10.0 - first RC 
+       
        * 2.10.0-svn-57
        
        * JSPWIKI-758: dropped support for RCS (as per 2.9.1 notes on UPGRADING document)

Modified: jspwiki/trunk/ReleaseNotes
URL: http://svn.apache.org/viewvc/jspwiki/trunk/ReleaseNotes?rev=1551727&r1=1551726&r2=1551727&view=diff
==============================================================================
--- jspwiki/trunk/ReleaseNotes (original)
+++ jspwiki/trunk/ReleaseNotes Tue Dec 17 21:39:33 2013
@@ -1,4 +1,53 @@
 
+Apache JSPWiki 2.10.0 - Release Notes
+=====================================
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.  
+
+The license file can be found in LICENSE.
+
+
+Welcome to the stable version of Apache JSPWiki 2.10.0!
+
+Apache JSPWiki 2.10.0 is the first JSPWiki release made as an Apache TLP. This release
+features, among other things:
+  * use of jspwiki-custom.properties to override specific values of jspwiki.properties file
+  * proxy support through X-Forwarded-For request header
+  * merging and compression of css & js
+  * upgrade of used libraries
+    -> lucene to 4.6
+    -> commons.io to 2.4
+    -> hsqldb to 2.3.0 (for testing)
+    -> jetty to 8.1.12 (for testing)
+    -> ehcache replacing oscache
+  * switch to maven as build tool
+  * jspwiki artifacts published at Central repository (org.apache.jspwiki groupId)
+  * dropped RCS support
+
+There have also been some public API changes, detailed at:
+http://svn.apache.org/repos/asf/jspwiki/trunk/jspwiki-war/src/main/config/doc/2.10-API.txt
+
+Details are available in the ChangeLog file or via our issue tracker.
+
+Please report any issues at https://issues.apache.org/jira/browse/JSPWIKI
+
+
+
 Apache JSPWiki 2.9.1-incubating - Release Notes
 ===============================================
 

Modified: jspwiki/trunk/UPGRADING
URL: http://svn.apache.org/viewvc/jspwiki/trunk/UPGRADING?rev=1551727&r1=1551726&r2=1551727&view=diff
==============================================================================
--- jspwiki/trunk/UPGRADING (original)
+++ jspwiki/trunk/UPGRADING Tue Dec 17 21:39:33 2013
@@ -1,6 +1,6 @@
 
-Apache JSPWiki 2.9.0-incubating - Upgrading Notes
-=================================================
+Apache JSPWiki 2.10.0-incubating - Upgrading Notes
+==================================================
 
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ -21,6 +21,13 @@ Apache JSPWiki 2.9.0-incubating - Upgrad
 
 The license file can be found in LICENSE.
 
+Upgrading JSPWiki to 2.10.0
+---------------------------
+
+1. There have been some public API changes, detailed at:
+http://svn.apache.org/repos/asf/jspwiki/trunk/jspwiki-war/src/main/config/doc/2.10-API.txt
+
+2. RCS Support dropped, as noted on 2.9.1 upgrade notes
 
 
 Upgrading JSPWiki to 2.9.1

Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java?rev=1551727&r1=1551726&r2=1551727&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java Tue Dec 17 21:39:33 2013
@@ -52,7 +52,7 @@ public final class Release {
      *  <p>
      *  If the POSTFIX is empty, it is not added to the version string.
      */
-    private static final String    POSTFIX       = "svn";
+    private static final String    POSTFIX       = "";
 
     /** The JSPWiki major version. */
     public static final int        VERSION       = 2;
@@ -72,7 +72,7 @@ public final class Release {
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "57";
+    public static final String     BUILD         = "";
     
     /**
      *  This is the generic version string you should use when printing out the version.  It is of