Skip to content

Commit 5035757

Browse files
ppkarwaszppkarwasz
authored
Merge branch '2.x' into dependabot/maven/log4j-parent/2.x/xmlunit.version-2.10.3
2 parents 93794fe + c5a0dd1 commit 5035757

File tree

4 files changed

+67
-51
lines changed

4 files changed

+67
-51
lines changed

‎.github/dependabot.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,9 @@ updates:
9090
registries:
9191
- maven-central
9292
ignore:
93+
# `com.github.spotbugs:spotbugs-annotations:4.9.0` and onwards require Java 11
94+
- dependency-name: "com.github.spotbugs:spotbugs-annotations"
95+
versions: [ "[4.9.0,)" ]
9396
# Jetty 10.x does not have an internal logging API
9497
- dependency-name: "org.eclipse.jetty:*"
9598
versions: [ "[10,)" ]

‎log4j-parent/pom.xml‎

Lines changed: 51 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<!-- =====================================================
6161
Direct dependency version properties (in alphabetical order)
6262
===================================================== -->
63-
<activemq.version>6.1.6</activemq.version>
63+
<activemq.version>6.1.7</activemq.version>
6464
<angus-activation.version>2.0.2</angus-activation.version>
6565
<angus-mail.version>2.0.3</angus-mail.version>
6666
<assertj.version>3.27.3</assertj.version>
@@ -108,6 +108,7 @@
108108
<jeromq.version>0.6.0</jeromq.version>
109109
<jmdns.version>3.6.1</jmdns.version>
110110
<jmh.version>1.37</jmh.version>
111+
<jspecify.version>1.0.0</jspecify.version>
111112
<junit.version>4.13.2</junit.version>
112113
<junit-jupiter.version>5.13.1</junit-jupiter.version>
113114
<junit-pioneer.version>1.9.1</junit-pioneer.version>
@@ -130,7 +131,8 @@
130131
<osgi.annotation.versioning.version>1.1.2</osgi.annotation.versioning.version>
131132
<pax-exam.version>4.14.0</pax-exam.version>
132133
<plexus-utils.version>3.6.0</plexus-utils.version>
133-
<spotbugs-annotations.version>4.9.3</spotbugs-annotations.version>
134+
<!-- `com.github.spotbugs:spotbugs-annotations:4.9.0` and onwards require Java 11: -->
135+
<spotbugs-annotations.version>4.8.6</spotbugs-annotations.version>
134136
<spring-boot.version>2.7.18</spring-boot.version>
135137
<spring-framework.version>5.3.39</spring-framework.version>
136138
<system-stubs.version>2.0.3</system-stubs.version>
@@ -1142,6 +1144,53 @@
11421144

11431145
<profiles>
11441146

1147+
<!-- `java8-tests` profile to force using Java 8 while running tests -->
1148+
<profile>
1149+
1150+
<id>java8-tests</id>
1151+
1152+
<activation>
1153+
<property>
1154+
<name>env.CI</name>
1155+
<value>true</value>
1156+
</property>
1157+
</activation>
1158+
1159+
<!-- There are certain Java 8 bugs[1] that cause Mockito failures[2].
1160+
Adding necessary dependencies to workaround them.
1161+
[1] https://bugs.openjdk.org/browse/JDK-8152174
1162+
[2] https://github.com/mockito/mockito/issues/1449 -->
1163+
<dependencies>
1164+
<dependency>
1165+
<groupId>org.jspecify</groupId>
1166+
<artifactId>jspecify</artifactId>
1167+
<version>${jspecify.version}</version>
1168+
<scope>test</scope>
1169+
</dependency>
1170+
</dependencies>
1171+
1172+
<build>
1173+
<plugins>
1174+
<plugin>
1175+
<groupId>org.apache.maven.plugins</groupId>
1176+
<artifactId>maven-surefire-plugin</artifactId>
1177+
<executions>
1178+
<!-- Modifies only the `default-test` run -->
1179+
<execution>
1180+
<id>default-test</id>
1181+
<configuration>
1182+
<jdkToolchain>
1183+
<version>[1.8, 9)</version>
1184+
</jdkToolchain>
1185+
</configuration>
1186+
</execution>
1187+
</executions>
1188+
</plugin>
1189+
</plugins>
1190+
</build>
1191+
1192+
</profile>
1193+
11451194
<!-- `plugin-processing` profile containing configuration specific to `@Plugin`-annotated members -->
11461195
<profile>
11471196

‎pom.xml‎

Lines changed: 1 addition & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,6 @@
357357
<!-- =====================================================
358358
Direct dependency version properties (in alphabetical order)
359359
===================================================== -->
360-
<jspecify.version>1.0.0</jspecify.version>
361360
<log4j-docgen.version>0.9.0</log4j-docgen.version>
362361
<node.version>21.7.1</node.version>
363362
<npm.version>10.5.0</npm.version>
@@ -830,7 +829,7 @@
830829
<outputDirectory>${maven.multiModuleProjectDirectory}/target/site/javadoc/${project.artifactId}</outputDirectory>
831830
<resources>
832831
<resource>
833-
<directory>${project.build.directory}/site/apidocs</directory>
832+
<directory>${project.build.directory}/reports/apidocs</directory>
834833
</resource>
835834
</resources>
836835
</configuration>
@@ -956,53 +955,6 @@
956955

957956
<profiles>
958957

959-
<!-- `java8-tests` profile to force using Java 8 while running tests -->
960-
<profile>
961-
962-
<id>java8-tests</id>
963-
964-
<activation>
965-
<property>
966-
<name>env.CI</name>
967-
<value>true</value>
968-
</property>
969-
</activation>
970-
971-
<!-- There are certain Java 8 bugs[1] that cause Mockito failures[2].
972-
Adding necessary dependencies to workaround them.
973-
[1] https://bugs.openjdk.org/browse/JDK-8152174
974-
[2] https://github.com/mockito/mockito/issues/1449 -->
975-
<dependencies>
976-
<dependency>
977-
<groupId>org.jspecify</groupId>
978-
<artifactId>jspecify</artifactId>
979-
<version>${jspecify.version}</version>
980-
<scope>test</scope>
981-
</dependency>
982-
</dependencies>
983-
984-
<build>
985-
<plugins>
986-
<plugin>
987-
<groupId>org.apache.maven.plugins</groupId>
988-
<artifactId>maven-surefire-plugin</artifactId>
989-
<executions>
990-
<!-- Modifies only the `default-test` run -->
991-
<execution>
992-
<id>default-test</id>
993-
<configuration>
994-
<jdkToolchain>
995-
<version>[1.8, 9)</version>
996-
</jdkToolchain>
997-
</configuration>
998-
</execution>
999-
</executions>
1000-
</plugin>
1001-
</plugins>
1002-
</build>
1003-
1004-
</profile>
1005-
1006958
<profile>
1007959
<id>rerun-tests</id>
1008960
<activation>

‎src/changelog/.2.x.x/3758_fix_jspecify_dep.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<entry xmlns="https://logging.apache.org/xml/ns"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="
5+
https://logging.apache.org/xml/ns
6+
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
7+
type="fixed">
8+
<issue id="3758" link="https://github.com/apache/logging-log4j2/issues/3758"/>
9+
<description format="asciidoc">
10+
Move `jspecify.version` Maven property and `java8-tests` profile from `log4j-bom` to `log4j-parent`, since the former gets trimmed before deployment.
11+
</description>
12+
</entry>

0 commit comments

Comments
 (0)