From 0cbd420599aa819dd6b5a4a78e85438bd25654b2 Mon Sep 17 00:00:00 2001 From: Alexey Borodin Date: Fri, 24 Jun 2022 14:37:16 +0300 Subject: [PATCH 1/6] deps: bump jacoco version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0cef938..4a21eef 100644 --- a/pom.xml +++ b/pom.xml @@ -439,7 +439,7 @@ SOFTWARE. org.jacoco jacoco-maven-plugin - 0.8.7 + 0.8.8 file From 2c0ee380aa38b29eb2854e777afe8d585687ed8d Mon Sep 17 00:00:00 2001 From: Aleksei Borodin Date: Mon, 27 Jun 2022 13:59:17 +0300 Subject: [PATCH 2/6] feat: add LICENSE.header and direct qulice.license to it --- LICENSE.header | 2 ++ LICENSE.txt | 4 ++-- pom.xml | 27 ++++----------------------- 3 files changed, 8 insertions(+), 25 deletions(-) create mode 100644 LICENSE.header diff --git a/LICENSE.header b/LICENSE.header new file mode 100644 index 0000000..a0880f7 --- /dev/null +++ b/LICENSE.header @@ -0,0 +1,2 @@ +The MIT License (MIT) Copyright (c) 2020-2022 artipie.com +https://github.com/artipie/ppom/blob/master/LICENSE.txt \ No newline at end of file diff --git a/LICENSE.txt b/LICENSE.txt index a5afc04..043d3b2 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2020 artipie.com +Copyright (c) 2020-2022 artipie.com Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -14,7 +14,7 @@ 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 NON-INFRINGEMENT. IN NO EVENT SHALL THE +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 diff --git a/pom.xml b/pom.xml index 4a21eef..bd21182 100644 --- a/pom.xml +++ b/pom.xml @@ -1,26 +1,7 @@ 4.0.0 @@ -39,12 +20,12 @@ SOFTWARE. 5.8.2 4.2.3 1.1.4 - ${project.basedir}/LICENSE.txt + ${project.basedir}/LICENSE.header MIT License - https://github.com/artipie/ppom/blob/master/LICENSE + https://github.com/artipie/ppom/blob/master/LICENSE.txt From f02adc0630bbab1347026ad80897f7c5aa66ad9d Mon Sep 17 00:00:00 2001 From: Aleksei Borodin Date: Mon, 27 Jun 2022 14:39:21 +0300 Subject: [PATCH 3/6] fix: return year to 2020 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bd21182..1380c9d 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,6 @@ From 16d579b565d542a502e82184367332e43bff77ed Mon Sep 17 00:00:00 2001 From: Aleksei Borodin Date: Mon, 27 Jun 2022 14:41:01 +0300 Subject: [PATCH 4/6] fix: format --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1380c9d..b394c6d 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,7 @@ From a75da11717f63bf4b41e0b423a6775033512ce0b Mon Sep 17 00:00:00 2001 From: Aleksei Borodin Date: Mon, 27 Jun 2022 14:44:05 +0300 Subject: [PATCH 5/6] fix: format license text --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index b394c6d..27189a8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,7 @@ From 9e973c39b49281e47ea4b69dfe240c0cd21f29ac Mon Sep 17 00:00:00 2001 From: Aleksei Borodin Date: Mon, 27 Jun 2022 14:49:30 +0300 Subject: [PATCH 6/6] fix: change input for XCOP --- .github/workflows/xcop.yml | 2 ++ pom.xml | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/xcop.yml b/.github/workflows/xcop.yml index ee2eb6b..c6db6fe 100644 --- a/.github/workflows/xcop.yml +++ b/.github/workflows/xcop.yml @@ -13,3 +13,5 @@ jobs: steps: - uses: actions/checkout@v2 - uses: g4s8/xcop-action@master + with: + license: LICENSE.header diff --git a/pom.xml b/pom.xml index 27189a8..bd21182 100644 --- a/pom.xml +++ b/pom.xml @@ -1,8 +1,6 @@