You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2022/05/24 21:02:54 UTC

[commons-logging] branch master updated (9d4b75c -> 0dc8dfa)

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-logging.git


    from 9d4b75c  Bump spotbugs from 4.6.0 to 4.7.0 #87
     new 6b34f4e  Reorg
     new 0b27941  Bump Java from 6 to 8.
     new 0dc8dfa  Bump Java from 6 to 8.

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 pom.xml                                             | 19 +++----------------
 src/changes/changes.xml                             | 21 ++++++++++++---------
 .../apache/commons/logging/impl/AvalonLogger.java   |  6 +++---
 .../apache/commons/logging/impl/WeakHashtable.java  |  9 +++------
 4 files changed, 21 insertions(+), 34 deletions(-)


[commons-logging] 02/03: Bump Java from 6 to 8.

Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-logging.git

commit 0b2794136ad592fc6b6a2f172aec673a340ff7e0
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue May 24 17:02:05 2022 -0400

    Bump Java from 6 to 8.
---
 pom.xml                 | 19 +++----------------
 src/changes/changes.xml |  3 +++
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0c7cb62..fc51bfd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@ under the License.
   <groupId>commons-logging</groupId>
   <artifactId>commons-logging</artifactId>
   <name>Apache Commons Logging</name>
-  <version>1.2.1-SNAPSHOT</version>
+  <version>1.3.0-SNAPSHOT</version>
   <description>Apache Commons Logging is a thin adapter allowing configurable bridging to other,
     well known logging systems.</description>
   <url>http://commons.apache.org/proper/commons-logging/</url>
@@ -563,8 +563,8 @@ under the License.
   </distributionManagement>
 
   <properties>
-    <animal-sniffer.signature>java16</animal-sniffer.signature>
-    <commons.logging.javaversion>1.6</commons.logging.javaversion>
+    <animal-sniffer.signature>java18</animal-sniffer.signature>
+    <commons.logging.javaversion>1.8</commons.logging.javaversion>
     <maven.compiler.source>${commons.logging.javaversion}</maven.compiler.source>
     <maven.compiler.target>${commons.logging.javaversion}</maven.compiler.target>
     <commons.componentid>logging</commons.componentid>
@@ -589,17 +589,4 @@ under the License.
     </commons.osgi.import>
   </properties>
 
-  <profiles>
-    <profile>
-      <!-- Bump the minimum compiler version for JDK 12+ -->
-      <id>jdk12-plus-no-java6</id>
-      <activation>
-        <jdk>[1.12,)</jdk>
-      </activation>
-      <properties>
-        <commons.logging.javaversion>1.7</commons.logging.javaversion>
-      </properties>
-    </profile>
-  </profiles>
-
 </project>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index ea1fdcc..c1ffe5c 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -64,6 +64,9 @@ The <action> type attribute can be add,update,fix,remove.
         Minor Improvements #34.
       </action>
       <!-- UPDATES -->
+      <action dev="ggregory" type="update" due-to="Gary Gregory">
+        Bump Java from 6 to 8.
+      </action>
       <action dev="ggregory" type="update" due-to="Dependabot, Gary Gregory">
         Bump actions/cache from 2 to 3.0.2 #50, #77.
       </action>


[commons-logging] 01/03: Reorg

Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-logging.git

commit 6b34f4eb23311dc2d920177f57b18f673f0eb513
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue May 24 16:59:55 2022 -0400

    Reorg
---
 src/changes/changes.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index a1f6e55..ea1fdcc 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -43,7 +43,7 @@ The <action> type attribute can be add,update,fix,remove.
     <title>Release Notes</title>
   </properties>
   <body>
-    <release version="1.2.1" date="TBD" description="This is a maintenance release containing bug fixes. Java 1.2 or later is required.">
+    <release version="1.3.0" date="TBD" description="This is a maintenance release containing bug fixes. Java 8 or later is required.">
       <!--  FIXES -->
       <action issue="LOGGING-165" dev="britter" type="add">
         Add Automatic-Module-Name Manifest Header for Java 9 compatibility.
@@ -57,6 +57,12 @@ The <action> type attribute can be add,update,fix,remove.
       <action dev="ggregory" type="fix" due-to="Jakob van Kruijssen, Bruno P. Kinoshita, Gary Gregory">
         Use a weak reference for the cached class loader #71.
       </action>
+      <action dev="ggregory" type="fix" due-to="xiaozhiliaoo">
+        Add more entries to .gitignore file #25.
+      </action>
+      <action dev="ggregory" type="fix" due-to="Arturo Bernal">
+        Minor Improvements #34.
+      </action>
       <!-- UPDATES -->
       <action dev="ggregory" type="update" due-to="Dependabot, Gary Gregory">
         Bump actions/cache from 2 to 3.0.2 #50, #77.
