Skip to content

Remove the patch version on the license list #240

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

Closed
wants to merge 3 commits into from
Closed

Remove the patch version on the license list #240

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1b91059
Remove the patch version on the license list
goneall May 28, 2024
a01c028
Allow for patch versions of the license list
goneall May 28, 2024
15cc5de
Revert "Allow for patch versions of the license list"
goneall May 28, 2024
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
9 changes: 8 additions & 1 deletion src/main/java/org/spdx/library/model/license/ListedLicenses.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import java.util.Optional;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.regex.Pattern;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand All @@ -43,6 +44,8 @@
public class ListedLicenses {

static final Logger logger = LoggerFactory.getLogger(ListedLicenses.class.getName());

static final Pattern PATCH_VERSION_PATTERN = Pattern.compile(".+\\..+\\..+");

boolean onlyUseLocalLicenses;
private IListedLicenseStore licenseModelStore;
Expand Down Expand Up @@ -199,7 +202,11 @@ public List<String> getSpdxListedLicenseIds() {
* If no license list is loaded, returns {@link org.spdx.storage.listedlicense.SpdxListedLicenseModelStore#DEFAULT_LICENSE_LIST_VERSION}.
*/
public String getLicenseListVersion() {
return this.licenseModelStore.getLicenseListVersion();
String retval = this.licenseModelStore.getLicenseListVersion();
if (PATCH_VERSION_PATTERN.matcher(retval).matches()) {
retval = retval.substring(0, retval.lastIndexOf('.'));
}
return retval;
}

/**
Expand Down