Skip to content

Commit

Permalink
Merge pull request #16693 from evanchooly/kotlin-javadoc
Browse files Browse the repository at this point in the history 
Fix javadoc runs in kotlin module
  • Loading branch information
@gsmet
gsmet authored Apr 21, 2021
2 parents 9861d4f + a67f652 commit 35c4fca
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 20 deletions.
23 changes: 13 additions & 10 deletions extensions/panache/hibernate-orm-panache-kotlin/runtime/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
</execution>
</executions>
<configuration>
<jvmTarget>1.8</jvmTarget>
<jvmTarget>11</jvmTarget>
</configuration>
</plugin>
<plugin>
Expand Down Expand Up @@ -156,30 +156,33 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<failOnError>false</failOnError>
</configuration>
</plugin>
<plugin>
<groupId>org.jetbrains.dokka</groupId>
<artifactId>dokka-maven-plugin</artifactId>
<version>0.10.1</version>
<version>1.4.30</version>
<executions>
<execution>
<id>javadoc</id>
<phase>pre-site</phase>
<phase>deploy</phase>
<goals>
<goal>dokka</goal>
<goal>javadocJar</goal>
</goals>
</execution>
</executions>
<configuration>
<jdkVersion>8</jdkVersion>
<jdkVersion>11</jdkVersion>
<outputFormat>html</outputFormat>
<sourceDirectories>
<sourceDirectory>src/main/kotlin</sourceDirectory>
</sourceDirectories>
<externalDocumentationLinks>
<link>
<!-- Root URL of the generated documentation to link with. The trailing slash is required! -->
<url>https://docs.oracle.com/javase/8/docs/api/</url>
<packageListUrl>https://docs.oracle.com/javase/8/docs/api/package-list</packageListUrl>
<url>https://docs.oracle.com/en/java/javase/11/docs/api/</url>
</link>
</externalDocumentationLinks>
</configuration>
Expand Down
23 changes: 13 additions & 10 deletions extensions/panache/mongodb-panache-kotlin/runtime/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
</executions>
<configuration>
<javaParameters>true</javaParameters>
<jvmTarget>1.8</jvmTarget>
<jvmTarget>11</jvmTarget>
</configuration>
</plugin>
<plugin>
Expand Down Expand Up @@ -176,30 +176,33 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<failOnError>false</failOnError>
</configuration>
</plugin>
<plugin>
<groupId>org.jetbrains.dokka</groupId>
<artifactId>dokka-maven-plugin</artifactId>
<version>0.10.1</version>
<version>1.4.30</version>
<executions>
<execution>
<id>javadoc</id>
<phase>pre-site</phase>
<phase>deploy</phase>
<goals>
<goal>dokka</goal>
<goal>javadocJar</goal>
</goals>
</execution>
</executions>
<configuration>
<jdkVersion>11</jdkVersion>
<outputFormat>html</outputFormat>
<sourceDirectories>
<sourceDirectory>src/main/java</sourceDirectory>
<sourceDirectory>src/main/kotlin</sourceDirectory>
</sourceDirectories>
<externalDocumentationLinks>
<link>
<!-- Root URL of the generated documentation to link with. The trailing slash is required! -->
<url>https://docs.oracle.com/javase/8/docs/api/</url>
<packageListUrl>https://docs.oracle.com/javase/8/docs/api/package-list</packageListUrl>
<url>https://docs.oracle.com/en/java/javase/11/docs/api/</url>
</link>
</externalDocumentationLinks>
</configuration>
Expand Down

0 comments on commit 35c4fca

Please sign in to comment.