Browse Source

next version will be 5.0.0

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1877872 13f79535-47bb-0310-9956-ffa450edef68
tags/before_ooxml_3rd_edition
PJ Fanning 4 years ago
parent
commit
00185c2857

+ 1
- 1
build.gradle View File

@@ -90,7 +90,7 @@ subprojects {
// See https://github.com/melix/japicmp-gradle-plugin
apply plugin: 'me.champeau.gradle.japicmp'

version = '4.1.3-SNAPSHOT'
version = '5.0.0-SNAPSHOT'
ext {
bouncyCastleVersion = '1.65'
commonsCodecVersion = '1.14'

+ 1
- 1
build.xml View File

@@ -42,7 +42,7 @@ under the License.

<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 environment="env"/>

+ 1
- 1
osgi/build.xml View File

@@ -26,7 +26,7 @@ under the License.

<!-- TODO Import these from the parent build file -->
<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"/>

<!-- jars in the /lib directory, see the fetch-bundle-jars target-->

+ 1
- 1
sonar/examples/pom.xml View File

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

+ 1
- 1
sonar/excelant/pom.xml View File

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

+ 1
- 1
sonar/integration-test/pom.xml View File

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

+ 1
- 1
sonar/main/pom.xml View File

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

+ 1
- 1
sonar/ooxml-schema-encryption/pom.xml View File

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

+ 1
- 1
sonar/ooxml-schema-security/pom.xml View File

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

+ 1
- 1
sonar/ooxml-schema/pom.xml View File

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

+ 1
- 1
sonar/ooxml/pom.xml View File

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

+ 1
- 1
sonar/pom.xml View File

@@ -4,7 +4,7 @@
<groupId>org.apache.poi</groupId>
<artifactId>poi-parent</artifactId>
<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>
<description>Maven build of Apache POI for Sonar checks</description>
<url>https://poi.apache.org/</url>

+ 1
- 1
sonar/scratchpad/pom.xml View File

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

+ 1
- 1
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
* @return the ClassID as UUID
*
* @since POI 4.1.3
* @since POI 5.0.0
*/
public UUID toUUID() {
final long mostSigBits = ByteBuffer.wrap(bytes, 0, 8).getLong();

+ 2
- 2
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
public int getCachedResultType() {
@@ -134,7 +134,7 @@ public final class FormulaRecord extends CellRecord {
/**
* Returns the type of the cached result
* @return A CellType
* @since POI 4.1.3
* @since POI 5.0.0
*/
public CellType getCachedResultTypeEnum() {
if (specialCachedValue == null) {

+ 2
- 2
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
public int getValueType() {
@@ -165,7 +165,7 @@ public final class FormulaSpecialCachedValue implements GenericRecord {
/**
* Returns the type of the cached value
* @return A CellType
* @since POI 4.1.3
* @since POI 5.0.0
*/
public CellType getValueTypeEnum() {
int typeCode = getTypeCode();

+ 2
- 2
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
public int getCachedResultType() {
@@ -78,7 +78,7 @@ public final class OldFormulaRecord extends OldCellRecord {
/**
* Returns the type of the cached result
* @return A CellType
* @since POI 4.1.3
* @since POI 5.0.0
*/
public CellType getCachedResultTypeEnum() {
if (specialCachedValue == null) {

+ 1
- 1
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 copyStyles whether to copy the cell styles
* @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) {
Sheet sourceCopy = sourceSheet.getWorkbook().cloneSheet(sourceSheet.getWorkbook().getSheetIndex(sourceSheet));

+ 10
- 10
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
*
* @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
@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
*
* @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
@Removal(version = "5.0.0")
@@ -351,7 +351,7 @@ public class SignatureConfig {
/**
* @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
@Removal(version = "5.0.0")
@@ -362,7 +362,7 @@ public class SignatureConfig {
/**
* @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
@Removal(version = "5.0.0")
@@ -878,7 +878,7 @@ public class SignatureConfig {
/**
* @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
@Removal(version = "5.0.0")
@@ -889,7 +889,7 @@ public class SignatureConfig {
/**
* @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
@Removal(version = "5.0.0")
@@ -900,7 +900,7 @@ public class SignatureConfig {
/**
* @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
@Removal(version = "5.0.0")
@@ -911,7 +911,7 @@ public class SignatureConfig {
/**
* @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
@Removal(version = "5.0.0")
@@ -922,7 +922,7 @@ public class SignatureConfig {
/**
* Helper method to set 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
@Deprecated
@@ -934,7 +934,7 @@ public class SignatureConfig {
/**
* @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
@Removal(version = "5.0.0")

+ 1
- 1
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.
* @since POI 4.1.3
* @since POI 5.0.0
*/
public void removeTitle() {
setAutoTitleDeleted(true);

+ 1
- 1
src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFDataSource.java View File

@@ -55,7 +55,7 @@ public interface XDDFDataSource<T> {
String getFormatCode();

/**
* @since POI 4.1.3
* @since POI 5.0.0
*/
@Internal
default void fillNumericalCache(CTNumData cache) {

+ 1
- 1
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.
* @param rowIdx the row index.
* @since POI 4.1.3
* @since POI 5.0.0
*/
public XSLFTableRow insertRow(int rowIdx) {
if (getNumberOfRows() < rowIdx) {

+ 1
- 1
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.
* @deprecated POI 4.1.3
* @deprecated POI 5.0.0
*/
public static final int TWIPS_PER_POINT = Font.TWIPS_PER_POINT;


Loading…
Cancel
Save