Closed andreaslarfors closed 3 years ago
Hi thanks for your contribution, but is it maybe conflicting with this PR?
thinking about it, technically maybe not, since the entire stuff from Oliver was going to the "v2" dir ...
thinking about it, technically maybe not, since the entire stuff from Oliver was going to the "v2" dir ...
Yes, I also did some work on v2 but couldn't make it work... So I did not include any changes to the v2 directory.
Looking closer at #81 I can see that the only non-v2 changes were to: .gitignore configuration/COUCHDB_PASSWORD configuration/COUCHDB_USER
As I did not change these three files there are technically no conflicts.
Whether the work in #81 depends on any changes made in this PR is a different question, but it looks quite separate.
@mcjaeger this has now been updated with all changes discussed in Slack. Tests are now passing too. Let me know if you have any questions about the merge.
testing seems to build nicely:
(also on mac), but the deployment of sw360 cannot be brought to an end:
So the issue is that among the prerequisites, the commons compress is missing:
https://repo1.maven.org/maven2/org/apache/commons/commons-compress/1.20/commons-compress-1.20.jar commons-compress-1.20.jar
(required because Apache POI was upgraded to four-something which requires this nowadays)
-> merging because this is not an issue of this branch here.
This is the bare-minimum changes needed to make sw360chores work with new SW360. Includes: