From 038f805ab6c3c4344576d6cb9c58ed17829fdfea Mon Sep 17 00:00:00 2001 From: Gary O'Neall Date: Sun, 26 Oct 2025 11:46:06 -0700 Subject: [PATCH 1/2] Fix JavaDoc errors --- pom.xml | 17 ++--------------- src/org/spdx/licensexml/LicenseXmlDocument.java | 2 -- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/pom.xml b/pom.xml index 923efcd..8af1feb 100644 --- a/pom.xml +++ b/pom.xml @@ -104,15 +104,6 @@ - - doclint-java8-disable - - [1.8,) - - - -Xdoclint:none - - release @@ -155,16 +146,12 @@ 3.12.0 true - 8 - ${env.JAVA_HOME}/bin/javadoc - -Xdoclint:none + true + all,-missing attach-javadocs - - ${javadoc.opts} - jar diff --git a/src/org/spdx/licensexml/LicenseXmlDocument.java b/src/org/spdx/licensexml/LicenseXmlDocument.java index ea49dde..b55bdbd 100644 --- a/src/org/spdx/licensexml/LicenseXmlDocument.java +++ b/src/org/spdx/licensexml/LicenseXmlDocument.java @@ -80,8 +80,6 @@ public class LicenseXmlDocument { * @param v2ModelStore model store for SPDX Spec version 2 license and exceptions * @param creationInfo Creation information to use for SPDX V3 licenses and exceptions * @param copyManager copyManager to use for copying data between model stores - * @param currentListVersion version of the license list to include the license data - * @param releaseDate Date the license list is released */ public LicenseXmlDocument(File file, IModelStore v2ModelStore, IModelStore v3ModelStore, IModelCopyManager copyManager, CreationInfo creationInfo) throws LicenseXmlException { From cdf1fa9eebab7e55ff3f4acacca09eb2209024f8 Mon Sep 17 00:00:00 2001 From: Gary O'Neall Date: Sun, 26 Oct 2025 11:49:56 -0700 Subject: [PATCH 2/2] Add javadoc test to CI --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d687fb6..cf25540 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,7 +41,7 @@ jobs: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} run: | if [[ $SONAR_TOKEN != "" ]]; then - mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent install sonar:sonar + mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent javadoc:javadoc install sonar:sonar else mvn --batch-mode --update-snapshots verify fi