Skip to content

Commit

Permalink
Remove Log4j 1.2.x from ITs
Browse files Browse the repository at this point in the history
  • Loading branch information
slawekjaranowski committed Aug 6, 2024
1 parent 881bb9c commit c7ad671
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 18 deletions.
6 changes: 3 additions & 3 deletions src/it/projects/git-issue-60-exec/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/it/projects/git-issue-60-exec/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -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()
assert buildLog.exists()
6 changes: 3 additions & 3 deletions src/it/projects/git-issue-60-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions src/it/projects/git-issue-60-java/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -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" )
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" )
2 changes: 1 addition & 1 deletion src/it/projects/setup-parent/invoker.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
invoker.goals = dependency:resolve-plugins install
invoker.goals = dependency:resolve-plugins dependency:resolve install
14 changes: 7 additions & 7 deletions src/it/projects/setup-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit c7ad671

Please sign in to comment.