From 936ffd7689f737ed2d3ed50607ed99aa70639d1c Mon Sep 17 00:00:00 2001 From: Yeser Amer Date: Tue, 19 Nov 2024 10:36:57 +0100 Subject: [PATCH 1/2] NO-ISSUE: Bump `xstream` to version `1.4.21` (#3138) * bump_xstream * bump_xstream --- build/optaplanner-build-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/optaplanner-build-parent/pom.xml b/build/optaplanner-build-parent/pom.xml index c1459d50d78..8c076cc2d1e 100644 --- a/build/optaplanner-build-parent/pom.xml +++ b/build/optaplanner-build-parent/pom.xml @@ -44,7 +44,7 @@ 1.4.14 2.22.1 - 1.4.20 + 1.4.21 6.6.7 3.8.6 3.6.1 From f0b07445ae6ce52a2bb6cf91e75e85fbd97cf8d5 Mon Sep 17 00:00:00 2001 From: Jozef Marko Date: Wed, 20 Nov 2024 23:56:45 +0100 Subject: [PATCH 2/2] kie-issues#1613: Add `CI :: Check license headers` GitHub Actions workflow (#3130) * Add license header * Revert "Add license header" This reverts commit be404f10de65dff2a48e001bc7699f92d50dd475. * .rat-excludes * align naming with kie-issues#1613 ensemble * moce licenses into single file * LICENSE.txt -> LICENSE * Remove NOTICE * Add jstree, jquery in .rat-excludes * NOTICE recreated --- .../workflows/ci_check_license_headers.yaml | 42 +++++++++ .gitignore | 3 + .rat-excludes | 23 +++++ LICENSE.txt => LICENSE | 94 +++++++++++++++++++ NOTICE | 26 +---- 5 files changed, 164 insertions(+), 24 deletions(-) create mode 100644 .github/workflows/ci_check_license_headers.yaml create mode 100644 .rat-excludes rename LICENSE.txt => LICENSE (68%) diff --git a/.github/workflows/ci_check_license_headers.yaml b/.github/workflows/ci_check_license_headers.yaml new file mode 100644 index 00000000000..363e014d111 --- /dev/null +++ b/.github/workflows/ci_check_license_headers.yaml @@ -0,0 +1,42 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +name: "CI :: Check license headers" + +on: + pull_request: + types: [opened, synchronize, reopened, ready_for_review] + +jobs: + check-license-headers: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Download Apache RAT + run: | + curl -LO https://repository.apache.org/content/repositories/snapshots/org/apache/rat/apache-rat/0.17-SNAPSHOT/apache-rat-0.17-20241115.065104-374.jar + + - name: Run Apache RAT + run: | + java -jar apache-rat-0.17-20241115.065104-374.jar --input-exclude-file .rat-excludes -- . > .tmp-rat-check-output + cat .tmp-rat-check-output + grep "Files with unapproved licenses:" .tmp-rat-check-output && rm .tmp-rat-check-output && echo "There are files with missing or unapproved license headers." && exit 1 || rm .tmp-rat-check-output && echo "All files have correct license headers." \ No newline at end of file diff --git a/.gitignore b/.gitignore index cf73519e072..64f262b18eb 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,6 @@ # Repository wide ignore mac DS_Store files .DS_Store + +# Apache RAT check excludes file +!.rat-excludes \ No newline at end of file diff --git a/.rat-excludes b/.rat-excludes new file mode 100644 index 00000000000..6818941e2f1 --- /dev/null +++ b/.rat-excludes @@ -0,0 +1,23 @@ +### general excludes +**/target/** +**/.* +*README* +*readme* +DISCLAIMER-WIP +**/src/test/resources/** +**/src/test/filtered-resources/** +**/*integration-test*/src/main/resources/** +**/**example**/**/resources/** +**/META-INF/services/** +**/META-INF/beans.xml + +### optaplanner specific excludes +**/optaplanner-docs/src/modules/ROOT/images/website/jquery/jquery.min.js +**/optaplanner-docs/src/modules/ROOT/images/website/jstree/** +**/optaplanner-examples/data/**/import/** +**/eclipse.importorder +**/src/main/resources/org/optaplanner/benchmark/impl/report/twitterbootstrap/css/** +**/src/main/resources/org/optaplanner/benchmark/impl/report/twitterbootstrap/img/** +**/src/main/resources/org/optaplanner/benchmark/impl/report/twitterbootstrap/js/** +**/benchmark.xsd +**/solver.xsd \ No newline at end of file diff --git a/LICENSE.txt b/LICENSE similarity index 68% rename from LICENSE.txt rename to LICENSE index d6456956733..695e30ee7fe 100644 --- a/LICENSE.txt +++ b/LICENSE @@ -200,3 +200,97 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + +------------------------------------------------------------------------------------------------------------------ +for optaplanner-benchmark/src/main/resources/org/optaplanner/benchmark/impl/report/twitterbootstrap/css/bootstrap* + optaplanner-benchmark/src/main/resources/org/optaplanner/benchmark/impl/report/twitterbootstrap/img/** + optaplanner-benchmark/src/main/resources/org/optaplanner/benchmark/impl/report/twitterbootstrap/js/bootstrap* + + (https://github.com/twbs/bootstrap/) + The MIT License (MIT) + + Copyright (c) 2011-2019 Twitter, Inc. + Copyright (c) 2011-2019 The Bootstrap Authors + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + +-------------------------------------------------------------------------------------------------------------- +for optaplanner-docs/src/modules/ROOT/images/website/jquery/jquery.min.js + optaplanner-benchmark/src/main/resources/org/optaplanner/benchmark/impl/report/twitterbootstrap/js/jquery* + + (https://github.com/jquery/jquery) + Copyright OpenJS Foundation and other contributors, https://openjsf.org/ + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +-------------------------------------------------------------------------------------------------------------------- +for optaplanner-benchmark/src/main/resources/org/optaplanner/benchmark/impl/report/twitterbootstrap/css/prettify.css + optaplanner-benchmark/src/main/resources/org/optaplanner/benchmark/impl/report/twitterbootstrap/js/prettify.js + + (https://github.com/googlearchive/code-prettify) + http://www.apache.org/licenses/LICENSE-2.0 + +------------------------------------------------------------------------- +for optaplanner-docs/src/modules/ROOT/images/website/jstree/32px.png + optaplanner-docs/src/modules/ROOT/images/website/jstree/40px.png + optaplanner-docs/src/modules/ROOT/images/website/jstree/jstree.js + optaplanner-docs/src/modules/ROOT/images/website/jstree/jstree.min.js + optaplanner-docs/src/modules/ROOT/images/website/jstree/style.css + optaplanner-docs/src/modules/ROOT/images/website/jstree/throbber.gif + + (https://github.com/vakata/jstree) + Copyright (c) 2014 Ivan Bozhanov + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation + files (the "Software"), to deal in the Software without + restriction, including without limitation the rights to use, + copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following + conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/NOTICE b/NOTICE index 98d06fdbfc0..1a3487b6c29 100644 --- a/NOTICE +++ b/NOTICE @@ -5,27 +5,5 @@ This product includes software developed at The Apache Software Foundation (http://www.apache.org/). The Initial Developer of some parts of the framework, which are copied from, derived from, or -inspired by KIE (Knowledge Is Everthing) group, is Red Hat, Inc (https://www.redhat.com/). -Copyright Red Hat, Inc. and/or its affiliates.. All Rights Reserved. - -This product also includes the following third-party components: - -* Twitter bootstrap version: 2.3.2 - Downloaded from: https://getbootstrap.com/ - License: Apache License v2.0 (just like OptaPlanner) - -* jQuery version: 1.9.1 - Downloaded from: http://jquery.com/ - License: MIT (which can be used by Apache License v2.0 projects) - -* google-code-pretty version: 4-Mar-2013 - Downloaded from: http://code.google.com/p/google-code-prettify - License: Apache License v2.0 (just like OptaPlanner) - -* jQuery version: 3.3.1 - Downloaded from: http://jquery.com/ - License: MIT - this is compatible with ASL 2.0: http://www.apache.org/legal/resolved.html#category-a - -* jstree version: 3.3.5 - Downloaded from: https://www.jstree.com/ - License: MIT - this is compatible with ASL 2.0: http://www.apache.org/legal/resolved.html#category-a +inspired by KIE (Knowledge Is Everything) group, is Red Hat, Inc (https://www.redhat.com/). +Copyright Red Hat, Inc. and/or its affiliates.. All Rights Reserved. \ No newline at end of file