more fixes

B3Partners · Dec 2, 2022 · dbf7ac1 · dbf7ac1
1 parent 79aca77
commit dbf7ac1
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 83 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -138,8 +138,8 @@ jobs:
 
   javadoc:
     name: JavaDoc Check
-    runs-on: ubuntu-22.04
-    needs: build
+    runs-on: ubuntu-latest
+#    needs: build
 
     steps:
       - uses: actions/checkout@v3
@@ -154,21 +154,18 @@ jobs:
           restore-keys: |
             maven-
 
-      # niet meer nodig sinds java 11 maken we geen UML meer
-      #- name: Install extra software
-      #  run: sudo apt install -y --no-install-recommends graphviz
-
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: 11
+          check-latest: true
 
       - name: Javadoc
-        run: mvn compile javadoc:javadoc
+        run: mvn compile javadoc:javadoc -fae
 
       - name: Test Javadoc
-        run: mvn test-compile javadoc:test-javadoc
+        run: mvn test-compile javadoc:test-javadoc -fae
 
 
   dependency-review:
@@ -184,6 +181,7 @@ jobs:
       - name: 'Dependency Review'
         uses: actions/dependency-review-action@v3
 
+
   cleanup:
     name: Maven cache cleanup
     if: ${{ always() }}

diff --git a/bag2-loader/pom.xml b/bag2-loader/pom.xml
@@ -243,24 +243,8 @@ SPDX-License-Identifier: MIT
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
-    <reporting>
-        <plugins>
-            <plugin>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-        </plugins>
-    </reporting>
     <profiles>
         <profile>
             <id>release</id>

diff --git a/bgt-loader/pom.xml b/bgt-loader/pom.xml
@@ -252,24 +252,8 @@ SPDX-License-Identifier: MIT
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
-    <reporting>
-        <plugins>
-            <plugin>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-        </plugins>
-    </reporting>
     <profiles>
         <profile>
             <id>release</id>

diff --git a/brmo-commandline/pom.xml b/brmo-commandline/pom.xml
@@ -24,8 +24,6 @@
             <artifactId>commons-cli</artifactId>
         </dependency>
         <dependency>
-            <!-- deze is eigenlijk alleen nodig voor java 11, maar
-            omdat we een runnable jar met classpath maken makkelijk om ook voor java 8 er bij te stoppen -->
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
             <version>${jaxb.api.version}</version>

diff --git a/brmo-stufbg204/pom.xml b/brmo-stufbg204/pom.xml
@@ -213,13 +213,6 @@
                     <verbose>false</verbose>
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <configuration>
-                    <!-- java 8 doclint van struikelt over de gegenereerde code; uitzetten van syntax check! -->
-                    <doclint>none</doclint>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
     <reporting>

diff --git a/pom.xml b/pom.xml
@@ -960,18 +960,10 @@
                         <notimestamp>true</notimestamp>
                         <quiet>true</quiet>
                         <stylesheet>java</stylesheet>
-                        <!-- dit is stuk miv Java 11 vanwege aanpassingen in de Javadoc API
-                        <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
-                        <docletArtifact>
-                            <groupId>org.umlgraph</groupId>
-                            <artifactId>umlgraph</artifactId>
-                            <version>5.6.6</version>
-                        </docletArtifact>
-                        <additionalOptions>-all -hide java.* -hide javax.* -hide org.* -inferrel</additionalOptions>
-                        -->
                         <show>package</show>
                         <useStandardDocletOptions>true</useStandardDocletOptions>
                         <links>
+                            <link>https://docs.oracle.com/en/java/javase/11/docs/api/</link>
                             <link>https://www.slf4j.org/apidocs/</link>
                             <link>https://docs.oracle.com/javaee/7/api/</link>
                             <link>https://docs.jboss.org/hibernate/orm/5.6/javadocs/</link>
@@ -980,11 +972,13 @@
                             <link>https://junit.org/junit5/docs/current/api/</link>
                             <link>https://b3partners.github.io/kadaster-gds2/apidocs/</link>
                             <link>https://b3partners.github.io/jdbc-util/apidocs/</link>
+                            <link>https://jdbc.postgresql.org/documentation/publicapi/</link>
+                            <link>https://www.xmlunit.org/api/java/main/</link>
                         </links>
                         <encoding>${project.build.sourceEncoding}</encoding>
                         <packagesheader>${project.artifactId}</packagesheader>
                         <!-- dit werkt niet voor veel projecten omdat de detected-link ${project.url}/apidocs is -->
-                        <detectLinks>false</detectLinks>
+                        <detectLinks>true</detectLinks>
                         <tags>
                             <tag>
                                 <name>todo</name>
@@ -996,31 +990,13 @@
                                 <placement>a</placement>
                                 <head>Note:</head>
                             </tag>
-                            <tag>
-                                <name>opt</name>
-                                <placement>X</placement>
-                            </tag>
-                            <tag>
-                                <name>composed</name>
-                                <placement>X</placement>
-                            </tag>
-                            <tag>
-                                <name>has</name>
-                                <placement>X</placement>
-                            </tag>
-                            <tag>
-                                <name>depend</name>
-                                <placement>X</placement>
-                            </tag>
-                            <tag>
-                                <name>assoc</name>
-                                <placement>X</placement>
-                            </tag>
-                            <tag>
-                                <name>extends</name>
-                                <placement>X</placement>
-                            </tag>
                         </tags>
+                        <additionalDependencies>
+                            <additionalDependency>
+                                <groupId>jakarta.xml.bind</groupId>
+                                <artifactId>jakarta.xml.bind-api</artifactId>
+                            </additionalDependency>
+                        </additionalDependencies>
                     </configuration>
                 </plugin>
                 <plugin>