diff --git a/pom.xml b/pom.xml index 83613ed2..7edf9393 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ https://sonarcloud.io spdx java-spdx-library - 12.1.9 + 12.2.0 @@ -121,7 +121,7 @@ org.jsoup jsoup - 1.21.2 + 1.22.1 com.google.code.findbugs @@ -206,7 +206,7 @@ org.sonatype.central central-publishing-maven-plugin - 0.9.0 + 0.10.0 true central diff --git a/src/main/java/org/spdx/library/conversion/Spdx2to3Converter.java b/src/main/java/org/spdx/library/conversion/Spdx2to3Converter.java index 52241283..0bb9a0ad 100644 --- a/src/main/java/org/spdx/library/conversion/Spdx2to3Converter.java +++ b/src/main/java/org/spdx/library/conversion/Spdx2to3Converter.java @@ -315,6 +315,7 @@ public static CreationInfo convertCreationInfo( CreationInfo retval = new CreationInfo.CreationInfoBuilder(modelStore, modelStore.getNextId(IdType.Anonymous), null) .setCreated(creationInfoV2.getCreated()) .setSpecVersion(SpdxConstantsV3.MODEL_SPEC_VERSION) + .setComment(creationInfoV2.getComment().orElse(null)) .build(); retval.setIdPrefix(uriPrefix); for (String docCreator:creationInfoV2.getCreators()) { diff --git a/src/test/java/org/spdx/library/conversion/Spdx2to3ConverterTest.java b/src/test/java/org/spdx/library/conversion/Spdx2to3ConverterTest.java index 310e075c..3675e0df 100644 --- a/src/test/java/org/spdx/library/conversion/Spdx2to3ConverterTest.java +++ b/src/test/java/org/spdx/library/conversion/Spdx2to3ConverterTest.java @@ -137,12 +137,14 @@ public void testConvertCreationInfo() throws InvalidSPDXAnalysisException { String organizationCreatorName = "Source Auditor Inc."; String organizationCreator = SpdxConstantsCompatV2.CREATOR_PREFIX_ORGANIZATION + organizationCreatorName; String created = "2010-01-29T18:30:22Z"; + String comment = "Test creation info comment"; String licenseListVersion = "3.21"; SpdxCreatorInformation creatorInfo = new SpdxCreatorInformation(fromModelStore, DOCUMENT_URI, creatorId, copyManager, true); creatorInfo.getCreators().add(personCreator); creatorInfo.getCreators().add(toolCreator); creatorInfo.getCreators().add(organizationCreator); creatorInfo.setCreated(created); + creatorInfo.setComment(comment); creatorInfo.setLicenseListVersion(licenseListVersion); List verify = creatorInfo.verify(); assertTrue(verify.isEmpty()); @@ -173,6 +175,7 @@ public void testConvertCreationInfo() throws InvalidSPDXAnalysisException { assertEquals(1, tools.length); assertEquals(toolCreatorName, tools[0].getName().get()); assertEquals(created, result.getCreated()); + assertEquals(comment, result.getComment().orElse(null)); assertEquals(IdType.Anonymous, toModelStore.getIdType(result.getObjectUri())); verify = result.verify(); assertTrue(verify.isEmpty());