Stowage/dependency-track
2
0
Fork 0
mirror of https://github.com/DependencyTrack/dependency-track.git synced 2025-10-19 16:03:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move manufacturer from ProjectMetadata to Project

Browse source 
As per CycloneDX specification, `metadata.manufacturer` refers to `metadata.component`, whereas `metadata.supplier` and `metadata.authors` refer to the BOM itself.

Keeping `manufacturer` in `ProjectMetadata` is awkward and confusing.

Signed-off-by: nscuro <nscuro@protonmail.com>
This commit is contained in:
nscuro 2023-11-27 21:47:02 +01:00
parent b6952ca22f
commit b5a0bbf5fe
No known key found for this signature in database
9 changed files with 76 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/org/dependencytrack/persistence/ProjectQueryManager.java
View file

@ -519,6 +519,7 @@ final class ProjectQueryManager extends QueryManager implements IQueryManager {
final Project project = getObjectByUuid(Project.class, transientProject.getUuid());
project.setAuthor(transientProject.getAuthor());
project.setPublisher(transientProject.getPublisher());
project.setManufacturer(transientProject.getManufacturer());
project.setSupplier(transientProject.getSupplier());
project.setGroup(transientProject.getGroup());
project.setName(transientProject.getName());
@ -580,6 +581,7 @@ final class ProjectQueryManager extends QueryManager implements IQueryManager {
}
Project project = new Project();
project.setAuthor(source.getAuthor());
project.setManufacturer(source.getManufacturer());
project.setSupplier(source.getSupplier());
project.setPublisher(source.getPublisher());
project.setGroup(source.getGroup());
@ -601,7 +603,6 @@ final class ProjectQueryManager extends QueryManager implements IQueryManager {
final var metadata = new ProjectMetadata();
metadata.setProject(project);
metadata.setAuthors(source.getMetadata().getAuthors());
metadata.setManufacturer(source.getMetadata().getManufacturer());
metadata.setSupplier(source.getMetadata().getSupplier());
persist(metadata);
}