Skip to content

Move jspecify.version property and java8-tests profile from `log4… #3763

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 23, 2025
+60 −48
Merged

Move jspecify.version property and java8-tests profile from `log4… #3763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 48 additions & 0 deletions log4j-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -1142,6 +1143,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>

Expand Down
48 changes: 0 additions & 48 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
12 changes: 12 additions & 0 deletions src/changelog/.2.x.x/3758_fix_jspecify_dep.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>