From e2c4ced5201271b4f259ea35f24073cef01ea801 Mon Sep 17 00:00:00 2001
From: damencho <damencho@jitsi.org>
Date: Fri, 29 Mar 2024 10:04:57 -0500
Subject: [PATCH 1/2] Revert "fix: Drops dokka dependency."

This reverts commit 858867a10ec0108b8ab436047ba2e4bc02ae66bf.
---
 pom.xml | 32 +++++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index d96ba06..807a873 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,6 +63,7 @@
         <kotest.version>5.7.2</kotest.version>
         <mockk.version>1.13.8</mockk.version>
         <prometheus.version>0.16.0</prometheus.version>
+        <dokka.version>1.9.0</dokka.version>
         <jetty.version>11.0.14</jetty.version>
         <jersey.version>3.0.10</jersey.version>
         <smack.version>4.4.6</smack.version>
@@ -84,6 +85,24 @@
     </dependencyManagement>
 
     <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.jetbrains.dokka</groupId>
+                    <artifactId>dokka-maven-plugin</artifactId>
+                    <version>${dokka.version}</version>
+                    <executions>
+                        <execution>
+                            <phase>package</phase>
+                            <goals>
+                                <goal>javadocJar</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -288,15 +307,6 @@
                             </execution>
                         </executions>
                     </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>3.4.0</version>
-                        <configuration>
-                            <doclint>-missing</doclint>
-                            <source>11</source>
-                        </configuration>
-                    </plugin>
                 </plugins>
             </build>
         </profile>
@@ -353,6 +363,10 @@
                             </execution>
                         </executions>
                     </plugin>
+                    <plugin>
+                        <groupId>org.jetbrains.dokka</groupId>
+                        <artifactId>dokka-maven-plugin</artifactId>
+                    </plugin>
                 </plugins>
             </build>
         </profile>

From d27a417d6476bcb4fedb713a0676d8c6f88b59c6 Mon Sep 17 00:00:00 2001
From: damencho <damencho@jitsi.org>
Date: Fri, 29 Mar 2024 10:19:14 -0500
Subject: [PATCH 2/2] fix: Updates phases for dokka plugin.

---
 pom.xml | 44 +++++++++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 19 deletions(-)

diff --git a/pom.xml b/pom.xml
index 807a873..521c330 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@
         <kotest.version>5.7.2</kotest.version>
         <mockk.version>1.13.8</mockk.version>
         <prometheus.version>0.16.0</prometheus.version>
-        <dokka.version>1.9.0</dokka.version>
+        <dokka.version>1.9.10</dokka.version>
         <jetty.version>11.0.14</jetty.version>
         <jersey.version>3.0.10</jersey.version>
         <smack.version>4.4.6</smack.version>
@@ -85,24 +85,6 @@
     </dependencyManagement>
 
     <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.jetbrains.dokka</groupId>
-                    <artifactId>dokka-maven-plugin</artifactId>
-                    <version>${dokka.version}</version>
-                    <executions>
-                        <execution>
-                            <phase>package</phase>
-                            <goals>
-                                <goal>javadocJar</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -162,6 +144,30 @@
                 <artifactId>maven-deploy-plugin</artifactId>
                 <version>3.0.0-M2</version>
             </plugin>
+            <plugin>
+                <groupId>org.jetbrains.dokka</groupId>
+                <artifactId>dokka-maven-plugin</artifactId>
+                <version>${dokka.version}</version>
+                <executions>
+                    <execution>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>dokka</goal>
+                            <goal>javadoc</goal>
+                            <goal>javadocJar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <dokkaPlugins>
+                        <plugin>
+                            <groupId>org.jetbrains.dokka</groupId>
+                            <artifactId>kotlin-as-java-plugin</artifactId>
+                            <version>${dokka.version}</version>
+                        </plugin>
+                    </dokkaPlugins>
+                </configuration>
+            </plugin>
         </plugins>
     </build>