You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fory.apache.org by ch...@apache.org on 2026/09/26 17:30:41 UTC

(fory) 03/04: fix(release): make Kotlin source and documentation jars reproducible

This is an automated email from the ASF dual-hosted git repository.

chaokunyang pushed a commit to tag v1.7.6-rc1
in repository https://gitbox.apache.org/repos/asf/fory.git

commit c9fd54b2e448612f5b3c89d301cbcf3133856501
Author: chaokunyang <sh...@gmail.com>
AuthorDate: Sun Sep 27 01:12:50 2026 +0800

    fix(release): make Kotlin source and documentation jars reproducible
---
 kotlin/pom.xml | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/kotlin/pom.xml b/kotlin/pom.xml
index ce9d84e18..0053d60ad 100644
--- a/kotlin/pom.xml
+++ b/kotlin/pom.xml
@@ -72,7 +72,7 @@
         <maven-spotless-plugin.version>2.43.0</maven-spotless-plugin.version>
         <google-java-format.version>1.24.0</google-java-format.version>
         <dokka.skip>false</dokka.skip>
-        <!-- Dokka owns the standard javadoc classifier for mixed Kotlin/Java modules. -->
+        <!-- Dokka generates mixed Kotlin/Java docs; the JAR plugin packages them reproducibly. -->
         <maven.javadoc.skip>true</maven.javadoc.skip>
     </properties>
 
@@ -185,7 +185,7 @@
                                 <goal>copy-resources</goal>
                             </goals>
                             <configuration>
-                                <!-- Dokka preserves and archives files already present in its output directory. -->
+                                <!-- Preserve the legal resources alongside the generated documentation. -->
                                 <skip>${dokka.skip}</skip>
                                 <outputDirectory>${project.build.directory}/dokkaJavadocJar/META-INF</outputDirectory>
                                 <resources>
@@ -205,7 +205,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-source-plugin</artifactId>
-                    <version>3.0.1</version>
+                    <version>3.3.1</version>
                     <executions>
                         <execution>
                             <id>attach-sources</id>
@@ -304,15 +304,35 @@
             <plugin>
                 <groupId>org.jetbrains.dokka</groupId>
                 <artifactId>dokka-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>generate-dokka-javadocs</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>javadoc</goal>
+                        </goals>
+                        <configuration>
+                            <skip>${dokka.skip}</skip>
+                            <outputDir>${project.build.directory}/dokkaJavadocJar</outputDir>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
                 <executions>
                     <execution>
                         <id>attach-dokka-javadocs</id>
                         <phase>package</phase>
                         <goals>
-                            <goal>javadocJar</goal>
+                            <goal>jar</goal>
                         </goals>
                         <configuration>
-                            <skip>${dokka.skip}</skip>
+                            <!-- Dokka's javadocJar does not honor project.build.outputTimestamp. -->
+                            <classifier>javadoc</classifier>
+                            <classesDirectory>${project.build.directory}/dokkaJavadocJar</classesDirectory>
+                            <skipIfEmpty>true</skipIfEmpty>
                         </configuration>
                     </execution>
                 </executions>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@fory.apache.org
For additional commands, e-mail: commits-help@fory.apache.org