Skip to content

Commit 8548259

Browse files
rgoersrgoers
committed
LOG4J2-1576 - Change from CLIRR to RevAPI to detect changes to the API
1 parent 3acea6c commit 8548259

File tree

21 files changed

+2454
-27
lines changed

21 files changed

+2454
-27
lines changed

‎log4j-api/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -238,11 +238,6 @@
238238
</build>
239239
<reporting>
240240
<plugins>
241-
<plugin>
242-
<groupId>org.codehaus.mojo</groupId>
243-
<artifactId>clirr-maven-plugin</artifactId>
244-
<version>${clirr.plugin.version}</version>
245-
</plugin>
246241
<plugin>
247242
<groupId>org.apache.maven.plugins</groupId>
248243
<artifactId>maven-changes-plugin</artifactId>

‎log4j-api/revapi.json

Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
1+
[
2+
{
3+
"extension": "revapi.java",
4+
"configuration": {
5+
"filter": {
6+
"classes": {
7+
"exclude": [
8+
"org\\.apache\\.logging\\.log4j\\.util\\.Activator",
9+
"org\\.apache\\.logging\\.log4j\\.util\\.LoaderUtil",
10+
"org\\.apache\\.logging\\.log4j\\.util\\.PrivateSecurityManagerStackTraceUtil",
11+
"org\\.apache\\.logging\\.log4j\\.util\\.PropertiesUtil",
12+
"org\\.apache\\.logging\\.log4j\\.util\\.ProviderUtil",
13+
"org\\.apache\\.logging\\.log4j\\.util\\.StackLocatorUtil"
14+
]
15+
}
16+
}
17+
}
18+
},
19+
{
20+
"extension": "revapi.ignore",
21+
"configuration": [
22+
{
23+
"code": "java.method.removed",
24+
"old": "method void org.apache.logging.log4j.Logger::entry()",
25+
"justification": "Removed deprecated method"
26+
},
27+
{
28+
"code": "java.method.removed",
29+
"old": "method void org.apache.logging.log4j.Logger::entry(java.lang.Object[])",
30+
"justification": "Removed deprectated method"
31+
},
32+
{
33+
"code": "java.method.removed",
34+
"old": "method void org.apache.logging.log4j.Logger::exit()",
35+
"justification": "Removed deprecated method"
36+
},
37+
{
38+
"code": "java.method.removed",
39+
"old": "method <R> R org.apache.logging.log4j.Logger::exit(R)",
40+
"justification": "Removed deprecated method"
41+
},
42+
{
43+
"code": "java.method.removed",
44+
"old": "method org.apache.logging.log4j.Marker org.apache.logging.log4j.MarkerManager::getMarker(java.lang.String, java.lang.String)",
45+
"justification": "Removed deprecated method"
46+
},
47+
{
48+
"code": "java.method.removed",
49+
"old": "method org.apache.logging.log4j.Marker org.apache.logging.log4j.MarkerManager::getMarker(java.lang.String, org.apache.logging.log4j.Marker)",
50+
"justification": "Removed deprecated method"
51+
},
52+
{
53+
"code": "java.method.removed",
54+
"old": "method void org.apache.logging.log4j.message.ParameterizedMessage::<init>(java.lang.String, java.lang.String[], java.lang.Throwable)",
55+
"justification": "Removed deprecated method"
56+
},
57+
{
58+
"code": "java.method.removed",
59+
"old": "method org.apache.logging.log4j.message.EntryMessage org.apache.logging.log4j.spi.AbstractLogger::enter(java.lang.String, java.lang.String, org.apache.logging.log4j.util.MessageSupplier[])",
60+
"justification": "Removed deprecated method"
61+
},
62+
{
63+
"code": "java.method.removed",
64+
"old": "method org.apache.logging.log4j.message.EntryMessage org.apache.logging.log4j.spi.AbstractLogger::enter(java.lang.String, org.apache.logging.log4j.util.MessageSupplier)",
65+
"justification": "Removed deprecated method"
66+
},
67+
{
68+
"code": "java.method.removed",
69+
"old": "method void org.apache.logging.log4j.spi.AbstractLogger::entry()",
70+
"justification": "Removed deprecated method"
71+
},
72+
{
73+
"code": "java.method.removed",
74+
"old": "method void org.apache.logging.log4j.spi.AbstractLogger::entry(java.lang.Object[])",
75+
"justification": "Removed deprecated method"
76+
},
77+
{
78+
"code": "java.method.removed",
79+
"old": "method void org.apache.logging.log4j.spi.AbstractLogger::exit()",
80+
"justification": "Removed deprecated method"
81+
},
82+
{
83+
"code": "java.method.removed",
84+
"old": "method <R> R org.apache.logging.log4j.spi.AbstractLogger::exit(R)",
85+
"justification": "Removed deprecated method"
86+
},
87+
{
88+
"code": "java.class.removed",
89+
"old": "class org.apache.logging.log4j.spi.LoggerContextKey",
90+
"justification": "Removed deprecated method"
91+
},
92+
{
93+
"code": "java.class.removed",
94+
"old": "class org.apache.logging.log4j.util.ProcessIdUtil",
95+
"justification": "Removed deprecated method"
96+
},
97+
{
98+
"code": "java.method.removed",
99+
"old": "method void org.apache.logging.log4j.util.ProviderUtil::loadProviders(java.util.Enumeration<java.net.URL>, java.lang.ClassLoader)",
100+
"justification": "Removed deprecated method"
101+
},
102+
{
103+
"code": "java.method.removed",
104+
"old": "method org.apache.logging.log4j.util.StackLocator.PrivateSecurityManager org.apache.logging.log4j.util.StackLocator::getSecurityManager()",
105+
"justification": "Internal inner class moved to its own class so it can be shared with Java 9"
106+
},
107+
{
108+
"code": "java.method.nowStatic",
109+
"old": "method java.lang.String org.apache.logging.log4j.util.Strings::toRootUpperCase(java.lang.String)",
110+
"new": "method java.lang.String org.apache.logging.log4j.util.Strings::toRootUpperCase(java.lang.String)",
111+
"justification": "Method was inaccessible"
112+
}
113+
]
114+
}
115+
]

‎log4j-cassandra/revapi.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
[
2+
{
3+
"extension": "revapi.ignore",
4+
"configuration": [
5+
{
6+
"code": "java.method.removed",
7+
"old": "method void org.apache.logging.log4j.cassandra.CassandraManager::writeInternal(org.apache.logging.log4j.core.LogEvent)",
8+
"justification": "Method not needed"
9+
}
10+
]
11+
}
12+
]

‎log4j-core-its/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
<log4jParentDir>${basedir}/..</log4jParentDir>
3232
<docLabel>Core Integration Tests Documentation</docLabel>
3333
<projectDir>/log4j-core-its</projectDir>
34+
<revapi.skip>true</revapi.skip>
3435
</properties>
3536
<dependencies>
3637
<dependency>

‎log4j-core-its/src/main/resources/placeholder.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Revapi requires something in the target/classes directory.

0 commit comments

Comments
 (0)