@@ -67,9 +73,6 @@ The <action> type attribute can be add,update,fix,remove.
       <action dev="ggregory" type="update" due-to="Dependabot, Gary Gregory">
         Bump actions/setup-java from 1.4.0 to 3, #21.
       </action>
-      <action dev="ggregory" type="update" due-to="xiaozhiliaoo">
-        Add more entries to .gitignore file #25.
-      </action>
       <action dev="ggregory" type="update" due-to="Dependabot">
         Bump junit from 3.8.1 to 4.13.2 #23, #38.
       </action>
@@ -98,7 +101,7 @@ The <action> type attribute can be add,update,fix,remove.
         Bump servlet-api from 2.3 to 2.5 #27.
       </action>
       <action dev="ggregory" type="update" due-to="Gary Gregory, Dependabot">
-        Migrate from maven-checkstyle-plugin from 2.7 to 3.1.2 #35.
+        Bump maven-checkstyle-plugin from 2.7 to 3.1.2 #35.
       </action>
       <action dev="ggregory" type="update" due-to="Dependabot">
         Bump spotbugs-maven-plugin from 4.1.4 to 4.6.0.0 #33, #70, #78.
@@ -106,9 +109,6 @@ The <action> type attribute can be add,update,fix,remove.
       <action dev="ggregory" type="update" due-to="Dependabot">
         Bump spotbugs from 4.5.3 to 4.7.0 #81, #87.
       </action>
-      <action dev="ggregory" type="update" due-to="Arturo Bernal">
-        Minor Improvements #34.
-      </action>
       <action dev="kinow" type="update" due-to="Dependabot">
         Bump commons-parent from 52 to 53 #82.
       </action>
@@ -116,7 +116,7 @@ The <action> type attribute can be add,update,fix,remove.
         Bump github/codeql-action from 1 to 2 #86.
       </action>
     </release>
-    <release version="1.2" date="2014-07-11" description="This is a maintenance release containing bug fixes. Java 1.2 or later is required.">
+    <release version="1.2" date="2014-07-11" description="This is a maintenance release containing bug fixes. Java 6 or later is required.">
       <action issue="LOGGING-37" dev="tn" type="fix" due-to="Matthias Ernst,Archie Cobbs">
         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.


[commons-logging] 03/03: Bump Java from 6 to 8.

Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-logging.git

commit 0dc8dfac821240be9e6bdf70075b625ce43c4d2a
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue May 24 17:02:14 2022 -0400

    Bump Java from 6 to 8.
---
 src/main/java/org/apache/commons/logging/impl/AvalonLogger.java  | 6 +++---
 src/main/java/org/apache/commons/logging/impl/WeakHashtable.java | 9 +++------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/apache/commons/logging/impl/AvalonLogger.java b/src/main/java/org/apache/commons/logging/impl/AvalonLogger.java
index c0ee68e..b95cdad 100644
--- a/src/main/java/org/apache/commons/logging/impl/AvalonLogger.java
+++ b/src/main/java/org/apache/commons/logging/impl/AvalonLogger.java
@@ -17,6 +17,8 @@
 
 package org.apache.commons.logging.impl;
 
+import java.util.Objects;
+
 import org.apache.avalon.framework.logger.Logger;
 import org.apache.commons.logging.Log;
 
@@ -73,9 +75,7 @@ public class AvalonLogger implements Log {
      * @param name the name of the avalon logger implementation to delegate to
      */
     public AvalonLogger(final String name) {
-        if (defaultLogger == null) {
-            throw new NullPointerException("default logger has to be specified if this constructor is used!");
-        }
+        Objects.requireNonNull(defaultLogger, "default logger has to be specified if this constructor is used!");
         this.logger = defaultLogger.getChildLogger(name);
     }
 
diff --git a/src/main/java/org/apache/commons/logging/impl/WeakHashtable.java b/src/main/java/org/apache/commons/logging/impl/WeakHashtable.java
index f8a21df..a168581 100644
--- a/src/main/java/org/apache/commons/logging/impl/WeakHashtable.java
+++ b/src/main/java/org/apache/commons/logging/impl/WeakHashtable.java
@@ -26,6 +26,7 @@ import java.util.HashSet;
 import java.util.Hashtable;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 
 /**
@@ -228,12 +229,8 @@ public final class WeakHashtable extends Hashtable {
     @Override
     public synchronized Object put(final Object key, final Object value) {
         // check for nulls, ensuring semantics match superclass
-        if (key == null) {
-            throw new NullPointerException("Null keys are not allowed");
-        }
-        if (value == null) {
-            throw new NullPointerException("Null values are not allowed");
-        }
+        Objects.requireNonNull(key, "key");
+        Objects.requireNonNull(value, "value");
 
         // for performance reasons, only purge every
         // MAX_CHANGES_BEFORE_PURGE times