[ASP-14476] gradle build changing

airslate-oss · Mar 31, 2022 · 22970a5 · 22970a5
1 parent 0993fd2
commit 22970a5
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -262,13 +262,29 @@ subprojects {
         publications {
             mavenJava(MavenPublication) {
                 from components.java
+
+                pom {
+                    packaging = 'jar'
+                    withXml {
+                        def r = asElement()
+                        def doc = r.getOwnerDocument()
+
+                        // remove duplicate entries
+                        XPath xpath = XPathFactory.newInstance().newXPath()
+                        NodeList res2 = (NodeList) xpath.evaluate("//dependency[artifactId = ./preceding-sibling::dependency/artifactId]", doc, XPathConstants.NODESET)
+                        for (int i = res2.getLength() - 1; i >= 0; i--) {
+                            Node n = res2.item(i)
+                            n.getParentNode().removeChild(n)
+                        }
+                    }
+                }
             }
         }
     }
 
     artifactoryPublish {
+        dependsOn(clean, jar)
         publications(publishing.publications.mavenJava)
-        dependsOn build
     }
 
     artifactory {
@@ -291,6 +307,7 @@ subprojects {
     }
 
     jar {
+        enabled = true
         from("../legal") {
             include "NOTICE"
             include "LICENSE"
@@ -600,7 +617,19 @@ rat {
         "osgi/README.md",
         "src/resources/ooxml-lite-report.*",
         // ignore svn conflict artifacts
-        "**/module-info.*"
+        "**/module-info.*",
+        // airslate fork files
+        "poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/ISDTContentBlock.java",
+        "poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/ISDTContentRun.java",
+        "poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/ISDTContentsBlock.java",
+        "poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/ISDTContentsRun.java",
+        "poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSDTBlock.java",
+        "poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSDTContentBlock.java",
+        "poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSDTContentRun.java",
+        "poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSDTPr.java",
+        "poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSDTRun.java",
+        "poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFSDTBlock.java",
+        "poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFSDTRun.java",
     ]
 
     /*

diff --git a/poi-integration/build.gradle b/poi-integration/build.gradle
@@ -194,4 +194,3 @@ javadoc.onlyIf { false }
 javadocJar.onlyIf { false }
 
 sourcesJar.onlyIf { false }
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -194,4 +194,3 @@ javadoc.onlyIf { false }
		javadocJar.onlyIf { false }

		sourcesJar.onlyIf { false }