Merge remote-tracking branch 'apache/2.x' into doc/2.x/lookups

Author: ppkarwasz

.github/dependabot.yaml

@@ -81,16 +81,16 @@ updates:
         update-types: [ "version-update:semver-major" ]
       # Apache Cassandra: keep version 3.x
       - dependency-name: "org.apache.cassandra:*"
-        versions: [ "[4.0.0,)" ]
+        versions: [ "[4,)" ]
       # Kubernetes: keep version 5.x
       - dependency-name: "io.fabric8:*"
-        versions: [ "[6.0.0,)" ]
+        versions: [ "[6,)" ]
       # `com.conversantmedia:disruptor` 1.2.16 requires Java 9
       - dependency-name: "com.conversantmedia:disruptor"
         versions: [ "[1.2.16,)" ]
       # Keep Jakarta EE at version 9.0
       - dependency-name: "jakarta.platform:*"
-        versions: [ "[10.0.0,)" ]
+        versions: [ "[10,)" ]
       # OpenRewrite is quite noisy. Let us skip patch and minor updates:
       - dependency-name: "org.openrewrite:*"
         update-types: [ "version-update:semver-minor", "version-update:semver-patch" ]
@@ -100,25 +100,28 @@ updates:
         update-types: [ "version-update:semver-minor", "version-update:semver-patch" ]
       # Json Unit 3.x requires Java 17
       - dependency-name: "net.javacrumbs.json-unit:*"
-        versions: [ "[3.0.0,)" ]
+        versions: [ "[3,)" ]
       # Update both `disruptor.version` to latest 3.x version
       # and `disruptor4.version` to latest 4.x version
       - dependency-name: "com.lmax:disruptor"
         update-types: [ "version-update:semver-major" ]
       # WebCompere System Stubs requires Java 11
       - dependency-name: "uk.org.webcompere:*"
-        versions: [ "2.1.0,)" ]
+        versions: [ "[2.1,)" ]
       # SLF4J 1.7.x should only upgrade to 1.7.x and
       # SLF4J 2.x should only upgrade to 2.x.
       - dependency-name: "org.slf4j:slf4j-api"
         update-types: [ "version-update:semver-major" ]
       # Plexus Utils 4.x are for Maven 4.x
       - dependency-name: "org.codehaus.plexus:plexus-utils"
-        versions: [ "4,)" ]
+        versions: [ "[4,)" ]
       # MongoDB 3.x should only upgrade to 3.x and
       # MongoDB 4.x should only upgrade to 4.x
       - dependency-name: "org.mongodb:*"
         update-types: [ "version-update:semver-major" ]
+      # H2 version 2.3.x requires Java 11
+      - dependency-name: "com.h2database:h2"
+        versions: [ "[2.3,)" ]
 
   - package-ecosystem: github-actions
     directory: "/"
@@ -141,43 +144,16 @@ updates:
     registries:
       - maven-central
     ignore:
-      # Jetty 10.x does not have an internal logging API
-      - dependency-name: "org.eclipse.jetty:*"
-        update-types: [ "version-update:semver-major" ]
-      # EclipseLink 3.x is Jakarta EE 9
-      - dependency-name: "org.eclipse.persistence:*"
-        update-types: [ "version-update:semver-major" ]
-      # Spring 6.x is Jakarta EE 9
-      - dependency-name: "org.springframework:*"
-        update-types: [ "version-update:semver-major" ]
-      # Spring Boot 3.x is Jakarta EE 9
-      - dependency-name: "org.springframework.boot:*"
-        update-types: [ "version-update:semver-major" ]
-      # Spring Cloud 2022.x is Jakarta EE 9
-      - dependency-name: "org.springframework.cloud:*"
-        update-types: [ "version-update:semver-major" ]
-      # Keep Logback version 1.2.x
-      - dependency-name: "ch.qos.logback:*"
-        update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
-      # Apache Cassandra: keep version 3.x
-      - dependency-name: "org.apache.cassandra:*"
-        versions: [ "[4.0.0,)" ]
-      # Kubernetes: keep version 5.x
-      - dependency-name: "io.fabric8:*"
-        versions: [ "[6.0.0,)" ]
       # Keep Jakarta EE at version 9.0
       - dependency-name: "jakarta.platform:*"
