Update to SPDX Spec 3.0.1

spdx · Dec 15, 2024 · f642d83 · f642d83
1 parent 5981733
commit f642d83
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,3 +15,6 @@ buildNumber.properties
 .classpath
 .project
 .settings/
+
+# IntelliJ IDE
+.idea
diff --git a/pom.xml b/pom.xml
@@ -120,17 +120,17 @@
 	  <dependency>
 	  	<groupId>org.spdx</groupId>
 	  	<artifactId>java-spdx-library</artifactId>
-	  	<version>2.0.0-Alpha</version>
+	  	<version>2.0.0-RC1</version>
 	  </dependency>
 	  <dependency>
 	  	<groupId>org.spdx</groupId>
 	  	<artifactId>spdx-rdf-store</artifactId>
-	  	<version>2.0.0-Alpha</version>
+	  	<version>2.0.0-RC1</version>
 	  </dependency>
 	  <dependency>
 	  	<groupId>org.spdx</groupId>
 	  	<artifactId>spdx-jackson-store</artifactId>
-	  	<version>2.0.0-Alpha</version>
+	  	<version>2.0.0-RC1</version>
 	  </dependency>
 	  <dependency>
 	  	<groupId>org.apache.ws.xmlschema</groupId>
@@ -140,12 +140,12 @@
 	  <dependency>
 	  	<groupId>org.spdx</groupId>
 	  	<artifactId>spdx-spreadsheet-store</artifactId>
-	  	<version>2.0.0-Alpha</version>
+	  	<version>2.0.0-RC1</version>
 	  </dependency>
 	  <dependency>
 	  	<groupId>org.spdx</groupId>
 	  	<artifactId>spdx-tagvalue-store</artifactId>
-	  	<version>2.0.0-Alpha</version>
+	  	<version>2.0.0-RC1</version>
 	  </dependency>
 	  <dependency>
 	  	<groupId>com.networknt</groupId>
@@ -161,8 +161,26 @@
 	  <dependency>
 	  	<groupId>org.spdx</groupId>
 	  	<artifactId>spdx-v3jsonld-store</artifactId>
-	  	<version>0.1.0-Alpha</version>
+	  	<version>1.0.0-RC1</version>
 	  </dependency>
+		<dependency>
+			<groupId>org.apache.poi</groupId>
+			<artifactId>poi</artifactId>
+			<version>5.3.0</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.jena</groupId>
+			<artifactId>jena-core</artifactId>
+			<version>5.2.0</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.spdx</groupId>
+			<artifactId>spdx-rdf-store</artifactId>
+			<version>2.0.0-RC1</version>
+			<scope>compile</scope>
+		</dependency>
 	</dependencies>
     <build>
   		<resources>

diff --git a/src/test/java/org/spdx/tools/CompareSpdxDocsTest.java b/src/test/java/org/spdx/tools/CompareSpdxDocsTest.java
@@ -127,7 +127,8 @@ public void testCompareDocumentsv22() throws OnlineToolException, SpreadsheetExc
 		Cell cell = resultRow.getCell(1);
 		int nextCol = 2;
 		while (Objects.nonNull(cell) && !cell.getStringCellValue().isEmpty()) {
-			assertTrue("Equals".equals(cell.getStringCellValue()) || "N/A".equals(cell.getStringCellValue()));
+			String cellResult = cell.getStringCellValue();
+			assertTrue("Equals".equals(cell.getStringCellValue()) || "N/A".equals(cellResult));
 			cell = resultRow.getCell(nextCol++);
 		}
 	}