This is an automated email from the ASF dual-hosted git repository.
pjfanning pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/poi.git
The following commit(s) were added to refs/heads/trunk by this push:
new 91476ad3e5 Change next release version to 6.1.0 (#1526)
91476ad3e5 is described below
commit 91476ad3e5093de4f5fa9c4fa425f964aedce2ed
Author: PJ Fanning <[email protected]>
AuthorDate: Tue Nov 3 20:44:44 2026 +0100
Change next release version to 6.1.0 (#1526)
Bump the snapshot version to 6.1.0-SNAPSHOT and update the
@since 6.0.1 markers to 6.1.0.
Co-authored-by: Claude Opus 5.5 <[email protected]>
---
build.gradle | 2 +-
build.xml | 2 +-
osgi/pom.xml | 4 ++--
poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackagePart.java | 2 +-
.../poi/poifs/crypt/dsig/services/RelationshipTransformService.java | 2 +-
.../poi/poifs/crypt/dsig/services/TimeStampSimpleHttpClient.java | 2 +-
.../main/java/org/apache/poi/hwpf/converter/WordToFoConverter.java | 4 ++--
.../main/java/org/apache/poi/hwpf/converter/WordToHtmlConverter.java | 4 ++--
.../src/main/java/org/apache/poi/hwpf/converter/WordToHtmlUtils.java | 2 +-
.../main/java/org/apache/poi/poifs/crypt/agile/AgileDecryptor.java | 4 ++--
poi/src/main/java/org/apache/poi/poifs/filesystem/BlockStore.java | 2 +-
poi/src/main/java/org/apache/poi/ss/format/SimpleFraction.java | 2 +-
12 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/build.gradle b/build.gradle
index 89c34140b2..4ad7911d5b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -106,7 +106,7 @@ allprojects {
// apply plugin: 'eclipse'
apply plugin: 'idea'
- version = '6.0.1-SNAPSHOT'
+ version = '6.1.0-SNAPSHOT'
tasks.cyclonedxDirectBom {
// includeConfigs is the list of configuration names to include when
generating the BOM (leave empty to include every configuration)
diff --git a/build.xml b/build.xml
index 6b1964eb34..187151fdee 100644
--- a/build.xml
+++ b/build.xml
@@ -42,7 +42,7 @@ under the License.
<description>The Apache POI project Ant build.</description>
- <property name="version.id" value="6.0.1-SNAPSHOT"/>
+ <property name="version.id" value="6.1.0-SNAPSHOT"/>
<property name="release.rc" value=""/>
<property environment="env"/>
diff --git a/osgi/pom.xml b/osgi/pom.xml
index 27b04f89a6..3a77d845af 100644
--- a/osgi/pom.xml
+++ b/osgi/pom.xml
@@ -24,12 +24,12 @@
<groupId>org.apache.poi</groupId>
<artifactId>poi-bundle</artifactId>
<packaging>bundle</packaging>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.1.0-SNAPSHOT</version>
<name>Apache POI OSGi bundle</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <poi.version>6.0.1-SNAPSHOT</poi.version>
+ <poi.version>6.1.0-SNAPSHOT</poi.version>
<pax.exam.version>4.14.0</pax.exam.version>
</properties>
diff --git
a/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackagePart.java
b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackagePart.java
index 0729a206a7..c763c1d808 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackagePart.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackagePart.java
@@ -669,7 +669,7 @@ public abstract class PackagePart implements
RelationshipSource, Comparable<Pack
* cache information derived from the content can detect that it is out of
date.
*
* @return the modification count of this part
- * @since 6.0.1
+ * @since 6.1.0
*/
public long getModificationCount() {
return _modificationCount;
diff --git
a/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/RelationshipTransformService.java
b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/RelationshipTransformService.java
index 5c5a1829fa..4acb1364ee 100644
---
a/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/RelationshipTransformService.java
+++
b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/RelationshipTransformService.java
@@ -96,7 +96,7 @@ public class RelationshipTransformService extends
TransformService {
/**
* Adds a RelationshipsGroupReference, i.e. signs all relationships of
the given type
*
- * @since 6.0.1
+ * @since 6.1.0
*/
public void addRelationshipGroupReference(String relationshipType) {
sourceTypes.add(relationshipType);
diff --git
a/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/TimeStampSimpleHttpClient.java
b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/TimeStampSimpleHttpClient.java
index e31bdde67e..33789566d0 100644
---
a/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/TimeStampSimpleHttpClient.java
+++
b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/TimeStampSimpleHttpClient.java
@@ -219,7 +219,7 @@ public class TimeStampSimpleHttpClient implements
TimeStampHttpClient {
* a redirect to another origin
* @return the response
* @throws IOException if the request fails
- * @since 6.0.1
+ * @since 6.1.0
*/
protected TimeStampHttpClientResponse handleRedirect(String url,
MethodHandler handler, boolean followRedirect, boolean sendAuth) throws
IOException {
final HttpURLConnection huc;
diff --git
a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToFoConverter.java
b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToFoConverter.java
index 039481d8d0..0b5bbf55e0 100644
---
a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToFoConverter.java
+++
b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToFoConverter.java
@@ -201,7 +201,7 @@ public class WordToFoConverter extends AbstractWordConverter
/**
* @return the extra check a HYPERLINK field target has to pass to be
written as a link
* @see #setHyperlinkValidator(Predicate)
- * @since 6.0.1
+ * @since 6.1.0
*/
public Predicate<String> getHyperlinkValidator()
{
@@ -217,7 +217,7 @@ public class WordToFoConverter extends AbstractWordConverter
* linked. The default accepts every target that passes the built-in check.
*
* @param hyperlinkValidator returns true for the targets to write as links
- * @since 6.0.1
+ * @since 6.1.0
*/
public void setHyperlinkValidator( Predicate<String> hyperlinkValidator )
{
diff --git
a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToHtmlConverter.java
b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToHtmlConverter.java
index 508626821c..5ec677b7d3 100644
---
a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToHtmlConverter.java
+++
b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToHtmlConverter.java
@@ -192,7 +192,7 @@ public class WordToHtmlConverter extends
AbstractWordConverter
/**
* @return the extra check a HYPERLINK field target has to pass to be
written as a link
* @see #setHyperlinkValidator(Predicate)
- * @since 6.0.1
+ * @since 6.1.0
*/
public Predicate<String> getHyperlinkValidator()
{
@@ -208,7 +208,7 @@ public class WordToHtmlConverter extends
AbstractWordConverter
* linked. The default accepts every target that passes the built-in check.
*
* @param hyperlinkValidator returns true for the targets to write as links
- * @since 6.0.1
+ * @since 6.1.0
*/
public void setHyperlinkValidator( Predicate<String> hyperlinkValidator )
{
diff --git
a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToHtmlUtils.java
b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToHtmlUtils.java
index a876ce3871..a00a777888 100644
---
a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToHtmlUtils.java
+++
b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToHtmlUtils.java
@@ -195,7 +195,7 @@ public class WordToHtmlUtils extends AbstractWordUtils
*
* @param hyperlink the target of a HYPERLINK field
* @return true if the target can be written as the {@code href} of a link
- * @since 6.0.1
+ * @since 6.1.0
*/
public static boolean isSafeHyperlink( final String hyperlink )
{
diff --git
a/poi/src/main/java/org/apache/poi/poifs/crypt/agile/AgileDecryptor.java
b/poi/src/main/java/org/apache/poi/poifs/crypt/agile/AgileDecryptor.java
index b5c1d769e0..2635af9a2c 100644
--- a/poi/src/main/java/org/apache/poi/poifs/crypt/agile/AgileDecryptor.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/agile/AgileDecryptor.java
@@ -73,7 +73,7 @@ public class AgileDecryptor extends Decryptor {
/**
* Whether {@link #getDataStream(DirectoryNode)} fails when the
DataIntegrity HMAC of the
* encrypted package does not match. Defaults to {@code true}.
- * @since 6.0.1
+ * @since 6.1.0
*/
public static boolean isFailOnIntegrityError() {
return FAIL_ON_INTEGRITY_ERROR;
@@ -86,7 +86,7 @@ public class AgileDecryptor extends Decryptor {
* Set it to {@code false} to only log a warning and decrypt the package
anyway, e.g. to
* extract the content of a file whose HMAC was written incorrectly. Excel
for the web shows such
* files, but only in read-only mode.
- * @since 6.0.1
+ * @since 6.1.0
*/
public static void setFailOnIntegrityError(final boolean
failOnIntegrityError) {
FAIL_ON_INTEGRITY_ERROR = failOnIntegrityError;
diff --git a/poi/src/main/java/org/apache/poi/poifs/filesystem/BlockStore.java
b/poi/src/main/java/org/apache/poi/poifs/filesystem/BlockStore.java
index 863376de78..d9b1106048 100644
--- a/poi/src/main/java/org/apache/poi/poifs/filesystem/BlockStore.java
+++ b/poi/src/main/java/org/apache/poi/poifs/filesystem/BlockStore.java
@@ -81,7 +81,7 @@ public abstract class BlockStore {
* Checks that the blocks may be changed, i.e. that changes to them are
kept
*
* @throws IllegalStateException if the blocks are read-only
- * @since 6.0.1
+ * @since 6.1.0
*/
protected void checkWriteable() {
// writeable by default
diff --git a/poi/src/main/java/org/apache/poi/ss/format/SimpleFraction.java
b/poi/src/main/java/org/apache/poi/ss/format/SimpleFraction.java
index 27c251b9ef..7d2a213b3b 100644
--- a/poi/src/main/java/org/apache/poi/ss/format/SimpleFraction.java
+++ b/poi/src/main/java/org/apache/poi/ss/format/SimpleFraction.java
@@ -23,7 +23,7 @@ public class SimpleFraction {
/**
* The most denominator digits a fraction can have: 10^9 - 1 is the
largest all-nines denominator that fits in an int
*
- * @since 6.0.1
+ * @since 6.1.0
*/
public static final int MAX_DENOMINATOR_DIGITS = 9;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]