Skip to content

Commit 465e1d1

Browse files
Copilotstefanseifert
Copilot
and
stefanseifert
authored
Remove Apache Log4j 1.x (EOL) from integration test projects (#116)
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: stefanseifert <5614031+stefanseifert@users.noreply.github.com>
1 parent d238c38 commit 465e1d1

File tree

22 files changed

+44
-88
lines changed

22 files changed

+44
-88
lines changed

‎src/test/resources/projects/project-38/child/expected/.classpath‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
<classpath>
33
<classpathentry kind="output" path="target/classes"/>
44
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
5-
<classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar" sourcepath="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13-sources.jar"/>
5+
<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36-sources.jar"/>
66
</classpath>

‎src/test/resources/projects/project-38/child/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ under the License.
3030
<packaging>jar</packaging>
3131
<dependencies>
3232
<dependency>
33-
<groupId>log4j</groupId>
34-
<artifactId>log4j</artifactId>
35-
<version>1.2.13</version>
33+
<groupId>org.slf4j</groupId>
34+
<artifactId>slf4j-api</artifactId>
35+
<version>1.7.36</version>
3636
</dependency>
3737
</dependencies>
3838
</project>

‎src/test/resources/projects/project-38/pom.xml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,6 @@ under the License.
2525
<artifactId>parent</artifactId>
2626
<packaging>pom</packaging>
2727
<version>1.0-SNAPSHOT</version>
28-
<dependencyManagement>
29-
<dependencies>
30-
<dependency>
31-
<groupId>log4j</groupId>
32-
<artifactId>log4j</artifactId>
33-
<version>1.2.8</version>
34-
</dependency>
35-
</dependencies>
36-
</dependencyManagement>
3728
<build>
3829
<plugins>
3930
<plugin>

‎src/test/resources/projects/project-53-MECLIPSE-551/.classpath.2.5.1.txt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,10 @@
1212
<attribute value="jar:file:/C:/Documents%20and%20Settings/PD79199/.m2/repository/junit/junit/3.8.2/junit-3.8.2-javadoc.jar!/" name="javadoc_location"/>
1313
</attributes>
1414
</classpathentry>
15-
<classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
15+
<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-simple/1.4.2/slf4j-simple-1.4.2.jar" sourcepath="M2_REPO/org/slf4j/slf4j-simple/1.4.2/slf4j-simple-1.4.2-sources.jar"/>
1616
<classpathentry kind="var" path="M2_REPO/mx4j/mx4j/3.0.1/mx4j-3.0.1.jar" sourcepath="M2_REPO/mx4j/mx4j/3.0.1/mx4j-3.0.1-sources.jar"/>
1717
<classpathentry kind="var" path="M2_REPO/mx4j/mx4j-tools/3.0.1/mx4j-tools-3.0.1.jar" sourcepath="M2_REPO/mx4j/mx4j-tools/3.0.1/mx4j-tools-3.0.1-sources.jar"/>
1818
<classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/servlet-api-2.5/6.1.4/servlet-api-2.5-6.1.4.jar" sourcepath="M2_REPO/org/mortbay/jetty/servlet-api-2.5/6.1.4/servlet-api-2.5-6.1.4-sources.jar"/>
1919
<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.4.2/slf4j-api-1.4.2.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.4.2/slf4j-api-1.4.2-sources.jar"/>
20-
<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.4.2/slf4j-log4j12-1.4.2.jar" sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.4.2/slf4j-log4j12-1.4.2-sources.jar"/>
2120
<classpathentry kind="var" path="M2_REPO/org/apache/wicket/wicket/1.4-rc4/wicket-1.4-rc4.jar" sourcepath="M2_REPO/org/apache/wicket/wicket/1.4-rc4/wicket-1.4-rc4-sources.jar"/>
2221
</classpath>

‎src/test/resources/projects/project-53-MECLIPSE-551/.classpath.2.6.txt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,11 @@
1111
<attribute value="jar:file:/C:/Documents%20and%20Settings/PD79199/.m2/repository/junit/junit/3.8.2/junit-3.8.2-javadoc.jar!/" name="javadoc_location"/>
1212
</attributes>
1313
</classpathentry>
14-
<classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
14+
<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-simple/1.4.2/slf4j-simple-1.4.2.jar" sourcepath="M2_REPO/org/slf4j/slf4j-simple/1.4.2/slf4j-simple-1.4.2-sources.jar"/>
1515
<classpathentry kind="var" path="M2_REPO/mx4j/mx4j/3.0.1/mx4j-3.0.1.jar" sourcepath="M2_REPO/mx4j/mx4j/3.0.1/mx4j-3.0.1-sources.jar"/>
1616
<classpathentry kind="var" path="M2_REPO/mx4j/mx4j-tools/3.0.1/mx4j-tools-3.0.1.jar" sourcepath="M2_REPO/mx4j/mx4j-tools/3.0.1/mx4j-tools-3.0.1-sources.jar"/>
1717
<classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/servlet-api-2.5/6.1.4/servlet-api-2.5-6.1.4.jar" sourcepath="M2_REPO/org/mortbay/jetty/servlet-api-2.5/6.1.4/servlet-api-2.5-6.1.4-sources.jar"/>
1818
<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.4.2/slf4j-api-1.4.2.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.4.2/slf4j-api-1.4.2-sources.jar"/>
19-
<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.4.2/slf4j-log4j12-1.4.2.jar" sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.4.2/slf4j-log4j12-1.4.2-sources.jar"/>
2019
<classpathentry kind="var" path="M2_REPO/org/apache/wicket/wicket/1.4-rc4/wicket-1.4-rc4.jar" sourcepath="M2_REPO/org/apache/wicket/wicket/1.4-rc4/wicket-1.4-rc4-sources.jar"/>
2120
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
2221
</classpath>

‎src/test/resources/projects/project-53-MECLIPSE-551/expected/.classpath‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
1212
<classpathentry kind="var" path="M2_REPO/org/apache/wicket/wicket/1.4-rc4/wicket-1.4-rc4.jar"/>
1313
<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.4.2/slf4j-api-1.4.2.jar"/>
14-
<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.4.2/slf4j-log4j12-1.4.2.jar"/>
15-
<classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
14+
<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-simple/1.4.2/slf4j-simple-1.4.2.jar"/>
1615
<classpathentry kind="var" path="M2_REPO/junit/junit/3.8.2/junit-3.8.2.jar">
1716
<attributes>
1817
<attribute value="true" name="test"/>

‎src/test/resources/projects/project-53-MECLIPSE-551/pom.xml‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,12 @@
3232
<version>${wicket.version}</version> </dependency>
3333
-->
3434

35-
<!-- LOGGING DEPENDENCIES - LOG4J -->
35+
<!-- LOGGING DEPENDENCIES - SLF4J -->
3636
<dependency>
3737
<groupId>org.slf4j</groupId>
38-
<artifactId>slf4j-log4j12</artifactId>
38+
<artifactId>slf4j-simple</artifactId>
3939
<version>1.4.2</version>
4040
</dependency>
41-
<dependency>
42-
<groupId>log4j</groupId>
43-
<artifactId>log4j</artifactId>
44-
<version>1.2.14</version>
45-
</dependency>
4641

4742
<!-- JUNIT DEPENDENCY FOR TESTING -->
4843
<dependency>

‎src/test/resources/projects/project-57-MECLIPSE-368/expected/.classpath‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,4 @@
33
<classpathentry kind="output" path="target/classes"/>
44
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
55
<classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar"/>
6-
<classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.15/log4j-1.2.15.jar"/>
76
</classpath>

‎src/test/resources/projects/project-57-MECLIPSE-368/pom.xml‎

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -46,37 +46,13 @@ under the License.
4646
<groupId>javax.servlet</groupId>
4747
<artifactId>servlet-api</artifactId>
4848
</exclusion>
49+
<exclusion>
50+
<groupId>log4j</groupId>
51+
<artifactId>log4j</artifactId>
52+
</exclusion>
4953
</exclusions>
5054
</dependency>
5155
</dependencies>
52-
<dependencyManagement>
53-
<dependencies>
54-
<dependency>
55-
<groupId>log4j</groupId>
56-
<artifactId>log4j</artifactId>
57-
<version>1.2.15</version>
58-
<scope>runtime</scope>
59-
<exclusions>
60-
<exclusion>
61-
<groupId>com.sun.jmx</groupId>
62-
<artifactId>jmxri</artifactId>
63-
</exclusion>
64-
<exclusion>
65-
<groupId>com.sun.jdmk</groupId>
66-
<artifactId>jmxtools</artifactId>
67-
</exclusion>
68-
<exclusion>
69-
<groupId>javax.jms</groupId>
70-
<artifactId>jms</artifactId>
71-
</exclusion>
72-
<exclusion>
73-
<groupId>javax.mail</groupId>
74-
<artifactId>mail</artifactId>
75-
</exclusion>
76-
</exclusions>
77-
</dependency>
78-
</dependencies>
79-
</dependencyManagement>
8056
<build>
8157
<plugins>
8258
<plugin>

‎src/test/resources/projects/project-61-MECLIPSE-548/expected/.classpath‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
33
<classpathentry kind="output" path="target/classes"/>
4-
<classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
4+
<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36-sources.jar"/>
55
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
66
</classpath>

0 commit comments

Comments
 (0)