From 93a936c72dd46db96afe613d29841f10bcabe69f Mon Sep 17 00:00:00 2001
From: Thomas Neidhart
Date: Wed, 9 Jul 2014 21:02:22 +0000
Subject: [PATCH] Post-release updates.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/logging/trunk@1609298 13f79535-47bb-0310-9956-ffa450edef68
---
RELEASE-NOTES.txt | 21 +++++++++++++++------
build.xml | 2 +-
doap_logging.rdf | 5 +++++
pom.xml | 6 +++---
src/changes/changes.xml | 4 +++-
src/conf/MANIFEST.MF | 12 ++++++------
src/site/site.xml | 4 ++--
src/site/xdoc/download_logging.xml | 30 +++++++++++++++---------------
src/site/xdoc/index.xml | 5 +++++
9 files changed, 55 insertions(+), 34 deletions(-)
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 7cdf7c0..2197ca5 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,22 +1,31 @@
Apache Commons Logging
- Version 1.1.3
+ Version 1.2
RELEASE NOTES
-The Commons Logging team is pleased to announce the release of Apache Commons Logging 1.1.3
+The Apache Commons Logging team is pleased to announce
+the release of Apache Commons Logging 1.2
-Commons Logging is a thin adapter allowing configurable bridging to other,
-well known logging systems.
+Apache Commons Logging is a thin adapter allowing configurable
+bridging to other, well-known logging systems.
This is a maintenance release containing bug fixes.
+Java 1.2 or later is required.
Changes in this version include:
Fixed Bugs:
-o LOGGING-151: Use "org.apache.commons.logging" as bundle symbolic name. Thanks to Krzysztof Daniel.
+o LOGGING-37: Improve performance of LogFactory#getFactory() by calling
+ Thread#currentThread()#getContextClassLoader() directly instead
+ of using reflection. As a consequence support for JDK 1.1 has
+ been dropped. Thanks to Matthias Ernst, Archie Cobbs.
+o LOGGING-156: Fix SecurityAllowedTestCase when executed with OpenJDK 1.7 due
+ to an additional required RuntimePermission. Thanks to Mikolaj Izdebski.
+o LOGGING-157: Fix javadoc to comply with javadoc tool from jdk 1.8. Thanks to Ville Skyttä.
+
Historical list of changes: http://commons.apache.org/proper/commons-logging/changes-report.html
-For complete information on Commons Logging, including instructions on how to submit bug reports,
+For complete information on Apache Commons Logging, including instructions on how to submit bug reports,
patches, or suggestions for improvement, see the Apache Commons Logging website:
http://commons.apache.org/proper/commons-logging/
\ No newline at end of file
diff --git a/build.xml b/build.xml
index b2ca788..998d570 100644
--- a/build.xml
+++ b/build.xml
@@ -94,7 +94,7 @@
-
+
diff --git a/doap_logging.rdf b/doap_logging.rdf
index 6eb9554..36a4816 100644
--- a/doap_logging.rdf
+++ b/doap_logging.rdf
@@ -37,6 +37,11 @@ limitations under the License.
+
+ commons-logging
+ 2014-07-11
+ 1.2
+
commons-logging
2013-03-21
diff --git a/pom.xml b/pom.xml
index 78b7d8b..be49f01 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@ under the License.
commons-logging
commons-logging
Apache Commons Logging
- 1.2-SNAPSHOT
+ 1.2.1-SNAPSHOT
Apache Commons Logging is a thin adapter allowing configurable bridging to other,
well known logging systems.
http://commons.apache.org/proper/commons-logging/
@@ -527,11 +527,11 @@ under the License.
1.2
1.2
logging
- 1.1.3
+ 1.2
LOGGING
12310484
- RC1
+ RC2
2.12
true
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index dbba588..f542a0b 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -43,7 +43,9 @@ The type attribute can be add,update,fix,remove.
Release Notes
-
+
+
+
Improve performance of LogFactory#getFactory() by calling Thread#currentThread()#getContextClassLoader()
directly instead of using reflection. As a consequence support for JDK 1.1 has been dropped.
diff --git a/src/conf/MANIFEST.MF b/src/conf/MANIFEST.MF
index c248781..5182e07 100644
--- a/src/conf/MANIFEST.MF
+++ b/src/conf/MANIFEST.MF
@@ -1,20 +1,20 @@
Manifest-Version: 1.0
-Export-Package: org.apache.commons.logging;version="1.1.3",org.apache.
- commons.logging.impl;version="1.1.3"
+Export-Package: org.apache.commons.logging;version="1.2.0",org.apache.
+ commons.logging.impl;version="1.2.0"
Implementation-Title: Commons Logging
Implementation-Vendor: The Apache Software Foundation
Implementation-Vendor-Id: org.apache
Specification-Title: Commons Logging
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
Bundle-SymbolicName: org.apache.commons.logging
-X-Compile-Target-JDK: 1.1
-Implementation-Version: 1.1.3
+X-Compile-Target-JDK: 1.2
+Implementation-Version: 1.2
Specification-Vendor: The Apache Software Foundation
Bundle-Name: Commons Logging
Created-By: Apache Maven Bundle Plugin
X-Compile-Source-JDK: 1.2
Bundle-Vendor: The Apache Software Foundation
-Bundle-Version: 1.1.3
+Bundle-Version: 1.2.0
Bundle-ManifestVersion: 2
Bundle-Description: Commons Logging is a thin adapter allowing configu
rable bridging to other, well known logging systems.
@@ -25,4 +25,4 @@ Import-Package: javax.servlet;resolution:=optional;version="[2.1.0,3.0
.0.1]",org.apache.log4j;resolution:=optional;version="[1.2.15,2.0.0)"
Include-Resource: META-INF/NOTICE.txt=NOTICE.txt,META-INF/LICENSE.txt=
LICENSE.txt
-Specification-Version: 1.1.3
+Specification-Version: 1.2
diff --git a/src/site/site.xml b/src/site/site.xml
index 6878c1c..73d424a 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -39,8 +39,8 @@ under the License.
href="/RELEASE-NOTES.txt"/>
-
+
diff --git a/src/site/xdoc/download_logging.xml b/src/site/xdoc/download_logging.xml
index 19a911a..79ccd0d 100644
--- a/src/site/xdoc/download_logging.xml
+++ b/src/site/xdoc/download_logging.xml
@@ -45,11 +45,11 @@ limitations under the License.
-->
- Download Commons Logging
+ Download Apache Commons Logging
Commons Documentation Team
-
+
We recommend you use a mirror to download our release
@@ -95,32 +95,32 @@ limitations under the License.
-
+
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index aa7974a..4219096 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -81,6 +81,11 @@ This gives short introductions to topics such as advanced class loading.
Binary and source distributions are available
here.
+
+ The main purpose of the 1.2 release is to drop support for Java 1.1.
+ For a full list of changes since the 1.1.3 release, please refer to the
+ change-report.
+
The 1.1.3 release only updates the Bundle-SymbolicName in the manifest
to "org.apache.commons.logging".