-        versions: [ "[10.0.0,)" ]
+        versions: [ "[10,)" ]
       # OpenRewrite is quite noisy. Let us skip patch and minor updates:
       - dependency-name: "org.openrewrite:*"
         update-types: [ "version-update:semver-minor", "version-update:semver-patch" ]
       - dependency-name: "org.openrewrite.maven:*"
         update-types: [ "version-update:semver-minor", "version-update:semver-patch" ]
       - dependency-name: "org.openrewrite.recipe:*"
         update-types: [ "version-update:semver-minor", "version-update:semver-patch" ]
-      # Json Unit 3.x requires Java 17
-      - dependency-name: "net.javacrumbs.json-unit:*"
-        versions: [ "[3.0.0,)" ]
       # SLF4J 1.7.x should only upgrade to 1.7.x and
       # SLF4J 2.x should only upgrade to 2.x.
       - dependency-name: "org.slf4j:slf4j-api"

.mvn/extensions.xml

@@ -55,7 +55,7 @@
     <exam-maven-plugin.version>4.13.5</exam-maven-plugin.version>
     <maven-taglib-plugin.version>2.4</maven-taglib-plugin.version>
     <!-- `surefire.version` property used in `apache.org:apache`: -->
-    <surefire.version>3.3.0</surefire.version>
+    <surefire.version>3.3.1</surefire.version>
 
     <!-- =====================================================
          Direct dependency version properties (in alphabetical order)
@@ -68,7 +68,7 @@
     <bsh.version>2.0b6</bsh.version>
     <cassandra.version>3.11.17</cassandra.version>
     <cassandra-driver.version>3.11.5</cassandra-driver.version>
-    <commons-codec.version>1.17.0</commons-codec.version>
+    <commons-codec.version>1.17.1</commons-codec.version>
     <commons-compress.version>1.26.2</commons-compress.version>
     <commons-csv.version>1.11.0</commons-csv.version>
     <commons-dbcp2.version>2.12.0</commons-dbcp2.version>
@@ -78,10 +78,10 @@
     <!-- `com.conversantmedia:disruptor` version 1.2.16 requires Java 9: -->
     <conversant.disruptor.version>1.2.15</conversant.disruptor.version>
     <disruptor.version>3.4.4</disruptor.version>
-    <elasticsearch-java.version>8.14.2</elasticsearch-java.version>
+    <elasticsearch-java.version>8.14.3</elasticsearch-java.version>
     <embedded-ldap.version>0.9.0</embedded-ldap.version>
     <felix.version>7.0.5</felix.version>
-    <flapdoodle-embed.version>4.12.0</flapdoodle-embed.version>
+    <flapdoodle-embed.version>4.13.0</flapdoodle-embed.version>
     <flapdoodle-reverse.version>1.7.2</flapdoodle-reverse.version>
     <flume.version>1.11.0</flume.version>
     <groovy.version>3.0.22</groovy.version>

log4j-parent/pom.xml

@@ -319,9 +319,6 @@
          Hence, *DO NOT MANUALLY EDIT THIS VALUE*! -->
     <project.build.outputTimestamp>2024-03-06T09:31:11Z</project.build.outputTimestamp>
 
-    <!-- Enables Predictive Test Selection for the project -->
-    <predictive.test.selection.enabled>false</predictive.test.selection.enabled>
-
     <!-- ========================
          Site-specific properties
          ======================== -->
@@ -942,6 +939,19 @@
       </build>
     </profile>
 
