Fix sources and javadoc generation in htmlflow, htmlflow-kotlin and htmlflow-view-loader modules

Author: BernardoPe

htmlflow-core/pom.xml

@@ -122,27 +122,6 @@
                     </execution>
                 </executions>
             </plugin>
-
-            <plugin>
-                <groupId>org.jetbrains.dokka</groupId>
-                <artifactId>dokka-maven-plugin</artifactId>
-                <version>1.9.10</version>
-                <executions>
-                    <execution>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>dokka</goal>
-                            <goal>javadoc</goal>
-                            <goal>javadocJar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <sourceDirectories>
-                        <source>src/main/java</source>
-                    </sourceDirectories>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>

htmlflow-kotlin/pom.xml

@@ -20,15 +20,6 @@
         HTML documents in a fluent style into a java.io.PrintStream.
     </description>
 
-    <properties>
-        <sonar.sources>
-            src/main/kotlin,
-        </sonar.sources>
-        <sonar.tests>
-            src/test/kotlin,
-        </sonar.tests>
-    </properties>
-
     <distributionManagement>
         <snapshotRepository>
             <id>ossrh</id>
@@ -122,7 +113,30 @@
     </dependencies>
 
     <build>
+        <sourceDirectory>src/main/kotlin</sourceDirectory>
+        <testSourceDirectory>src/test/kotlin</testSourceDirectory>
+
         <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>3.4.0</version>
+                <executions>
+                    <execution>
+                        <id>add-test-source</id>
+                        <phase>generate-test-sources</phase>
+                        <goals>
+                            <goal>add-test-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>src/test/java</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
             <plugin>
                 <groupId>org.jetbrains.kotlin</groupId>
                 <artifactId>kotlin-maven-plugin</artifactId>
@@ -159,27 +173,6 @@
                     <jvmTarget>${maven.compiler.target}</jvmTarget>
                 </configuration>
             </plugin>
-
-            <plugin>
-                <groupId>org.jetbrains.dokka</groupId>
-                <artifactId>dokka-maven-plugin</artifactId>
-                <version>1.9.10</version>
-                <executions>
-                    <execution>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>dokka</goal>
-                            <goal>javadoc</goal>
-                            <goal>javadocJar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <sourceDirectories>
-                        <source>src/main/kotlin</source>
-                    </sourceDirectories>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>

htmlflow-view-loader/pom.xml

@@ -26,15 +26,6 @@
         </repository>
     </distributionManagement>
 
-    <properties>
-        <sonar.sources>
-            src/main/kotlin,
-        </sonar.sources>
-        <sonar.tests>
-            src/test/kotlin,
-        </sonar.tests>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>com.github.xmlet</groupId>
@@ -69,6 +60,8 @@
     </dependencies>
 
     <build>
+        <sourceDirectory>src/main/kotlin</sourceDirectory>
+        <testSourceDirectory>src/test/kotlin</testSourceDirectory>
         <plugins>
             <plugin>
                 <groupId>org.jetbrains.kotlin</groupId>
@@ -106,27 +99,6 @@
                     <jvmTarget>${maven.compiler.target}</jvmTarget>
                 </configuration>
             </plugin>
-
-            <plugin>
-                <groupId>org.jetbrains.dokka</groupId>
-                <artifactId>dokka-maven-plugin</artifactId>
-                <version>1.9.10</version>
-                <executions>
-                    <execution>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>dokka</goal>
-                            <goal>javadoc</goal>
-                            <goal>javadocJar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <sourceDirectories>
-                        <source>src/main/kotlin</source>
-                    </sourceDirectories>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>

pom.xml

@@ -155,6 +155,7 @@
                     <sourceDirectories>
                         <source>htmlflow-core/src/main/java</source>
                         <source>htmlflow-kotlin/src/main/kotlin</source>
+                        <source>htmlflow-view-loader/src/main/kotlin</source>
                         <source>flowifier/src/main/java</source>
                     </sourceDirectories>
                 </configuration>