Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
17 changes: 2 additions & 15 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -104,15 +104,6 @@
</dependency>
</dependencies>
<profiles>
<profile>
<id>doclint-java8-disable</id>
<activation>
<jdk>[1.8,)</jdk>
</activation>
<properties>
<javadoc.opts>-Xdoclint:none</javadoc.opts>
</properties>
</profile>
<profile>
<id>release</id>
<build>
Expand Down Expand Up @@ -155,16 +146,12 @@
<version>3.12.0</version>
<configuration>
<quiet>true</quiet>
<source>8</source>
<javadocExecutable>${env.JAVA_HOME}/bin/javadoc</javadocExecutable>
<additionalparam>-Xdoclint:none</additionalparam>
<notimestamp>true</notimestamp>
<doclint>all,-missing</doclint>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<configuration>
<additionalparam>${javadoc.opts}</additionalparam>
</configuration>
<goals>
<goal>jar</goal>
</goals>
Expand Down
2 changes: 0 additions & 2 deletions src/org/spdx/licensexml/LicenseXmlDocument.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down