Skip to content

Commit 7cb95d2

Browse files
committed
Revert javadoc maven plugin upgrade, add build to ensure aggregate works
1 parent 4b465f2 commit 7cb95d2

File tree

2 files changed

+52
-3
lines changed

2 files changed

+52
-3
lines changed

.github/workflows/javadoc.yml

+49
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
name: Linux JDK 11 GitHub CI
2+
3+
on:
4+
pull_request:
5+
paths-ignore:
6+
- '**/src/main/resources/GeoServerApplication_*.properties'
7+
- '!**/src/main/resources/GeoServerApplication_fr.properties'
8+
9+
env:
10+
MAVEN_OPTS: -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 -Dmaven.wagon.http.retryHandler.count=3 -Xmx512m -Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss,SSS
11+
12+
jobs:
13+
javadoc:
14+
runs-on: ${{ matrix.os }}
15+
strategy:
16+
matrix:
17+
include:
18+
- os: ubuntu-20.04
19+
jdk: 11
20+
dist: 'temurin'
21+
steps:
22+
- uses: actions/checkout@v2
23+
with:
24+
# 500 commits, set to 0 to get all
25+
fetch-depth: 500
26+
- name: Set up JDK
27+
uses: actions/setup-java@v2
28+
with:
29+
java-version: ${{ matrix.jdk }}
30+
distribution: ${{ matrix.dist }}
31+
- name: Set up Maven
32+
uses: stCarolas/setup-maven@v4
33+
with:
34+
maven-version: 3.8.4
35+
- name: Maven repository caching
36+
uses: actions/cache@v2
37+
with:
38+
path: ~/.m2/repository
39+
key: gs-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
40+
restore-keys: |
41+
gs-${{ runner.os }}-maven-
42+
- name: Build with Maven
43+
run: mvn -B -fae -Dspotless.apply.skip=true -f src/pom.xml clean install -DskipTests
44+
- name: Build aggregate javadocs
45+
run: mvn -B -fae -Dspotless.apply.skip=true -f src/pom.xml javadoc:aggregate
46+
- name: Remove SNAPSHOT jars from repository
47+
run: |
48+
find ~/.m2/repository -name "*SNAPSHOT*" -type d | xargs rm -rf {}
49+

src/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1718,7 +1718,7 @@
17181718
</plugin>
17191719
<plugin>
17201720
<artifactId>maven-javadoc-plugin</artifactId>
1721-
<version>3.5.0</version>
1721+
<version>2.10.3</version>
17221722
</plugin>
17231723
<plugin>
17241724
<artifactId>maven-resources-plugin</artifactId>
@@ -2006,10 +2006,10 @@
20062006
</tags>
20072007

20082008
<links>
2009-
<link>http://docs.oracle.com/javase/8/docs/api/</link>
2009+
<link>https://docs.oracle.com/en/java/javase/11/docs/api</link>
20102010
<link>http://docs.oracle.com/javaee/7/api/</link>
20112011
<link>http://jscience.org/api/</link>
2012-
<link>http://tsusiatsoftware.net/jts/javadoc</link>
2012+
<link>https://locationtech.github.io/jts/javadoc/</link>
20132013
<link>http://docs.geotools.org/latest/javadocs/</link>
20142014
<link>http://xmlgraphics.apache.org/batik/javadoc</link>
20152015
<link>http://freemarker.sourceforge.net/docs/api/</link>

0 commit comments

Comments
 (0)