Skip to content

Commit

Permalink
Fix build pipeline for Java 9
Browse files Browse the repository at this point in the history
  • Loading branch information
@shred
shred committed Jun 6, 2020
1 parent df80966 commit aa6d47a
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 66 deletions.
13 changes: 9 additions & 4 deletions .gitlab-ci.yml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@

image: maven:3-jdk-11-slim

build:
tags:
- maven
script:
- mvn clean compile

deploy:
tags:
- maven
script:
- mvn -B clean install javadoc:javadoc javadoc:test-javadoc
- mvn -B install javadoc:javadoc
62 changes: 1 addition & 61 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.1.1</version>
<version>3.2.0</version>
<configuration>
<doclint>syntax,reference</doclint>
<linksource>true</linksource>
Expand Down Expand Up @@ -155,64 +155,4 @@
<scope>test</scope>
</dependency>
</dependencies>

<!-- Workaround: Java 9's javadoc search is broken if no module is defined -->
<profiles>
<profile>
<id>java-9</id>
<activation>
<jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<additionalJOption combine.self="override">--no-module-directories</additionalJOption>
</configuration>
</plugin>
</plugins>
</build>
<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<additionalJOption combine.self="override">--no-module-directories</additionalJOption>
</configuration>
</plugin>
</plugins>
</reporting>
</profile>
<profile>
<id>java-11</id>
<activation>
<jdk>[11,)</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<source>8</source>
</configuration>
</plugin>
</plugins>
</build>
<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<source>8</source>
</configuration>
</plugin>
</plugins>
</reporting>
</profile>
</profiles>
</project>
2 changes: 1 addition & 1 deletion src/doc/docs/examples.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Examples

In this chapter, you will find code examples that demonstrate the use and the possibilities of the API. You can also find (and run) these examples in the [ExamplesTest](./testapidocs/src-html/org/shredzone/commons/suncalc/ExamplesTest.html) unit test.
In this chapter, you will find code examples that demonstrate the use and the possibilities of the API. You can also find (and run) these examples in the [ExamplesTest](https://github.com/shred/commons-suncalc/blob/master/src/test/java/org/shredzone/commons/suncalc/ExamplesTest.java) unit test.

I know this is a long chapter. It is because _suncalc_ offers a lot of functionality. I still recommend to read it, or at least skim it, to get an idea of what is possible or best practice.

Expand Down

0 comments on commit aa6d47a

Please sign in to comment.