Use @BaselineIgnore instead of packages exclusions

Author: ppkarwasz

log4j-api/pom.xml

@@ -107,47 +107,6 @@
         </executions>
       </plugin>
 
-      <!--
-        ~ Remove the following plugin executions after `2.22.0` release!
-        ~ In `2.22.0`, we have removed protected methods from the final (or effectively final) classes:
-        ~  * org.apache.logging.log4j.Level,
-        ~  * org.apache.logging.log4j.util.ProviderUtil.
-        ~
-        ~ BND considers this a major API break.
-        -->
-      <plugin>
-        <groupId>biz.aQute.bnd</groupId>
-        <artifactId>bnd-baseline-maven-plugin</artifactId>
-        <configuration>
-          <diffpackages>
-            <diffpackage>!org.apache.logging.log4j</diffpackage>
-            <diffpackage>!org.apache.logging.log4j.util</diffpackage>
-            <diffpackage>*</diffpackage>
-          </diffpackages>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>remove-after-release</id>
-            <goals>
-              <goal>enforce</goal>
-            </goals>
-            <configuration>
-              <rules>
-                <requireProperty>
-                  <property>revision</property>
-                  <regex>2\.22\.0(-SNAPSHOT)?</regex>
-                  <regexMessage>Remove `bnd-baseline-maven-plugin` config in `log4j-api`.</regexMessage>
-                </requireProperty>
-              </rules>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
     </plugins>
   </build>
 </project>

log4j-api/src/main/java/org/apache/logging/log4j/Level.java

@@ -21,6 +21,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
+import aQute.bnd.annotation.baseline.BaselineIgnore;
 import org.apache.logging.log4j.spi.StandardLevel;
 import org.apache.logging.log4j.util.Strings;
 
@@ -75,6 +76,7 @@
  * used in logging configurations.
  * </p>
  */
+@BaselineIgnore("2.22.0")
 public final class Level implements Comparable<Level>, Serializable {
 
     private static final Level[] EMPTY_ARRAY = {};

log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataId.java

@@ -252,7 +252,6 @@ public StructuredDataId makeId(final String defaultId, final String anEnterprise
      * @deprecated Use {@link StructuredDataId#makeId(String, String)} instead
      */
     @Deprecated
-    @InlineMe(replacement = "this.makeId(defaultId, String.valueOf(anEnterpriseNumber))")
     public StructuredDataId makeId(final String defaultId, final int anEnterpriseNumber) {
         return makeId(defaultId, String.valueOf(anEnterpriseNumber));
     }

log4j-api/src/main/java/org/apache/logging/log4j/package-info.java

@@ -32,7 +32,7 @@
  * @see <a href="http://logging.apache.org/log4j/2.x/manual/api.html">Log4j 2 API manual</a>
  */
 @Export
-@Version("2.20.1")
+@Version("2.20.2")
 package org.apache.logging.log4j;
 
 import org.osgi.annotation.bundle.Export;

log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java

@@ -28,6 +28,7 @@
 
 import aQute.bnd.annotation.Cardinality;
 import aQute.bnd.annotation.Resolution;
+import aQute.bnd.annotation.baseline.BaselineIgnore;
 import aQute.bnd.annotation.spi.ServiceConsumer;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.apache.logging.log4j.Logger;
@@ -40,6 +41,7 @@
  * {@link #loadProvider(java.net.URL, ClassLoader)} a classpath accordingly.
  */
 @InternalApi
+@BaselineIgnore("2.22.0")
 @ServiceConsumer(value = Provider.class, resolution = Resolution.OPTIONAL, cardinality = Cardinality.MULTIPLE)
 public final class ProviderUtil {
 

log4j-api/src/main/java/org/apache/logging/log4j/util/package-info.java

@@ -20,7 +20,7 @@
  * There are no guarantees for binary or logical compatibility in this package.
  */
 @Export
-@Version("2.21.0")
+@Version("2.22.0")
 package org.apache.logging.log4j.util;
 
 import org.osgi.annotation.bundle.Export;

log4j-core/pom.xml

@@ -296,42 +296,6 @@
         </executions>
       </plugin>
 
-      <!-- Remove the following plugin executions after `2.22.0` release!
-           In `2.22.0`, we have removed *unused* `FastDateParser` due to LOG4J2-3672 and #1848.
-           Though `bnd-baseline-m-p` doesn't allow such breaking changes in non-major version upgrades.
-           Hence, we suppress it until `2.22.0` gets released. -->
-      <plugin>
-        <groupId>biz.aQute.bnd</groupId>
-        <artifactId>bnd-baseline-maven-plugin</artifactId>
-        <configuration>
-          <diffpackages>
-            <diffpackage>!org.apache.logging.log4j.core.util.datetime</diffpackage>
-            <diffpackage>*</diffpackage>
-          </diffpackages>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>remove-after-release</id>
-            <goals>
-              <goal>enforce</goal>
-            </goals>
-            <configuration>
-              <rules>
-                <requireProperty>
-                  <property>revision</property>
-                  <regex>2\.22\.0(-SNAPSHOT)?</regex>
-                  <regexMessage>Remove `bnd-baseline-maven-plugin` config in `log4j-core`.</regexMessage>
-                </requireProperty>
-              </rules>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
     </plugins>
   </build>
 </project>

log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/package-info.java

@@ -18,8 +18,10 @@
  * Log4j 2 date formatting classes.
  */
 @Export
-@Version("2.21.0")
+@Version("2.21.1")
+@BaselineIgnore("2.22.0")
 package org.apache.logging.log4j.core.util.datetime;
 
+import aQute.bnd.annotation.baseline.BaselineIgnore;
 import org.osgi.annotation.bundle.Export;
 import org.osgi.annotation.versioning.Version;