[karaf] branch main updated (1b17d4d -> e2a8855)

[jb...@apache.org]

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

jbonofre pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/karaf.git.


 discard 1b17d4d  Merge pull request #1472 from jbonofre/KARAF-7309
    omit 5974795  [SM-7309] Upgrade to Pax Logging 2.0.14
    omit 9bb263a  Merge pull request #1471 from jbonofre/KARAF-7300
     new e2a8855  [SM-7309] Upgrade to Pax Logging 2.0.14

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (1b17d4d)
            \
             N -- N -- N   refs/heads/main (e2a8855)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 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:

[karaf] 01/01: [SM-7309] Upgrade to Pax Logging 2.0.14

[jb...@apache.org]

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

jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/karaf.git

commit e2a88551be9f946e823895102418daa66a25e80d
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Fri Dec 31 06:48:16 2021 +0100

    [SM-7309] Upgrade to Pax Logging 2.0.14
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f103633..0739c7e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -304,7 +304,7 @@
 
         <pax.cdi.version>1.1.4</pax.cdi.version>
         <pax.exam.version>4.13.5</pax.exam.version>
-        <pax.logging.version>2.0.13</pax.logging.version>
+        <pax.logging.version>2.0.14</pax.logging.version>
         <pax.base.version>1.5.1</pax.base.version>
         <pax.swissbox.version>1.8.5</pax.swissbox.version>
         <pax.url.version>2.6.10</pax.url.version>