Bump log4j to 2.17.1

moditect · Jan 14, 2022 · d340c17 · d340c17
1 parent 787c7db
commit d340c17
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 26 deletions.
diff --git a/README.adoc b/README.adoc
@@ -118,8 +118,8 @@ module. Here is how the application can be executed via Layrry, organizing all t
 layers:
   log:
     modules:
-      - "org.apache.logging.log4j:log4j-api:2.17.0"
-      - "org.apache.logging.log4j:log4j-core:2.17.0"
+      - "org.apache.logging.log4j:log4j-api:2.17.1"
+      - "org.apache.logging.log4j:log4j-core:2.17.1"
       - "com.example:logconfig:1.0.0"
   foo:
     parents:
@@ -150,8 +150,8 @@ Alternatively you may use TOML instead of YAML
 ----
 [layers.log]
   modules = [
-    "org.apache.logging.log4j:log4j-api:2.17.0",
-    "org.apache.logging.log4j:log4j-core:2.17.0",
+    "org.apache.logging.log4j:log4j-api:2.17.1",
+    "org.apache.logging.log4j:log4j-core:2.17.1",
     "com.example.it:it-logconfig:1.0.0"]
 [layers.foo]
   parents = ["log"]
@@ -455,8 +455,8 @@ Then, the Layrry Java API can be used like this (showing the same example as abo
 ----
 Layers layers = Layers.builder()
     .layer("log")
-        .withModule("org.apache.logging.log4j:log4j-api:2.17.0")
-        .withModule("org.apache.logging.log4j:log4j-core:2.17.0")
+        .withModule("org.apache.logging.log4j:log4j-api:2.17.1")
+        .withModule("org.apache.logging.log4j:log4j-core:2.17.1")
         .withModule("com.example:logconfig:1.0.0")
     .layer("foo")
         .withParent("log")

diff --git a/examples/vertx-example/layrry-links-runner/src/test/resources/layers.yml b/examples/vertx-example/layrry-links-runner/src/test/resources/layers.yml
@@ -27,8 +27,8 @@ layers:
       - "com.fasterxml.jackson.core:jackson-annotations:2.11.3"
   log:
     modules:
-      - "org.apache.logging.log4j:log4j-api:2.17.0"
-      - "org.apache.logging.log4j:log4j-core:2.17.0"
+      - "org.apache.logging.log4j:log4j-api:2.17.1"
+      - "org.apache.logging.log4j:log4j-core:2.17.1"
       - "org.moditect.layrry.example.links:layrry-links-logconfig:1.0.0"
   platform:
     modules:

diff --git a/images/example.dot b/images/example.dot
@@ -8,8 +8,8 @@ digraph "package dependencies"
 
     subgraph cluster_log {
         node [style=filled];
-        "org.apache.logging.log4j:log4j-api@2.17.0"
-        "org.apache.logging.log4j:log4j-core:2.17.0"
+        "org.apache.logging.log4j:log4j-api@2.17.1"
+        "org.apache.logging.log4j:log4j-core:2.17.1"
         "com.example:logconfig:1.0.0"
     	label = "log";
     }
@@ -21,15 +21,15 @@ digraph "package dependencies"
         "com.example:foo@1.0.0";
         "com.example:greeter@1.0.0" [label=<com.example:greeter@<font color='red'>1.0.0</font>>];
 
-        "com.example:foo@1.0.0" -> "org.apache.logging.log4j:log4j-api@2.17.0";
+        "com.example:foo@1.0.0" -> "org.apache.logging.log4j:log4j-api@2.17.1";
         "com.example:foo@1.0.0" -> "com.example:greeter@1.0.0";
     }
 
     subgraph cluster_bar {
         node [style=filled];
 
         "com.example:greeter@2.0.0" [label=<com.example:greeter@<font color='red'>2.0.0</font>>];
-        "com.example:bar@1.0.0" -> "org.apache.logging.log4j:log4j-api@2.17.0";
+        "com.example:bar@1.0.0" -> "org.apache.logging.log4j:log4j-api@2.17.1";
         "com.example:bar@1.0.0" -> "com.example:greeter@2.0.0";
     }
 

