You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2018/03/11 18:28:16 UTC

logging-log4j2 git commit: LOG4J2-1976 - Revert OSGi API version to 4.3.1

Repository: logging-log4j2
Updated Branches:
  refs/heads/release-2.x 97c8fd904 -> 76bf4df50


LOG4J2-1976 - Revert OSGi API version to 4.3.1


Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/76bf4df5
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/76bf4df5
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/76bf4df5

Branch: refs/heads/release-2.x
Commit: 76bf4df50816768112fff4d13194a336e7f21447
Parents: 97c8fd9
Author: rgoers <ra...@dslextreme.com>
Authored: Sun Mar 11 11:28:10 2018 -0700
Committer: rgoers <ra...@dslextreme.com>
Committed: Sun Mar 11 11:28:10 2018 -0700

----------------------------------------------------------------------
 pom.xml                 |  3 ++-
 src/changes/changes.xml | 13 ++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/76bf4df5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 54711cc..a63ddff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -221,7 +221,8 @@
     <projectDir />
     <commonsLoggingVersion>1.2</commonsLoggingVersion>
     <javax.persistence>2.1.1</javax.persistence>
-    <osgi.api.version>6.0.0</osgi.api.version>
+    <!-- The OSGi API version MUST always be the MINIMUM version Log4j supports -->
+    <osgi.api.version>4.3.1</osgi.api.version>
     <!-- Version 5.15.0 requires Java 8 -->
     <activemq.version>5.14.5</activemq.version>
     <!-- Allow Clirr severity to be overriden by the command-line option -DminSeverity=level -->

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/76bf4df5/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 0af37ef..26420ce 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -31,6 +31,9 @@
          - "remove" - Removed
     -->
     <release version="2.11.0" date="2018-xx-xx" description="GA Release 2.11.0">
+      <action issue="LOG4J2-1976" dev="rgoers" type="fix">
+        Revert OSGi API version to 4.3.1.
+      </action>
       <action issue="LOG4J2-2273" dev="rpopma" type="update" due-to="Bruno P. Kinoshita">
         Documentation fix in manual page for custom configurations.
       </action>
@@ -197,7 +200,7 @@
       </action>
       <action issue="LOG4J2-2259" dev="ggregory" type="update">
         Update MongoDB 3 module from driver 3.6.1 to 3.6.3.
-      </action>      
+      </action>
       <action issue="LOG4J2-2260" dev="ggregory" type="update">
         [SMTP] Update javax.mail from 1.6.0 to 1.6.1.
       </action>
@@ -206,16 +209,16 @@
       </action>
       <action issue="LOG4J2-2270" dev="ggregory" type="fix" due-to="Cyril Martin">
         Strings::join, when called with [null] returns "null" instead of EMPTY.
-      </action>      
+      </action>
       <action issue="LOG4J2-2276" dev="ggregory" type="fix" due-to="Sean Baxter">
         ConcurrentModificationException from org.apache.logging.log4j.status.StatusLogger.&lt;clinit>(StatusLogger.java:71).
-      </action>      
+      </action>
       <action issue="LOG4J2-2274" dev="ggregory" type="fix" due-to="Sebastien Lannez">
         Allow EnvironmentPropertySource to run with a SecurityManager that rejects environment variable access.
-      </action>      
+      </action>
       <action issue="LOG4J2-2279" dev="ggregory" type="fix" due-to="Gary Gregory">
         Allow SystemPropertiesPropertySource to run with a SecurityManager that rejects system property access.
-      </action>      
+      </action>
     </release>
     <release version="2.10.0" date="2017-11-18" description="GA Release 2.10.0">
       <action issue="LOG4J2-2120" dev="mikes" type="add" due-to="Carter Douglas Kozak">