+    <profile>
+      <id>rerun-tests</id>
+      <activation>
+        <property>
+          <name>env.CI</name>
+          <value>true</value>
+        </property>
+      </activation>
+      <properties>
+        <surefire.rerunFailingTestsCount>2</surefire.rerunFailingTestsCount>
+      </properties>
+    </profile>
+
     <profile>
       <id>sequential-tests</id>
       <build>
@@ -993,40 +1003,6 @@
       </build>
     </profile>
 
-    <profile>
-      <!-- These settings cause a build failure if the Develocity extension is absent.
-
-           Due to a bug in Develocity, we disable Develocity by removing the `.mvn/extensions.xml` file
-           in the `deploy-site` run.
-           The removal of the file will also disable this profile.
-      -->
-      <id>predictive-test-selection</id>
-
-      <activation>
-        <file>
-          <exists>${maven.multiModuleProjectDirectory}/.mvn/extensions.xml</exists>
-        </file>
-      </activation>
-
-      <build>
-        <plugins>
-
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <properties>
-                <predictiveSelection>
-                  <enabled>${predictive.test.selection.enabled}</enabled>
-                </predictiveSelection>
-              </properties>
-            </configuration>
-          </plugin>
-
-        </plugins>
-      </build>
-
-    </profile>
   </profiles>
 
 </project>

pom.xml

@@ -3,6 +3,6 @@
        xmlns="https://logging.apache.org/xml/ns"
        xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
        type="updated">
-  <issue id="2711" link="https://github.com/apache/logging-log4j2/pull/2711"/>
-  <description format="asciidoc">Update `co.elastic.clients:elasticsearch-java` to version `8.14.2`</description>
+  <issue id="2731" link="https://github.com/apache/logging-log4j2/pull/2731"/>
+  <description format="asciidoc">Update `co.elastic.clients:elasticsearch-java` to version `8.14.3`</description>
 </entry>

src/changelog/.2.x.x/update_co_elastic_clients_elasticsearch_java.xml

@@ -3,6 +3,6 @@
        xmlns="https://logging.apache.org/xml/ns"
        xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
        type="updated">
-  <issue id="2543" link="https://github.com/apache/logging-log4j2/pull/2543"/>
-  <description format="asciidoc">Update `commons-codec:commons-codec` to version `1.17.0`</description>
+  <issue id="2741" link="https://github.com/apache/logging-log4j2/pull/2741"/>
+  <description format="asciidoc">Update `commons-codec:commons-codec` to version `1.17.1`</description>
 </entry>

src/changelog/.2.x.x/update_commons_codec_commons_codec.xml

@@ -3,6 +3,6 @@
        xmlns="https://logging.apache.org/xml/ns"
        xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
        type="updated">
-  <issue id="2710" link="https://github.com/apache/logging-log4j2/pull/2710"/>
-  <description format="asciidoc">Update `de.flapdoodle.embed:de.flapdoodle.embed.mongo` to version `4.12.0`</description>
+  <issue id="2739" link="https://github.com/apache/logging-log4j2/pull/2739"/>
+  <description format="asciidoc">Update `de.flapdoodle.embed:de.flapdoodle.embed.mongo` to version `4.13.0`</description>
 </entry>

src/changelog/.2.x.x/update_de_flapdoodle_embed_de_flapdoodle_embed_mongo.xml

@@ -3,6 +3,6 @@
        xmlns="https://logging.apache.org/xml/ns"
        xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
        type="updated">
-  <issue id="2669" link="https://github.com/apache/logging-log4j2/pull/2669"/>
-  <description format="asciidoc">Update `org.apache.maven.surefire:surefire-junit47` to version `3.3.0`</description>
+  <issue id="2732" link="https://github.com/apache/logging-log4j2/pull/2732"/>
+  <description format="asciidoc">Update `org.apache.maven.surefire:surefire-junit47` to version `3.3.1`</description>
 </entry>