spdx-utils: Regenerate SPDX enums to update to license list version 3.14 #4344
Conversation
Done by running "./gradlew :spdx-utils:generateSpdxEnums". For details see https://github.com/spdx/license-list-XML/releases/tag/v3.14. Signed-off-by: Thomas Steenbergen <thomas.steenbergen@here.com>
|
@tsteenbe have you checked whether |
| @@ -10,343 +10,3 @@ PARTICULAR PURPOSE. See the GNU General Public License for more details. | |||
| You should have received a copy of the GNU General Public License along with | |||
| this program; if not, write to the Free Software Foundation, Inc., 51 Franklin | |||
| Street, Fifth Floor, Boston, MA 02110-1301, USA. | |||
|
|
|||
There was a problem hiding this comment.
The (CI) test fails due to the changes in this file. @tsteenbe can you confirm the changes in this file are good?
There was a problem hiding this comment.
@fviernau Then it must be some logic on our side as https://github.com/spdx/license-list-XML/blob/v3.14/src/GPL-2.0-or-later.xml has not changed since July 4th 2019.
There was a problem hiding this comment.
I wasn't aware that ORT actually fetches the license texts for the SPDX licenses from ScanCode. In particular this license is fetched from the file licenses/scancode-toolkit/gpl-2.0-plus.LICENSE. A recent change in ORT aligned the version of the imported scancode resources with the version of ScanCode used in ORT [2]. So, as of [2] the license texts are not fetched anymore from ScanCode's develop branch, but from tag 3.2.1rc2.
This explains the downgrade of the license text observed here.
That's the situation - the question now is whether it is good as is...?
I'm fine with merging this PR as-is. I'm curious whether you @oss-review-toolkit/core-devs agree?!
Does anyone call the reason why SPDX texts are imported from ScanCode instead of from the SPDX license list repository?
[1] aboutcode-org/scancode-toolkit@cdda9c0#diff-db221c21b7d27dbf84985089c9702a5092ba5fcb9db519dbe7e86f51e0daea49
[2] ded4f20
There was a problem hiding this comment.
Does anyone call the reason why SPDX texts are imported from ScanCode instead of from the SPDX license list repository?
IIRC the license text formatting in the SPDX list was severely broken, and so we preferred to fetch from ScanCode instead. However, that issue seems to have been fixed by now.
So I guess what we should do is: Yes, align ScanCode version and ScanCode-specific license texts, but get SPDX license texts from the SPDX list only.
There was a problem hiding this comment.
Thanks @sschuberth . Your proposal makes sense to me.
There was a problem hiding this comment.
I'd propose then to do the "fetch SPDX license texts from SPDX list only" change as a separate commit (or even separate PR) to better see the impact of that change only on the formatting of license texts, to verify the formatting really is not broken anymore.
There was a problem hiding this comment.
I have tried this when working on #4523 but the license texts provided by SPDX are still badly formatted so we decided to stick with the ScanCode texts for now.
|
This update will be done as part of #4523. |
Done by running "./gradlew :spdx-utils:generateSpdxEnums". For details
see https://github.com/spdx/license-list-XML/releases/tag/v3.14.
Signed-off-by: Thomas Steenbergen thomas.steenbergen@here.com