You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by tv...@apache.org on 2018/08/21 09:04:02 UTC
svn commit: r1838533 - in /commons/proper/jcs/branches/commons-jcs-2.2.x: ./
commons-jcs-core/ commons-jcs-dist/ commons-jcs-jcache-extras/
commons-jcs-jcache-openjpa/ commons-jcs-jcache/ commons-jcs-tck-tests/
src/changes/
Author: tv
Date: Tue Aug 21 09:04:02 2018
New Revision: 1838533
URL: http://svn.apache.org/viewvc?rev=1838533&view=rev
Log:
Prepare release candidate for 2.2.1
Modified:
commons/proper/jcs/branches/commons-jcs-2.2.x/RELEASE-NOTES.txt
commons/proper/jcs/branches/commons-jcs-2.2.x/commons-jcs-core/pom.xml
commons/proper/jcs/branches/commons-jcs-2.2.x/commons-jcs-dist/pom.xml
commons/proper/jcs/branches/commons-jcs-2.2.x/commons-jcs-jcache-extras/pom.xml
commons/proper/jcs/branches/commons-jcs-2.2.x/commons-jcs-jcache-openjpa/pom.xml
commons/proper/jcs/branches/commons-jcs-2.2.x/commons-jcs-jcache/pom.xml
commons/proper/jcs/branches/commons-jcs-2.2.x/commons-jcs-tck-tests/pom.xml
commons/proper/jcs/branches/commons-jcs-2.2.x/pom.xml
commons/proper/jcs/branches/commons-jcs-2.2.x/src/changes/changes.xml
commons/proper/jcs/branches/commons-jcs-2.2.x/src/changes/release-notes.vm
Modified: commons/proper/jcs/branches/commons-jcs-2.2.x/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/commons/proper/jcs/branches/commons-jcs-2.2.x/RELEASE-NOTES.txt?rev=1838533&r1=1838532&r2=1838533&view=diff
==============================================================================
--- commons/proper/jcs/branches/commons-jcs-2.2.x/RELEASE-NOTES.txt (original)
+++ commons/proper/jcs/branches/commons-jcs-2.2.x/RELEASE-NOTES.txt Tue Aug 21 09:04:02 2018
@@ -1,20 +1,3 @@
-
-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.
-
-
Apache Commons JCS
Version 2.2.1
Release Notes
@@ -33,11 +16,6 @@ For the advice on upgrading from 1.x to
http://commons.apache.org/proper/commons-jcs/UpgradingFrom13.html
-Apache Commons JCS is a distributed, versatile caching system.
-
-$release.description.replaceAll(" ", "
-")
-
Changes in this version include:
Modified: commons/proper/jcs/branches/commons-jcs-2.2.x/commons-jcs-core/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jcs/branches/commons-jcs-2.2.x/commons-jcs-core/pom.xml?rev=1838533&r1=1838532&r2=1838533&view=diff
==============================================================================
--- commons/proper/jcs/branches/commons-jcs-2.2.x/commons-jcs-core/pom.xml (original)
+++ commons/proper/jcs/branches/commons-jcs-2.2.x/commons-jcs-core/pom.xml Tue Aug 21 09:04:02 2018
@@ -22,12 +22,12 @@
<parent>
<groupId>org.apache.commons</groupId>
<artifactId>commons-jcs</artifactId>
- <version>2.2.2-SNAPSHOT</version>
+ <version>2.2.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>commons-jcs-core</artifactId>
- <version>2.2.2-SNAPSHOT</version>
+ <version>2.2.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Apache Commons JCS :: Core</name>
Modified: commons/proper/jcs/branches/commons-jcs-2.2.x/commons-jcs-dist/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jcs/branches/commons-jcs-2.2.x/commons-jcs-dist/pom.xml?rev=1838533&r1=1838532&r2=1838533&view=diff
==============================================================================
--- commons/proper/jcs/branches/commons-jcs-2.2.x/commons-jcs-dist/pom.xml (original)
+++ commons/proper/jcs/branches/commons-jcs-2.2.x/commons-jcs-dist/pom.xml Tue Aug 21 09:04:02 2018
@@ -21,12 +21,12 @@
<parent>
<artifactId>commons-jcs</artifactId>
<groupId>org.apache.commons</groupId>
- <version>2.2.2-SNAPSHOT</version>
+ <version>2.2.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>commons-jcs-dist</artifactId>
- <version>2.2.2-SNAPSHOT</version>
+ <version>2.2.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Commons JCS :: Distribution</name>
<description>Creates the Apache Commons JCS multimodule distribution.</description>
Modified: commons/proper/jcs/branches/commons-jcs-2.2.x/commons-jcs-jcache-extras/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jcs/branches/commons-jcs-2.2.x/commons-jcs-jcache-extras/pom.xml?rev=1838533&r1=1838532&r2=1838533&view=diff
==============================================================================
--- commons/proper/jcs/branches/commons-jcs-2.2.x/commons-jcs-jcache-extras/pom.xml (original)
+++ commons/proper/jcs/branches/commons-jcs-2.2.x/commons-jcs-jcache-extras/pom.xml Tue Aug 21 09:04:02 2018
@@ -21,12 +21,12 @@
<parent>
<artifactId>commons-jcs</artifactId>
<groupId>org.apache.commons</groupId>
- <version>2.2.2-SNAPSHOT</version>
+ <version>2.2.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>commons-jcs-jcache-extras</artifactId>
- <version>2.2.2-SNAPSHOT</version>
+ <version>2.2.1-SNAPSHOT</version>
<name>Apache Commons JCS :: JCache Extras</name>
<scm>
Modified: commons/proper/jcs/branches/commons-jcs-2.2.x/commons-jcs-jcache-openjpa/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jcs/branches/commons-jcs-2.2.x/commons-jcs-jcache-openjpa/pom.xml?rev=1838533&r1=1838532&r2=1838533&view=diff
==============================================================================
--- commons/proper/jcs/branches/commons-jcs-2.2.x/commons-jcs-jcache-openjpa/pom.xml (original)
+++ commons/proper/jcs/branches/commons-jcs-2.2.x/commons-jcs-jcache-openjpa/pom.xml Tue Aug 21 09:04:02 2018
@@ -21,12 +21,12 @@
<parent>
<artifactId>commons-jcs</artifactId>
<groupId>org.apache.commons</groupId>
- <version>2.2.2-SNAPSHOT</version>
+ <version>2.2.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>commons-jcs-jcache-openjpa</artifactId>
- <version>2.2.2-SNAPSHOT</version>
+ <version>2.2.1-SNAPSHOT</version>
<name>Apache Commons JCS :: JCache OpenJPA</name>
<scm>
Modified: commons/proper/jcs/branches/commons-jcs-2.2.x/commons-jcs-jcache/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jcs/branches/commons-jcs-2.2.x/commons-jcs-jcache/pom.xml?rev=1838533&r1=1838532&r2=1838533&view=diff
==============================================================================
--- commons/proper/jcs/branches/commons-jcs-2.2.x/commons-jcs-jcache/pom.xml (original)
+++ commons/proper/jcs/branches/commons-jcs-2.2.x/commons-jcs-jcache/pom.xml Tue Aug 21 09:04:02 2018
@@ -23,12 +23,12 @@
<parent>
<groupId>org.apache.commons</groupId>
<artifactId>commons-jcs</artifactId>
- <version>2.2.2-SNAPSHOT</version>
+ <version>2.2.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>commons-jcs-jcache</artifactId>
- <version>2.2.2-SNAPSHOT</version>
+ <version>2.2.1-SNAPSHOT</version>
<name>Apache Commons JCS :: JCache</name>
<scm>
Modified: commons/proper/jcs/branches/commons-jcs-2.2.x/commons-jcs-tck-tests/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jcs/branches/commons-jcs-2.2.x/commons-jcs-tck-tests/pom.xml?rev=1838533&r1=1838532&r2=1838533&view=diff
==============================================================================
--- commons/proper/jcs/branches/commons-jcs-2.2.x/commons-jcs-tck-tests/pom.xml (original)
+++ commons/proper/jcs/branches/commons-jcs-2.2.x/commons-jcs-tck-tests/pom.xml Tue Aug 21 09:04:02 2018
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.commons</groupId>
<artifactId>commons-jcs</artifactId>
- <version>2.2.2-SNAPSHOT</version>
+ <version>2.2.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -34,7 +34,7 @@
-->
<artifactId>commons-jcs-jcache-tck</artifactId>
- <version>2.2.2-SNAPSHOT</version>
+ <version>2.2.1-SNAPSHOT</version>
<name>Apache Commons JCS :: JCache TCK</name>
Modified: commons/proper/jcs/branches/commons-jcs-2.2.x/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jcs/branches/commons-jcs-2.2.x/pom.xml?rev=1838533&r1=1838532&r2=1838533&view=diff
==============================================================================
--- commons/proper/jcs/branches/commons-jcs-2.2.x/pom.xml (original)
+++ commons/proper/jcs/branches/commons-jcs-2.2.x/pom.xml Tue Aug 21 09:04:02 2018
@@ -26,7 +26,7 @@
<artifactId>commons-jcs</artifactId>
<packaging>pom</packaging>
- <version>2.2.2-SNAPSHOT</version>
+ <version>2.2.1-SNAPSHOT</version>
<!--
* Build with -PjcacheTck to run the JSR-107 TCK
Modified: commons/proper/jcs/branches/commons-jcs-2.2.x/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/jcs/branches/commons-jcs-2.2.x/src/changes/changes.xml?rev=1838533&r1=1838532&r2=1838533&view=diff
==============================================================================
--- commons/proper/jcs/branches/commons-jcs-2.2.x/src/changes/changes.xml (original)
+++ commons/proper/jcs/branches/commons-jcs-2.2.x/src/changes/changes.xml Tue Aug 21 09:04:02 2018
@@ -19,7 +19,9 @@
<author email="dev@commons.apache.org">Apache Commons Developers</author>
</properties>
<body>
- <release version="2.2.1" date="2017-08-02">
+ <release version="2.2.2" date="in SVN">
+ </release>
+ <release version="2.2.1" date="2018-08-21">
<action dev="kinow" type="fix" due-to="athun">
Unexpected dispose() in CompositeCacheManager.release()
</action>
Modified: commons/proper/jcs/branches/commons-jcs-2.2.x/src/changes/release-notes.vm
URL: http://svn.apache.org/viewvc/commons/proper/jcs/branches/commons-jcs-2.2.x/src/changes/release-notes.vm?rev=1838533&r1=1838532&r2=1838533&view=diff
==============================================================================
--- commons/proper/jcs/branches/commons-jcs-2.2.x/src/changes/release-notes.vm (original)
+++ commons/proper/jcs/branches/commons-jcs-2.2.x/src/changes/release-notes.vm Tue Aug 21 09:04:02 2018
@@ -15,23 +15,6 @@
## specific language governing permissions and limitations
## under the License.
##
-
-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.
-
-
${project.name}
Version ${version}
Release Notes
@@ -50,16 +33,6 @@ For the advice on upgrading from 1.x to
${project.url}UpgradingFrom13.html
-$introduction.replaceAll("(?<!\015)\012", "
-").replaceAll("(?m)^ +","")
-
-## N.B. the available variables are described here:
-## http://maven.apache.org/plugins/maven-changes-plugin/examples/using-a-custom-announcement-template.html
-##
-## Hack to improve layout: replace all pairs of spaces with a single new-line
-$release.description.replaceAll(" ", "
-")
-
## set up indent sizes. Only change indent1
#set($props=${project.properties})
#set($jiralen=$props.get("commons.jira.id").length())