From c7ad6710729f8d69fc03b96d01707125534e7931 Mon Sep 17 00:00:00 2001
From: Slawomir Jaranowski <s.jaranowski@gmail.com>
Date: Mon, 5 Aug 2024 22:17:35 +0200
Subject: [PATCH] Remove Log4j 1.2.x from ITs

---
 src/it/projects/git-issue-60-exec/pom.xml       |  6 +++---
 src/it/projects/git-issue-60-exec/verify.groovy |  2 +-
 src/it/projects/git-issue-60-java/pom.xml       |  6 +++---
 src/it/projects/git-issue-60-java/verify.groovy |  6 +++---
 src/it/projects/setup-parent/invoker.properties |  2 +-
 src/it/projects/setup-parent/pom.xml            | 14 +++++++-------
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/it/projects/git-issue-60-exec/pom.xml b/src/it/projects/git-issue-60-exec/pom.xml
index 5ea2dd91..991a7a01 100644
--- a/src/it/projects/git-issue-60-exec/pom.xml
+++ b/src/it/projects/git-issue-60-exec/pom.xml
@@ -18,12 +18,12 @@
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
+      <artifactId>slf4j-reload4j</artifactId>
       <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
+      <groupId>ch.qos.reload4j</groupId>
+      <artifactId>reload4j</artifactId>
       <scope>provided</scope>
     </dependency>
   </dependencies>
diff --git a/src/it/projects/git-issue-60-exec/verify.groovy b/src/it/projects/git-issue-60-exec/verify.groovy
index 9ffe1022..8d266923 100644
--- a/src/it/projects/git-issue-60-exec/verify.groovy
+++ b/src/it/projects/git-issue-60-exec/verify.groovy
@@ -22,4 +22,4 @@ assert execLog.exists()
 assert execLog.getText().contains('Can you hear me, Major Tom?')
 
 File buildLog = new File(basedir, 'build.log')
-assert buildLog.exists()
\ No newline at end of file
+assert buildLog.exists()
diff --git a/src/it/projects/git-issue-60-java/pom.xml b/src/it/projects/git-issue-60-java/pom.xml
index 5f165cd5..1dc00a57 100644
--- a/src/it/projects/git-issue-60-java/pom.xml
+++ b/src/it/projects/git-issue-60-java/pom.xml
@@ -17,12 +17,12 @@
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
+      <artifactId>slf4j-reload4j</artifactId>
       <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
+      <groupId>ch.qos.reload4j</groupId>
+      <artifactId>reload4j</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/src/it/projects/git-issue-60-java/verify.groovy b/src/it/projects/git-issue-60-java/verify.groovy
index d7cbe3e2..b94f615d 100644
--- a/src/it/projects/git-issue-60-java/verify.groovy
+++ b/src/it/projects/git-issue-60-java/verify.groovy
@@ -25,6 +25,6 @@ File buildLog = new File(basedir, 'build.log')
 assert buildLog.exists()
 def buildLogText = buildLog.getText()
 assert buildLogText.contains( "Adding project dependency artifact: slf4j-api to classpath" )
-assert buildLogText.contains( "Adding project dependency artifact: log4j to classpath" )
-assert buildLogText.contains( "Adding project dependency artifact: slf4j-log4j12 to classpath" )
-assert !buildLogText.contains( "Adding project dependency artifact: junit to classpath" )
\ No newline at end of file
+assert buildLogText.contains( "Adding project dependency artifact: reload4j to classpath" )
+assert buildLogText.contains( "Adding project dependency artifact: slf4j-reload4j to classpath" )
+assert !buildLogText.contains( "Adding project dependency artifact: junit to classpath" )
diff --git a/src/it/projects/setup-parent/invoker.properties b/src/it/projects/setup-parent/invoker.properties
index b7044f62..d6de78b3 100644
--- a/src/it/projects/setup-parent/invoker.properties
+++ b/src/it/projects/setup-parent/invoker.properties
@@ -1 +1 @@
-invoker.goals = dependency:resolve-plugins install
+invoker.goals = dependency:resolve-plugins dependency:resolve install
diff --git a/src/it/projects/setup-parent/pom.xml b/src/it/projects/setup-parent/pom.xml
index 8895647b..7828ebd4 100644
--- a/src/it/projects/setup-parent/pom.xml
+++ b/src/it/projects/setup-parent/pom.xml
@@ -33,22 +33,22 @@
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>
-        <version>1.7.21</version>
+        <version>1.7.36</version>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-log4j12</artifactId>
-        <version>1.7.21</version>
+        <artifactId>slf4j-reload4j</artifactId>
+        <version>1.7.36</version>
       </dependency>
       <dependency>
-        <groupId>log4j</groupId>
-        <artifactId>log4j</artifactId>
-        <version>1.2.17</version>
+        <groupId>ch.qos.reload4j</groupId>
+        <artifactId>reload4j</artifactId>
+        <version>1.2.25</version>
       </dependency>
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
-        <version>3.8.1</version>
+        <version>4.13.2</version>
       </dependency>
     </dependencies>
   </dependencyManagement>