This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/2.x by this push:
new a3a4c6c16f Move `jspecify.version` property and `java8-tests` profile
from `log4j-bom` to `log4j-parent` (#3763)
a3a4c6c16f is described below
commit a3a4c6c16f62e53e1748661817153fb0bcb1451c
Author: Volkan Yazıcı <[email protected]>
AuthorDate: Mon Jun 23 10:44:58 2025 +0200
Move `jspecify.version` property and `java8-tests` profile from `log4j-bom`
to `log4j-parent` (#3763)
---
log4j-parent/pom.xml | 48 ++++++++++++++++++++++++++
pom.xml | 48 --------------------------
src/changelog/.2.x.x/3758_fix_jspecify_dep.xml | 12 +++++++
3 files changed, 60 insertions(+), 48 deletions(-)
diff --git a/log4j-parent/pom.xml b/log4j-parent/pom.xml
index c1e38a9231..6d8baeaff9 100644
--- a/log4j-parent/pom.xml
+++ b/log4j-parent/pom.xml
@@ -108,6 +108,7 @@
<jeromq.version>0.6.0</jeromq.version>
<jmdns.version>3.6.1</jmdns.version>
<jmh.version>1.37</jmh.version>
+ <jspecify.version>1.0.0</jspecify.version>
<junit.version>4.13.2</junit.version>
<junit-jupiter.version>5.13.1</junit-jupiter.version>
<junit-pioneer.version>1.9.1</junit-pioneer.version>
@@ -1143,6 +1144,53 @@
<profiles>
+ <!-- `java8-tests` profile to force using Java 8 while running tests -->
+ <profile>
+
+ <id>java8-tests</id>
+
+ <activation>
+ <property>
+ <name>env.CI</name>
+ <value>true</value>
+ </property>
+ </activation>
+
+ <!-- There are certain Java 8 bugs[1] that cause Mockito failures[2].
+ Adding necessary dependencies to workaround them.
+ [1] https://bugs.openjdk.org/browse/JDK-8152174
+ [2] https://github.com/mockito/mockito/issues/1449 -->
+ <dependencies>
+ <dependency>
+ <groupId>org.jspecify</groupId>
+ <artifactId>jspecify</artifactId>
+ <version>${jspecify.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <!-- Modifies only the `default-test` run -->
+ <execution>
+ <id>default-test</id>
+ <configuration>
+ <jdkToolchain>
+ <version>[1.8, 9)</version>
+ </jdkToolchain>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ </profile>
+
<!-- `plugin-processing` profile containing configuration specific to
`@Plugin`-annotated members -->
<profile>
diff --git a/pom.xml b/pom.xml
index 5fa1337d40..a6be2bd029 100644
--- a/pom.xml
+++ b/pom.xml
@@ -357,7 +357,6 @@
<!-- =====================================================
Direct dependency version properties (in alphabetical order)
===================================================== -->
- <jspecify.version>1.0.0</jspecify.version>
<log4j-docgen.version>0.9.0</log4j-docgen.version>
<node.version>21.7.1</node.version>
<npm.version>10.5.0</npm.version>
@@ -956,53 +955,6 @@
<profiles>
- <!-- `java8-tests` profile to force using Java 8 while running tests -->
- <profile>
-
- <id>java8-tests</id>
-
- <activation>
- <property>
- <name>env.CI</name>
- <value>true</value>
- </property>
- </activation>
-
- <!-- There are certain Java 8 bugs[1] that cause Mockito failures[2].
- Adding necessary dependencies to workaround them.
- [1] https://bugs.openjdk.org/browse/JDK-8152174
- [2] https://github.com/mockito/mockito/issues/1449 -->
- <dependencies>
- <dependency>
- <groupId>org.jspecify</groupId>
- <artifactId>jspecify</artifactId>
- <version>${jspecify.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <!-- Modifies only the `default-test` run -->
- <execution>
- <id>default-test</id>
- <configuration>
- <jdkToolchain>
- <version>[1.8, 9)</version>
- </jdkToolchain>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- </profile>
-
<profile>
<id>rerun-tests</id>
<activation>
diff --git a/src/changelog/.2.x.x/3758_fix_jspecify_dep.xml
b/src/changelog/.2.x.x/3758_fix_jspecify_dep.xml
new file mode 100644
index 0000000000..a482460839
--- /dev/null
+++ b/src/changelog/.2.x.x/3758_fix_jspecify_dep.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entry xmlns="https://logging.apache.org/xml/ns";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="
+ https://logging.apache.org/xml/ns
+ https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
+ type="fixed">
+ <issue id="3758"
link="https://github.com/apache/logging-log4j2/issues/3758"/>
+ <description format="asciidoc">
+ Move `jspecify.version` Maven property and `java8-tests` profile from
`log4j-bom` to `log4j-parent`, since the former gets trimmed before deployment.
+ </description>
+</entry>
