Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix javadoc runs in kotlin module #16693

Merged
merged 3 commits into from
Apr 21, 2021
Merged

Fix javadoc runs in kotlin module #16693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c1e5d4b
fix javadoc runs
evanchooly Apr 21, 2021
1f7abd2
bind dokka to deploy phase
evanchooly Apr 21, 2021
a67f652
"Fix" javadoc build for mongodb-panache-kotlin
gsmet Apr 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions extensions/panache/hibernate-orm-panache-kotlin/runtime/pom.xml
View file
Open in desktop
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>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this have to be the same as the Kotlin version we use?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That I don't know, maybe but I don't have the time to wait so it can be fixed later :).

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It does not. That's the latest version in central.

<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
Open in desktop
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