Merge pull request #53 from DDS-GmbH/fix/dependencies

Update dependencies
DDS-GmbH · Jun 11, 2021 · db1afb7 · db1afb7
2 parents e0b5640 + ef6dfd6
commit db1afb7
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -77,7 +77,7 @@ jobs:
           arguments: automatedTests
       - name: Publish test results
         if: always()
-        uses: EnricoMi/publish-unit-test-result-action@v1.3
+        uses: EnricoMi/publish-unit-test-result-action@v1.17
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           report_individual_runs: true

diff --git a/build.gradle b/build.gradle
@@ -13,8 +13,8 @@ buildscript {
 plugins {
     id 'java'
     id 'checkstyle'
-    id "org.sonarqube" version "3.0"
-    id "org.owasp.dependencycheck" version "6.0.2"
+    id "org.sonarqube" version "3.3"
+    id "org.owasp.dependencycheck" version "6.2.2"
     id 'maven-publish'
 }
 
@@ -44,27 +44,29 @@ repositories {
     }
 }
 
+def apachePOIVersion = '5.0.0'
+
 dependencies {
     implementation('commons-beanutils:commons-beanutils:1.9.4')
 
-    implementation("org.apache.poi:poi:4.1.2")
-    implementation("org.apache.poi:poi-ooxml:4.1.2")
-    implementation("org.apache.poi:poi-ooxml-schemas:4.1.2")
+    implementation("org.apache.poi:poi:$apachePOIVersion")
+    implementation("org.apache.poi:poi-ooxml:$apachePOIVersion")
+    implementation("org.apache.poi:poi-ooxml-lite:$apachePOIVersion")
 
-    implementation("com.google.code.gson:gson:2.8.6")
-    implementation("org.apache.tika:tika-core:1.24.1")
+    implementation("com.google.code.gson:gson:2.8.7")
+    implementation("org.apache.tika:tika-core:1.26")
 
-    implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.13.3'
-    runtimeOnly group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.13.3'
+    implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.14.1'
+    runtimeOnly group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.14.1'
 
     implementation 'com.codepoetics:protonpack:1.16'
-    implementation("com.google.guava:guava:29.0-jre")
+    implementation("com.google.guava:guava:30.1.1-jre")
 
-    testImplementation('org.junit.jupiter:junit-jupiter:5.6.0')
+    testImplementation('org.junit.jupiter:junit-jupiter:5.7.2')
     testImplementation("org.hamcrest:hamcrest:2.2")
     testImplementation("com.docu-tools:poipath:1.0.0")
 
-    checkstyle 'com.puppycrawl.tools:checkstyle:8.36.2'
+    checkstyle 'com.puppycrawl.tools:checkstyle:8.43'
 }
 
 tasks.withType(Checkstyle) {

diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
@@ -285,7 +285,6 @@
                       value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
         </module>
         <module name="JavadocMethod">
-            <property name="scope" value="public"/>
             <property name="allowMissingParamTags" value="true"/>
             <property name="allowMissingReturnTag" value="true"/>
             <property name="allowedAnnotations" value="Override, Test"/>

diff --git a/src/main/java/com/docutools/jocument/impl/word/WordUtilities.java b/src/main/java/com/docutools/jocument/impl/word/WordUtilities.java
@@ -319,7 +319,6 @@ private static void cloneTable(XWPFTable original, XWPFTable clone) {
           for (int i = 0; i < cells.size(); i++) {
             XWPFTableCell cell = cells.get(i);
             XWPFTableCell newCell = newRow.getCell(i) != null ? newRow.getCell(i) : newRow.createCell();
-            newCell.removeParagraph(0);
             CTTc ctTc = newCell.getCTTc();
             CTTcPr ctTcPr = ctTc.getTcPr();
             if (ctTcPr == null) {