This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/master by this push:
new 432f7d4cfc Remove `revapi` leftovers
432f7d4cfc is described below
commit 432f7d4cfcd4408480982f6a4fd1f51645d6d6e1
Author: Volkan Yazıcı <[email protected]>
AuthorDate: Tue Feb 14 20:49:25 2023 +0100
Remove `revapi` leftovers
---
log4j-api/revapi.json | 116 ---------------------
log4j-cassandra/revapi.json | 12 ---
log4j-core-its/pom.xml | 1 -
log4j-core-test/revapi.json | 2 -
log4j-core/revapi.json | 36 -------
log4j-flume-ng/revapi.json | 12 ---
log4j-jakarta-web/revapi.json | 14 ---
log4j-jdbc-dbcp2/revapi.json | 28 -----
log4j-jdbc/revapi.json | 23 ----
log4j-jpa/revapi.json | 108 -------------------
log4j-perf/pom.xml | 1 -
log4j-samples/pom.xml | 1 -
log4j-smtp/revapi.json | 23 ----
.../log4j-spring-cloud-config-samples/pom.xml | 2 -
log4j-spring-cloud-config/pom.xml | 1 -
log4j-taglib/revapi.json | 14 ---
log4j-web/revapi.json | 24 -----
pom.xml | 2 -
18 files changed, 420 deletions(-)
diff --git a/log4j-api/revapi.json b/log4j-api/revapi.json
deleted file mode 100644
index 06bc470f7b..0000000000
--- a/log4j-api/revapi.json
+++ /dev/null
@@ -1,116 +0,0 @@
-[
- {
- "extension": "revapi.java",
- "configuration": {
- "filter": {
- "classes": {
- "exclude": [
- "org\\.apache\\.logging\\.log4j\\.util\\.Activator",
- "org\\.apache\\.logging\\.log4j\\.util\\.LoaderUtil",
-
"org\\.apache\\.logging\\.log4j\\.util\\.PrivateSecurityManagerStackTraceUtil",
- "org\\.apache\\.logging\\.log4j\\.util\\.PropertiesUtil",
- "org\\.apache\\.logging\\.log4j\\.util\\.ProviderUtil",
- "org\\.apache\\.logging\\.log4j\\.util\\.StackLocator",
- "org\\.apache\\.logging\\.log4j\\.util\\.StackLocatorUtil"
- ]
- }
- }
- }
- },
- {
- "extension": "revapi.ignore",
- "configuration": [
- {
- "code": "java.method.removed",
- "old": "method void org.apache.logging.log4j.Logger::entry()",
- "justification": "Removed deprecated method"
- },
- {
- "code": "java.method.removed",
- "old": "method void
org.apache.logging.log4j.Logger::entry(java.lang.Object[])",
- "justification": "Removed deprectated method"
- },
- {
- "code": "java.method.removed",
- "old": "method void org.apache.logging.log4j.Logger::exit()",
- "justification": "Removed deprecated method"
- },
- {
- "code": "java.method.removed",
- "old": "method <R> R org.apache.logging.log4j.Logger::exit(R)",
- "justification": "Removed deprecated method"
- },
- {
- "code": "java.method.removed",
- "old": "method org.apache.logging.log4j.Marker
org.apache.logging.log4j.MarkerManager::getMarker(java.lang.String,
java.lang.String)",
- "justification": "Removed deprecated method"
- },
- {
- "code": "java.method.removed",
- "old": "method org.apache.logging.log4j.Marker
org.apache.logging.log4j.MarkerManager::getMarker(java.lang.String,
org.apache.logging.log4j.Marker)",
- "justification": "Removed deprecated method"
- },
- {
- "code": "java.method.removed",
- "old": "method void
org.apache.logging.log4j.message.ParameterizedMessage::<init>(java.lang.String,
java.lang.String[], java.lang.Throwable)",
- "justification": "Removed deprecated method"
- },
- {
- "code": "java.method.removed",
- "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[])",
- "justification": "Removed deprecated method"
- },
- {
- "code": "java.method.removed",
- "old": "method org.apache.logging.log4j.message.EntryMessage
org.apache.logging.log4j.spi.AbstractLogger::enter(java.lang.String,
org.apache.logging.log4j.util.MessageSupplier)",
- "justification": "Removed deprecated method"
- },
- {
- "code": "java.method.removed",
- "old": "method void
org.apache.logging.log4j.spi.AbstractLogger::entry()",
- "justification": "Removed deprecated method"
- },
- {
- "code": "java.method.removed",
- "old": "method void
org.apache.logging.log4j.spi.AbstractLogger::entry(java.lang.Object[])",
- "justification": "Removed deprecated method"
- },
- {
- "code": "java.method.removed",
- "old": "method void
org.apache.logging.log4j.spi.AbstractLogger::exit()",
- "justification": "Removed deprecated method"
- },
- {
- "code": "java.method.removed",
- "old": "method <R> R
org.apache.logging.log4j.spi.AbstractLogger::exit(R)",
- "justification": "Removed deprecated method"
- },
- {
- "code": "java.class.removed",
- "old": "class org.apache.logging.log4j.spi.LoggerContextKey",
- "justification": "Removed deprecated method"
- },
- {
- "code": "java.class.removed",
- "old": "class org.apache.logging.log4j.util.ProcessIdUtil",
- "justification": "Removed deprecated method"
- },
- {
- "code": "java.method.removed",
- "old": "method void
org.apache.logging.log4j.util.ProviderUtil::loadProviders(java.util.Enumeration<java.net.URL>,
java.lang.ClassLoader)",
- "justification": "Removed deprecated method"
- },
- {
- "code": "java.method.removed",
- "old": "method
org.apache.logging.log4j.util.StackLocator.PrivateSecurityManager
org.apache.logging.log4j.util.StackLocator::getSecurityManager()",
- "justification": "Internal inner class moved to its own class so it
can be shared with Java 9"
- },
- {
- "code": "java.method.nowStatic",
- "old": "method java.lang.String
org.apache.logging.log4j.util.Strings::toRootUpperCase(java.lang.String)",
- "new": "method java.lang.String
org.apache.logging.log4j.util.Strings::toRootUpperCase(java.lang.String)",
- "justification": "Method was inaccessible"
- }
- ]
- }
-]
diff --git a/log4j-cassandra/revapi.json b/log4j-cassandra/revapi.json
deleted file mode 100644
index ca1fa97c59..0000000000
--- a/log4j-cassandra/revapi.json
+++ /dev/null
@@ -1,12 +0,0 @@
-[
- {
- "extension": "revapi.ignore",
- "configuration": [
- {
- "code": "java.method.removed",
- "old": "method void
org.apache.logging.log4j.cassandra.CassandraManager::writeInternal(org.apache.logging.log4j.core.LogEvent)",
- "justification": "Method not needed"
- }
- ]
- }
-]
diff --git a/log4j-core-its/pom.xml b/log4j-core-its/pom.xml
index fc48a65f09..aaed4efbd6 100644
--- a/log4j-core-its/pom.xml
+++ b/log4j-core-its/pom.xml
@@ -30,7 +30,6 @@
<log4jParentDir>${basedir}/..</log4jParentDir>
<docLabel>Core Integration Tests Documentation</docLabel>
<projectDir>/log4j-core-its</projectDir>
- <revapi.skip>true</revapi.skip>
<maven.deploy.skip>true</maven.deploy.skip>
<maven.test.skip>true</maven.test.skip>
</properties>
diff --git a/log4j-core-test/revapi.json b/log4j-core-test/revapi.json
deleted file mode 100644
index 0d4f101c7a..0000000000
--- a/log4j-core-test/revapi.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/log4j-core/revapi.json b/log4j-core/revapi.json
deleted file mode 100644
index 1ee8659df3..0000000000
--- a/log4j-core/revapi.json
+++ /dev/null
@@ -1,36 +0,0 @@
-[
- {
- "extension": "revapi.java",
- "configuration": {
- "filter": {
- "classes": {
- "exclude": [
- "org\\.apache\\.logging\\.log4j\\.corel\\.impl\\.ContextAnchor",
-
"org\\.apache\\.logging\\.log4j\\.core\\.async\\.AsyncLoggerDisruptor",
-
"org\\.apache\\.logging\\.log4j\\.core\\.async\\.RingBufferLogEvent\\.Factory",
-
"org\\.apache\\.logging\\.log4j\\.core\\.layout\\.AbstractJacksonLayout",
-
"org\\.apache\\.logging\\.log4j\\.core\\.layout\\.AbstractJacksonLayout\\.ResolvableKeyValuePair",
-
"org\\.apache\\.logging\\.log4j\\.core\\.net\\.SmtpManager\\.FactoryData",
-
"org\\.apache\\.logging\\.log4j\\.core\\.net\\.TcpSocketManager\\.FactoryData",
-
"org\\.apache\\.logging\\.log4j\\.core\\.util\\.CronExpression\\.ValueSet",
-
"org\\.apache\\.logging\\.log4j\\.core\\.util\\.datetime\\.FastDatePrinter\\.NumberRule",
-
"org\\.apache\\.logging\\.log4j\\.core\\.util\\.datetime\\.FastDatePrinter\\.Rule"
- ]
- },
- "packages": {
- "exclude": [
- "org.apache.logging.log4j.core.jmx",
- "org.apache.logging.log4j.core.jackson",
- "org.apache.logging.log4j.core.time.internal",
- "org.apache.logging.log4j.core.util.datetime"
- ]
- }
- }
- }
- },
- {
- "extension": "revapi.ignore",
- "configuration": [
- ]
- }
-]
diff --git a/log4j-flume-ng/revapi.json b/log4j-flume-ng/revapi.json
deleted file mode 100644
index 04bbf7af5a..0000000000
--- a/log4j-flume-ng/revapi.json
+++ /dev/null
@@ -1,12 +0,0 @@
-[
- {
- "extension": "revapi.ignore",
- "configuration": [
- {
- "code": "java.method.removed",
- "old": "method java.util.Map<java.lang.String, java.lang.String>
org.apache.logging.log4j.flume.appender.FlumeEvent::getContextMap()",
- "justification": "Remove deprecated code"
- }
- ]
- }
-]
diff --git a/log4j-jakarta-web/revapi.json b/log4j-jakarta-web/revapi.json
deleted file mode 100644
index f523355e6f..0000000000
--- a/log4j-jakarta-web/revapi.json
+++ /dev/null
@@ -1,14 +0,0 @@
-[
- {
- "extension": "revapi.java",
- "configuration": {
- "filter": {
- "classes": {
- "exclude": [
- "org\\.apache\\.logging\\.log4j\\.web\\.Log4jWebLifeCycle"
- ]
- }
- }
- }
- }
-]
\ No newline at end of file
diff --git a/log4j-jdbc-dbcp2/revapi.json b/log4j-jdbc-dbcp2/revapi.json
deleted file mode 100644
index dd119a2669..0000000000
--- a/log4j-jdbc-dbcp2/revapi.json
+++ /dev/null
@@ -1,28 +0,0 @@
-[
- {
- "extension": "revapi.java",
- "configuration": {
- "filter": {
- "classes": {
- "exclude": [
- ]
- }
- }
- }
- },
- {
- "extension": "revapi.ignore",
- "configuration": [
- {
- "code": "java.class.removed",
- "old": "class
org.apache.logging.log4j.core.appender.db.jdbc.PoolingDriverConnectionSource",
- "justification": "Package was renamed to comply with the Java 9 module
system"
- },
- {
- "code": "java.class.removed",
- "old": "class
org.apache.logging.log4j.core.appender.db.jdbc.PoolableConnectionFactoryConfig",
- "justification": "Package was renamed to comply with the Java 9 module
system"
- }
- ]
- }
-]
\ No newline at end of file
diff --git a/log4j-jdbc/revapi.json b/log4j-jdbc/revapi.json
deleted file mode 100644
index 7c413e9e5e..0000000000
--- a/log4j-jdbc/revapi.json
+++ /dev/null
@@ -1,23 +0,0 @@
-[
- {
- "extension": "revapi.java",
- "configuration": {
- "filter": {
- "classes": {
- "exclude": [
- ]
- }
- }
- }
- },
- {
- "extension": "revapi.ignore",
- "configuration": [
- {
- "code": "java.class.removed",
- "old": "class
org.apache.logging.log4j.core.appender.db.jdbc.PoolingDriverConnectionSource",
- "justification": "Refactored to log4j-jdbc-dbcp2"
- }
- ]
- }
-]
\ No newline at end of file
diff --git a/log4j-jpa/revapi.json b/log4j-jpa/revapi.json
deleted file mode 100644
index 04f119af8d..0000000000
--- a/log4j-jpa/revapi.json
+++ /dev/null
@@ -1,108 +0,0 @@
-[
- {
- "extension": "revapi.ignore",
- "configuration": [
- {
- "code": "java.method.removed",
- "old": "method void
org.apache.logging.log4j.core.appender.db.jpa.JpaDatabaseManager::writeInternal(org.apache.logging.log4j.core.LogEvent)",
- "justification": "Method not needed"
- },
- {
- "code": "java.class.removed",
- "old": "class
org.apache.logging.log4j.core.appender.db.jpa.AbstractLogEventWrapperEntity",
- "justification": "Package was renamed to conform to the Java 9 module
system"
-
- },
- {
- "code": "java.class.removed",
- "old": "class
org.apache.logging.log4j.core.appender.db.jpa.BasicLogEventEntity",
- "justification": "Package was renamed to conform to the Java 9 module
system"
-
- },
- {
- "code": "java.class.removed",
- "old": "class
org.apache.logging.log4j.core.appender.db.jpa.JpaAppender",
- "justification": "Package was renamed to conform to the Java 9 module
system"
-
- },
- {
- "code": "java.class.removed",
- "old": "class
org.apache.logging.log4j.core.appender.db.jpa.JpaDatabaseManager",
- "justification": "Package was renamed to conform to the Java 9 module
system"
-
- },
- {
- "code": "java.class.removed",
- "old": "class
org.apache.logging.log4j.core.appender.db.jpa.converter.ContextDataAttributeConverter",
- "justification": "Package was renamed to conform to the Java 9 module
system"
-
- },
- {
- "code": "java.class.removed",
- "old": "class
org.apache.logging.log4j.core.appender.db.jpa.converter.ContextDataJsonAttributeConverter",
- "justification": "Package was renamed to conform to the Java 9 module
system"
-
- },
- {
- "code": "java.class.removed",
- "old": "class
org.apache.logging.log4j.core.appender.db.jpa.converter.ContextMapAttributeConverter",
- "justification": "Package was renamed to conform to the Java 9 module
system"
-
- },
- {
- "code": "java.class.removed",
- "old": "class
org.apache.logging.log4j.core.appender.db.jpa.converter.ContextMapJsonAttributeConverter",
- "justification": "Package was renamed to conform to the Java 9 module
system"
-
- },
- {
- "code": "java.class.removed",
- "old": "class
org.apache.logging.log4j.core.appender.db.jpa.converter.ContextStackAttributeConverter",
- "justification": "Package was renamed to conform to the Java 9 module
system"
-
- },
- {
- "code": "java.class.removed",
- "old": "class
org.apache.logging.log4j.core.appender.db.jpa.converter.ContextStackJsonAttributeConverter",
- "justification": "Package was renamed to conform to the Java 9 module
system"
-
- },
- {
- "code": "java.class.removed",
- "old": "class
org.apache.logging.log4j.core.appender.db.jpa.converter.InstantAttributeConverter",
- "justification": "Package was renamed to conform to the Java 9 module
system"
-
- },
- {
- "code": "java.class.removed",
- "old": "class
org.apache.logging.log4j.core.appender.db.jpa.converter.LevelAttributeConverter",
- "justification": "Package was renamed to conform to the Java 9 module
system"
-
- },
- {
- "code": "java.class.removed",
- "old": "class
org.apache.logging.log4j.core.appender.db.jpa.converter.MarkerAttributeConverter",
- "justification": "Package was renamed to conform to the Java 9 module
system"
-
- },
- {
- "code": "java.class.removed",
- "old": "class
org.apache.logging.log4j.core.appender.db.jpa.converter.MessageAttributeConverter",
- "justification": "Package was renamed to conform to the Java 9 module
system"
-
- },
- {
- "code": "java.class.removed",
- "old": "class
org.apache.logging.log4j.core.appender.db.jpa.converter.StackTraceElementAttributeConverter",
- "justification": "Package was renamed to conform to the Java 9 module
system"
-
- },
- {
- "code": "java.class.removed",
- "old": "class
org.apache.logging.log4j.core.appender.db.jpa.converter.ThrowableAttributeConverter",
- "justification": "Package was renamed to conform to the Java 9 module
system"
-
- }
- ]
- }
-]
diff --git a/log4j-perf/pom.xml b/log4j-perf/pom.xml
index 9114e943f0..ce84004504 100644
--- a/log4j-perf/pom.xml
+++ b/log4j-perf/pom.xml
@@ -34,7 +34,6 @@
<docLabel>Apache Log4J Performance Tests</docLabel>
<projectDir>/log4j-perf</projectDir>
<uberjar.name>benchmarks</uberjar.name>
- <revapi.skip>true</revapi.skip>
<maven.deploy.skip>true</maven.deploy.skip>
<module.name>org.apache.logging.log4j.perf</module.name>
</properties>
diff --git a/log4j-samples/pom.xml b/log4j-samples/pom.xml
index a5cf6aff34..25746faa7c 100644
--- a/log4j-samples/pom.xml
+++ b/log4j-samples/pom.xml
@@ -31,7 +31,6 @@
<properties>
<log4jParentDir>${basedir}/..</log4jParentDir>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <revapi.skip>true</revapi.skip>
<maven.deploy.skip>true</maven.deploy.skip>
<maven.install.skip>true</maven.install.skip>
<maven-jetty-plugin.version>6.1.26</maven-jetty-plugin.version>
diff --git a/log4j-smtp/revapi.json b/log4j-smtp/revapi.json
deleted file mode 100644
index 9b24f5ef96..0000000000
--- a/log4j-smtp/revapi.json
+++ /dev/null
@@ -1,23 +0,0 @@
-[
- {
- "extension": "revapi.java",
- "configuration": {
- "filter": {
- "classes": {
- "exclude": [
- ]
- }
- }
- }
- },
- {
- "extension": "revapi.ignore",
- "configuration": [
- {
- "code": "java.class.nonPublicPartOfAPI",
- "new": "class
org.apache.logging.log4j.smtp.appender.SmtpManager.FactoryData",
- "justification": "Internal component"
- }
- ]
- }
-]
\ No newline at end of file
diff --git
a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/pom.xml
b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/pom.xml
index 6b56b64aa0..dbb18da32e 100644
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/pom.xml
+++ b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/pom.xml
@@ -29,9 +29,7 @@
<url>http://maven.apache.org</url>
<properties>
<log4jParentDir>${basedir}/../..</log4jParentDir>
- <revapi.skip>true</revapi.skip>
<maven.deploy.skip>true</maven.deploy.skip>
-
<spring-ws.version>4.0.0</spring-ws.version>
</properties>
<dependencyManagement>
diff --git a/log4j-spring-cloud-config/pom.xml
b/log4j-spring-cloud-config/pom.xml
index de737ba827..664bacd3ae 100644
--- a/log4j-spring-cloud-config/pom.xml
+++ b/log4j-spring-cloud-config/pom.xml
@@ -28,7 +28,6 @@
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <revapi.skip>true</revapi.skip>
<spring-cloud.version>2021.0.4</spring-cloud.version>
<log4jParentDir>${basedir}/..</log4jParentDir>
</properties>
diff --git a/log4j-taglib/revapi.json b/log4j-taglib/revapi.json
deleted file mode 100644
index 9a74788eb5..0000000000
--- a/log4j-taglib/revapi.json
+++ /dev/null
@@ -1,14 +0,0 @@
-[
- {
- "extension": "revapi.java",
- "configuration": {
- "filter": {
- "classes": {
- "exclude": [
- "org\\.apache\\.logging\\.log4j\\.taglib\\.Log4jTaglibLogger"
- ]
- }
- }
- }
- }
-]
\ No newline at end of file
diff --git a/log4j-web/revapi.json b/log4j-web/revapi.json
deleted file mode 100644
index 9ba8949f89..0000000000
--- a/log4j-web/revapi.json
+++ /dev/null
@@ -1,24 +0,0 @@
-[
- {
- "extension": "revapi.java",
- "configuration": {
- "filter": {
- "classes": {
- "exclude": [
- "org\\.apache\\.logging\\.log4j\\.web\\.Log4jWebLifeCycle"
- ]
- }
- }
- }
- },
- {
- "extension": "revapi.ignore",
- "configuration": [
- {
- "code": "java.method.removed",
- "old": "method org.apache.logging.log4j.web.appender.ServletAppender
org.apache.logging.log4j.web.appender.ServletAppender::createAppender(org.apache.logging.log4j.core.Layout<?
extends java.io.Serializable>, org.apache.logging.log4j.core.Filter,
java.lang.String, boolean)",
- "justification": "Remove deprecated code"
- }
- ]
- }
-]
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 0659a7c2cb..7d08e98c0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -240,7 +240,6 @@
<!-- =================
Common properties
================= -->
- <revapi.skip>true</revapi.skip>
<manifestfile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestfile>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
@@ -293,7 +292,6 @@
<maven-scm-plugin.version>1.12.2</maven-scm-plugin.version>
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
<maven-taglib-plugin.version>2.4</maven-taglib-plugin.version>
- <revapi-maven-plugin.version>0.12.2</revapi-maven-plugin.version>
<spotbugs-maven-plugin.version>4.7.2.1</spotbugs-maven-plugin.version>
<spotless-maven-plugin.version>2.27.2</spotless-maven-plugin.version>
<!-- `surefire.version` property used in `apache.org:apache`: -->
