diff options
16 files changed, 50 insertions, 50 deletions
diff --git a/build.gradle b/build.gradle index e602120065..5feb7bbfa6 100644 --- a/build.gradle +++ b/build.gradle @@ -100,7 +100,7 @@ allprojects { // apply plugin: 'eclipse' apply plugin: 'idea' - version = '5.3.1-SNAPSHOT' + version = '5.4.0-SNAPSHOT' } /** @@ -42,7 +42,7 @@ under the License. <description>The Apache POI project Ant build.</description> - <property name="version.id" value="5.3.1-SNAPSHOT"/> + <property name="version.id" value="5.4.0-SNAPSHOT"/> <property name="release.rc" value=""/> <property environment="env"/> diff --git a/osgi/pom.xml b/osgi/pom.xml index b1cdfd0993..ff361f525a 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>5.3.1-SNAPSHOT</version> + <version>5.4.0-SNAPSHOT</version> <name>Apache POI OSGi bundle</name> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <poi.version>5.3.1-SNAPSHOT</poi.version> + <poi.version>5.4.0-SNAPSHOT</poi.version> <pax.exam.version>4.12.0</pax.exam.version> </properties> diff --git a/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/InvalidZipException.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/InvalidZipException.java index 3429420cbf..ae57393b12 100644 --- a/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/InvalidZipException.java +++ b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/InvalidZipException.java @@ -22,7 +22,7 @@ import java.io.IOException; /** * Thrown if the zip file is invalid. * - * @since 5.3.1 + * @since POI 5.4.0 */ public class InvalidZipException extends IOException { public InvalidZipException(String message) { diff --git a/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFBReader.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFBReader.java index 85f04f7bd8..2ec15c4a32 100644 --- a/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFBReader.java +++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFBReader.java @@ -107,7 +107,7 @@ public class XSSFBReader extends XSSFReader { * @return iterator of {@link InputStream}s * @throws InvalidFormatException if the sheet data format is invalid * @throws IOException if there is an I/O issue reading the data - * @since POI 5.3.1 + * @since POI 5.4.0 */ @Override public SheetIterator getSheetIterator() throws IOException, InvalidFormatException { diff --git a/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java index bb656b281d..a81bb59bfe 100644 --- a/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java +++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java @@ -280,7 +280,7 @@ public class XSSFReader { * * @throws InvalidFormatException if the sheet data format is invalid * @throws IOException if there is an I/O issue reading the data - * @since POI 5.3.1 + * @since POI 5.4.0 */ public SheetIterator getSheetIterator() throws IOException, InvalidFormatException { return new SheetIterator(workbookPart); diff --git a/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/AutoSizeColumnTracker.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/AutoSizeColumnTracker.java index 965f23a03e..b6b674a53b 100644 --- a/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/AutoSizeColumnTracker.java +++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/AutoSizeColumnTracker.java @@ -60,7 +60,7 @@ import org.apache.poi.util.Internal; // Using a HashSet instead of a TreeSet because we don't care about order. private final Set<Integer> untrackedColumns = new HashSet<>(); private boolean trackAllColumns; - // arbitraryExtraWidth is the extra width added to the best-fit column width (since POI 5.3.1) + // arbitraryExtraWidth is the extra width added to the best-fit column width (since POI 5.4.0) private double arbitraryExtraWidth = 0.0d; /** @@ -123,7 +123,7 @@ import org.apache.poi.util.Internal; * Set the extra width added to the best-fit column width (default 0.0). * * @param arbitraryExtraWidth the extra width added to the best-fit column width - * @since 5.3.1 + * @since 5.4.0 */ public void setArbitraryExtraWidth(final double arbitraryExtraWidth) { this.arbitraryExtraWidth = arbitraryExtraWidth; @@ -133,7 +133,7 @@ import org.apache.poi.util.Internal; * Get the extra width added to the best-fit column width. * * @return the extra width added to the best-fit column width - * @since 5.3.1 + * @since 5.4.0 */ public double getArbitraryExtraWidth() { return arbitraryExtraWidth; diff --git a/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFSheet.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFSheet.java index bd0f7c3dc1..b177d8b0ca 100644 --- a/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFSheet.java +++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFSheet.java @@ -1456,7 +1456,7 @@ public class SXSSFSheet implements Sheet, OoxmlSheetExtensions { * * @param arbitraryExtraWidth the extra width added to the best-fit column width * @throws IllegalStateException if autoSizeColumnTracker failed to initialize (possibly due to fonts not being installed in your OS) - * @since 5.3.1 + * @since 5.4.0 */ public void setArbitraryExtraWidth(final double arbitraryExtraWidth) { if (_autoSizeColumnTracker == null) { @@ -1470,7 +1470,7 @@ public class SXSSFSheet implements Sheet, OoxmlSheetExtensions { * * @return the extra width added to the best-fit column width * @throws IllegalStateException if autoSizeColumnTracker failed to initialize (possibly due to fonts not being installed in your OS) - * @since 5.3.1 + * @since 5.4.0 */ public double getArbitraryExtraWidth() { if (_autoSizeColumnTracker == null) { diff --git a/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFStyles.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFStyles.java index 0bcd7b6dd4..2cf75f302e 100644 --- a/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFStyles.java +++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFStyles.java @@ -152,7 +152,7 @@ public class XWPFStyles extends POIXMLDocumentPart { * Gets the underlying CTStyles object for the Styles. * * @return CTStyles object - * @since POI 5.3.1 + * @since POI 5.4.0 */ public CTStyles getCtStyles() { return ctStyles; @@ -161,7 +161,7 @@ public class XWPFStyles extends POIXMLDocumentPart { /** * Get the list of {@link XWPFStyle} in the Styles part. * - * @since POI 5.3.1 + * @since POI 5.4.0 */ public List<XWPFStyle> getStyles() { return Collections.unmodifiableList(listStyle); @@ -172,7 +172,7 @@ public class XWPFStyles extends POIXMLDocumentPart { * * @param pos Array position of the style to be removed * @return True if the style was removed. - * @since POI 5.3.1 + * @since POI 5.4.0 */ public boolean removeStyle(int pos) { if (pos >= 0 && pos < getNumberOfStyles()) { diff --git a/poi/src/main/java/org/apache/poi/ss/formula/LazyRefEval.java b/poi/src/main/java/org/apache/poi/ss/formula/LazyRefEval.java index 9e81aa9b0e..b48bed9c0b 100644 --- a/poi/src/main/java/org/apache/poi/ss/formula/LazyRefEval.java +++ b/poi/src/main/java/org/apache/poi/ss/formula/LazyRefEval.java @@ -41,7 +41,7 @@ public final class LazyRefEval extends RefEvalBase { /** * @return the Eval of the first sheet associated with this LazyRefEval - * @since POI 5.3.1 + * @since POI 5.4.0 */ public ValueEval getInnerValueEvalForFirstSheet() { return _evaluator.getEvalForCell(_evaluator.getFirstSheetIndex(), getRow(), getColumn()); diff --git a/poi/src/main/java/org/apache/poi/ss/usermodel/CellPropertyCategory.java b/poi/src/main/java/org/apache/poi/ss/usermodel/CellPropertyCategory.java index 79eeb8edc5..257d45abac 100644 --- a/poi/src/main/java/org/apache/poi/ss/usermodel/CellPropertyCategory.java +++ b/poi/src/main/java/org/apache/poi/ss/usermodel/CellPropertyCategory.java @@ -22,7 +22,7 @@ package org.apache.poi.ss.usermodel; * The CellPropertyCategory enum represents the different categories of cell properties. * Each category is used to classify and organize the cell properties based on their characteristics. * - * @since POI 5.3.1 + * @since POI 5.4.0 */ public enum CellPropertyCategory { diff --git a/poi/src/main/java/org/apache/poi/ss/usermodel/CellPropertyType.java b/poi/src/main/java/org/apache/poi/ss/usermodel/CellPropertyType.java index 74259b5ba3..f876e1a15f 100644 --- a/poi/src/main/java/org/apache/poi/ss/usermodel/CellPropertyType.java +++ b/poi/src/main/java/org/apache/poi/ss/usermodel/CellPropertyType.java @@ -22,7 +22,7 @@ package org.apache.poi.ss.usermodel; * Each type is associated with a specific category {@link CellPropertyCategory}, which classifies and organizes * the properties based on their characteristics. * - * @since POI 5.3.1 + * @since POI 5.4.0 */ public enum CellPropertyType { diff --git a/poi/src/main/java/org/apache/poi/ss/util/CellUtil.java b/poi/src/main/java/org/apache/poi/ss/util/CellUtil.java index 6d3ebb3678..0e930758a1 100644 --- a/poi/src/main/java/org/apache/poi/ss/util/CellUtil.java +++ b/poi/src/main/java/org/apache/poi/ss/util/CellUtil.java @@ -97,168 +97,168 @@ public final class CellUtil { /** - * @deprecated as of POI 5.3.1. Use {@link CellPropertyType#ALIGNMENT} instead. + * @deprecated as of POI 5.4.0. Use {@link CellPropertyType#ALIGNMENT} instead. */ @Deprecated @Removal(version = "7.0.0") public static final String ALIGNMENT = "alignment"; /** - * @deprecated as of POI 5.3.1. Use {@link CellPropertyType#BORDER_BOTTOM} instead. + * @deprecated as of POI 5.4.0. Use {@link CellPropertyType#BORDER_BOTTOM} instead. */ @Deprecated @Removal(version = "7.0.0") public static final String BORDER_BOTTOM = "borderBottom"; /** - * @deprecated as of POI 5.3.1. Use {@link CellPropertyType#BORDER_LEFT} instead. + * @deprecated as of POI 5.4.0. Use {@link CellPropertyType#BORDER_LEFT} instead. */ @Deprecated @Removal(version = "7.0.0") public static final String BORDER_LEFT = "borderLeft"; /** - * @deprecated as of POI 5.3.1. Use {@link CellPropertyType#BORDER_RIGHT} instead. + * @deprecated as of POI 5.4.0. Use {@link CellPropertyType#BORDER_RIGHT} instead. */ @Deprecated @Removal(version = "7.0.0") public static final String BORDER_RIGHT = "borderRight"; /** - * @deprecated as of POI 5.3.1. Use {@link CellPropertyType#BORDER_TOP} instead. + * @deprecated as of POI 5.4.0. Use {@link CellPropertyType#BORDER_TOP} instead. */ @Deprecated @Removal(version = "7.0.0") public static final String BORDER_TOP = "borderTop"; /** - * @deprecated as of POI 5.3.1. Use {@link CellPropertyType#BORDER_BOTTOM} instead. + * @deprecated as of POI 5.4.0. Use {@link CellPropertyType#BORDER_BOTTOM} instead. */ @Deprecated @Removal(version = "7.0.0") public static final String BOTTOM_BORDER_COLOR = "bottomBorderColor"; /** - * @deprecated as of POI 5.3.1. Use {@link CellPropertyType#BOTTOM_BORDER_COLOR} instead. + * @deprecated as of POI 5.4.0. Use {@link CellPropertyType#BOTTOM_BORDER_COLOR} instead. */ @Deprecated @Removal(version = "7.0.0") public static final String LEFT_BORDER_COLOR = "leftBorderColor"; /** - * @deprecated as of POI 5.3.1. Use {@link CellPropertyType#RIGHT_BORDER_COLOR} instead. + * @deprecated as of POI 5.4.0. Use {@link CellPropertyType#RIGHT_BORDER_COLOR} instead. */ @Deprecated @Removal(version = "7.0.0") public static final String RIGHT_BORDER_COLOR = "rightBorderColor"; /** - * @deprecated as of POI 5.3.1. Use {@link CellPropertyType#TOP_BORDER_COLOR} instead. + * @deprecated as of POI 5.4.0. Use {@link CellPropertyType#TOP_BORDER_COLOR} instead. */ @Deprecated @Removal(version = "7.0.0") public static final String TOP_BORDER_COLOR = "topBorderColor"; /** - * @deprecated as of POI 5.3.1. Use {@link CellPropertyType#DATA_FORMAT} instead. + * @deprecated as of POI 5.4.0. Use {@link CellPropertyType#DATA_FORMAT} instead. */ @Deprecated @Removal(version = "7.0.0") public static final String DATA_FORMAT = "dataFormat"; /** - * @deprecated as of POI 5.3.1. Use {@link CellPropertyType#FILL_BACKGROUND_COLOR} instead. + * @deprecated as of POI 5.4.0. Use {@link CellPropertyType#FILL_BACKGROUND_COLOR} instead. */ @Deprecated @Removal(version = "7.0.0") public static final String FILL_BACKGROUND_COLOR = "fillBackgroundColor"; /** - * @deprecated as of POI 5.3.1. Use {@link CellPropertyType#FILL_FOREGROUND_COLOR} instead. + * @deprecated as of POI 5.4.0. Use {@link CellPropertyType#FILL_FOREGROUND_COLOR} instead. */ @Deprecated @Removal(version = "7.0.0") public static final String FILL_FOREGROUND_COLOR = "fillForegroundColor"; /** - * @deprecated as of POI 5.3.1. Use {@link CellPropertyType#FILL_BACKGROUND_COLOR_COLOR} instead. + * @deprecated as of POI 5.4.0. Use {@link CellPropertyType#FILL_BACKGROUND_COLOR_COLOR} instead. */ @Deprecated @Removal(version = "7.0.0") public static final String FILL_BACKGROUND_COLOR_COLOR = "fillBackgroundColorColor"; /** - * @deprecated as of POI 5.3.1. Use {@link CellPropertyType#FILL_FOREGROUND_COLOR_COLOR} instead. + * @deprecated as of POI 5.4.0. Use {@link CellPropertyType#FILL_FOREGROUND_COLOR_COLOR} instead. */ @Deprecated @Removal(version = "7.0.0") public static final String FILL_FOREGROUND_COLOR_COLOR = "fillForegroundColorColor"; /** - * @deprecated as of POI 5.3.1. Use {@link CellPropertyType#FILL_PATTERN} instead. + * @deprecated as of POI 5.4.0. Use {@link CellPropertyType#FILL_PATTERN} instead. */ @Deprecated @Removal(version = "7.0.0") public static final String FILL_PATTERN = "fillPattern"; /** - * @deprecated as of POI 5.3.1. Use {@link CellPropertyType#FONT} instead. + * @deprecated as of POI 5.4.0. Use {@link CellPropertyType#FONT} instead. */ @Deprecated @Removal(version = "7.0.0") public static final String FONT = "font"; /** - * @deprecated as of POI 5.3.1. Use {@link CellPropertyType#HIDDEN} instead. + * @deprecated as of POI 5.4.0. Use {@link CellPropertyType#HIDDEN} instead. */ @Deprecated @Removal(version = "7.0.0") public static final String HIDDEN = "hidden"; /** - * @deprecated as of POI 5.3.1. Use {@link CellPropertyType#INDENTION} instead. + * @deprecated as of POI 5.4.0. Use {@link CellPropertyType#INDENTION} instead. */ @Deprecated @Removal(version = "7.0.0") public static final String INDENTION = "indention"; /** - * @deprecated as of POI 5.3.1. Use {@link CellPropertyType#LOCKED} instead. + * @deprecated as of POI 5.4.0. Use {@link CellPropertyType#LOCKED} instead. */ @Deprecated @Removal(version = "7.0.0") public static final String LOCKED = "locked"; /** - * @deprecated as of POI 5.3.1. Use {@link CellPropertyType#ROTATION} instead. + * @deprecated as of POI 5.4.0. Use {@link CellPropertyType#ROTATION} instead. */ @Deprecated @Removal(version = "7.0.0") public static final String ROTATION = "rotation"; /** - * @deprecated as of POI 5.3.1. Use {@link CellPropertyType#VERTICAL_ALIGNMENT} instead. + * @deprecated as of POI 5.4.0. Use {@link CellPropertyType#VERTICAL_ALIGNMENT} instead. */ @Deprecated @Removal(version = "7.0.0") public static final String VERTICAL_ALIGNMENT = "verticalAlignment"; /** - * @deprecated as of POI 5.3.1. Use {@link CellPropertyType#WRAP_TEXT} instead. + * @deprecated as of POI 5.4.0. Use {@link CellPropertyType#WRAP_TEXT} instead. */ @Deprecated @Removal(version = "7.0.0") public static final String WRAP_TEXT = "wrapText"; /** - * @deprecated as of POI 5.3.1. Use {@link CellPropertyType#SHRINK_TO_FIT} instead. + * @deprecated as of POI 5.4.0. Use {@link CellPropertyType#SHRINK_TO_FIT} instead. */ @Deprecated @Removal(version = "7.0.0") public static final String SHRINK_TO_FIT = "shrinkToFit"; /** - * @deprecated as of POI 5.3.1. Use {@link CellPropertyType#QUOTE_PREFIXED} instead. + * @deprecated as of POI 5.4.0. Use {@link CellPropertyType#QUOTE_PREFIXED} instead. */ @Deprecated @Removal(version = "7.0.0") @@ -565,7 +565,7 @@ public final class CellUtil { * @param cell The cell to change the style of * @param properties The properties to be added to a cell style, as {property: propertyValue}. * @since POI 3.14 beta 2 - * @deprecated as of POI 5.3.1. See {@link #setCellStylePropertiesEnum(Cell, Map)} + * @deprecated as of POI 5.4.0. See {@link #setCellStylePropertiesEnum(Cell, Map)} */ @Deprecated @Removal(version = "7.0.0") @@ -598,7 +598,7 @@ public final class CellUtil { * * @param cell The cell to change the style of * @param properties The properties to be added to a cell style, as {property: propertyValue}. - * @since POI 5.3.1 + * @since POI 5.4.0 */ public static void setCellStylePropertiesEnum(Cell cell, Map<CellPropertyType, Object> properties) { setCellStyleProperties(cell, properties, false); @@ -684,7 +684,7 @@ public final class CellUtil { * @param property The name of the property that is to be changed. * @param propertyValue The value of the property that is to be changed. * - * @since POI 5.3.1 + * @since POI 5.4.0 */ public static void setCellStyleProperty(Cell cell, CellPropertyType property, Object propertyValue) { boolean disableNullColorCheck = false; @@ -721,7 +721,7 @@ public final class CellUtil { * @param cell The cell that is to be changed. * @param propertyName The name of the property that is to be changed. * @param propertyValue The value of the property that is to be changed. - * @deprecated as of POI 5.3.1. See {@link #setCellStyleProperty(Cell, CellPropertyType, Object)} + * @deprecated as of POI 5.4.0. See {@link #setCellStyleProperty(Cell, CellPropertyType, Object)} */ @Deprecated @Removal(version = "7.0.0") diff --git a/poi/src/main/java/org/apache/poi/ss/util/RegionUtil.java b/poi/src/main/java/org/apache/poi/ss/util/RegionUtil.java index b74ce41f61..b68fd8bb57 100644 --- a/poi/src/main/java/org/apache/poi/ss/util/RegionUtil.java +++ b/poi/src/main/java/org/apache/poi/ss/util/RegionUtil.java @@ -56,7 +56,7 @@ public final class RegionUtil { /** * @param property The property to set * @param value The value to set the property to - * @since POI 5.3.1 + * @since POI 5.4.0 */ public CellPropertySetter(CellPropertyType property, int value) { this.property = property; @@ -66,7 +66,7 @@ public final class RegionUtil { /** * @param property The property to set * @param value The value to set the property to - * @since POI 5.3.1 + * @since POI 5.4.0 */ public CellPropertySetter(CellPropertyType property, BorderStyle value) { this.property = property; diff --git a/poi/src/main/java/org/apache/poi/ss/util/SheetUtil.java b/poi/src/main/java/org/apache/poi/ss/util/SheetUtil.java index a6ea07893a..bc448254fa 100644 --- a/poi/src/main/java/org/apache/poi/ss/util/SheetUtil.java +++ b/poi/src/main/java/org/apache/poi/ss/util/SheetUtil.java @@ -101,7 +101,7 @@ public class SheetUtil { /** * A system property which can be enabled to not fail when the * font-system is not available on the current machine. - * Since POI 5.3.1, this flag is enabled by default. + * Since POI 5.4.0, this flag is enabled by default. */ private static boolean ignoreMissingFontSystem = initIgnoreMissingFontSystemFlag(); diff --git a/poi/src/main/java/org/apache/poi/util/UserNameAwareTempFileCreationStrategy.java b/poi/src/main/java/org/apache/poi/util/UserNameAwareTempFileCreationStrategy.java index e8b1a03c1d..1fc84e837e 100644 --- a/poi/src/main/java/org/apache/poi/util/UserNameAwareTempFileCreationStrategy.java +++ b/poi/src/main/java/org/apache/poi/util/UserNameAwareTempFileCreationStrategy.java @@ -26,7 +26,7 @@ import java.nio.file.Paths; * that avoids permission issues when deploying applications with multiple users on the same server.
* Other than adding the username to the temporary directory, all other behavior is the same as the superclass.
*
- * @since POI 5.3.1
+ * @since POI 5.4.0
*/
public class UserNameAwareTempFileCreationStrategy extends DefaultTempFileCreationStrategy {
|