From 51f8c8dbfca35a9751560ed5e0f2734842a838f6 Mon Sep 17 00:00:00 2001
From: Mark Prins <1165786+mprins@users.noreply.github.com>
Date: Tue, 29 Nov 2022 10:40:51 +0100
Subject: [PATCH 1/2] Fix javadoc build voor bag2 loader
---
.github/workflows/linux.yml | 4 +---
bag2-loader/pom.xml | 1 +
brmo-commandline/pom.xml | 2 --
pom.xml | 5 +++--
4 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index c7cc387901..90ba58b636 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -133,9 +133,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'temurin'
- # downgrade to 11 because javadoc bug https://bugs.openjdk.org/browse/JDK-8222091
- # see https://github.com/B3Partners/brmo/pull/1602
- java-version: '11.0.16'
+ java-version: 11
cache: 'maven'
- name: 'Javadoc'
diff --git a/bag2-loader/pom.xml b/bag2-loader/pom.xml
index cc7e3ce956..4c17563154 100644
--- a/bag2-loader/pom.xml
+++ b/bag2-loader/pom.xml
@@ -147,6 +147,7 @@ SPDX-License-Identifier: MIT
nl.b3p.brmo.bag2.xml.leveringsdocument
${project.basedir}/src/main/xsd/
**/*.xsd
+ true
diff --git a/brmo-commandline/pom.xml b/brmo-commandline/pom.xml
index 574195ab48..ddf547e15d 100644
--- a/brmo-commandline/pom.xml
+++ b/brmo-commandline/pom.xml
@@ -24,8 +24,6 @@
commons-cli
-
jakarta.xml.bind
jakarta.xml.bind-api
${jaxb.api.version}
diff --git a/pom.xml b/pom.xml
index 7cc412c428..ef77b2e2ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -992,6 +992,7 @@
package
true
+ https://docs.oracle.com/en/java/javase/11/docs/api/
https://www.slf4j.org/apidocs/
https://docs.oracle.com/javaee/7/api/
https://docs.jboss.org/hibernate/orm/5.6/javadocs/
@@ -1000,11 +1001,11 @@
https://junit.org/junit5/docs/current/api/
https://b3partners.github.io/kadaster-gds2/apidocs/
https://b3partners.github.io/jdbc-util/apidocs/
+ https://jdbc.postgresql.org/documentation/publicapi/
+ https://www.xmlunit.org/api/java/main/
${project.build.sourceEncoding}
${project.artifactId}
-
- false
todo
From 03e58272d26063d1f16b605085279f7c22c5c4c9 Mon Sep 17 00:00:00 2001
From: Mark Prins <1165786+mprins@users.noreply.github.com>
Date: Tue, 31 Jan 2023 16:04:23 +0100
Subject: [PATCH 2/2] Update linux.yml
---
.github/workflows/linux.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 90ba58b636..d20ecbb52b 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -135,6 +135,8 @@ jobs:
distribution: 'temurin'
java-version: 11
cache: 'maven'
+ # this check can be removed when GH runners update to Javan 11.0.18 or higher
+ check-latest: true
- name: 'Javadoc'
run: mvn compile javadoc:javadoc -DskipQA=true