Author: jalkanen
Date: Sun Mar 30 03:42:34 2008
New Revision: 642703
URL: http://svn.apache.org/viewvc?rev=642703&view=rev
Log:
Switched to ASF copyright, removed @author
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
Modified: incubator/jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=642703&r1=642702&r2=642703&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sun Mar 30 03:42:34 2008
@@ -1,3 +1,12 @@
+2008-03-30 Janne Jalkanen <[EMAIL PROTECTED]>
+
+ * 2.7.0-svn-1
+
+ * Removed JDK 1.4 dependency in AdminBeanManager.
+
+ * Switched copyright in Release.java to ASF. Please use
+ this file as your reference when changing the boilerplate.
+
2008-03-29 Janne Jalkanen <[EMAIL PROTECTED]>
* 2.6.2
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java?rev=642703&r1=642702&r2=642703&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java Sun Mar 30
03:42:34 2008
@@ -1,21 +1,19 @@
/*
JSPWiki - a JSP-based WikiWiki clone.
- Copyright (C) 2001-2007 Janne Jalkanen ([EMAIL PROTECTED])
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation; either version 2.1 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Copyright 2008 The Apache Software Foundation
+
+ Licensed 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.
*/
package com.ecyrd.jspwiki;
@@ -36,7 +34,6 @@
* to the CVS history, it dates from 6.7.2001, and it really hasn't changed
* much since.
* </p>
- * @author Janne Jalkanen
* @since 1.0
*/
public final class Release
@@ -77,7 +74,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "0";
+ public static final String BUILD = "1";
/**
* This is the generic version string you should use
