From 32d7a45b50f74641ca2d148277230637e7c3c51a Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Wed, 26 Nov 2025 13:39:37 +0100 Subject: [PATCH 1/4] license headers --- jenkins/create_jobs.groovy | 17 +++++++++++ .../org/apache/poi/logging/NoOpLogger.java | 30 ++++++++++--------- .../org/apache/poi/logging/PoiLogManager.java | 30 ++++++++++--------- 3 files changed, 49 insertions(+), 28 deletions(-) diff --git a/jenkins/create_jobs.groovy b/jenkins/create_jobs.groovy index e6e6cb1061..432460ed4e 100644 --- a/jenkins/create_jobs.groovy +++ b/jenkins/create_jobs.groovy @@ -1,3 +1,20 @@ +/* ==================================================================== + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +==================================================================== */ + // This script is used as input to the Jenkins Job DSL plugin to create all the build-jobs that // Apache POI uses on the public Jenkins instance at https://ci-builds.apache.org/job/POI/ // diff --git a/poi/src/main/java/org/apache/poi/logging/NoOpLogger.java b/poi/src/main/java/org/apache/poi/logging/NoOpLogger.java index 1880d37062..3b17ed186e 100644 --- a/poi/src/main/java/org/apache/poi/logging/NoOpLogger.java +++ b/poi/src/main/java/org/apache/poi/logging/NoOpLogger.java @@ -1,17 +1,19 @@ -/* Copyright 2004 The Apache Software Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* ==================================================================== + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +==================================================================== */ package org.apache.poi.logging; diff --git a/poi/src/main/java/org/apache/poi/logging/PoiLogManager.java b/poi/src/main/java/org/apache/poi/logging/PoiLogManager.java index 2404d55706..2da065311f 100644 --- a/poi/src/main/java/org/apache/poi/logging/PoiLogManager.java +++ b/poi/src/main/java/org/apache/poi/logging/PoiLogManager.java @@ -1,17 +1,19 @@ -/* Copyright 2004 The Apache Software Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* ==================================================================== + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +==================================================================== */ package org.apache.poi.logging; From c4e0cde59cd38638a29632de1addd749d6cfdc2d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 Nov 2025 15:42:57 +0100 Subject: [PATCH 2/4] Bump bouncyCastleVersion from 1.82 to 1.83 (#953) Bumps `bouncyCastleVersion` from 1.82 to 1.83. Updates `org.bouncycastle:bcpkix-jdk18on` from 1.82 to 1.83 - [Changelog](https://github.com/bcgit/bc-java/blob/main/docs/releasenotes.html) - [Commits](https://github.com/bcgit/bc-java/commits) Updates `org.bouncycastle:bcutil-jdk18on` from 1.82 to 1.83 - [Changelog](https://github.com/bcgit/bc-java/blob/main/docs/releasenotes.html) - [Commits](https://github.com/bcgit/bc-java/commits) --- updated-dependencies: - dependency-name: org.bouncycastle:bcpkix-jdk18on dependency-version: '1.83' dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.bouncycastle:bcutil-jdk18on dependency-version: '1.83' dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 85f45723e8..47bd74730f 100644 --- a/build.gradle +++ b/build.gradle @@ -107,7 +107,7 @@ subprojects { apply plugin: 'com.adarshr.test-logger' ext { - bouncyCastleVersion = '1.82' + bouncyCastleVersion = '1.83' commonsCodecVersion = '1.20.0' commonsCompressVersion = '1.28.0' commonsIoVersion = '2.21.0' From 1dbfba92251f87fbff84cdc27b0a5d437782b5ff Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Wed, 26 Nov 2025 20:54:08 +0100 Subject: [PATCH 3/4] Update changes.xml --- src/documentation/content/xdocs/changes.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/documentation/content/xdocs/changes.xml b/src/documentation/content/xdocs/changes.xml index c3cb929728..5c3757d412 100644 --- a/src/documentation/content/xdocs/changes.xml +++ b/src/documentation/content/xdocs/changes.xml @@ -72,6 +72,7 @@ + Upgrade bouncycastle dependency to 1.83 Upgrade commons-io dependency to 2.21.0 Upgrade commons-codec dependency to 1.20.0 Upgrade pdfbox dependency to 3.0.6 From 6b6735a3c46c84d7b45cead025bcaf4c728c3b85 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Wed, 26 Nov 2025 22:05:00 +0100 Subject: [PATCH 4/4] Update changes.xml --- src/documentation/content/xdocs/changes.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/documentation/content/xdocs/changes.xml b/src/documentation/content/xdocs/changes.xml index 5c3757d412..17ee23fd58 100644 --- a/src/documentation/content/xdocs/changes.xml +++ b/src/documentation/content/xdocs/changes.xml @@ -79,6 +79,7 @@ Add back module-info classes that were omitted from the 5.5.0 jars by accident + Fix NPE in XWPFParagraph.getCTSpacing()