diff --git a/build.gradle b/build.gradle
index 150b43f58b..458dbf0326 100644
--- a/build.gradle
+++ b/build.gradle
@@ -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'
diff --git a/build.xml b/build.xml
index bb2ab3ecc3..e1481837c0 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="4.1.3-SNAPSHOT"/>
+    <property name="version.id" value="5.0.0-SNAPSHOT"/>
     <property name="release.rc" value="RC1"/>
 
     <property environment="env"/>
diff --git a/osgi/build.xml b/osgi/build.xml
index bce1434f92..364d41bb5c 100644
--- a/osgi/build.xml
+++ b/osgi/build.xml
@@ -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-->
diff --git a/sonar/examples/pom.xml b/sonar/examples/pom.xml
index dd91449a8d..4c05cf549d 100644
--- a/sonar/examples/pom.xml
+++ b/sonar/examples/pom.xml
@@ -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>
diff --git a/sonar/excelant/pom.xml b/sonar/excelant/pom.xml
index fb22def986..692876ac7a 100644
--- a/sonar/excelant/pom.xml
+++ b/sonar/excelant/pom.xml
@@ -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>
diff --git a/sonar/integration-test/pom.xml b/sonar/integration-test/pom.xml
index 1e45004768..38a817eeec 100644
--- a/sonar/integration-test/pom.xml
+++ b/sonar/integration-test/pom.xml
@@ -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>
diff --git a/sonar/main/pom.xml b/sonar/main/pom.xml
index 37ab22980d..bc5176d64c 100644
--- a/sonar/main/pom.xml
+++ b/sonar/main/pom.xml
@@ -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>
diff --git a/sonar/ooxml-schema-encryption/pom.xml b/sonar/ooxml-schema-encryption/pom.xml
index 99d871f0de..40a114ecc9 100644
--- a/sonar/ooxml-schema-encryption/pom.xml
+++ b/sonar/ooxml-schema-encryption/pom.xml
@@ -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>
diff --git a/sonar/ooxml-schema-security/pom.xml b/sonar/ooxml-schema-security/pom.xml
index 4224b78a45..493dd6429b 100644
--- a/sonar/ooxml-schema-security/pom.xml
+++ b/sonar/ooxml-schema-security/pom.xml
@@ -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>
diff --git a/sonar/ooxml-schema/pom.xml b/sonar/ooxml-schema/pom.xml
index d863dd9f82..184e7ebded 100644
--- a/sonar/ooxml-schema/pom.xml
+++ b/sonar/ooxml-schema/pom.xml
@@ -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>
diff --git a/sonar/ooxml/pom.xml b/sonar/ooxml/pom.xml
index 8954afdd86..505e5f1dc6 100644
--- a/sonar/ooxml/pom.xml
+++ b/sonar/ooxml/pom.xml
@@ -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>
diff --git a/sonar/pom.xml b/sonar/pom.xml
index 71043ff79a..02b314ce3d 100644
--- a/sonar/pom.xml
+++ b/sonar/pom.xml
@@ -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>
diff --git a/sonar/scratchpad/pom.xml b/sonar/scratchpad/pom.xml
index c9893da6da..1553055431 100644
--- a/sonar/scratchpad/pom.xml
+++ b/sonar/scratchpad/pom.xml
@@ -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>
diff --git a/src/java/org/apache/poi/hpsf/ClassID.java b/src/java/org/apache/poi/hpsf/ClassID.java
index 6a9db4d105..15eefc476b 100644
--- a/src/java/org/apache/poi/hpsf/ClassID.java
+++ b/src/java/org/apache/poi/hpsf/ClassID.java
@@ -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();
diff --git a/src/java/org/apache/poi/hssf/record/FormulaRecord.java b/src/java/org/apache/poi/hssf/record/FormulaRecord.java
index a6850e5b9b..1593220a24 100644
--- a/src/java/org/apache/poi/hssf/record/FormulaRecord.java
+++ b/src/java/org/apache/poi/hssf/record/FormulaRecord.java
@@ -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) {
diff --git a/src/java/org/apache/poi/hssf/record/FormulaSpecialCachedValue.java b/src/java/org/apache/poi/hssf/record/FormulaSpecialCachedValue.java
index 22fefd38e3..9eadacea83 100644
--- a/src/java/org/apache/poi/hssf/record/FormulaSpecialCachedValue.java
+++ b/src/java/org/apache/poi/hssf/record/FormulaSpecialCachedValue.java
@@ -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();
diff --git a/src/java/org/apache/poi/hssf/record/OldFormulaRecord.java b/src/java/org/apache/poi/hssf/record/OldFormulaRecord.java
index f27bf16d6a..dd18abebf6 100644
--- a/src/java/org/apache/poi/hssf/record/OldFormulaRecord.java
+++ b/src/java/org/apache/poi/hssf/record/OldFormulaRecord.java
@@ -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) {
diff --git a/src/java/org/apache/poi/ss/usermodel/RangeCopier.java b/src/java/org/apache/poi/ss/usermodel/RangeCopier.java
index b9d42f61b9..c6b82a6860 100644
--- a/src/java/org/apache/poi/ss/usermodel/RangeCopier.java
+++ b/src/java/org/apache/poi/ss/usermodel/RangeCopier.java
@@ -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));
diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java b/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java
index 13346dc9e4..e7660d8dd8 100644
--- a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java
+++ b/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java
@@ -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")
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFChart.java b/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFChart.java
index cebe38b8f2..dd959dddee 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFChart.java
+++ b/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFChart.java
@@ -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);
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFDataSource.java b/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFDataSource.java
index 3bfd18bbe8..e6f085e807 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFDataSource.java
+++ b/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFDataSource.java
@@ -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) {
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTable.java b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTable.java
index 74c0921345..1f5040e380 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTable.java
+++ b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTable.java
@@ -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) {
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
index dde51c3485..a63c420258 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
@@ -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;