diff --git a/...gration-test/it-runner/src/test/java/org/moditect/layrry/it/test/LayrryIntegrationIT.java b/...gration-test/it-runner/src/test/java/org/moditect/layrry/it/test/LayrryIntegrationIT.java
@@ -28,8 +28,8 @@ public class LayrryIntegrationIT extends AbstractIntegrationTestCase {
     public void runLayersFromApi() {
         Layers layers = Layers.builder()
                 .layer("log")
-                .withModule("org.apache.logging.log4j:log4j-api:2.17.0")
-                .withModule("org.apache.logging.log4j:log4j-core:2.17.0")
+                .withModule("org.apache.logging.log4j:log4j-api:2.17.1")
+                .withModule("org.apache.logging.log4j:log4j-core:2.17.1")
                 .withModule("org.moditect.layrry.it:it-logconfig:1.0.0")
                 .layer("foo")
                 .withParent("log")
@@ -57,8 +57,8 @@ public void runLayersFromApiWithFlatRepository() {
                 .resolve(Resolvers.local()
                         .withLocalRepo("flat", Paths.get("target/repositories/flat").toAbsolutePath(), "flat"))
                 .layer("log")
-                .withModule("org.apache.logging.log4j:log4j-api:2.17.0")
-                .withModule("org.apache.logging.log4j:log4j-core:2.17.0")
+                .withModule("org.apache.logging.log4j:log4j-api:2.17.1")
+                .withModule("org.apache.logging.log4j:log4j-core:2.17.1")
                 .withModule("org.moditect.layrry.it:it-logconfig:1.0.0")
                 .layer("foo")
                 .withParent("log")

diff --git a/integration-test/it-runner/src/test/resources/layers-flat.toml b/integration-test/it-runner/src/test/resources/layers-flat.toml
@@ -21,8 +21,8 @@
   path   = "../../../target/repositories/flat"
 [layers.log]
   modules = [
-    "org.apache.logging.log4j:log4j-api:2.17.0",
-    "org.apache.logging.log4j:log4j-core:2.17.0",
+    "org.apache.logging.log4j:log4j-api:2.17.1",
+    "org.apache.logging.log4j:log4j-core:2.17.1",
     "org.moditect.layrry.it:it-logconfig:1.0.0"]
 [layers.foo]
   parents = ["log"]

diff --git a/integration-test/it-runner/src/test/resources/layers-flat.yml b/integration-test/it-runner/src/test/resources/layers-flat.yml
@@ -23,8 +23,8 @@ resolve:
 layers:
   log:
     modules:
-      - "org.apache.logging.log4j:log4j-api:2.17.0"
-      - "org.apache.logging.log4j:log4j-core:2.17.0"
+      - "org.apache.logging.log4j:log4j-api:2.17.1"
+      - "org.apache.logging.log4j:log4j-core:2.17.1"
       - "org.moditect.layrry.it:it-logconfig:1.0.0"
   foo:
     parents:

diff --git a/integration-test/it-runner/src/test/resources/layers.toml b/integration-test/it-runner/src/test/resources/layers.toml
@@ -16,8 +16,8 @@
 
 [layers.log]
   modules = [
-    "org.apache.logging.log4j:log4j-api:2.17.0",
-    "org.apache.logging.log4j:log4j-core:2.17.0",
+    "org.apache.logging.log4j:log4j-api:2.17.1",
+    "org.apache.logging.log4j:log4j-core:2.17.1",
     "org.moditect.layrry.it:it-logconfig:1.0.0"]
 [layers.foo]
   parents = ["log"]

diff --git a/integration-test/it-runner/src/test/resources/layers.yml b/integration-test/it-runner/src/test/resources/layers.yml
@@ -17,8 +17,8 @@
 layers:
   log:
     modules:
-      - "org.apache.logging.log4j:log4j-api:2.17.0"
-      - "org.apache.logging.log4j:log4j-core:2.17.0"
+      - "org.apache.logging.log4j:log4j-api:2.17.1"
+      - "org.apache.logging.log4j:log4j-core:2.17.1"
       - "org.moditect.layrry.it:it-logconfig:1.0.0"
   foo:
     parents:

diff --git a/integration-test/it-runner/src/test/resources/versions.properties b/integration-test/it-runner/src/test/resources/versions.properties
@@ -14,5 +14,5 @@
 #  limitations under the License.
 #
 
-log4jVersion = 2.17.0
+log4jVersion = 2.17.1
 appVersion   = 1.0.0
diff --git a/pom.xml b/pom.xml
@@ -50,7 +50,7 @@
     <version.assembly.plugin>3.3.0</version.assembly.plugin>
     <version.exec.plugin>3.0.0</version.exec.plugin>
     <version.shade.plugin>3.2.4</version.shade.plugin>
-    <version.log4j>2.17.0</version.log4j>
+    <version.log4j>2.17.1</version.log4j>
   </properties>
 
   <scm>