Skip to content

Bump version of core library #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
goneall merged 2 commits into from
Feb 1, 2025
Merged

Bump version of core library #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b463a85
Bump version of core library
goneall Feb 1, 2025
42b3bac
Rename exception
goneall Feb 1, 2025
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 pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
<dependency>
<groupId>org.spdx</groupId>
<artifactId>spdx-java-core</artifactId>
<version>1.0.0-RC1</version>
<version>1.0.0-RC2</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/org/spdx/library/model/v2/ExternalSpdxElement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@

import org.spdx.core.CoreModelObject;
import org.spdx.core.DefaultModelStore;
import org.spdx.core.DefaultStoreNotInitialized;
import org.spdx.core.IModelCopyManager;
import org.spdx.core.IndividualUriValue;
import org.spdx.core.InvalidSPDXAnalysisException;
Expand All @@ -53,7 +52,7 @@ public class ExternalSpdxElement extends SpdxElement implements IndividualUriVal

// Note: The documentUri and ID must be specified

public ExternalSpdxElement(String documentUri, String id) throws DefaultStoreNotInitialized, InvalidSPDXAnalysisException {
public ExternalSpdxElement(String documentUri, String id) throws InvalidSPDXAnalysisException {
this(DefaultModelStore.getDefaultModelStore(),
checkConvertDocumentUri(documentUri, id, DefaultModelStore.getDefaultModelStore()),
checkConvertId(id), DefaultModelStore.getDefaultCopyManager());
Expand Down
14 changes: 3 additions & 11 deletions src/main/java/org/spdx/library/model/v2/ModelObjectV2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,7 @@

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.spdx.core.CoreModelObject;
import org.spdx.core.DefaultModelStore;
import org.spdx.core.DefaultStoreNotInitialized;
import org.spdx.core.IModelCopyManager;
import org.spdx.core.IndividualUriValue;
import org.spdx.core.InvalidSPDXAnalysisException;
import org.spdx.core.ModelObjectHelper;
import org.spdx.core.SpdxInvalidTypeException;
import org.spdx.core.TypedValue;
import org.spdx.core.*;
import org.spdx.library.model.v2.enumerations.AnnotationType;
import org.spdx.library.model.v2.enumerations.ChecksumAlgorithm;
import org.spdx.library.model.v2.enumerations.ReferenceCategory;
Expand Down Expand Up @@ -171,9 +163,9 @@ public ModelObjectV2(CoreModelObjectBuilder builder)

/**
* Updates the ID and document URI based on the object URI and/or what is available in the store
* @throws DefaultStoreNotInitialized
* @throws org.spdx.core.DefaultStoreNotInitializedException
*/
private void updateIdAndDocumentUri() throws DefaultStoreNotInitialized {
private void updateIdAndDocumentUri() throws DefaultStoreNotInitializedException {
if (objectUri.contains("#")) {
int index = objectUri.lastIndexOf('#');
documentUri = objectUri.substring(0, index);
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/org/spdx/library/model/v2/license/ExternalExtractedLicenseInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@

import org.spdx.core.CoreModelObject;
import org.spdx.core.DefaultModelStore;
import org.spdx.core.DefaultStoreNotInitialized;
import org.spdx.core.IModelCopyManager;
import org.spdx.core.IndividualUriValue;
import org.spdx.core.InvalidSPDXAnalysisException;
Expand Down Expand Up @@ -67,7 +66,7 @@ public class ExternalExtractedLicenseInfo extends AbstractExtractedLicenseInfo i
* @param id ID used in the EXTERNAL document
* @throws InvalidSPDXAnalysisException on error generating object
*/
public ExternalExtractedLicenseInfo(String documentUri, String id) throws DefaultStoreNotInitialized, InvalidSPDXAnalysisException {
public ExternalExtractedLicenseInfo(String documentUri, String id) throws InvalidSPDXAnalysisException {
this(DefaultModelStore.getDefaultModelStore(),
checkConvertDocumentUri(documentUri, id, DefaultModelStore.getDefaultModelStore()),
checkConvertId(id), DefaultModelStore.getDefaultCopyManager());
Expand Down