You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by vy...@apache.org on 2024/01/23 09:08:33 UTC

(logging-log4j2) branch 2.x updated (dd4a78002f -> 5c4b30cf0e)

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

vy pushed a change to branch 2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git


    from dd4a78002f Update auto-generated changelogs (#2226)
     new fe164eb22f Bump com.fasterxml.woodstox:woodstox-core from 6.5.1 to 6.6.0
     new 5c4b30cf0e Pin `stax2-api` to avoid `RequireUpperBoundDeps` failures (#2205)

The 2 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:
 log4j-core-its/pom.xml   | 6 ------
 log4j-core-java9/pom.xml | 9 +++++++++
 log4j-core/pom.xml       | 7 -------
 log4j-parent/pom.xml     | 7 -------
 4 files changed, 9 insertions(+), 20 deletions(-)


(logging-log4j2) 01/02: Bump com.fasterxml.woodstox:woodstox-core from 6.5.1 to 6.6.0

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

vy pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git

commit fe164eb22f890d32909187d888d52a41e50bd75d
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Wed Jan 17 10:22:09 2024 +0000

    Bump com.fasterxml.woodstox:woodstox-core from 6.5.1 to 6.6.0
    
    Bumps [com.fasterxml.woodstox:woodstox-core](https://github.com/FasterXML/woodstox) from 6.5.1 to 6.6.0.
    - [Commits](https://github.com/FasterXML/woodstox/compare/woodstox-core-6.5.1...woodstox-core-6.6.0)
    
    ---
    updated-dependencies:
    - dependency-name: com.fasterxml.woodstox:woodstox-core
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <su...@github.com>
---
 log4j-parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/log4j-parent/pom.xml b/log4j-parent/pom.xml
index b04f371762..623540113e 100644
--- a/log4j-parent/pom.xml
+++ b/log4j-parent/pom.xml
@@ -144,7 +144,7 @@
     <tomcat-juli.version>10.0.27</tomcat-juli.version>
     <velocity.version>1.7</velocity.version>
     <wiremock.version>2.35.1</wiremock.version>
-    <woodstox.version>6.5.1</woodstox.version>
+    <woodstox.version>6.6.0</woodstox.version>
     <xmlunit.version>2.9.1</xmlunit.version>
     <xz.version>1.9</xz.version>
     <zstd.version>1.5.5-11</zstd.version>


(logging-log4j2) 02/02: Pin `stax2-api` to avoid `RequireUpperBoundDeps` failures (#2205)

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

vy pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git

commit 5c4b30cf0e284b4586d5edd1adf741bbdc9afd1e
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Tue Jan 23 09:57:35 2024 +0100

    Pin `stax2-api` to avoid `RequireUpperBoundDeps` failures (#2205)
---
 log4j-core-its/pom.xml   | 6 ------
 log4j-core-java9/pom.xml | 9 +++++++++
 log4j-core/pom.xml       | 7 -------
 log4j-parent/pom.xml     | 7 -------
 4 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/log4j-core-its/pom.xml b/log4j-core-its/pom.xml
index 706a41a69d..8564c7c0fc 100644
--- a/log4j-core-its/pom.xml
+++ b/log4j-core-its/pom.xml
@@ -91,12 +91,6 @@
       <artifactId>jctools-core</artifactId>
       <optional>true</optional>
     </dependency>
-    <!-- POM for jackson-dataformat-xml depends on woodstox-core -->
-    <dependency>
-      <groupId>com.fasterxml.woodstox</groupId>
-      <artifactId>woodstox-core</artifactId>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-api-test</artifactId>
diff --git a/log4j-core-java9/pom.xml b/log4j-core-java9/pom.xml
index 6b6c0e0b25..8db7719e75 100644
--- a/log4j-core-java9/pom.xml
+++ b/log4j-core-java9/pom.xml
@@ -30,6 +30,7 @@
   <properties>
     <maven.compiler.release>9</maven.compiler.release>
     <maven.deploy.skip>true</maven.deploy.skip>
+    <stax2-api.version>4.2.2</stax2-api.version>
   </properties>
   <dependencies>
     <!-- Naturally, all implementations require the log4j-api JAR -->
@@ -45,6 +46,14 @@
       <groupId>com.fasterxml.jackson.dataformat</groupId>
       <artifactId>jackson-dataformat-xml</artifactId>
     </dependency>
+    <!-- Pinning `org.codehaus.woodstox:stax2-api` (which is injected by `com.fasterxml.jackson.dataformat:jackson-dataformat-xml`) to avoid `RequireUpperBoundDeps` failures: -->
+    <dependency>
+      <groupId>org.codehaus.woodstox</groupId>
+      <artifactId>stax2-api</artifactId>
+      <version>${stax2-api.version}</version>
+      <scope>runtime</scope>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
diff --git a/log4j-core/pom.xml b/log4j-core/pom.xml
index 9362d8f3af..e47a160fef 100644
--- a/log4j-core/pom.xml
+++ b/log4j-core/pom.xml
@@ -199,13 +199,6 @@
       <scope>runtime</scope>
       <optional>true</optional>
     </dependency>
-    <!-- POM for jackson-dataformat-xml depends on woodstox-core -->
-    <dependency>
-      <groupId>com.fasterxml.woodstox</groupId>
-      <artifactId>woodstox-core</artifactId>
-      <scope>runtime</scope>
-      <optional>true</optional>
-    </dependency>
   </dependencies>
   <build>
     <plugins>
diff --git a/log4j-parent/pom.xml b/log4j-parent/pom.xml
index 623540113e..b819c77df6 100644
--- a/log4j-parent/pom.xml
+++ b/log4j-parent/pom.xml
@@ -144,7 +144,6 @@
     <tomcat-juli.version>10.0.27</tomcat-juli.version>
     <velocity.version>1.7</velocity.version>
     <wiremock.version>2.35.1</wiremock.version>
-    <woodstox.version>6.6.0</woodstox.version>
     <xmlunit.version>2.9.1</xmlunit.version>
     <xz.version>1.9</xz.version>
     <zstd.version>1.5.5-11</zstd.version>
@@ -1031,12 +1030,6 @@
         <version>${wiremock.version}</version>
       </dependency>
 
-      <dependency>
-        <groupId>com.fasterxml.woodstox</groupId>
-        <artifactId>woodstox-core</artifactId>
-        <version>${woodstox.version}</version>
-      </dependency>
-
       <dependency>
         <groupId>org.xmlunit</groupId>
         <artifactId>xmlunit-core</artifactId>