Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

next version will be 5.0.0 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1877872 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning 2020-05-17 17:29:37 +00:00
parent 6a1e8dbb70
commit 00185c2857
23 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -90,7 +90,7 @@ subprojects {
// See https://github.com/melix/japicmp-gradle-plugin // See https://github.com/melix/japicmp-gradle-plugin
apply plugin: 'me.champeau.gradle.japicmp' apply plugin: 'me.champeau.gradle.japicmp'
version = '4.1.3-SNAPSHOT' version = '5.0.0-SNAPSHOT'
ext { ext {
bouncyCastleVersion = '1.65' bouncyCastleVersion = '1.65'
commonsCodecVersion = '1.14' commonsCodecVersion = '1.14'

2
build.xml
View File

@ -42,7 +42,7 @@ under the License.
<description>The Apache POI project Ant build.</description> <description>The Apache POI project Ant build.</description>
<property name="version.id" value="4.1.3-SNAPSHOT"/> <property name="version.id" value="5.0.0-SNAPSHOT"/>
<property name="release.rc" value="RC1"/> <property name="release.rc" value="RC1"/>
<property environment="env"/> <property environment="env"/>

2
osgi/build.xml
View File

@ -26,7 +26,7 @@ under the License.
<!-- TODO Import these from the parent build file --> <!-- TODO Import these from the parent build file -->
<property name="repository.m2" value="https://repo1.maven.org"/> <property name="repository.m2" value="https://repo1.maven.org"/>
<property name="version.id" value="4.1.3-SNAPSHOT"/> <property name="version.id" value="5.0.0-SNAPSHOT"/>
<property name="dist.dir" value="build/dist"/> <property name="dist.dir" value="build/dist"/>
<!-- jars in the /lib directory, see the fetch-bundle-jars target--> <!-- jars in the /lib directory, see the fetch-bundle-jars target-->

2
sonar/examples/pom.xml
View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.apache.poi</groupId> <groupId>org.apache.poi</groupId>
<artifactId>poi-parent</artifactId> <artifactId>poi-parent</artifactId>
<version>4.1.3-SNAPSHOT</version> <version>5.0.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>poi-examples</artifactId> <artifactId>poi-examples</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>

2
sonar/excelant/pom.xml
View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.apache.poi</groupId> <groupId>org.apache.poi</groupId>
<artifactId>poi-parent</artifactId> <artifactId>poi-parent</artifactId>
<version>4.1.3-SNAPSHOT</version> <version>5.0.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>poi-excelant</artifactId> <artifactId>poi-excelant</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>

2
sonar/integration-test/pom.xml
View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.apache.poi</groupId> <groupId>org.apache.poi</groupId>
<artifactId>poi-parent</artifactId> <artifactId>poi-parent</artifactId>
<version>4.1.3-SNAPSHOT</version> <version>5.0.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>integration-test</artifactId> <artifactId>integration-test</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>

2
sonar/main/pom.xml
View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.apache.poi</groupId> <groupId>org.apache.poi</groupId>
<artifactId>poi-parent</artifactId> <artifactId>poi-parent</artifactId>
<version>4.1.3-SNAPSHOT</version> <version>5.0.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>poi-main</artifactId> <artifactId>poi-main</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>

2
sonar/ooxml-schema-encryption/pom.xml
View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.apache.poi</groupId> <groupId>org.apache.poi</groupId>
<artifactId>poi-parent</artifactId> <artifactId>poi-parent</artifactId>
<version>4.1.3-SNAPSHOT</version> <version>5.0.0-SNAPSHOT</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>
<artifactId>poi-ooxml-schema-encryption</artifactId> <artifactId>poi-ooxml-schema-encryption</artifactId>

2
sonar/ooxml-schema-security/pom.xml
View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.apache.poi</groupId> <groupId>org.apache.poi</groupId>
<artifactId>poi-parent</artifactId> <artifactId>poi-parent</artifactId>
<version>4.1.3-SNAPSHOT</version> <version>5.0.0-SNAPSHOT</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>
<artifactId>poi-ooxml-schema-security</artifactId> <artifactId>poi-ooxml-schema-security</artifactId>

2
sonar/ooxml-schema/pom.xml
View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.apache.poi</groupId> <groupId>org.apache.poi</groupId>
<artifactId>poi-parent</artifactId> <artifactId>poi-parent</artifactId>
<version>4.1.3-SNAPSHOT</version> <version>5.0.0-SNAPSHOT</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>
<artifactId>poi-ooxml-schema</artifactId> <artifactId>poi-ooxml-schema</artifactId>

2
sonar/ooxml/pom.xml
View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.apache.poi</groupId> <groupId>org.apache.poi</groupId>
<artifactId>poi-parent</artifactId> <artifactId>poi-parent</artifactId>
<version>4.1.3-SNAPSHOT</version> <version>5.0.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>poi-ooxml</artifactId> <artifactId>poi-ooxml</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>

2
sonar/pom.xml
View File

@ -4,7 +4,7 @@
<groupId>org.apache.poi</groupId> <groupId>org.apache.poi</groupId>
<artifactId>poi-parent</artifactId> <artifactId>poi-parent</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>4.1.3-SNAPSHOT</version> <version>5.0.0-SNAPSHOT</version>
<name>Apache POI - the Java API for Microsoft Documents</name> <name>Apache POI - the Java API for Microsoft Documents</name>
<description>Maven build of Apache POI for Sonar checks</description> <description>Maven build of Apache POI for Sonar checks</description>
<url>https://poi.apache.org/</url> <url>https://poi.apache.org/</url>

2
sonar/scratchpad/pom.xml
View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.apache.poi</groupId> <groupId>org.apache.poi</groupId>
<artifactId>poi-parent</artifactId> <artifactId>poi-parent</artifactId>
<version>4.1.3-SNAPSHOT</version> <version>5.0.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>poi-scratchpad</artifactId> <artifactId>poi-scratchpad</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>

2
src/java/org/apache/poi/hpsf/ClassID.java
View File

@ -335,7 +335,7 @@ public class ClassID implements Duplicatable, GenericRecord {
* Converts the ClassID to an UUID * Converts the ClassID to an UUID
* @return the ClassID as UUID * @return the ClassID as UUID
* *
* @since POI 4.1.3 * @since POI 5.0.0
*/ */
public UUID toUUID() { public UUID toUUID() {
final long mostSigBits = ByteBuffer.wrap(bytes, 0, 8).getLong(); final long mostSigBits = ByteBuffer.wrap(bytes, 0, 8).getLong();

4
src/java/org/apache/poi/hssf/record/FormulaRecord.java
View File

@ -121,7 +121,7 @@ public final class FormulaRecord extends CellRecord {
} }
/** /**
* @deprecated POI 4.1.3, will be removed in 5.0, use getCachedResultTypeEnum until switch to enum is fully done * @deprecated POI 5.0.0, will be removed in 5.0, use getCachedResultTypeEnum until switch to enum is fully done
*/ */
@Deprecated @Deprecated
public int getCachedResultType() { public int getCachedResultType() {
@ -134,7 +134,7 @@ public final class FormulaRecord extends CellRecord {
/** /**
* Returns the type of the cached result * Returns the type of the cached result
* @return A CellType * @return A CellType
* @since POI 4.1.3 * @since POI 5.0.0
*/ */
public CellType getCachedResultTypeEnum() { public CellType getCachedResultTypeEnum() {
if (specialCachedValue == null) { if (specialCachedValue == null) {

4
src/java/org/apache/poi/hssf/record/FormulaSpecialCachedValue.java
View File

@ -145,7 +145,7 @@ public final class FormulaSpecialCachedValue implements GenericRecord {
} }
/** /**
* @deprecated POI 4.1.3, will be removed in 5.0, use getValueTypeEnum until switch to enum is fully done * @deprecated POI 5.0.0, will be removed in 5.0, use getValueTypeEnum until switch to enum is fully done
*/ */
@Deprecated @Deprecated
public int getValueType() { public int getValueType() {
@ -165,7 +165,7 @@ public final class FormulaSpecialCachedValue implements GenericRecord {
/** /**
* Returns the type of the cached value * Returns the type of the cached value
* @return A CellType * @return A CellType
* @since POI 4.1.3 * @since POI 5.0.0
*/ */
public CellType getValueTypeEnum() { public CellType getValueTypeEnum() {
int typeCode = getTypeCode(); int typeCode = getTypeCode();

4
src/java/org/apache/poi/hssf/record/OldFormulaRecord.java
View File

@ -65,7 +65,7 @@ public final class OldFormulaRecord extends OldCellRecord {
} }
/** /**
* @deprecated POI 4.1.3, will be removed in 5.0, use getCachedResultTypeEnum until switch to enum is fully done * @deprecated POI 5.0.0, will be removed in 5.0, use getCachedResultTypeEnum until switch to enum is fully done
*/ */
@Deprecated @Deprecated
public int getCachedResultType() { public int getCachedResultType() {
@ -78,7 +78,7 @@ public final class OldFormulaRecord extends OldCellRecord {
/** /**
* Returns the type of the cached result * Returns the type of the cached result
* @return A CellType * @return A CellType
* @since POI 4.1.3 * @since POI 5.0.0
*/ */
public CellType getCachedResultTypeEnum() { public CellType getCachedResultTypeEnum() {
if (specialCachedValue == null) { if (specialCachedValue == null) {

2
src/java/org/apache/poi/ss/usermodel/RangeCopier.java
View File

@ -61,7 +61,7 @@ public abstract class RangeCopier {
* @param tileDestRange destination range, which should be overridden * @param tileDestRange destination range, which should be overridden
* @param copyStyles whether to copy the cell styles * @param copyStyles whether to copy the cell styles
* @param copyMergedRanges whether to copy merged ranges * @param copyMergedRanges whether to copy merged ranges
* @since 4.1.3 * @since 5.0.0
*/ */
public void copyRange(CellRangeAddress tilePatternRange, CellRangeAddress tileDestRange, boolean copyStyles, boolean copyMergedRanges) { public void copyRange(CellRangeAddress tilePatternRange, CellRangeAddress tileDestRange, boolean copyStyles, boolean copyMergedRanges) {
Sheet sourceCopy = sourceSheet.getWorkbook().cloneSheet(sourceSheet.getWorkbook().getSheetIndex(sourceSheet)); Sheet sourceCopy = sourceSheet.getWorkbook().cloneSheet(sourceSheet.getWorkbook().getSheetIndex(sourceSheet));

20
src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java
View File

@ -240,7 +240,7 @@ public class SignatureConfig {
/** /**
* @return the opc package to be used by this thread, stored as thread-local * @return the opc package to be used by this thread, stored as thread-local
* *
* @deprecated in POI 4.1.3 - use {@link SignatureInfo#setOpcPackage(OPCPackage)} instead * @deprecated in POI 5.0.0 - use {@link SignatureInfo#setOpcPackage(OPCPackage)} instead
*/ */
@Deprecated @Deprecated
@Removal(version = "5.0.0") @Removal(version = "5.0.0")
@ -251,7 +251,7 @@ public class SignatureConfig {
/** /**
* @param opcPackage the opc package to be handled by this thread, stored as thread-local * @param opcPackage the opc package to be handled by this thread, stored as thread-local
* *
* @deprecated in POI 4.1.3 - use {@link SignatureInfo#setOpcPackage(OPCPackage)} instead * @deprecated in POI 5.0.0 - use {@link SignatureInfo#setOpcPackage(OPCPackage)} instead
*/ */
@Deprecated @Deprecated
@Removal(version = "5.0.0") @Removal(version = "5.0.0")
@ -351,7 +351,7 @@ public class SignatureConfig {
/** /**
* @return the dereferencer used for Reference/@URI attributes, defaults to {@link OOXMLURIDereferencer} * @return the dereferencer used for Reference/@URI attributes, defaults to {@link OOXMLURIDereferencer}
* *
* @deprecated in POI 4.1.3 - use {@link SignatureInfo#getUriDereferencer()} instead * @deprecated in POI 5.0.0 - use {@link SignatureInfo#getUriDereferencer()} instead
*/ */
@Deprecated @Deprecated
@Removal(version = "5.0.0") @Removal(version = "5.0.0")
@ -362,7 +362,7 @@ public class SignatureConfig {
/** /**
* @param uriDereferencer the dereferencer used for Reference/@URI attributes * @param uriDereferencer the dereferencer used for Reference/@URI attributes
* *
* @deprecated in POI 4.1.3 - use {@link SignatureInfo#setUriDereferencer(URIDereferencer)} instead * @deprecated in POI 5.0.0 - use {@link SignatureInfo#setUriDereferencer(URIDereferencer)} instead
*/ */
@Deprecated @Deprecated
@Removal(version = "5.0.0") @Removal(version = "5.0.0")
@ -878,7 +878,7 @@ public class SignatureConfig {
/** /**
* @param signatureFactory the xml signature factory, saved as thread-local * @param signatureFactory the xml signature factory, saved as thread-local
* *
* @deprecated in POI 4.1.3 - use {@link SignatureInfo#setSignatureFactory(XMLSignatureFactory)} * @deprecated in POI 5.0.0 - use {@link SignatureInfo#setSignatureFactory(XMLSignatureFactory)}
*/ */
@Deprecated @Deprecated
@Removal(version = "5.0.0") @Removal(version = "5.0.0")
@ -889,7 +889,7 @@ public class SignatureConfig {
/** /**
* @return the xml signature factory (thread-local) * @return the xml signature factory (thread-local)
* *
* @deprecated in POI 4.1.3 - will be handled by SignatureInfo internally * @deprecated in POI 5.0.0 - will be handled by SignatureInfo internally
*/ */
@Deprecated @Deprecated
@Removal(version = "5.0.0") @Removal(version = "5.0.0")
@ -900,7 +900,7 @@ public class SignatureConfig {
/** /**
* @param keyInfoFactory the key factory, saved as thread-local * @param keyInfoFactory the key factory, saved as thread-local
* *
* @deprecated in POI 4.1.3 - use {@link SignatureInfo#setKeyInfoFactory(KeyInfoFactory)} * @deprecated in POI 5.0.0 - use {@link SignatureInfo#setKeyInfoFactory(KeyInfoFactory)}
*/ */
@Deprecated @Deprecated
@Removal(version = "5.0.0") @Removal(version = "5.0.0")
@ -911,7 +911,7 @@ public class SignatureConfig {
/** /**
* @return the key factory (thread-local) * @return the key factory (thread-local)
* *
* @deprecated in POI 4.1.3 - will be handled by SignatureInfo internally * @deprecated in POI 5.0.0 - will be handled by SignatureInfo internally
*/ */
@Deprecated @Deprecated
@Removal(version = "5.0.0") @Removal(version = "5.0.0")
@ -922,7 +922,7 @@ public class SignatureConfig {
/** /**
* Helper method to set provider * Helper method to set provider
* @param provider the provider * @param provider the provider
* @deprecated in POI 4.1.3 - use {@link SignatureInfo#setProvider(Provider)} * @deprecated in POI 5.0.0 - use {@link SignatureInfo#setProvider(Provider)}
*/ */
@Internal @Internal
@Deprecated @Deprecated
@ -934,7 +934,7 @@ public class SignatureConfig {
/** /**
* @return the cached provider or null if not set before * @return the cached provider or null if not set before
* *
* @deprecated in POI 4.1.3 - will be handled by SignatureInfo internally * @deprecated in POI 5.0.0 - will be handled by SignatureInfo internally
*/ */
@Deprecated @Deprecated
@Removal(version = "5.0.0") @Removal(version = "5.0.0")

2
src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFChart.java
View File

@ -325,7 +325,7 @@ public abstract class XDDFChart extends POIXMLDocumentPart implements TextContai
/** /**
* Remove the chart title. * Remove the chart title.
* @since POI 4.1.3 * @since POI 5.0.0
*/ */
public void removeTitle() { public void removeTitle() {
setAutoTitleDeleted(true); setAutoTitleDeleted(true);

2
src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFDataSource.java
View File

@ -55,7 +55,7 @@ public interface XDDFDataSource<T> {
String getFormatCode(); String getFormatCode();
/** /**
* @since POI 4.1.3 * @since POI 5.0.0
*/ */
@Internal @Internal
default void fillNumericalCache(CTNumData cache) { default void fillNumericalCache(CTNumData cache) {

2
src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTable.java
View File

@ -171,7 +171,7 @@ public class XSLFTable extends XSLFGraphicFrame implements Iterable<XSLFTableRow
/** /**
* Insert a new row at the given index. * Insert a new row at the given index.
* @param rowIdx the row index. * @param rowIdx the row index.
* @since POI 4.1.3 * @since POI 5.0.0
*/ */
public XSLFTableRow insertRow(int rowIdx) { public XSLFTableRow insertRow(int rowIdx) {
if (getNumberOfRows() < rowIdx) { if (getNumberOfRows() < rowIdx) {

2
src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
View File

@ -117,7 +117,7 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
/** /**
* Kept for backwards-compatibility, use {@link Font#TWIPS_PER_POINT} instead. * Kept for backwards-compatibility, use {@link Font#TWIPS_PER_POINT} instead.
* @deprecated POI 4.1.3 * @deprecated POI 5.0.0
*/ */
public static final int TWIPS_PER_POINT = Font.TWIPS_PER_POINT; public static final int TWIPS_PER_POINT = Font.TWIPS_PER_POINT;