Update SPDX Java libraries

spdx · Feb 1, 2025 · e1fb2a8 · e1fb2a8
1 parent 22e0b8e
commit e1fb2a8
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -105,17 +105,17 @@
     <dependency>
       <groupId>org.spdx</groupId>
       <artifactId>java-spdx-library</artifactId>
-      <version>2.0.0-RC1</version>
+      <version>2.0.0-RC2</version>
     </dependency>
     <dependency>
       <groupId>org.spdx</groupId>
       <artifactId>spdx-rdf-store</artifactId>
-      <version>2.0.0-RC1</version>
+      <version>2.0.0-RC2</version>
     </dependency>
     <dependency>
       <groupId>org.spdx</groupId>
       <artifactId>spdx-jackson-store</artifactId>
-      <version>2.0.0-RC1</version>
+      <version>2.0.0-RC2</version>
     </dependency>
 
     <dependency>
@@ -157,7 +157,7 @@
     <dependency>
     	<groupId>org.spdx</groupId>
     	<artifactId>spdx-v3jsonld-store</artifactId>
-    	<version>1.0.0-RC1</version>
+    	<version>1.0.0-RC3</version>
     </dependency>
   </dependencies>
 

diff --git a/src/main/java/org/spdx/maven/utils/SpdxV2LicenseManager.java b/src/main/java/org/spdx/maven/utils/SpdxV2LicenseManager.java
@@ -21,7 +21,7 @@
 import java.util.Map;
 
 import org.apache.maven.model.License;
-import org.spdx.core.DefaultStoreNotInitialized;
+import org.spdx.core.DefaultStoreNotInitializedException;
 import org.spdx.core.InvalidSPDXAnalysisException;
 import org.spdx.library.LicenseInfoFactory;
 import org.spdx.library.model.v2.SpdxDocument;
@@ -213,7 +213,7 @@ public AnyLicenseInfo mavenLicenseToSpdxLicense( License mavenLicense ) throws L
                 throw new LicenseManagerException(
                         "Can not map maven license " + mavenLicense.getName() + "  Invalid listed or extracted license id matching the URL " + mavenLicense.getUrl() );
             }
-            catch ( DefaultStoreNotInitialized e )
+            catch ( DefaultStoreNotInitializedException e )
             {
                 throw new LicenseManagerException( "Default model store not initialized" );
             }

diff --git a/src/main/java/org/spdx/maven/utils/SpdxV3LicenseManager.java b/src/main/java/org/spdx/maven/utils/SpdxV3LicenseManager.java
@@ -22,7 +22,7 @@
 import java.util.Set;
 
 import org.apache.maven.model.License;
-import org.spdx.core.DefaultStoreNotInitialized;
+import org.spdx.core.DefaultStoreNotInitializedException;
 import org.spdx.core.InvalidSPDXAnalysisException;
 import org.spdx.library.LicenseInfoFactory;
 import org.spdx.library.model.v2.license.InvalidLicenseStringException;
@@ -209,7 +209,7 @@ public AnyLicenseInfo mavenLicenseToSpdxLicense( License mavenLicense ) throws L
                 throw new LicenseManagerException(
                         "Can not map maven license " + mavenLicense.getName() + "  Invalid listed or extracted license id matching the URL " + mavenLicense.getUrl() );
             }
-            catch ( DefaultStoreNotInitialized e )
+            catch ( DefaultStoreNotInitializedException e )
             {
                 throw new LicenseManagerException( "Default model store not initialized" );
             }

diff --git a/src/test/java/org/spdx/maven/utils/TestSpdxSourceFileParser.java b/src/test/java/org/spdx/maven/utils/TestSpdxSourceFileParser.java
@@ -9,7 +9,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.spdx.core.DefaultModelStore;
-import org.spdx.core.DefaultStoreNotInitialized;
+import org.spdx.core.DefaultStoreNotInitializedException;
 import org.spdx.core.InvalidSPDXAnalysisException;
 import org.spdx.library.LicenseInfoFactory;
 import org.spdx.library.ModelCopyManager;
@@ -72,7 +72,7 @@ public void testParseFileForSpdxLicenses() throws SpdxSourceParserException, Inv
         assertEquals( 2, ( (DisjunctiveLicenseSet) parseLic( result.get( 2 ) ) ).getMembers().size() );
     }
 
-    private AnyLicenseInfo parseLic( String expression ) throws InvalidLicenseStringException, DefaultStoreNotInitialized
+    private AnyLicenseInfo parseLic( String expression ) throws InvalidLicenseStringException, DefaultStoreNotInitializedException
     {
         return LicenseInfoFactory.parseSPDXLicenseString( expression );
     }