From 4e6e103facd6a4a0535273e44055ea49f05c31be Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Mon, 7 Aug 2023 12:16:23 +0700 Subject: [PATCH 001/342] chore: update version for development [skip ci] --- pom.xml | 2 +- src/main/resources/liquibase/changelog.xml | 1 + src/main/resources/liquibase/version/0.4.8.xml | 10 ++++++++++ 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/liquibase/version/0.4.8.xml diff --git a/pom.xml b/pom.xml index fb76700129..f0cf649c45 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ ru.mystamps mystamps - 0.4.7 + 0.4.8-SNAPSHOT war diff --git a/src/main/resources/liquibase/changelog.xml b/src/main/resources/liquibase/changelog.xml index 3fa841c471..22d6ad0e35 100644 --- a/src/main/resources/liquibase/changelog.xml +++ b/src/main/resources/liquibase/changelog.xml @@ -18,6 +18,7 @@ + diff --git a/src/main/resources/liquibase/version/0.4.8.xml b/src/main/resources/liquibase/version/0.4.8.xml new file mode 100644 index 0000000000..b96e68b6e3 --- /dev/null +++ b/src/main/resources/liquibase/version/0.4.8.xml @@ -0,0 +1,10 @@ + + + + + + From 82300b836de665ef4657fcd5ada2bc65e5f20fc2 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Thu, 10 Aug 2023 10:56:10 +0700 Subject: [PATCH 002/342] chore: add basic workflows for manually running Terraform and Ansible from GitHub Actions Part of #1631 [skip ci] --- .github/workflows/provision-by-ansible.yml | 34 ++++++++++++++++++++ .github/workflows/provision-by-terraform.yml | 33 +++++++++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 .github/workflows/provision-by-ansible.yml create mode 100644 .github/workflows/provision-by-terraform.yml diff --git a/.github/workflows/provision-by-ansible.yml b/.github/workflows/provision-by-ansible.yml new file mode 100644 index 0000000000..309990c98b --- /dev/null +++ b/.github/workflows/provision-by-ansible.yml @@ -0,0 +1,34 @@ +name: Provision a server by Ansible + +on: + # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#onworkflow_dispatch + workflow_dispatch: + +# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions +permissions: + contents: read # for "git clone" + +defaults: + # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#defaultsrun + run: + # Enable fail-fast behavior using set -eo pipefail + # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#exit-codes-and-error-action-preference + shell: bash + +jobs: + setup-server: + name: Provision a server + # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idruns-on + runs-on: ubuntu-20.04 + steps: + + - name: Clone source code + uses: actions/checkout@v3.5.2 # https://github.com/actions/checkout + with: + # Whether to configure the token or SSH key with the local git config. Default: true + persist-credentials: false + + - name: Install ansible + # The command pip3 install --user ansible==2.10.17 doesn't work as we have an old version + # See https://docs.ansible.com/ansible/2.10/installation_guide/intro_installation.html#installing-devel-from-github-with-pip + run: python3 -m pip install --user https://github.com/ansible/ansible/archive/refs/tags/v2.10.17.tar.gz diff --git a/.github/workflows/provision-by-terraform.yml b/.github/workflows/provision-by-terraform.yml new file mode 100644 index 0000000000..fb9807bdcf --- /dev/null +++ b/.github/workflows/provision-by-terraform.yml @@ -0,0 +1,33 @@ +name: Setup a server by Terraform + +on: + # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#onworkflow_dispatch + workflow_dispatch: + +# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions +permissions: + contents: read # for "git clone" + +defaults: + # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#defaultsrun + run: + # Enable fail-fast behavior using set -eo pipefail + # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#exit-codes-and-error-action-preference + shell: bash + +jobs: + setup-server: + name: Setup a server + # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idruns-on + runs-on: ubuntu-20.04 + steps: + + - name: Clone source code + uses: actions/checkout@v3.5.2 # https://github.com/actions/checkout + with: + # Whether to configure the token or SSH key with the local git config. Default: true + persist-credentials: false + + - name: Install terraform + working-directory: infra/terraform + run: tfenv install From e4b804bb625add745e98737739587540a445b109 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Fri, 11 Aug 2023 09:52:02 +0700 Subject: [PATCH 003/342] task: install tfenv to unbreak the workflow Part of #1631 [skip ci] --- .github/workflows/provision-by-terraform.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.github/workflows/provision-by-terraform.yml b/.github/workflows/provision-by-terraform.yml index fb9807bdcf..a57abe19b7 100644 --- a/.github/workflows/provision-by-terraform.yml +++ b/.github/workflows/provision-by-terraform.yml @@ -28,6 +28,21 @@ jobs: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false + # https://github.com/tfutils/tfenv#manual + - name: Install tfenv + uses: actions/checkout@v3.5.2 + with: + # https://github.com/actions/checkout#checkout-multiple-repos-nested + repository: tfutils/tfenv + path: tfenv + ref: v3.0.0 + # Whether to configure the token or SSH key with the local git config. Default: true + persist-credentials: false + + # https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#adding-a-system-path + - name: Add tfenv directory to PATH + run: echo "$GITHUB_WORKSPACE/tfenv/bin" >> $GITHUB_PATH + - name: Install terraform working-directory: infra/terraform run: tfenv install From f5c0bfad55d4b8bdce6018a3455c39edf55b1759 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Fri, 11 Aug 2023 10:05:31 +0700 Subject: [PATCH 004/342] task: show tools versions, run terraform init and terraform plan Part of #1631 [skip ci] --- .github/workflows/provision-by-terraform.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/provision-by-terraform.yml b/.github/workflows/provision-by-terraform.yml index a57abe19b7..634fd78243 100644 --- a/.github/workflows/provision-by-terraform.yml +++ b/.github/workflows/provision-by-terraform.yml @@ -46,3 +46,14 @@ jobs: - name: Install terraform working-directory: infra/terraform run: tfenv install + + - name: Show tools versions + run: | + tfenv --version + terraform -version + + - name: Run terraform init + run: terraform init + + - name: Run terraform plan + run: terraform plan From 5765274ba9413259bdd1f277a09ad2d6b01128a5 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Fri, 11 Aug 2023 10:11:12 +0700 Subject: [PATCH 005/342] task: execute tfenv use in order to register used terraform version Part of #1631 [skip ci] --- .github/workflows/provision-by-terraform.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/provision-by-terraform.yml b/.github/workflows/provision-by-terraform.yml index 634fd78243..5ed14f30f4 100644 --- a/.github/workflows/provision-by-terraform.yml +++ b/.github/workflows/provision-by-terraform.yml @@ -45,7 +45,9 @@ jobs: - name: Install terraform working-directory: infra/terraform - run: tfenv install + run: | + tfenv install + tfenv use - name: Show tools versions run: | From 3e12f5cbde6e53c3aeb9351dcf3a4e109c67b695 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Fri, 11 Aug 2023 10:15:41 +0700 Subject: [PATCH 006/342] chore: add comments with links to tfenv docs Part of #1631 [skip ci] --- .github/workflows/provision-by-terraform.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/provision-by-terraform.yml b/.github/workflows/provision-by-terraform.yml index 5ed14f30f4..cd4e2a6032 100644 --- a/.github/workflows/provision-by-terraform.yml +++ b/.github/workflows/provision-by-terraform.yml @@ -43,6 +43,8 @@ jobs: - name: Add tfenv directory to PATH run: echo "$GITHUB_WORKSPACE/tfenv/bin" >> $GITHUB_PATH + # https://github.com/tfutils/tfenv#tfenv-install-version + # https://github.com/tfutils/tfenv#tfenv-use-version - name: Install terraform working-directory: infra/terraform run: | From 9e014293888613d0a81d56b0a896f8a2fd076c8b Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Fri, 11 Aug 2023 10:16:17 +0700 Subject: [PATCH 007/342] chore: execute only tfenv --version as it shows both versions Part of #1631 [skip ci] --- .github/workflows/provision-by-terraform.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/provision-by-terraform.yml b/.github/workflows/provision-by-terraform.yml index cd4e2a6032..2261b9581b 100644 --- a/.github/workflows/provision-by-terraform.yml +++ b/.github/workflows/provision-by-terraform.yml @@ -52,9 +52,7 @@ jobs: tfenv use - name: Show tools versions - run: | - tfenv --version - terraform -version + run: tfenv --version - name: Run terraform init run: terraform init From 7506f0c16f4b77f424e56b27e999efd35f403932 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Fri, 11 Aug 2023 10:17:12 +0700 Subject: [PATCH 008/342] task: execute terraform from a proper directory Part of #1631 [skip ci] --- .github/workflows/provision-by-terraform.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/provision-by-terraform.yml b/.github/workflows/provision-by-terraform.yml index 2261b9581b..22e7c52d40 100644 --- a/.github/workflows/provision-by-terraform.yml +++ b/.github/workflows/provision-by-terraform.yml @@ -55,7 +55,9 @@ jobs: run: tfenv --version - name: Run terraform init + working-directory: infra/terraform run: terraform init - name: Run terraform plan + working-directory: infra/terraform run: terraform plan From 3b7727b3ea1d494409642dbcc850240801fc4c37 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Fri, 11 Aug 2023 10:23:22 +0700 Subject: [PATCH 009/342] revert: chore: execute only tfenv --version as it shows both versions This reverts commit 9e014293888613d0a81d56b0a896f8a2fd076c8b. Part of #1631 [skip ci] --- .github/workflows/provision-by-terraform.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/provision-by-terraform.yml b/.github/workflows/provision-by-terraform.yml index 22e7c52d40..2f385e1c13 100644 --- a/.github/workflows/provision-by-terraform.yml +++ b/.github/workflows/provision-by-terraform.yml @@ -52,7 +52,9 @@ jobs: tfenv use - name: Show tools versions - run: tfenv --version + run: | + tfenv --version + terraform -version - name: Run terraform init working-directory: infra/terraform From bf424bbac427b8cbb144a7fd1ccfffe1dc6c0840 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Sun, 13 Aug 2023 11:55:20 +0700 Subject: [PATCH 010/342] task: pass -detaile-exitcode option to terraform plan Part of #1631 [skip ci] --- .github/workflows/provision-by-terraform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/provision-by-terraform.yml b/.github/workflows/provision-by-terraform.yml index 2f385e1c13..115259182d 100644 --- a/.github/workflows/provision-by-terraform.yml +++ b/.github/workflows/provision-by-terraform.yml @@ -62,4 +62,4 @@ jobs: - name: Run terraform plan working-directory: infra/terraform - run: terraform plan + run: terraform plan -detailed-exitcode From d316b2c0c40400b533da58b35b667c7b053a6dc6 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Sun, 13 Aug 2023 12:00:15 +0700 Subject: [PATCH 011/342] chore: update a link to Digital Ocean docs --- infra/terraform/terraform.tfvars.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infra/terraform/terraform.tfvars.example b/infra/terraform/terraform.tfvars.example index 12209d5f0a..d3392d9d7b 100644 --- a/infra/terraform/terraform.tfvars.example +++ b/infra/terraform/terraform.tfvars.example @@ -1,2 +1,2 @@ -# How to obtain a token: https://www.digitalocean.com/docs/api/create-personal-access-token/ +# How to obtain a token: https://docs.digitalocean.com/reference/api/create-personal-access-token/ do_token = "" From 0cf41d44a3dba82ea9842a44dbcf366f04b70a80 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Sun, 13 Aug 2023 12:00:49 +0700 Subject: [PATCH 012/342] task: add description and type to do_token variable Part of #1631 [skip ci] --- infra/terraform/my-stamps.tf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/infra/terraform/my-stamps.tf b/infra/terraform/my-stamps.tf index 05204b7797..80d4a8113c 100644 --- a/infra/terraform/my-stamps.tf +++ b/infra/terraform/my-stamps.tf @@ -3,6 +3,8 @@ # @todo #1000 Terraform: add Mailgun variable "do_token" { + description = "Digital Ocean Personal Access Token" + type = string } # Digital Ocean provider docs: https://registry.terraform.io/providers/digitalocean/digitalocean/2.28.1/docs From 421d8ea9a2806646dd3f943bd0d2234855f76a71 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Sun, 13 Aug 2023 12:46:19 +0700 Subject: [PATCH 013/342] style: move a comment from variables file to the place where a variable is being used [skip ci] --- infra/terraform/my-stamps.tf | 1 + infra/terraform/terraform.tfvars.example | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/infra/terraform/my-stamps.tf b/infra/terraform/my-stamps.tf index 80d4a8113c..7145309a00 100644 --- a/infra/terraform/my-stamps.tf +++ b/infra/terraform/my-stamps.tf @@ -3,6 +3,7 @@ # @todo #1000 Terraform: add Mailgun variable "do_token" { + # How to obtain a token: https://docs.digitalocean.com/reference/api/create-personal-access-token/ description = "Digital Ocean Personal Access Token" type = string } diff --git a/infra/terraform/terraform.tfvars.example b/infra/terraform/terraform.tfvars.example index d3392d9d7b..7ca7b4e4e2 100644 --- a/infra/terraform/terraform.tfvars.example +++ b/infra/terraform/terraform.tfvars.example @@ -1,2 +1 @@ -# How to obtain a token: https://docs.digitalocean.com/reference/api/create-personal-access-token/ do_token = "" From 182722edc21a06c3067f1cd038c74ad8f22eae58 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Fri, 18 Aug 2023 10:25:55 +0700 Subject: [PATCH 014/342] task: checkout generated-terraform branch to a nested folder Part of #1631 [skip ci] --- .github/workflows/provision-by-terraform.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/provision-by-terraform.yml b/.github/workflows/provision-by-terraform.yml index 115259182d..bbad33ef2d 100644 --- a/.github/workflows/provision-by-terraform.yml +++ b/.github/workflows/provision-by-terraform.yml @@ -28,6 +28,11 @@ jobs: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false + - name: Checkout terraform data to a subdirectory + run: | + git fetch --depth=1 origin generated-terraform + git worktree add terraform-data generated-terraform + # https://github.com/tfutils/tfenv#manual - name: Install tfenv uses: actions/checkout@v3.5.2 @@ -63,3 +68,8 @@ jobs: - name: Run terraform plan working-directory: infra/terraform run: terraform plan -detailed-exitcode + + - name: Cleanup + if: always() + run: | + [ ! -d terraform-data ] || git worktree remove terraform-data From 1f2b84fd8cccefc52bc47fc74eecb51826e1968c Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Wed, 23 Aug 2023 11:44:45 +0700 Subject: [PATCH 015/342] chore: don't set permissions on decrypted files as ansible-vault has already set 600 on them [skip ci] --- src/main/scripts/ci/deploy.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/scripts/ci/deploy.sh b/src/main/scripts/ci/deploy.sh index 1a5ce25064..84faefde4f 100755 --- a/src/main/scripts/ci/deploy.sh +++ b/src/main/scripts/ci/deploy.sh @@ -45,7 +45,6 @@ for FILE in "$PRIVATE_KEY" "$VARS_FILE"; do --vault-password-file "$PASS_FILE" \ --output "$FILE" \ "${FILE}.enc" - chmod 600 "$FILE" done ansible-playbook \ From e59534e3b6b599d8e4642dcb4e5e30a303e6e582 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Wed, 23 Aug 2023 11:52:12 +0700 Subject: [PATCH 016/342] task: decrypt and use terraform data from generated-terraform branch Part of #1631 [skip ci] --- .github/workflows/provision-by-terraform.yml | 35 +++++++++++++++++++- .gitignore | 4 ++- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/.github/workflows/provision-by-terraform.yml b/.github/workflows/provision-by-terraform.yml index bbad33ef2d..b595107748 100644 --- a/.github/workflows/provision-by-terraform.yml +++ b/.github/workflows/provision-by-terraform.yml @@ -29,6 +29,7 @@ jobs: persist-credentials: false - name: Checkout terraform data to a subdirectory + working-directory: infra/terraform run: | git fetch --depth=1 origin generated-terraform git worktree add terraform-data generated-terraform @@ -56,10 +57,32 @@ jobs: tfenv install tfenv use + - name: Install ansible-vault + # The command pip3 install --user ansible==2.10.17 doesn't work as we have an old version + # See https://docs.ansible.com/ansible/2.10/installation_guide/intro_installation.html#installing-devel-from-github-with-pip + run: python3 -m pip install --user https://github.com/ansible/ansible/archive/refs/tags/v2.10.17.tar.gz + - name: Show tools versions run: | tfenv --version terraform -version + ansible-vault --version + + - name: Decrypt terraform files + working-directory: infra/terraform + env: + # https://docs.github.com/en/actions/security-guides/encrypted-secrets#using-encrypted-secrets-in-a-workflow + VAULT_PASSWORD: ${{ secrets.VAULT_PASSWORD }} + run | + echo -n "$VAULT_PASSWORD" >vault-pass.txt + + for FILENAME in terraform.tfstate terraform.tfvars; do + echo "Decrypting ${FILENAME}.enc to $FILENAME" + ansible-vault decrypt \ + --vault-password-file vault-pass.txt \ + --output "terraform-data/$FILENAME" \ + "terraform-data/${FILENAME}.enc" + done - name: Run terraform init working-directory: infra/terraform @@ -67,9 +90,19 @@ jobs: - name: Run terraform plan working-directory: infra/terraform - run: terraform plan -detailed-exitcode + run: >- + terraform plan \ + -detailed-exitcode \ + -var-file terraform-data/terraform.tfvars \ + -state terraform-data/terraform.tfstate \ + -out terraform.tfplan + - name: Cleanup if: always() + working-directory: infra/terraform run: | + for FILENAME in vault-pass.txt terraform.tfplan terraform-data/terraform.tfstate terraform-data/terraform.tfvars; do + [ ! -f "$FILE" ] || rm -fv "$FILE" + done [ ! -d terraform-data ] || git worktree remove terraform-data diff --git a/.gitignore b/.gitignore index eff567a664..15afa27f0f 100644 --- a/.gitignore +++ b/.gitignore @@ -39,8 +39,10 @@ infra/terraform/terraform.tfstate.backup infra/docker/application-prod.properties infra/docker/mysql_backup_mystamps.sql.gz -# created by src/main/scripts/ci/deploy.sh +# created by src/main/scripts/ci/deploy.sh or .github/workflows/provision-by-terraform.yml vault-pass.txt + +# created by src/main/scripts/ci/deploy.sh mystamps_rsa prod_vars.yml From 5ff671bf13f8e58fc227f2ed25e6af64a3862412 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Wed, 23 Aug 2023 12:07:42 +0700 Subject: [PATCH 017/342] chore: fix syntax of provision-by-terraform.yml $ cd src/main/frontend $ npm install @action-validator/core @action-validator/cli --save-dev $ npx action-validator ~/git/mystamps/.github/workflows/provision-by-terraform.yml { "actionType": "workflow", "errors": [ { "code": "parse_error", "detail": "could not find expected ':' at line 87 column 7, while scanning a simple key at line 76 column 9", "path": "", "title": "Parse Error", "location": { "index": 3416, "line": 87, "column": 7 } } ] } Correction for e59534e3b6b599d8e4642dcb4e5e30a303e6e582 commit Part of #1631 [skip ci] --- .github/workflows/provision-by-terraform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/provision-by-terraform.yml b/.github/workflows/provision-by-terraform.yml index b595107748..5681e3dbbb 100644 --- a/.github/workflows/provision-by-terraform.yml +++ b/.github/workflows/provision-by-terraform.yml @@ -73,7 +73,7 @@ jobs: env: # https://docs.github.com/en/actions/security-guides/encrypted-secrets#using-encrypted-secrets-in-a-workflow VAULT_PASSWORD: ${{ secrets.VAULT_PASSWORD }} - run | + run: | echo -n "$VAULT_PASSWORD" >vault-pass.txt for FILENAME in terraform.tfstate terraform.tfvars; do From bde55314fb512d89f911a9b47c06bdbe4965330b Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Wed, 23 Aug 2023 12:22:12 +0700 Subject: [PATCH 018/342] chore: disable Terraform's version check Part of #1631 [skip ci] --- .github/workflows/provision-by-terraform.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/provision-by-terraform.yml b/.github/workflows/provision-by-terraform.yml index 5681e3dbbb..5ab4ff9e5c 100644 --- a/.github/workflows/provision-by-terraform.yml +++ b/.github/workflows/provision-by-terraform.yml @@ -63,6 +63,9 @@ jobs: run: python3 -m pip install --user https://github.com/ansible/ansible/archive/refs/tags/v2.10.17.tar.gz - name: Show tools versions + env: + # https://developer.hashicorp.com/terraform/cli/commands#upgrade-and-security-bulletin-checks + CHECKPOINT_DISABLE: true run: | tfenv --version terraform -version From c67a1b667a8e331788ec882e10344511118927be Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Wed, 23 Aug 2023 12:28:38 +0700 Subject: [PATCH 019/342] chore: fix cleaning up of the temporary files Correction for e59534e3b6b599d8e4642dcb4e5e30a303e6e582 commit Part of #1631 [skip ci] --- .github/workflows/provision-by-terraform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/provision-by-terraform.yml b/.github/workflows/provision-by-terraform.yml index 5ab4ff9e5c..57e4d58c3d 100644 --- a/.github/workflows/provision-by-terraform.yml +++ b/.github/workflows/provision-by-terraform.yml @@ -105,7 +105,7 @@ jobs: if: always() working-directory: infra/terraform run: | - for FILENAME in vault-pass.txt terraform.tfplan terraform-data/terraform.tfstate terraform-data/terraform.tfvars; do + for FILE in vault-pass.txt terraform.tfplan terraform-data/terraform.tfstate terraform-data/terraform.tfvars; do [ ! -f "$FILE" ] || rm -fv "$FILE" done [ ! -d terraform-data ] || git worktree remove terraform-data From 225fe8164b8ed62d7c4f1be2c987fb6d85d6c3b0 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Fri, 1 Sep 2023 11:25:29 +0700 Subject: [PATCH 020/342] chore: modify show-spring-boot-version-diff.sh script to fail when file not found --- src/main/scripts/show-spring-boot-version-diff.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scripts/show-spring-boot-version-diff.sh b/src/main/scripts/show-spring-boot-version-diff.sh index 18e253025a..4a32dfb3f2 100755 --- a/src/main/scripts/show-spring-boot-version-diff.sh +++ b/src/main/scripts/show-spring-boot-version-diff.sh @@ -22,7 +22,7 @@ printf "Comparing with Spring Boot %s (project vs spring versions)\\n\\n" "$SPRI # shellcheck disable=SC2002 join \ <(cat "$PROJECT_POM" | awk -F'[<>]' -v OFS='\t' '$2~/\.version$/{print $2, $3}' | sort) \ - <(curl -s "$SPRING_POM" | awk -F'[<>]' -v OFS='\t' '$2~/\.version$/{print $2, $3}' | sort) \ + <(curl -sS --fail-with-body "$SPRING_POM" | awk -F'[<>]' -v OFS='\t' '$2~/\.version$/{print $2, $3}' | sort) \ | awk ' { if ($2 != $3){ From dd2b7e26751fc9e66bf5ff15c1c8635a24551ed8 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Fri, 1 Sep 2023 11:26:31 +0700 Subject: [PATCH 021/342] build: update Spring Boot to 2.3.12 This also updates Spring Security to 5.3.13 Changelogs: * Spring Boot - https://spring.io/blog/2020/01/23/spring-boot-2-3-0-m1-is-now-available - https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-2.3.0-M1-Release-Notes - https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-2.3.0-M1-Configuration-Changelog - https://spring.io/blog/2020/02/13/spring-boot-2-3-0-m2-available-now - https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-2.3.0-M2-Release-Notes - https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-2.3.0-M2-Configuration-Changelog - https://spring.io/blog/2020/03/12/spring-boot-2-3-0-m3-available-now - https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-2.3.0-M3-Release-Notes - https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-2.3.0-M3-Configuration-Changelog - https://spring.io/blog/2020/04/03/spring-boot-2-3-0-m4-available-now - https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-2.3.0-M4-Release-Notes - https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-2.3.0-M4-Configuration-Changelog - https://spring.io/blog/2020/05/01/spring-boot-2-3-0-rc1-available-now - https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-2.3.0-RC1-Release-Notes - https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-2.3.0-RC1-Configuration-Changelog - https://spring.io/blog/2020/05/15/spring-boot-2-3-0-available-now - https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-2.3-Release-Notes - https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-2.3.0-Configuration-Changelog - https://spring.io/blog/2020/06/12/spring-boot-2-3-1-available-now - https://spring.io/blog/2020/07/24/spring-boot-2-3-2-available-now - https://spring.io/blog/2020/08/13/spring-boot-2-3-3-available-now - https://spring.io/blog/2020/09/17/spring-boot-2-3-4-available-now - https://spring.io/blog/2020/10/29/spring-boot-2-3-5-available-now - https://spring.io/blog/2020/11/13/spring-boot-2-3-6-available-now - https://spring.io/blog/2020/12/11/spring-boot-2-3-7-available-now - https://spring.io/blog/2021/01/14/spring-boot-2-3-8-available-now - https://spring.io/blog/2021/02/18/spring-boot-2-3-9-is-now-available - https://spring.io/blog/2021/04/15/spring-boot-2-3-10-is-now-available - https://spring.io/blog/2021/05/20/spring-boot-2-3-11-available-now - https://spring.io/blog/2021/06/10/spring-boot-2-3-12-release-available-now * Spring Security - https://github.com/spring-projects/spring-security/releases/tag/5.3.0.M1 - https://github.com/spring-projects/spring-security/releases/tag/5.3.0.RC1 - https://github.com/spring-projects/spring-security/releases/tag/5.3.0.RELEASE - https://spring.io/blog/2020/03/05/spring-security-5-3-goes-ga - https://docs.spring.io/spring-security/site/docs/5.3.x/reference/html5/#new - https://spring.io/blog/2020/04/02/spring-security-5-3-1-5-2-3-5-1-9-5-0-15-4-2-15-released - https://spring.io/blog/2020/05/13/cve-reports-published-for-spring-security - https://spring.io/security/cve-2020-5407 - https://spring.io/security/cve-2020-5408 - https://spring.io/blog/2020/05/07/spring-security-5-3-2-5-2-4-5-1-10-5-0-16-4-2-16-released - https://spring.io/blog/2020/06/03/spring-security-5-3-3-5-2-5-5-1-11-5-0-17-4-2-17-released - https://spring.io/blog/2020/08/12/spring-security-5-3-4-5-2-6-5-1-12-5-0-18-4-2-18-released - https://spring.io/blog/2020/10/08/spring-security-5-4-1-5-3-5-5-2-7-5-1-13-5-0-19-4-2-19-released - https://spring.io/blog/2020/12/03/spring-security-5-4-2-5-3-6-and-5-2-8-released - https://github.com/spring-projects/spring-security/releases/tag/5.3.7.RELEASE - https://spring.io/blog/2021/02/11/spring-security-5-4-4-5-3-8-and-5-2-9-released - https://spring.io/blog/2021/04/12/spring-security-5-2-10-5-3-9-and-5-4-6-released - https://spring.io/blog/2021/06/22/spring-security-5-5-1-5-4-7-5-3-10-and-5-2-11-released - https://spring.io/blog/2021/06/28/cve-report-published-for-spring-security - https://spring.io/security/cve-2021-22119 - https://github.com/spring-projects/spring-security/releases/tag/5.3.11.RELEASE - https://github.com/spring-projects/spring-security/releases/tag/5.3.12.RELEASE - https://spring.io/blog/2021/12/20/spring-security-5-2-15-5-3-13-5-4-10-5-5-4-and-5-6-1-released Fix #1244 --- NEWS.txt | 3 +-- pom.xml | 4 ++-- src/main/resources/application.properties | 4 ++-- src/main/scripts/show-spring-boot-version-diff.sh | 2 ++ 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/NEWS.txt b/NEWS.txt index 61d9bb590b..e3de248b42 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -1,8 +1,7 @@ 0.x (upcoming release) - +- (infrastructure) migrate to Spring Boot 2.3 0.4.7 - - (infrastructure) port JavaScript unit tests from Jasmine to Jest - (infrastructure) discontinue usage of Danger - (infrastructure) discontinue usage of 0pdd diff --git a/pom.xml b/pom.xml index f0cf649c45..feb8743865 100644 --- a/pom.xml +++ b/pom.xml @@ -522,7 +522,7 @@ org.springframework.boot spring-boot-starter-parent - 2.2.13.RELEASE + 2.3.12.RELEASE - 5.2.15.RELEASE + 5.3.13.RELEASE boot2-v1.2 diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 9f9a8ba79d..fb625aaa2f 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -8,7 +8,7 @@ debug: false trace: false logging.level.sql: INFO logging.level.web: INFO -spring.http.log-request-details: false +spring.mvc.log-request-details: false spring.main.banner-mode: off @@ -31,7 +31,7 @@ spring.jackson.default-property-inclusion: NON_NULL # 1Kb for headers and post requests (upload files accounted separately) server.max-http-header-size: 1024 -server.jetty.max-http-post-size: 1024 +server.jetty.max-http-form-post-size: 1024 server.servlet.session.cookie.http-only: true diff --git a/src/main/scripts/show-spring-boot-version-diff.sh b/src/main/scripts/show-spring-boot-version-diff.sh index 4a32dfb3f2..583f086361 100755 --- a/src/main/scripts/show-spring-boot-version-diff.sh +++ b/src/main/scripts/show-spring-boot-version-diff.sh @@ -1,5 +1,7 @@ #!/bin/bash +# @todo #1244 Retrofit show-spring-boot-version-diff.sh script to work with a new format of the file + # Treat unset variables and parameters as an error when performing parameter expansion set -o nounset From a79e06b415cddc9f314ce20c8ecfbd905f7e356f Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Tue, 5 Sep 2023 10:47:56 +0700 Subject: [PATCH 022/342] style: update Spring Boot version in comments Relate to #1244 [skip ci] --- .../templates/application-prod.properties | 2 +- pom.xml | 24 +++++++++---------- .../resources/application-postgres.properties | 2 +- .../resources/application-test.properties | 2 +- .../resources/application-travis.properties | 2 +- src/main/resources/application.properties | 4 ++-- src/test/resources/logback-test.xml | 4 ++-- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/infra/vagrant/provisioning/roles/mystamps-app/templates/application-prod.properties b/infra/vagrant/provisioning/roles/mystamps-app/templates/application-prod.properties index 983a64b259..24d5be7bb8 100644 --- a/infra/vagrant/provisioning/roles/mystamps-app/templates/application-prod.properties +++ b/infra/vagrant/provisioning/roles/mystamps-app/templates/application-prod.properties @@ -43,7 +43,7 @@ app.use-cdn: true server.servlet.session.cookie.secure: true # Full list of autoconfiguration classes: -# https://docs.spring.io/spring-boot/docs/2.2.x/reference/html/appendix-auto-configuration-classes.html +# https://docs.spring.io/spring-boot/docs/2.3.x/reference/html/appendix-auto-configuration-classes.html # The difference between test profile is that we don't need # SpringApplicationAdminJmxAutoConfiguration and H2ConsoleAutoConfiguration spring.autoconfigure.exclude: \ diff --git a/pom.xml b/pom.xml index feb8743865..ef4b21c79f 100644 --- a/pom.xml +++ b/pom.xml @@ -79,7 +79,7 @@ ${slf4j.version} - + org.springframework.boot spring-boot-starter @@ -91,13 +91,13 @@ - + org.springframework.boot spring-boot-starter-jdbc - + org.springframework.boot spring-boot-starter-jetty @@ -117,19 +117,19 @@ - + org.springframework.boot spring-boot-starter-logging - + org.springframework.boot spring-boot-starter-security - + org.springframework.boot spring-boot-starter-thymeleaf @@ -141,7 +141,7 @@ - + org.springframework.boot spring-boot-starter-web @@ -469,7 +469,7 @@ test - + org.springframework.boot spring-boot-starter-test @@ -518,7 +518,7 @@ - + org.springframework.boot spring-boot-starter-parent @@ -527,7 +527,7 @@ 1.8 @@ -682,7 +682,7 @@ ru.mystamps.web.support.spring.boot.ApplicationBootstrap diff --git a/src/main/resources/application-postgres.properties b/src/main/resources/application-postgres.properties index df39e13395..9ad8246b94 100644 --- a/src/main/resources/application-postgres.properties +++ b/src/main/resources/application-postgres.properties @@ -39,7 +39,7 @@ logging.level.org.springframework.web.servlet.mvc.method.annotation.RequestMappi app.use-cdn: false # Full list of autoconfiguration classes: -# https://docs.spring.io/spring-boot/docs/2.2.x/reference/html/appendix-auto-configuration-classes.html +# https://docs.spring.io/spring-boot/docs/2.3.x/reference/html/appendix-auto-configuration-classes.html # The difference between test profile is that we don't need H2ConsoleAutoConfiguration # @todo #1054 Extract list of exclusions to a common profile spring.autoconfigure.exclude: \ diff --git a/src/main/resources/application-test.properties b/src/main/resources/application-test.properties index b275dba7fd..fbda710f6d 100644 --- a/src/main/resources/application-test.properties +++ b/src/main/resources/application-test.properties @@ -47,7 +47,7 @@ logging.level.org.springframework.web.servlet.mvc.method.annotation.RequestMappi app.use-cdn: false # Full list of autoconfiguration classes: -# https://docs.spring.io/spring-boot/docs/2.2.x/reference/html/appendix-auto-configuration-classes.html +# https://docs.spring.io/spring-boot/docs/2.3.x/reference/html/appendix-auto-configuration-classes.html spring.autoconfigure.exclude: \ org.springframework.boot.autoconfigure.jms.activemq.ActiveMQAutoConfiguration \ , org.springframework.boot.autoconfigure.aop.AopAutoConfiguration \ diff --git a/src/main/resources/application-travis.properties b/src/main/resources/application-travis.properties index 7e83c26a95..9e6ae716d2 100644 --- a/src/main/resources/application-travis.properties +++ b/src/main/resources/application-travis.properties @@ -38,7 +38,7 @@ app.preview.dir: /tmp/preview app.use-cdn: false # Full list of autoconfiguration classes: -# https://docs.spring.io/spring-boot/docs/2.2.x/reference/html/appendix-auto-configuration-classes.html +# https://docs.spring.io/spring-boot/docs/2.3.x/reference/html/appendix-auto-configuration-classes.html # The difference between test profile is that we don't need H2ConsoleAutoConfiguration spring.autoconfigure.exclude: \ org.springframework.boot.autoconfigure.jms.activemq.ActiveMQAutoConfiguration \ diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index fb625aaa2f..9df067f50a 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -21,7 +21,7 @@ spring.resources.add-mappings: false spring.cache.type: none # See for details: -# https://docs.spring.io/spring-boot/docs/2.2.x/api/org/springframework/boot/autoconfigure/web/servlet/MultipartProperties.html +# https://docs.spring.io/spring-boot/docs/2.3.x/api/org/springframework/boot/autoconfigure/web/servlet/MultipartProperties.html spring.servlet.multipart.location: /tmp spring.servlet.multipart.max-request-size: 10MB spring.servlet.multipart.max-file-size: 5MB @@ -41,7 +41,7 @@ server.compression.enabled: true server.compression.min-response-size: 512 # See for details: -# https://docs.spring.io/spring-boot/docs/2.2.x/reference/html/spring-boot-features.html#boot-features-custom-log-configuration +# https://docs.spring.io/spring-boot/docs/2.3.x/reference/html/spring-boot-features.html#boot-features-custom-log-configuration # https://logback.qos.ch/manual/layouts.html logging.pattern.level: [user:%-2X{userId}] %5p diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml index aa99618e30..71cc566096 100644 --- a/src/test/resources/logback-test.xml +++ b/src/test/resources/logback-test.xml @@ -3,8 +3,8 @@ 1.9.1 - 1.14.3 + 1.16.1 5.3.2 From f516f4234efd7f619fd9baf4f2b48b0695e52f0a Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Fri, 13 Oct 2023 10:55:46 +0700 Subject: [PATCH 029/342] chore: increase a number of Jetty threads to fix the integration tests Correction for 08a07ceaad78017e5c45ee7362dd3300f97a5ed5 commit. Previously, a number of threads was enough only for handling a single client connection. When we tried to create a series with an image that should be downloaded from the same server, we couldn't do that as an only worker was busy -- it was waiting when a server downloads an image from itself. Fix #1633 --- src/main/resources/application-postgres.properties | 4 ++-- src/main/resources/application-test.properties | 4 ++-- src/main/resources/application-travis.properties | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/resources/application-postgres.properties b/src/main/resources/application-postgres.properties index 6dff24f56e..fbfd112c3b 100644 --- a/src/main/resources/application-postgres.properties +++ b/src/main/resources/application-postgres.properties @@ -39,8 +39,8 @@ logging.level.org.springframework.web.servlet.mvc.method.annotation.RequestMappi app.use-cdn: false # reduce a number of threads (8 and 200 by default) -server.jetty.threads.min: 2 -server.jetty.threads.max: 4 +server.jetty.threads.min: 4 +server.jetty.threads.max: 6 # Full list of autoconfiguration classes: # https://docs.spring.io/spring-boot/docs/2.3.x/reference/html/appendix-auto-configuration-classes.html diff --git a/src/main/resources/application-test.properties b/src/main/resources/application-test.properties index 34ce13f49a..6bd14377ee 100644 --- a/src/main/resources/application-test.properties +++ b/src/main/resources/application-test.properties @@ -14,8 +14,8 @@ spring.h2.console.path: /console server.max-http-header-size: 4096 # reduce a number of threads (8 and 200 by default) -server.jetty.threads.min: 2 -server.jetty.threads.max: 4 +server.jetty.threads.min: 4 +server.jetty.threads.max: 6 spring.messages.cache-duration: 1m spring.messages.fallback-to-system-locale: false diff --git a/src/main/resources/application-travis.properties b/src/main/resources/application-travis.properties index 638841a18d..8746936d46 100644 --- a/src/main/resources/application-travis.properties +++ b/src/main/resources/application-travis.properties @@ -38,8 +38,8 @@ app.preview.dir: /tmp/preview app.use-cdn: false # reduce a number of threads (8 and 200 by default) -server.jetty.threads.min: 2 -server.jetty.threads.max: 4 +server.jetty.threads.min: 4 +server.jetty.threads.max: 6 # Full list of autoconfiguration classes: # https://docs.spring.io/spring-boot/docs/2.3.x/reference/html/appendix-auto-configuration-classes.html From b5f858ddb269cd1b73fe75ce9a9a0aa1e7fb21ee Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Fri, 13 Oct 2023 11:24:49 +0700 Subject: [PATCH 030/342] task: run ansible in syntax check mode Part of #1631 [skip ci] --- .github/workflows/provision-by-ansible.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/provision-by-ansible.yml b/.github/workflows/provision-by-ansible.yml index f4857f69af..e0a0238d99 100644 --- a/.github/workflows/provision-by-ansible.yml +++ b/.github/workflows/provision-by-ansible.yml @@ -32,3 +32,7 @@ jobs: # The command pip3 install --user ansible==2.10.17 doesn't work as we have an old version # See https://docs.ansible.com/ansible/2.10/installation_guide/intro_installation.html#installing-devel-from-github-with-pip run: python3 -m pip install --user https://github.com/ansible/ansible/archive/refs/tags/v2.10.17.tar.gz + + - name: Run ansible in syntax check mode + run: ansible-playbook provisioning/prod.yml -i provisioning/prod.inventory --syntax-check + working-directory: infra/vagrant From de2ef914aaaa01dda8640e361b15790eccacc0f0 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Sun, 15 Oct 2023 16:16:29 +0700 Subject: [PATCH 031/342] task: add prod.inventory and prod.yml to allow to run Ansible from CI Part of #1125 Required for #1631 [skip ci] --- .github/workflows/provision-by-ansible.yml | 27 ++++++++++++++++++ .gitignore | 6 ++-- infra/vagrant/provisioning/prod.inventory | 13 +++++++++ infra/vagrant/provisioning/vars/prod.yml.enc | 29 ++++++++++++++++++++ 4 files changed, 73 insertions(+), 2 deletions(-) create mode 100644 infra/vagrant/provisioning/prod.inventory create mode 100644 infra/vagrant/provisioning/vars/prod.yml.enc diff --git a/.github/workflows/provision-by-ansible.yml b/.github/workflows/provision-by-ansible.yml index e0a0238d99..5a5f6de9c2 100644 --- a/.github/workflows/provision-by-ansible.yml +++ b/.github/workflows/provision-by-ansible.yml @@ -33,6 +33,33 @@ jobs: # See https://docs.ansible.com/ansible/2.10/installation_guide/intro_installation.html#installing-devel-from-github-with-pip run: python3 -m pip install --user https://github.com/ansible/ansible/archive/refs/tags/v2.10.17.tar.gz + - name: Show ansible version + run: ansible --version + + - name: Decrypt ansible files + working-directory: infra/vagrant + env: + # https://docs.github.com/en/actions/security-guides/encrypted-secrets#using-encrypted-secrets-in-a-workflow + VAULT_PASSWORD: ${{ secrets.VAULT_PASSWORD }} + run: | + printf '%s' "$VAULT_PASSWORD" >vault-pass.txt + + for FILENAME in provisioning/vars/prod.yml; do + echo "Decrypting ${FILENAME}.enc to $FILENAME" + ansible-vault decrypt \ + --vault-password-file vault-pass.txt \ + --output "$FILENAME" \ + "${FILENAME}.enc" + done + - name: Run ansible in syntax check mode + working-directory: infra/vagrant run: ansible-playbook provisioning/prod.yml -i provisioning/prod.inventory --syntax-check + + - name: Cleanup + if: always() working-directory: infra/vagrant + run: | + for FILE in vault-pass.txt provisioning/vars/prod.yml; do + [ ! -f "$FILE" ] || rm -fv "$FILE" + done diff --git a/.gitignore b/.gitignore index 15afa27f0f..6cb4e300a6 100644 --- a/.gitignore +++ b/.gitignore @@ -21,7 +21,6 @@ src/main/frontend/node_modules/ # Vagrant related files .vagrant/ infra/vagrant/provisioning/vagrant.retry -infra/vagrant/provisioning/prod.inventory infra/vagrant/provisioning/vars/prod.yml infra/vagrant/provisioning/roles/php-coder.oraclejdk/ infra/vagrant/provisioning/roles/php-coder.nginx/ @@ -39,7 +38,10 @@ infra/terraform/terraform.tfstate.backup infra/docker/application-prod.properties infra/docker/mysql_backup_mystamps.sql.gz -# created by src/main/scripts/ci/deploy.sh or .github/workflows/provision-by-terraform.yml +# created by: +# src/main/scripts/ci/deploy.sh +# .github/workflows/provision-by-ansible.yml +# .github/workflows/provision-by-terraform.yml vault-pass.txt # created by src/main/scripts/ci/deploy.sh diff --git a/infra/vagrant/provisioning/prod.inventory b/infra/vagrant/provisioning/prod.inventory new file mode 100644 index 0000000000..9fd9996d8f --- /dev/null +++ b/infra/vagrant/provisioning/prod.inventory @@ -0,0 +1,13 @@ +# Ansible inventory file +# See: https://docs.ansible.com/ansible/2.10/user_guide/intro_inventory.html + +[prod] +my-stamps.ru ansible_host=46.101.232.167 + +[all:vars] +ansible_user=coder +ansible_ssh_private_key_file=/Users/coder/.ssh/mystamps_rsa + +# https://docs.ansible.com/ansible/2.10/reference_appendices/python_3_support.html#using-python-3-on-the-managed-machines-with-commands-and-playbooks +# https://docs.ansible.com/ansible/2.10/reference_appendices/interpreter_discovery.html +ansible_python_interpreter=/usr/bin/python3 diff --git a/infra/vagrant/provisioning/vars/prod.yml.enc b/infra/vagrant/provisioning/vars/prod.yml.enc new file mode 100644 index 0000000000..dd035094ec --- /dev/null +++ b/infra/vagrant/provisioning/vars/prod.yml.enc @@ -0,0 +1,29 @@ +$ANSIBLE_VAULT;1.1;AES256 +31383633616337333536623830663864613437393030393034323836633239623463383735313363 +3638316534376236666238343763626533376135633362660a373965346438346266653163613830 +63323334323330623363316438333133306364356639346464353663313730613130353461636237 +3736643233626662310a383133353338303335623333316331306139323334343565316333633030 +62323966656263373736353464326662356465363062356239373238663062396263306236633232 +35343165323639356637653030326263386235653965613438326566373739663938333730623765 +39343837393032303735386636363137323839626537303339303139633830666239366135393462 +35326163326666653433303536656633383831303533303236643333356461636361376364396338 +38366331396561393737313636623230666531363966636332343763363061366161666135336434 +66323038376137356163326139643338663330663535633938376163653163373039353165363135 +31333264633663306563346663336535616333626237356436626138653234326333633932666232 +38303761363464323164393830383261636436653962396131653833323866653364313338313836 +39316362653534326166393562396237633863663835646636343930326139646461343632613764 +33626634613736363664316134333365653632393537616139383864316662373839653262386263 +32616364616437343133393930613636396663383962313331353139353338306335623831316630 +61313765366339643537313835613134393363646539393037393665303863323966376565356335 +34356463333761303231333539653935633535353061313865303431393634313139386534363266 +32633866363164663461323834326131633431393663316237623630313034643830663434333631 +30666139393634616231393839303135363863643261353866613236633435353164396666386533 +38333433336364666139306666326437396336363439353032326137396139386335326336316132 +61343862353035633561613231383134313935346361393232313733333566336531396337343639 +63356631346238323838343561663265396264633533653836323131373835633064623961363335 +36306531356338353035383062363330336337343362333663396366393263346630363637333365 +35613037373139313966613534386664646431656239363465666166653166363630396166656632 +32386635333761393730393237663763386534386162313166656564343434643066613536633634 +61653365326162613363653431333433626562636462353537643739316236366535386463653830 +35323563353837386533663732323438656637613237366261303335376463646262323866323230 +34323731343430323236 From 5e618ea1fe68fe12b87785cd5d5a0ac5b3a8e5f0 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Sun, 15 Oct 2023 17:08:58 +0700 Subject: [PATCH 032/342] refactor: prefer printf instead of echo -n [skip ci] --- .github/workflows/provision-by-terraform.yml | 2 +- src/main/scripts/ci/deploy.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/provision-by-terraform.yml b/.github/workflows/provision-by-terraform.yml index d2bc19af97..814dd239d6 100644 --- a/.github/workflows/provision-by-terraform.yml +++ b/.github/workflows/provision-by-terraform.yml @@ -77,7 +77,7 @@ jobs: # https://docs.github.com/en/actions/security-guides/encrypted-secrets#using-encrypted-secrets-in-a-workflow VAULT_PASSWORD: ${{ secrets.VAULT_PASSWORD }} run: | - echo -n "$VAULT_PASSWORD" >vault-pass.txt + printf '%s' "$VAULT_PASSWORD" >vault-pass.txt for FILENAME in terraform.tfstate terraform.tfvars; do echo "Decrypting ${FILENAME}.enc to $FILENAME" diff --git a/src/main/scripts/ci/deploy.sh b/src/main/scripts/ci/deploy.sh index 84faefde4f..02dcff133d 100755 --- a/src/main/scripts/ci/deploy.sh +++ b/src/main/scripts/ci/deploy.sh @@ -36,7 +36,7 @@ if [ -z "${VAULT_PASSWORD:-}" ]; then exit 1 fi -echo -n "$VAULT_PASSWORD" >"$PASS_FILE" +printf '%s' "$VAULT_PASSWORD" >"$PASS_FILE" for FILE in "$PRIVATE_KEY" "$VARS_FILE"; do FILENAME="$(basename "$FILE")" From 2b5d07d79bc78b2ebe7baca766bdc5545ae19a77 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Sun, 15 Oct 2023 17:26:12 +0700 Subject: [PATCH 033/342] task: install required ansible roles Part of #1631 [skip ci] --- .github/workflows/provision-by-ansible.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/provision-by-ansible.yml b/.github/workflows/provision-by-ansible.yml index 5a5f6de9c2..266dc3f9c7 100644 --- a/.github/workflows/provision-by-ansible.yml +++ b/.github/workflows/provision-by-ansible.yml @@ -52,6 +52,10 @@ jobs: "${FILENAME}.enc" done + - name: Install required collections + working-directory: infra/vagrant + run: ansible-galaxy collection install --requirements-file requirements.yml --collections-path provisioning/roles + - name: Run ansible in syntax check mode working-directory: infra/vagrant run: ansible-playbook provisioning/prod.yml -i provisioning/prod.inventory --syntax-check From 170aea92d32318bff6a0caacabac631315aeacbd Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Sun, 15 Oct 2023 17:37:24 +0700 Subject: [PATCH 034/342] task: correct a command to install required ansible roles Correction for 2b5d07d79bc78b2ebe7baca766bdc5545ae19a77 commit. Part of #1631 [skip ci] --- .github/workflows/provision-by-ansible.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/provision-by-ansible.yml b/.github/workflows/provision-by-ansible.yml index 266dc3f9c7..edf3368fb3 100644 --- a/.github/workflows/provision-by-ansible.yml +++ b/.github/workflows/provision-by-ansible.yml @@ -54,7 +54,7 @@ jobs: - name: Install required collections working-directory: infra/vagrant - run: ansible-galaxy collection install --requirements-file requirements.yml --collections-path provisioning/roles + run: ansible-galaxy role install --role-file requirements.yml --roles-path provisioning/roles - name: Run ansible in syntax check mode working-directory: infra/vagrant From 79fc14595033a8ed42c935e7ab1552bbd80bae99 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Sun, 15 Oct 2023 17:42:53 +0700 Subject: [PATCH 035/342] task: run ansible in check mode Part of #1631 [skip ci] --- .github/workflows/provision-by-ansible.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/provision-by-ansible.yml b/.github/workflows/provision-by-ansible.yml index edf3368fb3..10db574094 100644 --- a/.github/workflows/provision-by-ansible.yml +++ b/.github/workflows/provision-by-ansible.yml @@ -60,6 +60,10 @@ jobs: working-directory: infra/vagrant run: ansible-playbook provisioning/prod.yml -i provisioning/prod.inventory --syntax-check + - name: Run ansible in check mode + working-directory: infra/vagrant + run: ansible-playbook provisioning/prod.yml -i provisioning/prod.inventory --check + - name: Cleanup if: always() working-directory: infra/vagrant From 6b77f30b5266a90a0addc867579b961f622d5552 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Tue, 17 Oct 2023 11:56:38 +0700 Subject: [PATCH 036/342] task: run ansible in real mode as we can't fully rely that in check mode no changes will be made Part of #1631 [skip ci] --- .github/workflows/provision-by-ansible.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/provision-by-ansible.yml b/.github/workflows/provision-by-ansible.yml index 10db574094..bb60036dd5 100644 --- a/.github/workflows/provision-by-ansible.yml +++ b/.github/workflows/provision-by-ansible.yml @@ -60,9 +60,9 @@ jobs: working-directory: infra/vagrant run: ansible-playbook provisioning/prod.yml -i provisioning/prod.inventory --syntax-check - - name: Run ansible in check mode + - name: Run ansible working-directory: infra/vagrant - run: ansible-playbook provisioning/prod.yml -i provisioning/prod.inventory --check + run: ansible-playbook provisioning/prod.yml -i provisioning/prod.inventory - name: Cleanup if: always() From f58d9725aeeff3d80708559eadcbda667e359674 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Tue, 17 Oct 2023 12:01:38 +0700 Subject: [PATCH 037/342] task: disable host key checking in ansible to suppress interactive prompt Part of #1631 [skip ci] --- .github/workflows/provision-by-ansible.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/provision-by-ansible.yml b/.github/workflows/provision-by-ansible.yml index bb60036dd5..22282d0891 100644 --- a/.github/workflows/provision-by-ansible.yml +++ b/.github/workflows/provision-by-ansible.yml @@ -62,6 +62,10 @@ jobs: - name: Run ansible working-directory: infra/vagrant + env: + # Disable host key checking to suppress interactive prompt. + # See: https://docs.ansible.com/ansible/2.10/user_guide/connection_details.html#managing-host-key-checking + ANSIBLE_HOST_KEY_CHECKING: 'False' run: ansible-playbook provisioning/prod.yml -i provisioning/prod.inventory - name: Cleanup From 8ced7c2be525c8021068c77b3e82743ca1f53a9d Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Tue, 24 Oct 2023 11:16:59 +0700 Subject: [PATCH 038/342] refactor: move declaration of remote user out of inventory file This change reduces differences between prod.inventory and mystamps.inventory to let us merge them later. Part of #1631 [skip ci] --- infra/vagrant/provisioning/prod.inventory | 1 - infra/vagrant/provisioning/prod.yml | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/infra/vagrant/provisioning/prod.inventory b/infra/vagrant/provisioning/prod.inventory index 9fd9996d8f..27efe21846 100644 --- a/infra/vagrant/provisioning/prod.inventory +++ b/infra/vagrant/provisioning/prod.inventory @@ -5,7 +5,6 @@ my-stamps.ru ansible_host=46.101.232.167 [all:vars] -ansible_user=coder ansible_ssh_private_key_file=/Users/coder/.ssh/mystamps_rsa # https://docs.ansible.com/ansible/2.10/reference_appendices/python_3_support.html#using-python-3-on-the-managed-machines-with-commands-and-playbooks diff --git a/infra/vagrant/provisioning/prod.yml b/infra/vagrant/provisioning/prod.yml index 9ef54cf682..b675a9dbec 100644 --- a/infra/vagrant/provisioning/prod.yml +++ b/infra/vagrant/provisioning/prod.yml @@ -1,6 +1,7 @@ --- - hosts: all gather_facts: no + remote_user: coder become: yes become_method: sudo vars: From 3dbfd9e058b20f2ce8915c868cac72b780762597 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Tue, 24 Oct 2023 11:29:00 +0700 Subject: [PATCH 039/342] task: commit a private key for server provisioning Part of #1631 [skip ci] --- .github/workflows/provision-by-ansible.yml | 6 +- .gitignore | 3 + infra/vagrant/provisioning/coder_rsa.enc | 89 ++++++++++++++++++++++ infra/vagrant/provisioning/prod.inventory | 2 - src/main/scripts/ci/deploy.sh | 2 + 5 files changed, 98 insertions(+), 4 deletions(-) create mode 100644 infra/vagrant/provisioning/coder_rsa.enc diff --git a/.github/workflows/provision-by-ansible.yml b/.github/workflows/provision-by-ansible.yml index 22282d0891..d7e2b42893 100644 --- a/.github/workflows/provision-by-ansible.yml +++ b/.github/workflows/provision-by-ansible.yml @@ -44,7 +44,7 @@ jobs: run: | printf '%s' "$VAULT_PASSWORD" >vault-pass.txt - for FILENAME in provisioning/vars/prod.yml; do + for FILENAME in provisioning/vars/prod.yml provisioning/coder_rsa; do echo "Decrypting ${FILENAME}.enc to $FILENAME" ansible-vault decrypt \ --vault-password-file vault-pass.txt \ @@ -66,12 +66,14 @@ jobs: # Disable host key checking to suppress interactive prompt. # See: https://docs.ansible.com/ansible/2.10/user_guide/connection_details.html#managing-host-key-checking ANSIBLE_HOST_KEY_CHECKING: 'False' + # See: https://docs.ansible.com/ansible/2.10/reference_appendices/config.html#envvar-ANSIBLE_PRIVATE_KEY_FILE + ANSIBLE_PRIVATE_KEY_FILE: 'provisioning/coder_rsa' run: ansible-playbook provisioning/prod.yml -i provisioning/prod.inventory - name: Cleanup if: always() working-directory: infra/vagrant run: | - for FILE in vault-pass.txt provisioning/vars/prod.yml; do + for FILE in vault-pass.txt provisioning/vars/prod.yml provisioning/coder_rsa; do [ ! -f "$FILE" ] || rm -fv "$FILE" done diff --git a/.gitignore b/.gitignore index 6cb4e300a6..ccb8c31310 100644 --- a/.gitignore +++ b/.gitignore @@ -44,6 +44,9 @@ infra/docker/mysql_backup_mystamps.sql.gz # .github/workflows/provision-by-terraform.yml vault-pass.txt +# created by .github/workflows/provision-by-ansible.yml +coder_rsa + # created by src/main/scripts/ci/deploy.sh mystamps_rsa prod_vars.yml diff --git a/infra/vagrant/provisioning/coder_rsa.enc b/infra/vagrant/provisioning/coder_rsa.enc new file mode 100644 index 0000000000..84a4151719 --- /dev/null +++ b/infra/vagrant/provisioning/coder_rsa.enc @@ -0,0 +1,89 @@ +$ANSIBLE_VAULT;1.1;AES256 +37353262383730363737326662386135303332343861366338663434306237313233643965326630 +3338633834633638376562333632313165643832396162660a373932666338363763636265636530 +38616433633330333533396331366661396430633133396433303437656566376436306530396136 +3861386163323565360a353636613036343430643166356361353037306264303761343766383035 +30373834393361666630656136343735363465386366623138346639626164663934353064616133 +37633331383038393865623639303431393431653737336334643339303036346236323031633562 +66326638393564663036343864393130633939313236323837613864303365333165626166383663 +32663530323365643038303566626165336138613330623766633837343436353334333335303636 +39333065663831626161663930383430343364376137333862656437306264383732343830363862 +64623863643064646538643966326436643137313933636138383134326661383036663139613562 +34313536333166376562656132653538303561623734313334383139336637626436633666653030 +66633166656137663566313861623530333565343731656161396539623235656437656365643965 +65333236333164316366643234633331306132623564396163336232663163656162303836303434 +66383363633533383933643664613932396661343734386439343861383364656532633965383962 +63626537613934333635386538653462626531336230613062323362306638663839636639313534 +62306565343237653535393333313663313536316163666131316665383532393335353930643066 +35663862376138636633303566633263396636373031613539373831616563336133386237326163 +37353134633266666233373430383638346532663134393434343138666466633135333166363964 +31613065313037353337636439636664376438653732383838633463343662313137636238316234 +37356136616265616364306530633433643863323535346165393738666366336664326134653164 +30313962363465623631316534303530333534623663326130393764653966306431633166366430 +62363663623663353732666365626562643632376336363266376632386639653231343237373032 +35643733313161356535616539623061663165373437653564633636306336313131303533646433 +63336264373162316139386263343635636636303732366433623738383039653437326563346232 +30656432386164323239663465633732326535636533646661663934303266316331356662386361 +35613335626436346263376162323936396465633333373164343532623137643665303563663536 +64396633663831653264323336666165326134386363313632346335623732646136303662356337 +39653031356633376337356436333762333636373961666564653138303865323437373933623261 +32383762663665383132326333343430343433663334626334313462373162366261646530646166 +62343864643539343335353836396630383937623538646338663466353933613035656135316138 +63633264653333313165663264613535623231616164646636653166613132343636363032316638 +61643962373563376562366263366231356466613931623639656135323635386563383532343066 +36646133653733353737633836316162376132386539393366383763656162333737363763393630 +34336563353564313062373132313138653330303238633164623561376238653032613566343731 +34363164626230316438653363393936373136366261336236303033643437366139396365393230 +38366539616233363062393233363230363739643838393739666533623433643565376231623536 +32346361386334636361613936663362383534646338656338393330356262323934333334316135 +62636666373564346238346364363931393561396465623232336534383431633430323466396334 +32346663623030653266316566373635373332663238616666643865616232616661396133306461 +62336538303236323461363439313638376264636136613936333538616662303833326466356435 +61616466383839303938616533303431303839613934373236333765633664666364323231616265 +38383730386166616430613930356431306465383135656633353931323737393861396661623661 +34313338363931376136303865326665326439376665613538303036663262656539623666383838 +35653666313861386439346235383466636639383737366164353535653565626133656439343361 +65656166363336626438626233653366623966356230636364633531623735353364306539626533 +35623436396434373565393434633061323739353562313064623238666632613264646436663565 +39346163363661346266393638323865383032646135653639333931656634343137353063373563 +66326461616464643935383636383135343361376465646230623064306163613763633237353065 +31386330623338336239356132303766383064633139613663353232623265623436373538376635 +32653833643138366161623263316163343139346438393166623934313163656661623137653363 +32356364663032373237313464333734356133306536376135653235663835653934363836386333 +32303863373137646531373065366138613739366261613336343539633662363964613864356136 +39313266313735623866313031336664633063613732343634623263393634633366393434383938 +62366632626561613865396564326363346263616662633862626365356632363237336162363737 +64376639636239396565643138633632343562373437653661373730633261663331633965623665 +34656664666661313931373562383132363431633034303831663166366632333062393535366534 +62313537376133363435346538393365656365656162346530633837653938333563303561653462 +37323661613535336134663139393033306661636363613537613533663032326238383231383739 +65663063663465333036316437616639303262386330353164663938633961626638323432623164 +36373338646530363438346438393536383335646433636238353561656139343032383765323931 +66373932666166386265396365346464353832326462316333333432323761343731373162623961 +32626138316164666639323561643430306333363561333965616461663164373730663263643834 +32333436396238323734343364613966376336616362666266653230373034636534636634636538 +31346539623435363163633563626136363833346132636532356636343663373562313439313765 +65623665373336393862643032643163366331313466663565376433613338393964633036613063 +66333334643231313737666166646262366133303938666331616435376662396334336561613538 +36616463626634626662343538376238393761363464636233656463616566396434623832336462 +65386436366165343231383830326330366435643065303730313762353736353561666230613337 +64633231623731336533373366623863643430653637333766373365316266336461666430336137 +34393963313839373936633633373730643330333031656565363530383762616233373937343230 +31356334313866623234306632656439333062323934626238393237626662356363626465376436 +30356133653634326638303965633735663236626132353037653131616339613230336434626666 +33363836643036383730303864303663356632306332646635646263313564363230313566643163 +63633439633032626563353536616139613534343335656666393364336330363064646366636537 +64653164653534393530363637663134343564356430386238336365613837346439656665623164 +35303136326164343766623939343862653865646532306563646631396639396631303062323436 +38383665316265643233366563663339346332333462393039613134646138313134326532666632 +37636136363534376632633230616365323966653937663436353531353138636439323133633632 +33626439313434613237626231633237393266323666666334333062653236636339663461336631 +38346162616235623833306166373733623564316235616331316166383962333337326666653962 +36616536633966393537343261303932383062636661333962346430353432663438623039303961 +64383837303237343337623962326261313162376534323661666333393133376439393566303938 +66623231333338666638383836386165643636306165386466653437363661386463336462643736 +37303331393162623833343533623839636565363064393931366362396164353738636662386337 +32303735653865316663316539343463653632386339653961326233366664303764386236643864 +63306462613232656336623161646136333536396632363264633539303538636635663865636165 +31316537613036306465623938623634316365636535613630363162653665366237613262313039 +37386462663336323265 diff --git a/infra/vagrant/provisioning/prod.inventory b/infra/vagrant/provisioning/prod.inventory index 27efe21846..ead5342b71 100644 --- a/infra/vagrant/provisioning/prod.inventory +++ b/infra/vagrant/provisioning/prod.inventory @@ -5,8 +5,6 @@ my-stamps.ru ansible_host=46.101.232.167 [all:vars] -ansible_ssh_private_key_file=/Users/coder/.ssh/mystamps_rsa - # https://docs.ansible.com/ansible/2.10/reference_appendices/python_3_support.html#using-python-3-on-the-managed-machines-with-commands-and-playbooks # https://docs.ansible.com/ansible/2.10/reference_appendices/interpreter_discovery.html ansible_python_interpreter=/usr/bin/python3 diff --git a/src/main/scripts/ci/deploy.sh b/src/main/scripts/ci/deploy.sh index 02dcff133d..34edd5e761 100755 --- a/src/main/scripts/ci/deploy.sh +++ b/src/main/scripts/ci/deploy.sh @@ -38,6 +38,8 @@ fi printf '%s' "$VAULT_PASSWORD" >"$PASS_FILE" +# LATER: consider specifying private key via env variable +# https://docs.ansible.com/ansible/2.10/reference_appendices/config.html#envvar-ANSIBLE_PRIVATE_KEY_FILE for FILE in "$PRIVATE_KEY" "$VARS_FILE"; do FILENAME="$(basename "$FILE")" echo "Decrypting ${FILENAME}.enc to $FILENAME" From 71c7df4e51940659725f724e472055132d96bd97 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Thu, 26 Oct 2023 11:19:25 +0700 Subject: [PATCH 040/342] ci: update ansible-lint to 4.3.7 Changelogs: - https://github.com/ansible/ansible-lint/releases/tag/v4.3.0 - https://github.com/ansible/ansible-lint/releases/tag/v4.3.1 - https://github.com/ansible/ansible-lint/releases/tag/v4.3.2 - https://github.com/ansible/ansible-lint/releases/tag/v4.3.3 - https://github.com/ansible/ansible-lint/releases/tag/v4.3.4 - https://github.com/ansible/ansible-lint/releases/tag/v4.3.5 - https://github.com/ansible/ansible-lint/releases/tag/v4.3.6 - https://github.com/ansible/ansible-lint/releases/tag/v4.3.7 Fix #1516 --- .github/workflows/static-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index fb00c6276b..b90db42cb1 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -173,7 +173,7 @@ jobs: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false - name: Install ansible-lint - run: pip3 install --user ansible-lint==4.2.0 + run: pip3 install --user ansible-lint==4.3.7 - name: Run ansible-lint run: ./src/main/scripts/execute-command.sh ansible-lint From a8f0af730442ba4f12c0af83d6f0358defdf2f8a Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Thu, 26 Oct 2023 11:22:59 +0700 Subject: [PATCH 041/342] build: update mysql-connector-java to 5.1.49 Changelogs: - https://dev.mysql.com/blog-archive/mysql-connector-j-5-1-47-ga-has-been-released/ - https://dev.mysql.com/blog-archive/mysql-connector-j-5-1-48/ - https://dev.mysql.com/blog-archive/mysql-connector-j-5-1-49-ga-has-been-released/ Fix #1184 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0db474825b..68481faa55 100644 --- a/pom.xml +++ b/pom.xml @@ -625,7 +625,7 @@ 1.7.6 - 5.1.46 + 5.1.49 2.0.1 3.0.2 From f89650b88f818662c93a4edd37b3e1a18e52c3b8 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Sat, 28 Oct 2023 11:33:08 +0700 Subject: [PATCH 042/342] chore: pin rich version to make ansible-lint work Correction for 71c7df4e51940659725f724e472055132d96bd97 commit. Relate to #1516 --- .github/workflows/static-analysis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index b90db42cb1..9c78da7b4b 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -173,7 +173,8 @@ jobs: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false - name: Install ansible-lint - run: pip3 install --user ansible-lint==4.3.7 + # Pin rich version to workaround https://github.com/ansible/ansible-lint/issues/1795 + run: pip3 install --user rich<11.0.0 ansible-lint==4.3.7 - name: Run ansible-lint run: ./src/main/scripts/execute-command.sh ansible-lint From 0d5c4fd9177986a843b7fbb1b96b558c62c9dce0 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Sat, 28 Oct 2023 11:40:04 +0700 Subject: [PATCH 043/342] chore: quote pip argument to fix "11.0.0: No such file or directory" error Correction for f89650b88f818662c93a4edd37b3e1a18e52c3b8 commit. Relate to #1516 --- .github/workflows/static-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 9c78da7b4b..637db93281 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -174,7 +174,7 @@ jobs: persist-credentials: false - name: Install ansible-lint # Pin rich version to workaround https://github.com/ansible/ansible-lint/issues/1795 - run: pip3 install --user rich<11.0.0 ansible-lint==4.3.7 + run: pip3 install --user 'rich<11.0.0' ansible-lint==4.3.7 - name: Run ansible-lint run: ./src/main/scripts/execute-command.sh ansible-lint From 76253a368ee263af1194baec166ffe627c972d0b Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Sun, 29 Oct 2023 17:27:15 +0700 Subject: [PATCH 044/342] chore: configure ansible-lint to exclude role-name check The error was: Error: [E106] Role name mystamps-app does not match `^[a-z][a-z0-9_]+$` pattern Error: [E106] Role name mystamps-backup does not match `^[a-z][a-z0-9_]+$` pattern Error: [E106] Role name mystamps-nginx does not match `^[a-z][a-z0-9_]+$` pattern Error: [E106] Role name mystamps-user does not match `^[a-z][a-z0-9_]+$` pattern Relate to #1516 --- src/main/scripts/execute-command.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/scripts/execute-command.sh b/src/main/scripts/execute-command.sh index 3e2ecf367d..601267f5a5 100755 --- a/src/main/scripts/execute-command.sh +++ b/src/main/scripts/execute-command.sh @@ -16,6 +16,7 @@ MVN=mvn case ${1:-} in 'ansible-lint') exec ansible-lint \ + -x role-name \ "$ROOTDIR/infra/vagrant/provisioning/prod.yml" \ "$ROOTDIR/infra/vagrant/provisioning/vagrant.yml" \ "$ROOTDIR/infra/vagrant/provisioning/bootstrap.yml" \ From c7e15be7305c658a648efc9cddb4742233db3cfa Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Sun, 29 Oct 2023 17:31:13 +0700 Subject: [PATCH 045/342] chore: try to exclude ansble-lint rule by number instead of its name Relate to #1516 --- src/main/scripts/execute-command.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scripts/execute-command.sh b/src/main/scripts/execute-command.sh index 601267f5a5..ad44cfd8c6 100755 --- a/src/main/scripts/execute-command.sh +++ b/src/main/scripts/execute-command.sh @@ -16,7 +16,7 @@ MVN=mvn case ${1:-} in 'ansible-lint') exec ansible-lint \ - -x role-name \ + -x 106 \ "$ROOTDIR/infra/vagrant/provisioning/prod.yml" \ "$ROOTDIR/infra/vagrant/provisioning/vagrant.yml" \ "$ROOTDIR/infra/vagrant/provisioning/bootstrap.yml" \ From 4fc79990038f3b040391dcb9aef62fd1bb1ca31e Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Sun, 29 Oct 2023 17:49:44 +0700 Subject: [PATCH 046/342] ci: enable and configure Dependabot Part of #1590 --- .github/dependabot.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000000..4617c70f40 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,22 @@ +# See for details: +# - https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuring-dependabot-version-updates +# - https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file +version: 2 +updates: + + - package-ecosystem: "maven" + directory: "/" + # https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#allow + allow: + - dependency-name: "org.jsoup:jsoup" + # https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#scheduleinterval + schedule: + interval: "daily" + time: "08:00" + timezone: "Asia/Novosibirsk" + # https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#commit-message + commit-message: + prefix: "chore" + assignees: [ "php-coder" ] + reviewers: [ "php-coder" ] + labels: [ "kind/dependency-update" ] From 4263c3d38e41b4087cef6a2e24ddaaa507d2f5c4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 29 Oct 2023 10:51:13 +0000 Subject: [PATCH 047/342] chore: bump org.jsoup:jsoup from 1.16.1 to 1.16.2 Bumps [org.jsoup:jsoup](https://github.com/jhy/jsoup) from 1.16.1 to 1.16.2. - [Release notes](https://github.com/jhy/jsoup/releases) - [Changelog](https://github.com/jhy/jsoup/blob/master/CHANGES) - [Commits](https://github.com/jhy/jsoup/compare/jsoup-1.16.1...jsoup-1.16.2) --- updated-dependencies: - dependency-name: org.jsoup:jsoup dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 68481faa55..a16dce6e90 100644 --- a/pom.xml +++ b/pom.xml @@ -608,7 +608,7 @@ 1.9.1 - 1.16.1 + 1.16.2 5.3.2 From 0e869a1f3d1dec0d6bfa466fc238090e36aa8e5f Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Sun, 29 Oct 2023 20:17:20 +0700 Subject: [PATCH 048/342] chore: add more libraries to keep up-to-date by Dependabot Part of #1590 --- .github/dependabot.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 4617c70f40..732071b059 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -8,7 +8,11 @@ updates: directory: "/" # https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#allow allow: + - dependency-name: "net.coobird:thumbnailator" + - dependency-name: "org.apache.commons:commons-lang3" + - dependency-name: "org.apache.commons:commons-text" - dependency-name: "org.jsoup:jsoup" + - dependency-name: "org.projectlombok:lombok" # https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#scheduleinterval schedule: interval: "daily" From 1517305a4d1c74cab4a77b109384cb31393e4df6 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Sun, 29 Oct 2023 20:20:07 +0700 Subject: [PATCH 049/342] chore: configure Dependabot to have no more than 2 PRs in-flight Part of #1590 --- .github/dependabot.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 732071b059..6a0ce795cf 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -24,3 +24,5 @@ updates: assignees: [ "php-coder" ] reviewers: [ "php-coder" ] labels: [ "kind/dependency-update" ] + # https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#open-pull-requests-limit + open-pull-requests-limit: 2 From c6f81e96e567fec1dd9e296440f441f834d8a4d0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 29 Oct 2023 13:21:25 +0000 Subject: [PATCH 050/342] chore: bump org.projectlombok:lombok from 1.18.22 to 1.18.30 Bumps [org.projectlombok:lombok](https://github.com/projectlombok/lombok) from 1.18.22 to 1.18.30. - [Changelog](https://github.com/projectlombok/lombok/blob/master/doc/changelog.markdown) - [Commits](https://github.com/projectlombok/lombok/compare/v1.18.22...v1.18.30) --- updated-dependencies: - dependency-name: org.projectlombok:lombok dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a16dce6e90..0c4d0d8727 100644 --- a/pom.xml +++ b/pom.xml @@ -620,7 +620,7 @@ 4.11.0 - 1.18.22 + 1.18.30 1.7.6 From cfaba501ce69d727f20ab7550b5d3e7b363281d9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 29 Oct 2023 13:21:22 +0000 Subject: [PATCH 051/342] chore: bump net.coobird:thumbnailator from 0.4.17 to 0.4.20 Bumps [net.coobird:thumbnailator](https://github.com/coobird/thumbnailator) from 0.4.17 to 0.4.20. - [Commits](https://github.com/coobird/thumbnailator/compare/0.4.17...0.4.20) --- updated-dependencies: - dependency-name: net.coobird:thumbnailator dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0c4d0d8727..6a54d99789 100644 --- a/pom.xml +++ b/pom.xml @@ -687,7 +687,7 @@ ru.mystamps.web.support.spring.boot.ApplicationBootstrap 2.22.0 - 0.4.17 + 0.4.20 3.0.4.RELEASE From babbfabca400de76e323f442e8b0a6deffdbbe82 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Sun, 29 Oct 2023 20:52:25 +0700 Subject: [PATCH 052/342] chore: reduce number of Dependabot PRs in-flight to 1 Part of #1590 --- .github/dependabot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 6a0ce795cf..609a97bdfb 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -25,4 +25,4 @@ updates: reviewers: [ "php-coder" ] labels: [ "kind/dependency-update" ] # https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#open-pull-requests-limit - open-pull-requests-limit: 2 + open-pull-requests-limit: 1 From 7550a60507aac30392483e9471db329efc4f9a55 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Oct 2023 01:54:44 +0000 Subject: [PATCH 053/342] chore: bump org.apache.commons:commons-text from 1.4 to 1.11.0 Bumps org.apache.commons:commons-text from 1.4 to 1.11.0. --- updated-dependencies: - dependency-name: org.apache.commons:commons-text dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6a54d99789..f475e67c94 100644 --- a/pom.xml +++ b/pom.xml @@ -557,7 +557,7 @@ 3.8 - 1.4 + 1.11.0 3.8.1 2.5.1 From 9d6cf08c86db8fd5e89e5433c5db78f4ca1d347d Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Wed, 1 Nov 2023 11:48:05 +0700 Subject: [PATCH 054/342] refactor: use recently introduced StringSubstitutor.setEnableUndefinedVariableException() Follow-up to #1182 --- .../ru/mystamps/web/feature/report/ReportServiceImpl.java | 4 +++- .../java/ru/mystamps/web/feature/site/MailServiceImpl.java | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/ru/mystamps/web/feature/report/ReportServiceImpl.java b/src/main/java/ru/mystamps/web/feature/report/ReportServiceImpl.java index 803f852c0c..e70a5d570d 100644 --- a/src/main/java/ru/mystamps/web/feature/report/ReportServiceImpl.java +++ b/src/main/java/ru/mystamps/web/feature/report/ReportServiceImpl.java @@ -73,7 +73,9 @@ public String prepareDailyStatistics(AdminDailyReport report) { put(ctx, "invalid_csrf_cnt", report.getInvalidCsrfCounter()); put(ctx, "bad_request_cnt", -1L); // FIXME: #122 - return new StringSubstitutor(ctx).replace(template); + StringSubstitutor substitutor = new StringSubstitutor(ctx); + substitutor.setEnableUndefinedVariableException(true); + return substitutor.replace(template); } private static void put(Map ctx, String key, long value) { diff --git a/src/main/java/ru/mystamps/web/feature/site/MailServiceImpl.java b/src/main/java/ru/mystamps/web/feature/site/MailServiceImpl.java index ab9fa13824..e51db05fd0 100644 --- a/src/main/java/ru/mystamps/web/feature/site/MailServiceImpl.java +++ b/src/main/java/ru/mystamps/web/feature/site/MailServiceImpl.java @@ -135,6 +135,7 @@ private String getTextOfActivationMail(SendUsersActivationDto activation) { ctx.put("expire_after_days", String.valueOf(CronService.PURGE_AFTER_DAYS)); StringSubstitutor substitutor = new StringSubstitutor(ctx); + substitutor.setEnableUndefinedVariableException(true); return substitutor.replace(template); } @@ -151,6 +152,7 @@ private String getSubjectOfDailyStatisticsMail(AdminDailyReport report) { ctx.put("total_changes", String.valueOf(report.countTotalChanges())); StringSubstitutor substitutor = new StringSubstitutor(ctx); + substitutor.setEnableUndefinedVariableException(true); return substitutor.replace(template); } From 648895ba6e483d8f7c0d189842f8b002268d26b9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Oct 2023 12:04:45 +0000 Subject: [PATCH 055/342] chore: bump org.apache.commons:commons-lang3 from 3.8 to 3.13.0 Bumps org.apache.commons:commons-lang3 from 3.8 to 3.13.0. --- updated-dependencies: - dependency-name: org.apache.commons:commons-lang3 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Fix #1183 --- pom.xml | 2 +- .../ru/mystamps/web/feature/category/CategoryServiceImpl.java | 2 +- .../mystamps/web/feature/category/SuggestionController.java | 4 +++- .../ru/mystamps/web/feature/country/CountryServiceImpl.java | 2 +- .../ru/mystamps/web/feature/country/SuggestionController.java | 4 +++- src/main/java/ru/mystamps/web/feature/site/CspController.java | 3 ++- 6 files changed, 11 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index f475e67c94..9efbaec4c5 100644 --- a/pom.xml +++ b/pom.xml @@ -555,7 +555,7 @@ 0.27.0 - 3.8 + 3.13.0 1.11.0 3.8.1 diff --git a/src/main/java/ru/mystamps/web/feature/category/CategoryServiceImpl.java b/src/main/java/ru/mystamps/web/feature/category/CategoryServiceImpl.java index d07c6a3307..477a5f9df5 100644 --- a/src/main/java/ru/mystamps/web/feature/category/CategoryServiceImpl.java +++ b/src/main/java/ru/mystamps/web/feature/category/CategoryServiceImpl.java @@ -102,7 +102,7 @@ public List findIdsWhenNameStartsWith(String name) { // FIXME: escape % and _ chars in name Validate.isTrue( !StringUtils.containsAny(name, '%', '_'), - "Name must not contain '%%' or '_' chars" + "Name must not contain '%' or '_' chars" ); // converting to lowercase to perform a case-insensitive search diff --git a/src/main/java/ru/mystamps/web/feature/category/SuggestionController.java b/src/main/java/ru/mystamps/web/feature/category/SuggestionController.java index ccb1f1e819..ed206dd09d 100644 --- a/src/main/java/ru/mystamps/web/feature/category/SuggestionController.java +++ b/src/main/java/ru/mystamps/web/feature/category/SuggestionController.java @@ -24,6 +24,8 @@ import org.springframework.web.bind.annotation.RestController; import ru.mystamps.web.support.spring.security.CustomUserDetails; +import java.util.Objects; + @RestController @RequiredArgsConstructor class SuggestionController { @@ -32,7 +34,7 @@ class SuggestionController { @GetMapping(CategoryUrl.SUGGEST_SERIES_CATEGORY) public String suggestCategoryForUser(@AuthenticationPrincipal CustomUserDetails currentUser) { - return StringUtils.defaultString( + return Objects.toString( categoryService.suggestCategoryForUser(currentUser.getUserId()), StringUtils.EMPTY ); diff --git a/src/main/java/ru/mystamps/web/feature/country/CountryServiceImpl.java b/src/main/java/ru/mystamps/web/feature/country/CountryServiceImpl.java index b3aff4f4c1..5cf6456fcf 100644 --- a/src/main/java/ru/mystamps/web/feature/country/CountryServiceImpl.java +++ b/src/main/java/ru/mystamps/web/feature/country/CountryServiceImpl.java @@ -102,7 +102,7 @@ public List findIdsWhenNameStartsWith(String name) { // FIXME: escape % and _ chars in name Validate.isTrue( !StringUtils.containsAny(name, '%', '_'), - "Name must not contain '%%' or '_' chars" + "Name must not contain '%' or '_' chars" ); // converting to lowercase to perform a case-insensitive search diff --git a/src/main/java/ru/mystamps/web/feature/country/SuggestionController.java b/src/main/java/ru/mystamps/web/feature/country/SuggestionController.java index 4bab602ba8..17f07ed389 100644 --- a/src/main/java/ru/mystamps/web/feature/country/SuggestionController.java +++ b/src/main/java/ru/mystamps/web/feature/country/SuggestionController.java @@ -24,6 +24,8 @@ import org.springframework.web.bind.annotation.RestController; import ru.mystamps.web.support.spring.security.CustomUserDetails; +import java.util.Objects; + @RestController @RequiredArgsConstructor class SuggestionController { @@ -36,7 +38,7 @@ class SuggestionController { */ @GetMapping(CountryUrl.SUGGEST_SERIES_COUNTRY) public String suggestCountryForUser(@AuthenticationPrincipal CustomUserDetails currentUser) { - return StringUtils.defaultString( + return Objects.toString( countryService.suggestCountryForUser(currentUser.getUserId()), StringUtils.EMPTY ); diff --git a/src/main/java/ru/mystamps/web/feature/site/CspController.java b/src/main/java/ru/mystamps/web/feature/site/CspController.java index 9a6159080c..6f18062b96 100644 --- a/src/main/java/ru/mystamps/web/feature/site/CspController.java +++ b/src/main/java/ru/mystamps/web/feature/site/CspController.java @@ -29,6 +29,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; +import java.util.Objects; import java.util.regex.Pattern; @RestController @@ -49,7 +50,7 @@ public void handleReport( @RequestHeader(name = HttpHeaders.USER_AGENT, defaultValue = UNKNOWN) String userAgent) { if (LOG.isWarnEnabled()) { - String ip = StringUtils.defaultString(request.getRemoteAddr(), UNKNOWN); + String ip = Objects.toString(request.getRemoteAddr(), UNKNOWN); LOG.warn("CSP report from IP: {}, user agent: {}", ip, userAgent); // Omit "original-policy" as it's quite long and it's useless most of the time From 6bcbc2abe130788600e6dc991a9c7e5284bb628b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 Nov 2023 01:45:39 +0000 Subject: [PATCH 056/342] chore: bump org.apache.commons:commons-lang3 from 3.13.0 to 3.14.0 Bumps org.apache.commons:commons-lang3 from 3.13.0 to 3.14.0. --- updated-dependencies: - dependency-name: org.apache.commons:commons-lang3 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9efbaec4c5..f696494143 100644 --- a/pom.xml +++ b/pom.xml @@ -555,7 +555,7 @@ 0.27.0 - 3.13.0 + 3.14.0 1.11.0 3.8.1 From 56db12c84b66f5aa9320ebd7da7caa55e81a8b8b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 Nov 2023 01:10:17 +0000 Subject: [PATCH 057/342] chore: bump org.jsoup:jsoup from 1.16.2 to 1.17.1 Bumps [org.jsoup:jsoup](https://github.com/jhy/jsoup) from 1.16.2 to 1.17.1. - [Release notes](https://github.com/jhy/jsoup/releases) - [Changelog](https://github.com/jhy/jsoup/blob/master/CHANGES.md) - [Commits](https://github.com/jhy/jsoup/compare/jsoup-1.16.2...jsoup-1.17.1) --- updated-dependencies: - dependency-name: org.jsoup:jsoup dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f696494143..ca06b48fa9 100644 --- a/pom.xml +++ b/pom.xml @@ -608,7 +608,7 @@ 1.9.1 - 1.16.2 + 1.17.1 5.3.2 From b5c5e4e796f2443380dc7bd22e3f7e479a615730 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Wed, 29 Nov 2023 12:20:57 +0700 Subject: [PATCH 058/342] ci: don't run some checks on pull requests as they're already have been run for push --- .github/workflows/integration-tests-h2.yml | 1 - .github/workflows/integration-tests-mysql.yml | 1 - .github/workflows/integration-tests-postgres.yml | 1 - .github/workflows/static-analysis.yml | 1 - .github/workflows/unit-tests.yml | 1 - 5 files changed, 5 deletions(-) diff --git a/.github/workflows/integration-tests-h2.yml b/.github/workflows/integration-tests-h2.yml index 70874412a8..7728095c7e 100644 --- a/.github/workflows/integration-tests-h2.yml +++ b/.github/workflows/integration-tests-h2.yml @@ -2,7 +2,6 @@ name: Integration Tests (H2) on: push: - pull_request: # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions permissions: diff --git a/.github/workflows/integration-tests-mysql.yml b/.github/workflows/integration-tests-mysql.yml index 70773502f8..c60e2ccfcf 100644 --- a/.github/workflows/integration-tests-mysql.yml +++ b/.github/workflows/integration-tests-mysql.yml @@ -2,7 +2,6 @@ name: Integration Tests (MySQL) on: push: - pull_request: # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions permissions: diff --git a/.github/workflows/integration-tests-postgres.yml b/.github/workflows/integration-tests-postgres.yml index d963ac1f72..1fec00dc33 100644 --- a/.github/workflows/integration-tests-postgres.yml +++ b/.github/workflows/integration-tests-postgres.yml @@ -2,7 +2,6 @@ name: Integration Tests (PostgreSQL) on: push: - pull_request: # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions permissions: diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 637db93281..b6a8479a75 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -2,7 +2,6 @@ name: Static Analysis on: push: - pull_request: # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions permissions: diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index a9298811f8..f77ee38606 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -2,7 +2,6 @@ name: Unit Tests on: push: - pull_request: # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions permissions: From 7207d6eafd747d1c12020f1bb947d92aac274d69 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Mon, 4 Dec 2023 11:42:02 +0700 Subject: [PATCH 059/342] ci: configure dependabot to monitor actions/* dependencies Part of #1590 [skip ci] --- .github/dependabot.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 609a97bdfb..ff92926751 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -26,3 +26,24 @@ updates: labels: [ "kind/dependency-update" ] # https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#open-pull-requests-limit open-pull-requests-limit: 1 + + - package-ecosystem: "github-actions" + directory: "/" + # https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#allow + allow: + - dependency-name: "actions/checkout" + - dependency-name: "actions/setup-java" + - dependency-name: "actions/upload-artifact" + # https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#scheduleinterval + schedule: + interval: "daily" + time: "08:00" + timezone: "Asia/Novosibirsk" + # https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#commit-message + commit-message: + prefix: "ci" + assignees: [ "php-coder" ] + reviewers: [ "php-coder" ] + labels: [ "kind/dependency-update", "area/ci" ] + # https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#open-pull-requests-limit + open-pull-requests-limit: 1 From eb4d361d8fefcbf0bae53f5d6bb9eca7d77e85b6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Dec 2023 04:43:27 +0000 Subject: [PATCH 060/342] ci: bump actions/setup-java from 3.13.0 to 4.0.0 Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.13.0 to 4.0.0. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v3.13.0...v4.0.0) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/deploy.yml | 2 +- .github/workflows/integration-tests-h2.yml | 2 +- .github/workflows/integration-tests-mysql.yml | 2 +- .github/workflows/integration-tests-postgres.yml | 2 +- .github/workflows/static-analysis.yml | 14 +++++++------- .github/workflows/unit-tests.yml | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 5a3eaa04eb..a86f25eaa1 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -32,7 +32,7 @@ jobs: persist-credentials: false - name: Install JDK - uses: actions/setup-java@v3.13.0 # https://github.com/actions/setup-java + uses: actions/setup-java@v4.0.0 # https://github.com/actions/setup-java with: distribution: 'adopt' # https://github.com/actions/setup-java#supported-distributions java-version: '8' # https://github.com/actions/setup-java#supported-version-syntax diff --git a/.github/workflows/integration-tests-h2.yml b/.github/workflows/integration-tests-h2.yml index 7728095c7e..c447b21af1 100644 --- a/.github/workflows/integration-tests-h2.yml +++ b/.github/workflows/integration-tests-h2.yml @@ -28,7 +28,7 @@ jobs: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false - name: Install JDK - uses: actions/setup-java@v3.13.0 # https://github.com/actions/setup-java + uses: actions/setup-java@v4.0.0 # https://github.com/actions/setup-java with: distribution: 'adopt' # https://github.com/actions/setup-java#supported-distributions java-version: '8' # https://github.com/actions/setup-java#supported-version-syntax diff --git a/.github/workflows/integration-tests-mysql.yml b/.github/workflows/integration-tests-mysql.yml index c60e2ccfcf..31fe30d867 100644 --- a/.github/workflows/integration-tests-mysql.yml +++ b/.github/workflows/integration-tests-mysql.yml @@ -53,7 +53,7 @@ jobs: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false - name: Install JDK - uses: actions/setup-java@v3.13.0 # https://github.com/actions/setup-java + uses: actions/setup-java@v4.0.0 # https://github.com/actions/setup-java with: distribution: 'adopt' # https://github.com/actions/setup-java#supported-distributions java-version: '8' # https://github.com/actions/setup-java#supported-version-syntax diff --git a/.github/workflows/integration-tests-postgres.yml b/.github/workflows/integration-tests-postgres.yml index 1fec00dc33..24d56ba196 100644 --- a/.github/workflows/integration-tests-postgres.yml +++ b/.github/workflows/integration-tests-postgres.yml @@ -44,7 +44,7 @@ jobs: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false - name: Install JDK - uses: actions/setup-java@v3.13.0 # https://github.com/actions/setup-java + uses: actions/setup-java@v4.0.0 # https://github.com/actions/setup-java with: distribution: 'adopt' # https://github.com/actions/setup-java#supported-distributions java-version: '8' # https://github.com/actions/setup-java#supported-version-syntax diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index b6a8479a75..96bcd33a89 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -26,7 +26,7 @@ jobs: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false - name: Install JDK - uses: actions/setup-java@v3.13.0 # https://github.com/actions/setup-java + uses: actions/setup-java@v4.0.0 # https://github.com/actions/setup-java with: distribution: 'adopt' # https://github.com/actions/setup-java#supported-distributions java-version: '8' # https://github.com/actions/setup-java#supported-version-syntax @@ -45,7 +45,7 @@ jobs: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false - name: Install JDK - uses: actions/setup-java@v3.13.0 # https://github.com/actions/setup-java + uses: actions/setup-java@v4.0.0 # https://github.com/actions/setup-java with: distribution: 'adopt' # https://github.com/actions/setup-java#supported-distributions java-version: '8' # https://github.com/actions/setup-java#supported-version-syntax @@ -64,7 +64,7 @@ jobs: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false - name: Install JDK - uses: actions/setup-java@v3.13.0 # https://github.com/actions/setup-java + uses: actions/setup-java@v4.0.0 # https://github.com/actions/setup-java with: distribution: 'adopt' # https://github.com/actions/setup-java#supported-distributions java-version: '8' # https://github.com/actions/setup-java#supported-version-syntax @@ -83,7 +83,7 @@ jobs: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false - name: Install JDK - uses: actions/setup-java@v3.13.0 # https://github.com/actions/setup-java + uses: actions/setup-java@v4.0.0 # https://github.com/actions/setup-java with: distribution: 'adopt' # https://github.com/actions/setup-java#supported-distributions java-version: '8' # https://github.com/actions/setup-java#supported-version-syntax @@ -188,7 +188,7 @@ jobs: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false - name: Install JDK - uses: actions/setup-java@v3.13.0 # https://github.com/actions/setup-java + uses: actions/setup-java@v4.0.0 # https://github.com/actions/setup-java with: distribution: 'adopt' # https://github.com/actions/setup-java#supported-distributions java-version: '8' # https://github.com/actions/setup-java#supported-version-syntax @@ -207,7 +207,7 @@ jobs: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false - name: Install JDK - uses: actions/setup-java@v3.13.0 # https://github.com/actions/setup-java + uses: actions/setup-java@v4.0.0 # https://github.com/actions/setup-java with: distribution: 'adopt' # https://github.com/actions/setup-java#supported-distributions java-version: '8' # https://github.com/actions/setup-java#supported-version-syntax @@ -233,7 +233,7 @@ jobs: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false - name: Install JDK - uses: actions/setup-java@v3.13.0 # https://github.com/actions/setup-java + uses: actions/setup-java@v4.0.0 # https://github.com/actions/setup-java with: distribution: 'adopt' # https://github.com/actions/setup-java#supported-distributions java-version: '8' # https://github.com/actions/setup-java#supported-version-syntax diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index f77ee38606..cdf91c4d87 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -26,7 +26,7 @@ jobs: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false - name: Install JDK - uses: actions/setup-java@v3.13.0 # https://github.com/actions/setup-java + uses: actions/setup-java@v4.0.0 # https://github.com/actions/setup-java with: distribution: 'adopt' # https://github.com/actions/setup-java#supported-distributions java-version: '8' # https://github.com/actions/setup-java#supported-version-syntax @@ -45,7 +45,7 @@ jobs: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false - name: Install JDK - uses: actions/setup-java@v3.13.0 # https://github.com/actions/setup-java + uses: actions/setup-java@v4.0.0 # https://github.com/actions/setup-java with: distribution: 'adopt' # https://github.com/actions/setup-java#supported-distributions java-version: '8' # https://github.com/actions/setup-java#supported-version-syntax From e5cb8422d22c7b3ba5ed904a2645af628e925885 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Dec 2023 01:55:47 +0000 Subject: [PATCH 061/342] ci: bump actions/checkout from 4.1.0 to 4.1.1 Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.0 to 4.1.1. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4.1.0...v4.1.1) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/dependencies-diff.yml | 2 +- .github/workflows/deploy.yml | 2 +- .github/workflows/integration-tests-h2.yml | 2 +- .github/workflows/integration-tests-mysql.yml | 2 +- .../workflows/integration-tests-postgres.yml | 2 +- .github/workflows/provision-by-ansible.yml | 2 +- .github/workflows/provision-by-terraform.yml | 4 ++-- .github/workflows/static-analysis.yml | 24 +++++++++---------- .github/workflows/todos-extract-from-code.yml | 2 +- .../workflows/todos-handle-issue-changes.yml | 2 +- .github/workflows/unit-tests.yml | 4 ++-- 11 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/dependencies-diff.yml b/.github/workflows/dependencies-diff.yml index 9e9a0ff02c..755c23d9e3 100644 --- a/.github/workflows/dependencies-diff.yml +++ b/.github/workflows/dependencies-diff.yml @@ -29,7 +29,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Clone source code - uses: actions/checkout@v4.1.0 # https://github.com/actions/checkout + uses: actions/checkout@v4.1.1 # https://github.com/actions/checkout with: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index a86f25eaa1..5ff463cf58 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -26,7 +26,7 @@ jobs: steps: - name: Clone source code - uses: actions/checkout@v4.1.0 # https://github.com/actions/checkout + uses: actions/checkout@v4.1.1 # https://github.com/actions/checkout with: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false diff --git a/.github/workflows/integration-tests-h2.yml b/.github/workflows/integration-tests-h2.yml index c447b21af1..16de29186a 100644 --- a/.github/workflows/integration-tests-h2.yml +++ b/.github/workflows/integration-tests-h2.yml @@ -23,7 +23,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Clone source code - uses: actions/checkout@v4.1.0 # https://github.com/actions/checkout + uses: actions/checkout@v4.1.1 # https://github.com/actions/checkout with: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false diff --git a/.github/workflows/integration-tests-mysql.yml b/.github/workflows/integration-tests-mysql.yml index 31fe30d867..8ebb2d2601 100644 --- a/.github/workflows/integration-tests-mysql.yml +++ b/.github/workflows/integration-tests-mysql.yml @@ -48,7 +48,7 @@ jobs: - '3306:3306' steps: - name: Clone source code - uses: actions/checkout@v4.1.0 # https://github.com/actions/checkout + uses: actions/checkout@v4.1.1 # https://github.com/actions/checkout with: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false diff --git a/.github/workflows/integration-tests-postgres.yml b/.github/workflows/integration-tests-postgres.yml index 24d56ba196..a62b612864 100644 --- a/.github/workflows/integration-tests-postgres.yml +++ b/.github/workflows/integration-tests-postgres.yml @@ -39,7 +39,7 @@ jobs: - '5432:5432' steps: - name: Clone source code - uses: actions/checkout@v4.1.0 # https://github.com/actions/checkout + uses: actions/checkout@v4.1.1 # https://github.com/actions/checkout with: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false diff --git a/.github/workflows/provision-by-ansible.yml b/.github/workflows/provision-by-ansible.yml index d7e2b42893..82091b26aa 100644 --- a/.github/workflows/provision-by-ansible.yml +++ b/.github/workflows/provision-by-ansible.yml @@ -23,7 +23,7 @@ jobs: steps: - name: Clone source code - uses: actions/checkout@v4.1.0 # https://github.com/actions/checkout + uses: actions/checkout@v4.1.1 # https://github.com/actions/checkout with: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false diff --git a/.github/workflows/provision-by-terraform.yml b/.github/workflows/provision-by-terraform.yml index 814dd239d6..6cb8442d82 100644 --- a/.github/workflows/provision-by-terraform.yml +++ b/.github/workflows/provision-by-terraform.yml @@ -23,7 +23,7 @@ jobs: steps: - name: Clone source code - uses: actions/checkout@v4.1.0 # https://github.com/actions/checkout + uses: actions/checkout@v4.1.1 # https://github.com/actions/checkout with: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false @@ -36,7 +36,7 @@ jobs: # https://github.com/tfutils/tfenv#manual - name: Install tfenv - uses: actions/checkout@v4.1.0 + uses: actions/checkout@v4.1.1 with: # https://github.com/actions/checkout#checkout-multiple-repos-nested repository: tfutils/tfenv diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 96bcd33a89..1882af4529 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Clone source code - uses: actions/checkout@v4.1.0 # https://github.com/actions/checkout + uses: actions/checkout@v4.1.1 # https://github.com/actions/checkout with: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false @@ -40,7 +40,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Clone source code - uses: actions/checkout@v4.1.0 # https://github.com/actions/checkout + uses: actions/checkout@v4.1.1 # https://github.com/actions/checkout with: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false @@ -59,7 +59,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Clone source code - uses: actions/checkout@v4.1.0 # https://github.com/actions/checkout + uses: actions/checkout@v4.1.1 # https://github.com/actions/checkout with: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false @@ -78,7 +78,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Clone source code - uses: actions/checkout@v4.1.0 # https://github.com/actions/checkout + uses: actions/checkout@v4.1.1 # https://github.com/actions/checkout with: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false @@ -97,7 +97,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Clone source code - uses: actions/checkout@v4.1.0 # https://github.com/actions/checkout + uses: actions/checkout@v4.1.1 # https://github.com/actions/checkout with: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false @@ -118,7 +118,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Clone source code - uses: actions/checkout@v4.1.0 # https://github.com/actions/checkout + uses: actions/checkout@v4.1.1 # https://github.com/actions/checkout with: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false @@ -137,7 +137,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Clone source code - uses: actions/checkout@v4.1.0 # https://github.com/actions/checkout + uses: actions/checkout@v4.1.1 # https://github.com/actions/checkout with: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false @@ -152,7 +152,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Clone source code - uses: actions/checkout@v4.1.0 # https://github.com/actions/checkout + uses: actions/checkout@v4.1.1 # https://github.com/actions/checkout with: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false @@ -167,7 +167,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Clone source code - uses: actions/checkout@v4.1.0 # https://github.com/actions/checkout + uses: actions/checkout@v4.1.1 # https://github.com/actions/checkout with: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false @@ -183,7 +183,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Clone source code - uses: actions/checkout@v4.1.0 # https://github.com/actions/checkout + uses: actions/checkout@v4.1.1 # https://github.com/actions/checkout with: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false @@ -202,7 +202,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Clone source code - uses: actions/checkout@v4.1.0 # https://github.com/actions/checkout + uses: actions/checkout@v4.1.1 # https://github.com/actions/checkout with: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false @@ -228,7 +228,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Clone source code - uses: actions/checkout@v4.1.0 # https://github.com/actions/checkout + uses: actions/checkout@v4.1.1 # https://github.com/actions/checkout with: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false diff --git a/.github/workflows/todos-extract-from-code.yml b/.github/workflows/todos-extract-from-code.yml index e79748cddc..3a279ad1d8 100644 --- a/.github/workflows/todos-extract-from-code.yml +++ b/.github/workflows/todos-extract-from-code.yml @@ -32,7 +32,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Clone source code - uses: actions/checkout@v4.1.0 # https://github.com/actions/checkout + uses: actions/checkout@v4.1.1 # https://github.com/actions/checkout with: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: true diff --git a/.github/workflows/todos-handle-issue-changes.yml b/.github/workflows/todos-handle-issue-changes.yml index c6b9eacc5f..9c90353293 100644 --- a/.github/workflows/todos-handle-issue-changes.yml +++ b/.github/workflows/todos-handle-issue-changes.yml @@ -26,7 +26,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Clone source code - uses: actions/checkout@v4.1.0 # https://github.com/actions/checkout + uses: actions/checkout@v4.1.1 # https://github.com/actions/checkout with: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: true diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index cdf91c4d87..b8a8167b19 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Clone source code - uses: actions/checkout@v4.1.0 # https://github.com/actions/checkout + uses: actions/checkout@v4.1.1 # https://github.com/actions/checkout with: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false @@ -40,7 +40,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Clone source code - uses: actions/checkout@v4.1.0 # https://github.com/actions/checkout + uses: actions/checkout@v4.1.1 # https://github.com/actions/checkout with: # Whether to configure the token or SSH key with the local git config. Default: true persist-credentials: false From c2fc16b5d26c0ed8b2306d83e4199c4a284790c3 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Tue, 5 Dec 2023 21:09:05 +0700 Subject: [PATCH 062/342] build: update hibernate-validator to 6.1.7.Final This also moves from javax.validation:validation-api to jakarta.validation:jakarta.validation-api Changelogs: - https://github.com/hibernate/hibernate-validator/blob/6.1.7.Final/changelog.txt - https://developer.jboss.org/docs/DOC-16355#jive_content_id_61x - https://in.relation.to/2019/11/20/hibernate-validator-610-6018-released/ - https://in.relation.to/2020/01/23/hibernate-validator-6-1-1-released/ - https://in.relation.to/2020/01/31/hibernate-validator-6-1-2-released/ - https://in.relation.to/2020/04/10/hibernate-validator-613-6019-released/ - https://in.relation.to/2020/05/07/hibernate-validator-615-6020-released/ - https://in.relation.to/2020/09/30/hibernate-validator-616-6021-released/ - https://in.relation.to/2020/12/16/hibernate-validator-617-6022-released/ Fix #1200 --- pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index ca06b48fa9..8f3a65912d 100644 --- a/pom.xml +++ b/pom.xml @@ -24,9 +24,9 @@ - javax.validation - validation-api - ${javax-validation.version} + jakarta.validation + jakarta.validation-api + ${jakarta-validation.version} @@ -184,7 +184,7 @@ provided - + org.hibernate.validator hibernate-validator-annotation-processor @@ -577,7 +577,7 @@ 1.4.200 - 6.0.22.Final + 6.1.7.Final 4.0.3 @@ -600,7 +600,7 @@ 3.21.0-GA - 2.0.1.Final + 2.0.2 9.4.19.v20190610 From 65d2e6b8b2982e9f6aee8257dba5e8e1308941fc Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Tue, 5 Dec 2023 21:25:12 +0700 Subject: [PATCH 063/342] chore: configure dependabot to update hibernate-validator only for patch releases Part of #1590 --- .github/dependabot.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index ff92926751..10d95571db 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -13,6 +13,11 @@ updates: - dependency-name: "org.apache.commons:commons-text" - dependency-name: "org.jsoup:jsoup" - dependency-name: "org.projectlombok:lombok" + - dependency-name: "org.hibernate.validator:hibernate-validator" + # https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#ignore + ignore: + - dependency-name: "org.hibernate.validator:hibernate-validator" + update-types: [ "version-update:semver-major", "version-update:semver-minor" ] # https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#scheduleinterval schedule: interval: "daily" From 7e3b06d3fcd485ff6286cae7e16c1d746cc67b4e Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Tue, 5 Dec 2023 21:32:13 +0700 Subject: [PATCH 064/342] chore: fix order of properties in pom.xml Correction for c2fc16b5d26c0ed8b2306d83e4199c4a284790c3 commit. Relate to #1200 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 8f3a65912d..08343c8867 100644 --- a/pom.xml +++ b/pom.xml @@ -590,6 +590,9 @@ 1.6.7 + + 2.0.2 + - 2.0.2 - 9.4.19.v20190610 From 8df5aaa97a9bae4ab2c28e213990cc48b2d4fdc9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Dec 2023 01:56:06 +0000 Subject: [PATCH 065/342] ci: bump actions/upload-artifact from 3.1.1 to 4.0.0 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3.1.1 to 4.0.0. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v3.1.1...v4.0.0) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/integration-tests-h2.yml | 2 +- .github/workflows/integration-tests-mysql.yml | 2 +- .github/workflows/integration-tests-postgres.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/integration-tests-h2.yml b/.github/workflows/integration-tests-h2.yml index 16de29186a..7f84da0a72 100644 --- a/.github/workflows/integration-tests-h2.yml +++ b/.github/workflows/integration-tests-h2.yml @@ -37,7 +37,7 @@ jobs: run: ./src/main/scripts/execute-command.sh integration-tests - name: Save RobotFramework reports if: ${{ failure() }} - uses: actions/upload-artifact@v3.1.1 # https://github.com/actions/upload-artifact + uses: actions/upload-artifact@v4.0.0 # https://github.com/actions/upload-artifact with: name: robotframework-reports path: target/robotframework-reports/ diff --git a/.github/workflows/integration-tests-mysql.yml b/.github/workflows/integration-tests-mysql.yml index 8ebb2d2601..3aefb93f6e 100644 --- a/.github/workflows/integration-tests-mysql.yml +++ b/.github/workflows/integration-tests-mysql.yml @@ -78,7 +78,7 @@ jobs: ./src/main/scripts/execute-command.sh integration-tests - name: Save RobotFramework reports if: ${{ failure() }} - uses: actions/upload-artifact@v3.1.1 # https://github.com/actions/upload-artifact + uses: actions/upload-artifact@v4.0.0 # https://github.com/actions/upload-artifact with: name: robotframework-reports path: target/robotframework-reports/ diff --git a/.github/workflows/integration-tests-postgres.yml b/.github/workflows/integration-tests-postgres.yml index a62b612864..2a36441477 100644 --- a/.github/workflows/integration-tests-postgres.yml +++ b/.github/workflows/integration-tests-postgres.yml @@ -55,7 +55,7 @@ jobs: run: ./src/main/scripts/execute-command.sh integration-tests - name: Save RobotFramework reports if: ${{ failure() }} - uses: actions/upload-artifact@v3.1.1 # https://github.com/actions/upload-artifact + uses: actions/upload-artifact@v4.0.0 # https://github.com/actions/upload-artifact with: name: robotframework-reports path: target/robotframework-reports/ From 7be093e60e414b074d3164202a47836cf21966e7 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Sat, 9 Dec 2023 21:31:23 +0700 Subject: [PATCH 066/342] chore: remove unused liquibase-maven-plugin [skip ci] --- pom.xml | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/pom.xml b/pom.xml index 08343c8867..041504b3a1 100644 --- a/pom.xml +++ b/pom.xml @@ -1078,23 +1078,6 @@ ${jacoco.plugin.version} - - org.liquibase - liquibase-maven-plugin - ${liquibase.version} - - ${basedir}/src/main/resources/liquibase/changelog.xml - /dev/stdout - - scheme,init-data,prod-data - - com.mysql.jdbc.Driver - jdbc:mysql://localhost:3306/mystamps?characterEncoding=UTF-8&useSSL=false - mystamps - secret - - - @@ -1078,16 +1077,6 @@ ${jacoco.plugin.version} - - - org.owasp - dependency-check-maven - ${owasp-plugin.version} - - - 4.11.0 + 4.25.1 1.18.30 diff --git a/src/main/resources/liquibase/version/0.3/2014-06-12--ru_country_name.xml b/src/main/resources/liquibase/version/0.3/2014-06-12--ru_country_name.xml index ed6c084b4c..225156394c 100644 --- a/src/main/resources/liquibase/version/0.3/2014-06-12--ru_country_name.xml +++ b/src/main/resources/liquibase/version/0.3/2014-06-12--ru_country_name.xml @@ -3,7 +3,9 @@ xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog - http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd"> + http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.24.xsd"> + + Adds name_ru column to countries table diff --git a/src/main/resources/liquibase/version/0.3/2014-08-16--users_activation_lang.xml b/src/main/resources/liquibase/version/0.3/2014-08-16--users_activation_lang.xml index eaf5a4714f..c7ca587210 100644 --- a/src/main/resources/liquibase/version/0.3/2014-08-16--users_activation_lang.xml +++ b/src/main/resources/liquibase/version/0.3/2014-08-16--users_activation_lang.xml @@ -3,7 +3,9 @@ xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog - http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd"> + http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.24.xsd"> + + Adds lang column to users_activation table (with default value "en") diff --git a/src/main/resources/liquibase/version/0.3/2014-09-17--category_slug.xml b/src/main/resources/liquibase/version/0.3/2014-09-17--category_slug.xml index df1918bb7e..0fba3ccd5c 100644 --- a/src/main/resources/liquibase/version/0.3/2014-09-17--category_slug.xml +++ b/src/main/resources/liquibase/version/0.3/2014-09-17--category_slug.xml @@ -3,7 +3,9 @@ xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog - http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd"> + http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.24.xsd"> + + Adds slug column to categories table diff --git a/src/main/resources/liquibase/version/0.3/2014-09-17--country_slug.xml b/src/main/resources/liquibase/version/0.3/2014-09-17--country_slug.xml index 4318053375..d755852889 100644 --- a/src/main/resources/liquibase/version/0.3/2014-09-17--country_slug.xml +++ b/src/main/resources/liquibase/version/0.3/2014-09-17--country_slug.xml @@ -3,7 +3,9 @@ xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog - http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd"> + http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.24.xsd"> + + Adds slug column to countries table diff --git a/src/main/resources/liquibase/version/0.4.3/2020-03-08--add_alt_price_to_series_sales_import_parsed_data.xml b/src/main/resources/liquibase/version/0.4.3/2020-03-08--add_alt_price_to_series_sales_import_parsed_data.xml index 3fced4dbff..770ab1e312 100644 --- a/src/main/resources/liquibase/version/0.4.3/2020-03-08--add_alt_price_to_series_sales_import_parsed_data.xml +++ b/src/main/resources/liquibase/version/0.4.3/2020-03-08--add_alt_price_to_series_sales_import_parsed_data.xml @@ -3,7 +3,9 @@ xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog - http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd"> + http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.24.xsd"> + + diff --git a/src/main/resources/liquibase/version/0.4.3/2020-03-21--add_release_day_to_series_import_parsed_data.xml b/src/main/resources/liquibase/version/0.4.3/2020-03-21--add_release_day_to_series_import_parsed_data.xml index b91fde49c3..8d88432fa8 100644 --- a/src/main/resources/liquibase/version/0.4.3/2020-03-21--add_release_day_to_series_import_parsed_data.xml +++ b/src/main/resources/liquibase/version/0.4.3/2020-03-21--add_release_day_to_series_import_parsed_data.xml @@ -3,7 +3,9 @@ xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog - http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd"> + http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.24.xsd"> + + diff --git a/src/main/resources/liquibase/version/0.4.4/2020-05-04--series_sale_condition.xml b/src/main/resources/liquibase/version/0.4.4/2020-05-04--series_sale_condition.xml index 6889e4277c..02f0ee4973 100644 --- a/src/main/resources/liquibase/version/0.4.4/2020-05-04--series_sale_condition.xml +++ b/src/main/resources/liquibase/version/0.4.4/2020-05-04--series_sale_condition.xml @@ -3,7 +3,9 @@ xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog - http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd"> + http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.24.xsd"> + + diff --git a/src/main/resources/liquibase/version/0.4.4/2020-06-03--series_sales_import_parsed_data_condition.xml b/src/main/resources/liquibase/version/0.4.4/2020-06-03--series_sales_import_parsed_data_condition.xml index 2ab3173a2b..b95a67f6a9 100644 --- a/src/main/resources/liquibase/version/0.4.4/2020-06-03--series_sales_import_parsed_data_condition.xml +++ b/src/main/resources/liquibase/version/0.4.4/2020-06-03--series_sales_import_parsed_data_condition.xml @@ -3,7 +3,9 @@ xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog - http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.8.xsd"> + http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.24.xsd"> + + diff --git a/src/main/resources/liquibase/version/0.4/2017-01-06--top_categories.xml b/src/main/resources/liquibase/version/0.4/2017-01-06--top_categories.xml index a6d9f2407a..fc8f6eb297 100644 --- a/src/main/resources/liquibase/version/0.4/2017-01-06--top_categories.xml +++ b/src/main/resources/liquibase/version/0.4/2017-01-06--top_categories.xml @@ -3,7 +3,9 @@ xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog - http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd"> + http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.24.xsd"> + + diff --git a/src/main/resources/liquibase/version/0.4/2017-05-11--image_preview.xml b/src/main/resources/liquibase/version/0.4/2017-05-11--image_preview.xml index 7497cdd8a8..38683401b0 100644 --- a/src/main/resources/liquibase/version/0.4/2017-05-11--image_preview.xml +++ b/src/main/resources/liquibase/version/0.4/2017-05-11--image_preview.xml @@ -3,7 +3,9 @@ xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog - http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd"> + http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.24.xsd"> + + diff --git a/src/main/resources/liquibase/version/0.4/2017-11-22--import_request_series_id.xml b/src/main/resources/liquibase/version/0.4/2017-11-22--import_request_series_id.xml index 61124115b8..80b51b9d54 100644 --- a/src/main/resources/liquibase/version/0.4/2017-11-22--import_request_series_id.xml +++ b/src/main/resources/liquibase/version/0.4/2017-11-22--import_request_series_id.xml @@ -3,7 +3,9 @@ xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog - http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd"> + http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.24.xsd"> + + diff --git a/src/main/resources/liquibase/version/0.4/2017-12-21--solovyov_catalog.xml b/src/main/resources/liquibase/version/0.4/2017-12-21--solovyov_catalog.xml index fe217689ef..7a3fe9e695 100644 --- a/src/main/resources/liquibase/version/0.4/2017-12-21--solovyov_catalog.xml +++ b/src/main/resources/liquibase/version/0.4/2017-12-21--solovyov_catalog.xml @@ -3,7 +3,9 @@ xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog - http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd"> + http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.24.xsd"> + + diff --git a/src/main/resources/liquibase/version/0.4/2017-12-21--zagorski_catalog.xml b/src/main/resources/liquibase/version/0.4/2017-12-21--zagorski_catalog.xml index c84dfa5012..778406ab9c 100644 --- a/src/main/resources/liquibase/version/0.4/2017-12-21--zagorski_catalog.xml +++ b/src/main/resources/liquibase/version/0.4/2017-12-21--zagorski_catalog.xml @@ -3,7 +3,9 @@ xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog - http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd"> + http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.24.xsd"> + + diff --git a/src/main/resources/liquibase/version/0.4/2018-01-01--add_perforated_to_parsed_data.xml b/src/main/resources/liquibase/version/0.4/2018-01-01--add_perforated_to_parsed_data.xml index 265f749953..e44629ae4b 100644 --- a/src/main/resources/liquibase/version/0.4/2018-01-01--add_perforated_to_parsed_data.xml +++ b/src/main/resources/liquibase/version/0.4/2018-01-01--add_perforated_to_parsed_data.xml @@ -3,7 +3,9 @@ xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog - http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd"> + http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.24.xsd"> + + diff --git a/src/main/resources/liquibase/version/0.4/2018-01-01--add_quantity_to_parsed_data.xml b/src/main/resources/liquibase/version/0.4/2018-01-01--add_quantity_to_parsed_data.xml index 53f8794aa0..f10d023268 100644 --- a/src/main/resources/liquibase/version/0.4/2018-01-01--add_quantity_to_parsed_data.xml +++ b/src/main/resources/liquibase/version/0.4/2018-01-01--add_quantity_to_parsed_data.xml @@ -3,7 +3,9 @@ xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog - http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd"> + http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.24.xsd"> + + diff --git a/src/main/resources/liquibase/version/0.4/2018-02-09--add_seller_info_to_parsed_data.xml b/src/main/resources/liquibase/version/0.4/2018-02-09--add_seller_info_to_parsed_data.xml index 5df7958e8e..4337951816 100644 --- a/src/main/resources/liquibase/version/0.4/2018-02-09--add_seller_info_to_parsed_data.xml +++ b/src/main/resources/liquibase/version/0.4/2018-02-09--add_seller_info_to_parsed_data.xml @@ -3,7 +3,9 @@ xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog - http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd"> + http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.24.xsd"> + + diff --git a/src/main/resources/liquibase/version/0.4/2018-07-05--series_import_parsed_data_michel_numbers_field.xml b/src/main/resources/liquibase/version/0.4/2018-07-05--series_import_parsed_data_michel_numbers_field.xml index 03b7d0471f..1606231a4f 100644 --- a/src/main/resources/liquibase/version/0.4/2018-07-05--series_import_parsed_data_michel_numbers_field.xml +++ b/src/main/resources/liquibase/version/0.4/2018-07-05--series_import_parsed_data_michel_numbers_field.xml @@ -3,7 +3,9 @@ xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog - http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd"> + http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.24.xsd"> + + diff --git a/src/main/resources/liquibase/version/0.4/2018-07-15--series_import_parsed_data_group_id_field.xml b/src/main/resources/liquibase/version/0.4/2018-07-15--series_import_parsed_data_group_id_field.xml index f6c0c756b0..ba3176242a 100644 --- a/src/main/resources/liquibase/version/0.4/2018-07-15--series_import_parsed_data_group_id_field.xml +++ b/src/main/resources/liquibase/version/0.4/2018-07-15--series_import_parsed_data_group_id_field.xml @@ -3,7 +3,9 @@ xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog - http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd"> + http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.24.xsd"> + + From 6001d3c8d5c978faf81750a3de9e704fa610d688 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Mon, 25 Dec 2023 20:55:38 +0700 Subject: [PATCH 070/342] ci: configure dependabot to monitor H2 updates Part of #1590 [skip ci] --- .github/dependabot.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 3445e9f56e..086e8a7c8d 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -8,6 +8,7 @@ updates: directory: "/" # https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#allow allow: + - dependency-name: "com.h2database:h2" - dependency-name: "net.coobird:thumbnailator" - dependency-name: "org.apache.commons:commons-lang3" - dependency-name: "org.apache.commons:commons-text" From d1fd2491dbe0169c35f89d08aa4a61b519190138 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Wed, 27 Dec 2023 12:20:52 +0700 Subject: [PATCH 071/342] ci: execute integration tests on H2 also under Java 11 and 17 Part of #1350 #1158 #1556 --- .github/workflows/integration-tests-h2.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/workflows/integration-tests-h2.yml b/.github/workflows/integration-tests-h2.yml index 7f84da0a72..4d68010163 100644 --- a/.github/workflows/integration-tests-h2.yml +++ b/.github/workflows/integration-tests-h2.yml @@ -21,6 +21,19 @@ jobs: name: Integration Tests # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idruns-on runs-on: ubuntu-20.04 + # https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs + strategy: + matrix: + # https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs#example-adding-configurations + include: + - java-version: '8' + allow-failure: false + - java-version: '11' + allow-failure: true + - java-version: '17' + allow-failure: true + # https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs#handling-failures + continue-on-error: {{ matrix.allow-failure }} steps: - name: Clone source code uses: actions/checkout@v4.1.1 # https://github.com/actions/checkout From 2ac5106b0a0947635c782c16c14b7f4f8b795804 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Wed, 27 Dec 2023 12:26:13 +0700 Subject: [PATCH 072/342] chore: fix "A mapping was not expected" error See https://github.com/actions/runner/issues/2289#issuecomment-1611908545 Corrections for d1fd2491dbe0169c35f89d08aa4a61b519190138 commit. Relate to #1350 #1158 #1556 --- .github/workflows/integration-tests-h2.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration-tests-h2.yml b/.github/workflows/integration-tests-h2.yml index 4d68010163..239e481e50 100644 --- a/.github/workflows/integration-tests-h2.yml +++ b/.github/workflows/integration-tests-h2.yml @@ -33,7 +33,7 @@ jobs: - java-version: '17' allow-failure: true # https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs#handling-failures - continue-on-error: {{ matrix.allow-failure }} + continue-on-error: ${{ matrix.allow-failure }} steps: - name: Clone source code uses: actions/checkout@v4.1.1 # https://github.com/actions/checkout From 123e7687df85791883460cce8b43dfdfeb1dbf2b Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Wed, 27 Dec 2023 12:30:16 +0700 Subject: [PATCH 073/342] chore: really run on JDK 11 and 17 Corrections for d1fd2491dbe0169c35f89d08aa4a61b519190138 commit. Relate to #1350 #1158 #1556 --- .github/workflows/integration-tests-h2.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/integration-tests-h2.yml b/.github/workflows/integration-tests-h2.yml index 239e481e50..68735f2340 100644 --- a/.github/workflows/integration-tests-h2.yml +++ b/.github/workflows/integration-tests-h2.yml @@ -43,9 +43,9 @@ jobs: - name: Install JDK uses: actions/setup-java@v4.0.0 # https://github.com/actions/setup-java with: - distribution: 'adopt' # https://github.com/actions/setup-java#supported-distributions - java-version: '8' # https://github.com/actions/setup-java#supported-version-syntax - cache: 'maven' # https://github.com/actions/setup-java#caching-packages-dependencies + distribution: 'adopt' # https://github.com/actions/setup-java#supported-distributions + java-version: ${{ matrix.java-version }} # https://github.com/actions/setup-java#supported-version-syntax + cache: 'maven' # https://github.com/actions/setup-java#caching-packages-dependencies - name: Run integration tests run: ./src/main/scripts/execute-command.sh integration-tests - name: Save RobotFramework reports From 586db5dcd5977aa35d6a9e17f308eb82cddc8652 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Thu, 28 Dec 2023 11:53:57 +0700 Subject: [PATCH 074/342] build: fix "Warning: bootstrap class path not set in conjunction with -source 8" on JDK 11 and 17 Part of #1350 #1158 #1556 --- pom.xml | 40 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 37 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index c3d2edbe4e..9e97cfdb1d 100644 --- a/pom.xml +++ b/pom.xml @@ -875,8 +875,6 @@ maven-compiler-plugin ${compiler.plugin.version} - ${java.version} - ${java.version} true true false @@ -1263,11 +1261,13 @@ - org.apache.maven.plugins maven-compiler-plugin + ${java.version} + ${java.version} + true @@ -1279,6 +1279,40 @@ + + jdk11 + + 11 + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 11 + + + + + + + jdk17 + + 17 + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 17 + + + + + frontend From eab0c5647d925b9a2e25693946c587776a850c74 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Tue, 2 Jan 2024 16:24:00 +0700 Subject: [PATCH 075/342] refactor: extract NodeJS version into a property Relate to #1655 --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9e97cfdb1d..2caa66a37b 100644 --- a/pom.xml +++ b/pom.xml @@ -628,6 +628,7 @@ 5.1.49 2.0.1 + v10.16.0 3.12.0 @@ -1337,7 +1338,7 @@ frontend-maven-plugin ${frontend.plugin.version} - v10.16.0 + ${nodejs.version} ${basedir}/src/main/frontend From 585ed2b3eef8eb31963a8b1ecceff5d46e3a2afe Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Tue, 2 Jan 2024 16:32:09 +0700 Subject: [PATCH 076/342] build: fix build of frontend code on newer Macs Relate to #1442 and probably to #1179 Fix #1655 --- pom.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pom.xml b/pom.xml index 2caa66a37b..4d99f1fecb 100644 --- a/pom.xml +++ b/pom.xml @@ -1314,6 +1314,19 @@ + + darwin-aarch64 + + + mac + aarch64 + + + + + v16.19.1 + + frontend From e556c7658cf8ea6c6e6a7271c3ca92b8dc98fb00 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Tue, 2 Jan 2024 16:42:40 +0700 Subject: [PATCH 077/342] chore: turn off messages about funding of nodejs packages --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4d99f1fecb..d0c2c20ada 100644 --- a/pom.xml +++ b/pom.xml @@ -1369,7 +1369,7 @@ initialize - ci + ci --no-fund From 7e401613c2c0e63ead37dbc3579deba0451e7f0e Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Tue, 2 Jan 2024 21:28:39 +0700 Subject: [PATCH 078/342] ci: unbreak show-spring-boot-version-diff.sh script by updating Ubuntu image to bring newer curl --fail-with-body option has been added to curl in 7.76.0 while Ubuntu 20.04 contains 7.68.0. Update to newer Ubuntu will bring us curl 7.81.0 that should fix the issue. See also: - https://github.com/actions/runner-images/blob/266f9413d39fc77ade974757b633ef98873c9c21/images/ubuntu/Ubuntu2004-Readme.md - https://github.com/actions/runner-images/blob/266f9413d39fc77ade974757b633ef98873c9c21/images/ubuntu/Ubuntu2204-Readme.md Correction for 225fe8164b8ed62d7c4f1be2c987fb6d85d6c3b0 commit. Part of #1657 Fix #1653 --- .github/workflows/dependencies-diff.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependencies-diff.yml b/.github/workflows/dependencies-diff.yml index 755c23d9e3..09c7bc7def 100644 --- a/.github/workflows/dependencies-diff.yml +++ b/.github/workflows/dependencies-diff.yml @@ -26,7 +26,7 @@ jobs: show-spring-boot-version-diff: name: Run show-spring-boot-version-diff.sh # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idruns-on - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Clone source code uses: actions/checkout@v4.1.1 # https://github.com/actions/checkout From 42c0a2ef4f991eed970e3d999438f3713036a20c Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Tue, 2 Jan 2024 21:37:17 +0700 Subject: [PATCH 079/342] ci: unbreak pdd installation by updating Ubuntu image to bring newer Ruby > nokogiri requires Ruby version >= 3.0, < 3.4.dev. The current ruby version is 2.7.0.0 So, let's use Ubuntu 22.04 that has Ruby 3.0.2p107 Part of #1657 Fix #1654 --- .github/workflows/todos-extract-from-code.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/todos-extract-from-code.yml b/.github/workflows/todos-extract-from-code.yml index 3a279ad1d8..738f83b943 100644 --- a/.github/workflows/todos-extract-from-code.yml +++ b/.github/workflows/todos-extract-from-code.yml @@ -29,7 +29,7 @@ jobs: extract-pdd-puzzles: name: Extract todos from code # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idruns-on - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Clone source code uses: actions/checkout@v4.1.1 # https://github.com/actions/checkout From e8ffaac3d031bbb999f95f3454dfc3cb2f649254 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Tue, 2 Jan 2024 22:02:48 +0700 Subject: [PATCH 080/342] ci: unbreak show-spring-boot-version-diff.sh script by pinning Spring Boot version Relate to #1632 --- src/main/scripts/show-spring-boot-version-diff.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/scripts/show-spring-boot-version-diff.sh b/src/main/scripts/show-spring-boot-version-diff.sh index 583f086361..9a3a51a868 100755 --- a/src/main/scripts/show-spring-boot-version-diff.sh +++ b/src/main/scripts/show-spring-boot-version-diff.sh @@ -13,7 +13,9 @@ set -o pipefail CURRENT_DIR="$(dirname "$0")" PROJECT_POM="$CURRENT_DIR/../../../pom.xml" -SPRING_VERSION="$(grep -FA1 'spring-boot-starter-parent' "$PROJECT_POM" | awk -F'[<>]' '//{print $3}')" + +SPRING_VERSION='2.2.13.RELEASE' +#SPRING_VERSION="$(grep -FA1 'spring-boot-starter-parent' "$PROJECT_POM" | awk -F'[<>]' '//{print $3}')" # @todo #869 show-spring-boot-version-diff.sh: properly handle recursive properties SPRING_POM="https://raw.githubusercontent.com/spring-projects/spring-boot/v$SPRING_VERSION/spring-boot-project/spring-boot-dependencies/pom.xml" From d5e5f3c62d74e7cdd2383f80132985efd4ff9361 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Tue, 2 Jan 2024 22:10:53 +0700 Subject: [PATCH 081/342] chore: show-spring-boot-version-diff.sh now fails when Spring's POM url not found --- src/main/scripts/show-spring-boot-version-diff.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/scripts/show-spring-boot-version-diff.sh b/src/main/scripts/show-spring-boot-version-diff.sh index 9a3a51a868..0f4e50ab2f 100755 --- a/src/main/scripts/show-spring-boot-version-diff.sh +++ b/src/main/scripts/show-spring-boot-version-diff.sh @@ -18,15 +18,15 @@ SPRING_VERSION='2.2.13.RELEASE' #SPRING_VERSION="$(grep -FA1 'spring-boot-starter-parent' "$PROJECT_POM" | awk -F'[<>]' '//{print $3}')" # @todo #869 show-spring-boot-version-diff.sh: properly handle recursive properties -SPRING_POM="https://raw.githubusercontent.com/spring-projects/spring-boot/v$SPRING_VERSION/spring-boot-project/spring-boot-dependencies/pom.xml" +SPRING_POM="$(curl -sS --fail-with-body https://raw.githubusercontent.com/spring-projects/spring-boot/v$SPRING_VERSION/spring-boot-project/spring-boot-dependencies/pom.xml)" printf "Comparing with Spring Boot %s (project vs spring versions)\\n\\n" "$SPRING_VERSION" # I know about useless cat below, but it's here for better readability. # shellcheck disable=SC2002 join \ - <(cat "$PROJECT_POM" | awk -F'[<>]' -v OFS='\t' '$2~/\.version$/{print $2, $3}' | sort) \ - <(curl -sS --fail-with-body "$SPRING_POM" | awk -F'[<>]' -v OFS='\t' '$2~/\.version$/{print $2, $3}' | sort) \ + <(cat "$PROJECT_POM" | awk -F'[<>]' -v OFS='\t' '$2~/\.version$/{print $2, $3}' | sort) \ + <(echo "$SPRING_POM" | awk -F'[<>]' -v OFS='\t' '$2~/\.version$/{print $2, $3}' | sort) \ | awk ' { if ($2 != $3){ From f0c15c57324c1dec6e47417175c303d69e5ca420 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Tue, 2 Jan 2024 22:14:08 +0700 Subject: [PATCH 082/342] chore: pass extra options to compiler on JDK17 for error-prone Relate to #1440 Part of #1350 and #1556 --- pom.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pom.xml b/pom.xml index d0c2c20ada..5d664ec379 100644 --- a/pom.xml +++ b/pom.xml @@ -1309,6 +1309,19 @@ maven-compiler-plugin 17 + true + + -J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED + -J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED + -J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED + -J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED + -J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED + -J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED + -J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED + -J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED + -J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED + -J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED + From 41ba55619c93bde07020c1791800b22faea47107 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Fri, 5 Jan 2024 20:46:38 +0700 Subject: [PATCH 083/342] ci: introduce a workflow for populating Maven cache that can be shared amongst workflows Part of #1656 [skip ci] --- .github/dependabot.yml | 1 + .github/workflows/populate-maven-cache.yml | 52 ++++++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 .github/workflows/populate-maven-cache.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 086e8a7c8d..db3db1e443 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -38,6 +38,7 @@ updates: directory: "/" # https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#allow allow: + - dependency-name: "actions/cache" - dependency-name: "actions/checkout" - dependency-name: "actions/setup-java" - dependency-name: "actions/upload-artifact" diff --git a/.github/workflows/populate-maven-cache.yml b/.github/workflows/populate-maven-cache.yml new file mode 100644 index 0000000000..983771f44e --- /dev/null +++ b/.github/workflows/populate-maven-cache.yml @@ -0,0 +1,52 @@ +name: Populates a cache for Maven + +on: + push: + # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#onpull_requestpull_request_targetbranchesbranches-ignore + branches: + - master + # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#onpushpull_requestpull_request_targetpathspaths-ignore + paths: + - pom.xml + - .github/workflows/populate-maven-cache.yml + # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#onworkflow_dispatch + workflow_dispatch: + +# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions +permissions: + contents: read # for "git clone" + +defaults: + # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#defaultsrun + run: + # Enable fail-fast behavior using set -eo pipefail + # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#exit-codes-and-error-action-preference + shell: bash + +jobs: + populate-maven-cache: + name: Populate Maven cache + # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idruns-on + runs-on: ubuntu-20.04 + steps: + + - name: Clone source code + uses: actions/checkout@v4.1.1 # https://github.com/actions/checkout + with: + # Whether to configure the token or SSH key with the local git config. Default: true + persist-credentials: false + + - name: Install JDK + uses: actions/setup-java@v4.0.0 # https://github.com/actions/setup-java + with: + distribution: 'adopt' # https://github.com/actions/setup-java#supported-distributions + java-version: '8' # https://github.com/actions/setup-java#supported-version-syntax + + - name: Restore existing cache copy + uses: actions/cache@v3.3.2 # https://github.com/actions/cache + with: + key: maven-repository-${{ hashFiles('pom.xml') }} + path: ~/.m2/repository + + - name: Download all dependencies + run: mvn dependency:resolve dependency:resolve-plugins From 6714415c3b013d04f1fa20730074936048c7bf7e Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Fri, 5 Jan 2024 20:51:24 +0700 Subject: [PATCH 084/342] chore: reduce noise from Maven Relate to #1656 [skip ci] --- .github/workflows/populate-maven-cache.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/populate-maven-cache.yml b/.github/workflows/populate-maven-cache.yml index 983771f44e..6e06362df3 100644 --- a/.github/workflows/populate-maven-cache.yml +++ b/.github/workflows/populate-maven-cache.yml @@ -49,4 +49,4 @@ jobs: path: ~/.m2/repository - name: Download all dependencies - run: mvn dependency:resolve dependency:resolve-plugins + run: mvn --no-transfer-progress dependency:resolve dependency:resolve-plugins From 04ce41005b1c0f46fbb1697c4d8045db7d84a214 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Fri, 5 Jan 2024 21:15:54 +0700 Subject: [PATCH 085/342] style: rename a step --- .github/workflows/populate-maven-cache.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/populate-maven-cache.yml b/.github/workflows/populate-maven-cache.yml index 6e06362df3..3cb1e31f0b 100644 --- a/.github/workflows/populate-maven-cache.yml +++ b/.github/workflows/populate-maven-cache.yml @@ -42,7 +42,7 @@ jobs: distribution: 'adopt' # https://github.com/actions/setup-java#supported-distributions java-version: '8' # https://github.com/actions/setup-java#supported-version-syntax - - name: Restore existing cache copy + - name: Restore existing cache uses: actions/cache@v3.3.2 # https://github.com/actions/cache with: key: maven-repository-${{ hashFiles('pom.xml') }} From 3e76317db866e245258ffd3c0d81e1154f4ad231 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Fri, 5 Jan 2024 21:16:24 +0700 Subject: [PATCH 086/342] chore: try to restore a previous copy of cache on cache-miss Part of #1656 --- .github/workflows/populate-maven-cache.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/populate-maven-cache.yml b/.github/workflows/populate-maven-cache.yml index 3cb1e31f0b..a74c51b531 100644 --- a/.github/workflows/populate-maven-cache.yml +++ b/.github/workflows/populate-maven-cache.yml @@ -45,8 +45,10 @@ jobs: - name: Restore existing cache uses: actions/cache@v3.3.2 # https://github.com/actions/cache with: + # https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#input-parameters-for-the-cache-action key: maven-repository-${{ hashFiles('pom.xml') }} path: ~/.m2/repository + restore-keys: maven-repository- - name: Download all dependencies run: mvn --no-transfer-progress dependency:resolve dependency:resolve-plugins From 2167a192068c37d3ff6eeff667b370856c69e351 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Fri, 5 Jan 2024 21:18:03 +0700 Subject: [PATCH 087/342] chore: use a single shared Maven cache for all workflows Part of #1656 --- .github/workflows/deploy.yml | 9 ++- .github/workflows/integration-tests-h2.yml | 8 ++- .github/workflows/integration-tests-mysql.yml | 8 ++- .../workflows/integration-tests-postgres.yml | 8 ++- .github/workflows/static-analysis.yml | 56 ++++++++++++++++--- .github/workflows/unit-tests.yml | 16 +++++- 6 files changed, 92 insertions(+), 13 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 5ff463cf58..7fc3693a2d 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -36,7 +36,14 @@ jobs: with: distribution: 'adopt' # https://github.com/actions/setup-java#supported-distributions java-version: '8' # https://github.com/actions/setup-java#supported-version-syntax - cache: 'maven' # https://github.com/actions/setup-java#caching-packages-dependencies + + - name: Restore existing cache + uses: actions/cache@v3.3.2 # https://github.com/actions/cache + with: + # https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#input-parameters-for-the-cache-action + key: maven-repository-${{ hashFiles('pom.xml') }} + path: ~/.m2/repository + restore-keys: maven-repository- - name: Build WAR file # NOTE: we use -Dmaven.test.skip=true instead of -DskipUnitTests=true diff --git a/.github/workflows/integration-tests-h2.yml b/.github/workflows/integration-tests-h2.yml index 68735f2340..6a5e93601d 100644 --- a/.github/workflows/integration-tests-h2.yml +++ b/.github/workflows/integration-tests-h2.yml @@ -45,7 +45,13 @@ jobs: with: distribution: 'adopt' # https://github.com/actions/setup-java#supported-distributions java-version: ${{ matrix.java-version }} # https://github.com/actions/setup-java#supported-version-syntax - cache: 'maven' # https://github.com/actions/setup-java#caching-packages-dependencies + - name: Restore existing cache + uses: actions/cache@v3.3.2 # https://github.com/actions/cache + with: + # https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#input-parameters-for-the-cache-action + key: maven-repository-${{ hashFiles('pom.xml') }} + path: ~/.m2/repository + restore-keys: maven-repository- - name: Run integration tests run: ./src/main/scripts/execute-command.sh integration-tests - name: Save RobotFramework reports diff --git a/.github/workflows/integration-tests-mysql.yml b/.github/workflows/integration-tests-mysql.yml index 3aefb93f6e..3be03bdf74 100644 --- a/.github/workflows/integration-tests-mysql.yml +++ b/.github/workflows/integration-tests-mysql.yml @@ -57,7 +57,13 @@ jobs: with: distribution: 'adopt' # https://github.com/actions/setup-java#supported-distributions java-version: '8' # https://github.com/actions/setup-java#supported-version-syntax - cache: 'maven' # https://github.com/actions/setup-java#caching-packages-dependencies + - name: Restore existing cache + uses: actions/cache@v3.3.2 # https://github.com/actions/cache + with: + # https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#input-parameters-for-the-cache-action + key: maven-repository-${{ hashFiles('pom.xml') }} + path: ~/.m2/repository + restore-keys: maven-repository- # This is a workaround for github action limitation: we can't specify command for the service (--character-set-server=utf8) # and have to modify database manually. See also: # https://github.com/actions/runner/discussions/1872 and https://github.com/orgs/community/discussions/26688 diff --git a/.github/workflows/integration-tests-postgres.yml b/.github/workflows/integration-tests-postgres.yml index 2a36441477..f7b79280ab 100644 --- a/.github/workflows/integration-tests-postgres.yml +++ b/.github/workflows/integration-tests-postgres.yml @@ -48,7 +48,13 @@ jobs: with: distribution: 'adopt' # https://github.com/actions/setup-java#supported-distributions java-version: '8' # https://github.com/actions/setup-java#supported-version-syntax - cache: 'maven' # https://github.com/actions/setup-java#caching-packages-dependencies + - name: Restore existing cache + uses: actions/cache@v3.3.2 # https://github.com/actions/cache + with: + # https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#input-parameters-for-the-cache-action + key: maven-repository-${{ hashFiles('pom.xml') }} + path: ~/.m2/repository + restore-keys: maven-repository- - name: Run integration tests env: SPRING_PROFILES_ACTIVE: postgres diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 1882af4529..b7f4391da2 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -30,7 +30,13 @@ jobs: with: distribution: 'adopt' # https://github.com/actions/setup-java#supported-distributions java-version: '8' # https://github.com/actions/setup-java#supported-version-syntax - cache: 'maven' # https://github.com/actions/setup-java#caching-packages-dependencies + - name: Restore existing cache + uses: actions/cache@v3.3.2 # https://github.com/actions/cache + with: + # https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#input-parameters-for-the-cache-action + key: maven-repository-${{ hashFiles('pom.xml') }} + path: ~/.m2/repository + restore-keys: maven-repository- - name: Run CheckStyle run: ./src/main/scripts/execute-command.sh checkstyle @@ -49,7 +55,13 @@ jobs: with: distribution: 'adopt' # https://github.com/actions/setup-java#supported-distributions java-version: '8' # https://github.com/actions/setup-java#supported-version-syntax - cache: 'maven' # https://github.com/actions/setup-java#caching-packages-dependencies + - name: Restore existing cache + uses: actions/cache@v3.3.2 # https://github.com/actions/cache + with: + # https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#input-parameters-for-the-cache-action + key: maven-repository-${{ hashFiles('pom.xml') }} + path: ~/.m2/repository + restore-keys: maven-repository- - name: Run PMD run: ./src/main/scripts/execute-command.sh pmd @@ -68,7 +80,13 @@ jobs: with: distribution: 'adopt' # https://github.com/actions/setup-java#supported-distributions java-version: '8' # https://github.com/actions/setup-java#supported-version-syntax - cache: 'maven' # https://github.com/actions/setup-java#caching-packages-dependencies + - name: Restore existing cache + uses: actions/cache@v3.3.2 # https://github.com/actions/cache + with: + # https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#input-parameters-for-the-cache-action + key: maven-repository-${{ hashFiles('pom.xml') }} + path: ~/.m2/repository + restore-keys: maven-repository- - name: Check license header run: ./src/main/scripts/execute-command.sh check-license @@ -87,7 +105,13 @@ jobs: with: distribution: 'adopt' # https://github.com/actions/setup-java#supported-distributions java-version: '8' # https://github.com/actions/setup-java#supported-version-syntax - cache: 'maven' # https://github.com/actions/setup-java#caching-packages-dependencies + - name: Restore existing cache + uses: actions/cache@v3.3.2 # https://github.com/actions/cache + with: + # https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#input-parameters-for-the-cache-action + key: maven-repository-${{ hashFiles('pom.xml') }} + path: ~/.m2/repository + restore-keys: maven-repository- - name: Check pom.xml run: ./src/main/scripts/execute-command.sh check-pom @@ -192,7 +216,13 @@ jobs: with: distribution: 'adopt' # https://github.com/actions/setup-java#supported-distributions java-version: '8' # https://github.com/actions/setup-java#supported-version-syntax - cache: 'maven' # https://github.com/actions/setup-java#caching-packages-dependencies + - name: Restore existing cache + uses: actions/cache@v3.3.2 # https://github.com/actions/cache + with: + # https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#input-parameters-for-the-cache-action + key: maven-repository-${{ hashFiles('pom.xml') }} + path: ~/.m2/repository + restore-keys: maven-repository- - name: Run maven-enforcer-plugin run: ./src/main/scripts/execute-command.sh enforcer @@ -211,7 +241,13 @@ jobs: with: distribution: 'adopt' # https://github.com/actions/setup-java#supported-distributions java-version: '8' # https://github.com/actions/setup-java#supported-version-syntax - cache: 'maven' # https://github.com/actions/setup-java#caching-packages-dependencies + - name: Restore existing cache + uses: actions/cache@v3.3.2 # https://github.com/actions/cache + with: + # https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#input-parameters-for-the-cache-action + key: maven-repository-${{ hashFiles('pom.xml') }} + path: ~/.m2/repository + restore-keys: maven-repository- - name: Compile sources run: >- mvn \ @@ -237,7 +273,13 @@ jobs: with: distribution: 'adopt' # https://github.com/actions/setup-java#supported-distributions java-version: '8' # https://github.com/actions/setup-java#supported-version-syntax - cache: 'maven' # https://github.com/actions/setup-java#caching-packages-dependencies + - name: Restore existing cache + uses: actions/cache@v3.3.2 # https://github.com/actions/cache + with: + # https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#input-parameters-for-the-cache-action + key: maven-repository-${{ hashFiles('pom.xml') }} + path: ~/.m2/repository + restore-keys: maven-repository- - name: Compile sources run: >- mvn \ diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index b8a8167b19..839c7b4e26 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -30,7 +30,13 @@ jobs: with: distribution: 'adopt' # https://github.com/actions/setup-java#supported-distributions java-version: '8' # https://github.com/actions/setup-java#supported-version-syntax - cache: 'maven' # https://github.com/actions/setup-java#caching-packages-dependencies + - name: Restore existing cache + uses: actions/cache@v3.3.2 # https://github.com/actions/cache + with: + # https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#input-parameters-for-the-cache-action + key: maven-repository-${{ hashFiles('pom.xml') }} + path: ~/.m2/repository + restore-keys: maven-repository- - name: Run Jest run: ./src/main/scripts/execute-command.sh jest @@ -49,6 +55,12 @@ jobs: with: distribution: 'adopt' # https://github.com/actions/setup-java#supported-distributions java-version: '8' # https://github.com/actions/setup-java#supported-version-syntax - cache: 'maven' # https://github.com/actions/setup-java#caching-packages-dependencies + - name: Restore existing cache + uses: actions/cache@v3.3.2 # https://github.com/actions/cache + with: + # https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#input-parameters-for-the-cache-action + key: maven-repository-${{ hashFiles('pom.xml') }} + path: ~/.m2/repository + restore-keys: maven-repository- - name: Run unit tests run: ./src/main/scripts/execute-command.sh unit-tests From 6ebeb720a90ad68b0be24c045e60e63f19d50979 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Sat, 6 Jan 2024 20:51:30 +0700 Subject: [PATCH 088/342] revert: "chore: reduce noise from Maven" This reverts commit 6714415c3b013d04f1fa20730074936048c7bf7e. Relate to #1656 --- .github/workflows/populate-maven-cache.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/populate-maven-cache.yml b/.github/workflows/populate-maven-cache.yml index a74c51b531..b32921916b 100644 --- a/.github/workflows/populate-maven-cache.yml +++ b/.github/workflows/populate-maven-cache.yml @@ -51,4 +51,4 @@ jobs: restore-keys: maven-repository- - name: Download all dependencies - run: mvn --no-transfer-progress dependency:resolve dependency:resolve-plugins + run: mvn dependency:resolve dependency:resolve-plugins From 1abf10198fe36185eef71fd80c0ce5800dcdfd41 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Sat, 6 Jan 2024 20:52:40 +0700 Subject: [PATCH 089/342] chore: download even more dependencies Part of #1656 --- .github/workflows/populate-maven-cache.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/populate-maven-cache.yml b/.github/workflows/populate-maven-cache.yml index b32921916b..a18ee759a2 100644 --- a/.github/workflows/populate-maven-cache.yml +++ b/.github/workflows/populate-maven-cache.yml @@ -51,4 +51,4 @@ jobs: restore-keys: maven-repository- - name: Download all dependencies - run: mvn dependency:resolve dependency:resolve-plugins + run: mvn dependency:go-offline From 9c833c554a385c7005ef2e99d8c6acf3341275f2 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Sat, 6 Jan 2024 20:54:53 +0700 Subject: [PATCH 090/342] chore: list downloaded artifacts Part of #1656 --- .github/workflows/populate-maven-cache.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/populate-maven-cache.yml b/.github/workflows/populate-maven-cache.yml index a18ee759a2..1c0da70bec 100644 --- a/.github/workflows/populate-maven-cache.yml +++ b/.github/workflows/populate-maven-cache.yml @@ -52,3 +52,6 @@ jobs: - name: Download all dependencies run: mvn dependency:go-offline + + - name: List downloaded artifacts + run: find ~/.m2/repository From e8661c29b769f91cd48e6a1697c0b1743cbec584 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Sat, 6 Jan 2024 20:58:07 +0700 Subject: [PATCH 091/342] chore: list only files Part of #1656 [skip ci] --- .github/workflows/populate-maven-cache.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/populate-maven-cache.yml b/.github/workflows/populate-maven-cache.yml index 1c0da70bec..56559d1ad4 100644 --- a/.github/workflows/populate-maven-cache.yml +++ b/.github/workflows/populate-maven-cache.yml @@ -54,4 +54,4 @@ jobs: run: mvn dependency:go-offline - name: List downloaded artifacts - run: find ~/.m2/repository + run: find ~/.m2/repository -type f From 1c8a0c228f4f73b26736e445d10ab4459389d92a Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Sat, 6 Jan 2024 21:02:20 +0700 Subject: [PATCH 092/342] chore: list only JAR files Part of #1656 [skip ci] --- .github/workflows/populate-maven-cache.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/populate-maven-cache.yml b/.github/workflows/populate-maven-cache.yml index 56559d1ad4..27204d431c 100644 --- a/.github/workflows/populate-maven-cache.yml +++ b/.github/workflows/populate-maven-cache.yml @@ -54,4 +54,4 @@ jobs: run: mvn dependency:go-offline - name: List downloaded artifacts - run: find ~/.m2/repository -type f + run: find ~/.m2/repository -type f -name '*.jar' From e9d058d7daba2207d284a924747aa2fbfd52ecc4 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Sat, 6 Jan 2024 21:08:21 +0700 Subject: [PATCH 093/342] chore: update copyright year [skip ci] --- pom.xml | 2 +- src/main/config/nginx/503.en.html | 2 +- src/main/config/nginx/503.ru.html | 2 +- src/main/java/ru/mystamps/web/common/ControllerUtils.java | 2 +- src/main/java/ru/mystamps/web/common/Currency.java | 2 +- src/main/java/ru/mystamps/web/common/EntityWithParentDto.java | 2 +- src/main/java/ru/mystamps/web/common/JdbcUtils.java | 2 +- src/main/java/ru/mystamps/web/common/LinkEntityDto.java | 2 +- src/main/java/ru/mystamps/web/common/LocaleUtils.java | 2 +- src/main/java/ru/mystamps/web/common/Pager.java | 2 +- src/main/java/ru/mystamps/web/common/RowMappers.java | 2 +- src/main/java/ru/mystamps/web/common/SitemapInfoDto.java | 2 +- src/main/java/ru/mystamps/web/common/SlugUtils.java | 2 +- src/main/java/ru/mystamps/web/config/ApplicationContext.java | 2 +- src/main/java/ru/mystamps/web/config/DaoConfig.java | 2 +- .../java/ru/mystamps/web/config/DispatcherServletContext.java | 2 +- src/main/java/ru/mystamps/web/config/MvcConfig.java | 2 +- src/main/java/ru/mystamps/web/config/ServicesConfig.java | 2 +- src/main/java/ru/mystamps/web/config/TaskExecutorConfig.java | 2 +- .../java/ru/mystamps/web/feature/account/AccountConfig.java | 2 +- .../java/ru/mystamps/web/feature/account/AccountController.java | 2 +- src/main/java/ru/mystamps/web/feature/account/AccountDb.java | 2 +- src/main/java/ru/mystamps/web/feature/account/AccountUrl.java | 2 +- .../java/ru/mystamps/web/feature/account/AccountValidation.java | 2 +- .../ru/mystamps/web/feature/account/ActivateAccountDto.java | 2 +- .../ru/mystamps/web/feature/account/ActivateAccountForm.java | 2 +- src/main/java/ru/mystamps/web/feature/account/AddUserDbDto.java | 2 +- .../mystamps/web/feature/account/AddUsersActivationDbDto.java | 2 +- .../ru/mystamps/web/feature/account/ExistingActivationKey.java | 2 +- .../web/feature/account/ExistingActivationKeyValidator.java | 2 +- src/main/java/ru/mystamps/web/feature/account/JdbcUserDao.java | 2 +- .../ru/mystamps/web/feature/account/JdbcUsersActivationDao.java | 2 +- .../ru/mystamps/web/feature/account/RegisterAccountDto.java | 2 +- .../ru/mystamps/web/feature/account/RegisterAccountForm.java | 2 +- src/main/java/ru/mystamps/web/feature/account/RowMappers.java | 2 +- .../ru/mystamps/web/feature/account/SendUsersActivationDto.java | 2 +- src/main/java/ru/mystamps/web/feature/account/UniqueLogin.java | 2 +- .../ru/mystamps/web/feature/account/UniqueLoginValidator.java | 2 +- src/main/java/ru/mystamps/web/feature/account/UserDao.java | 2 +- src/main/java/ru/mystamps/web/feature/account/UserDetails.java | 2 +- src/main/java/ru/mystamps/web/feature/account/UserService.java | 2 +- .../java/ru/mystamps/web/feature/account/UserServiceImpl.java | 2 +- .../ru/mystamps/web/feature/account/UsersActivationDao.java | 2 +- .../ru/mystamps/web/feature/account/UsersActivationDto.java | 2 +- .../ru/mystamps/web/feature/account/UsersActivationFullDto.java | 2 +- .../ru/mystamps/web/feature/account/UsersActivationService.java | 2 +- .../web/feature/account/UsersActivationServiceImpl.java | 2 +- .../java/ru/mystamps/web/feature/category/AddCategoryDbDto.java | 2 +- .../java/ru/mystamps/web/feature/category/AddCategoryDto.java | 2 +- .../java/ru/mystamps/web/feature/category/AddCategoryForm.java | 2 +- .../ru/mystamps/web/feature/category/ApiCategoryService.java | 2 +- src/main/java/ru/mystamps/web/feature/category/Category.java | 2 +- .../java/ru/mystamps/web/feature/category/CategoryConfig.java | 2 +- .../ru/mystamps/web/feature/category/CategoryController.java | 2 +- src/main/java/ru/mystamps/web/feature/category/CategoryDao.java | 2 +- src/main/java/ru/mystamps/web/feature/category/CategoryDb.java | 2 +- .../web/feature/category/CategoryLinkEntityDtoConverter.java | 2 +- .../java/ru/mystamps/web/feature/category/CategoryService.java | 2 +- .../ru/mystamps/web/feature/category/CategoryServiceImpl.java | 2 +- src/main/java/ru/mystamps/web/feature/category/CategoryUrl.java | 2 +- .../ru/mystamps/web/feature/category/CategoryValidation.java | 2 +- .../java/ru/mystamps/web/feature/category/JdbcCategoryDao.java | 2 +- .../ru/mystamps/web/feature/category/SuggestionController.java | 2 +- .../web/feature/category/TogglzWithFallbackCategoryService.java | 2 +- .../ru/mystamps/web/feature/category/UniqueCategoryName.java | 2 +- .../web/feature/category/UniqueCategoryNameValidator.java | 2 +- .../ru/mystamps/web/feature/category/UniqueCategorySlug.java | 2 +- .../web/feature/category/UniqueCategorySlugValidator.java | 2 +- .../ru/mystamps/web/feature/collection/AddCollectionDbDto.java | 2 +- .../mystamps/web/feature/collection/AddToCollectionDbDto.java | 2 +- .../ru/mystamps/web/feature/collection/AddToCollectionDto.java | 2 +- .../ru/mystamps/web/feature/collection/AddToCollectionForm.java | 2 +- .../ru/mystamps/web/feature/collection/CollectionConfig.java | 2 +- .../mystamps/web/feature/collection/CollectionController.java | 2 +- .../java/ru/mystamps/web/feature/collection/CollectionDao.java | 2 +- .../ru/mystamps/web/feature/collection/CollectionInfoDto.java | 2 +- .../ru/mystamps/web/feature/collection/CollectionService.java | 2 +- .../mystamps/web/feature/collection/CollectionServiceImpl.java | 2 +- .../java/ru/mystamps/web/feature/collection/CollectionUrl.java | 2 +- .../ru/mystamps/web/feature/collection/JdbcCollectionDao.java | 2 +- .../ru/mystamps/web/feature/collection/MaxNumberOfStamps.java | 2 +- .../web/feature/collection/MaxNumberOfStampsValidator.java | 2 +- .../java/ru/mystamps/web/feature/collection/RowMappers.java | 2 +- .../mystamps/web/feature/collection/SeriesInCollectionDto.java | 2 +- .../web/feature/collection/SeriesInCollectionWithPriceDto.java | 2 +- .../java/ru/mystamps/web/feature/country/AddCountryDbDto.java | 2 +- .../java/ru/mystamps/web/feature/country/AddCountryDto.java | 2 +- .../java/ru/mystamps/web/feature/country/AddCountryForm.java | 2 +- .../java/ru/mystamps/web/feature/country/ApiCountryService.java | 2 +- src/main/java/ru/mystamps/web/feature/country/Country.java | 2 +- .../java/ru/mystamps/web/feature/country/CountryConfig.java | 2 +- .../java/ru/mystamps/web/feature/country/CountryController.java | 2 +- src/main/java/ru/mystamps/web/feature/country/CountryDao.java | 2 +- src/main/java/ru/mystamps/web/feature/country/CountryDb.java | 2 +- .../web/feature/country/CountryLinkEntityDtoConverter.java | 2 +- .../java/ru/mystamps/web/feature/country/CountryService.java | 2 +- .../ru/mystamps/web/feature/country/CountryServiceImpl.java | 2 +- src/main/java/ru/mystamps/web/feature/country/CountryUrl.java | 2 +- .../java/ru/mystamps/web/feature/country/CountryValidation.java | 2 +- .../java/ru/mystamps/web/feature/country/JdbcCountryDao.java | 2 +- .../ru/mystamps/web/feature/country/SuggestionController.java | 2 +- .../web/feature/country/TogglzWithFallbackCountryService.java | 2 +- .../java/ru/mystamps/web/feature/country/UniqueCountryName.java | 2 +- .../web/feature/country/UniqueCountryNameValidator.java | 2 +- .../java/ru/mystamps/web/feature/country/UniqueCountrySlug.java | 2 +- .../web/feature/country/UniqueCountrySlugValidator.java | 2 +- .../java/ru/mystamps/web/feature/image/AddImageDataDbDto.java | 2 +- .../mystamps/web/feature/image/CreateImagePreviewException.java | 2 +- .../web/feature/image/DatabaseImagePersistenceStrategy.java | 2 +- .../web/feature/image/FilesystemImagePersistenceStrategy.java | 2 +- src/main/java/ru/mystamps/web/feature/image/ImageConfig.java | 2 +- .../java/ru/mystamps/web/feature/image/ImageController.java | 2 +- src/main/java/ru/mystamps/web/feature/image/ImageDao.java | 2 +- src/main/java/ru/mystamps/web/feature/image/ImageDataDao.java | 2 +- src/main/java/ru/mystamps/web/feature/image/ImageDb.java | 2 +- src/main/java/ru/mystamps/web/feature/image/ImageDto.java | 2 +- src/main/java/ru/mystamps/web/feature/image/ImageInfoDto.java | 2 +- .../mystamps/web/feature/image/ImagePersistenceException.java | 2 +- .../ru/mystamps/web/feature/image/ImagePersistenceStrategy.java | 2 +- .../ru/mystamps/web/feature/image/ImagePreviewStrategy.java | 2 +- src/main/java/ru/mystamps/web/feature/image/ImageService.java | 2 +- .../java/ru/mystamps/web/feature/image/ImageServiceImpl.java | 2 +- src/main/java/ru/mystamps/web/feature/image/ImageUrl.java | 2 +- .../java/ru/mystamps/web/feature/image/ImageValidation.java | 2 +- src/main/java/ru/mystamps/web/feature/image/JdbcImageDao.java | 2 +- .../java/ru/mystamps/web/feature/image/JdbcImageDataDao.java | 2 +- .../ru/mystamps/web/feature/image/ReplaceImageDataDbDto.java | 2 +- src/main/java/ru/mystamps/web/feature/image/RowMappers.java | 2 +- .../web/feature/image/ThumbnailatorImagePreviewStrategy.java | 2 +- .../mystamps/web/feature/image/TimedImagePreviewStrategy.java | 2 +- .../mystamps/web/feature/participant/AddParticipantDbDto.java | 2 +- .../ru/mystamps/web/feature/participant/AddParticipantDto.java | 2 +- .../ru/mystamps/web/feature/participant/AddParticipantForm.java | 2 +- .../ru/mystamps/web/feature/participant/EntityWithIdDto.java | 2 +- .../ru/mystamps/web/feature/participant/JdbcParticipantDao.java | 2 +- .../ru/mystamps/web/feature/participant/ParticipantConfig.java | 2 +- .../mystamps/web/feature/participant/ParticipantController.java | 2 +- .../ru/mystamps/web/feature/participant/ParticipantDao.java | 2 +- .../java/ru/mystamps/web/feature/participant/ParticipantDb.java | 2 +- .../ru/mystamps/web/feature/participant/ParticipantService.java | 2 +- .../web/feature/participant/ParticipantServiceImpl.java | 2 +- .../ru/mystamps/web/feature/participant/ParticipantUrl.java | 2 +- .../mystamps/web/feature/participant/ParticipantValidation.java | 2 +- .../java/ru/mystamps/web/feature/participant/RowMappers.java | 2 +- .../java/ru/mystamps/web/feature/report/AdminDailyReport.java | 2 +- src/main/java/ru/mystamps/web/feature/report/ReportConfig.java | 2 +- .../java/ru/mystamps/web/feature/report/ReportController.java | 2 +- src/main/java/ru/mystamps/web/feature/report/ReportService.java | 2 +- .../java/ru/mystamps/web/feature/report/ReportServiceImpl.java | 2 +- src/main/java/ru/mystamps/web/feature/report/ReportUrl.java | 2 +- .../ru/mystamps/web/feature/series/AddCatalogPriceDbDto.java | 2 +- .../java/ru/mystamps/web/feature/series/AddCommentDbDto.java | 2 +- src/main/java/ru/mystamps/web/feature/series/AddImageDto.java | 2 +- src/main/java/ru/mystamps/web/feature/series/AddImageForm.java | 2 +- .../ru/mystamps/web/feature/series/AddReleaseYearDbDto.java | 2 +- .../java/ru/mystamps/web/feature/series/AddSeriesDbDto.java | 2 +- src/main/java/ru/mystamps/web/feature/series/AddSeriesDto.java | 2 +- src/main/java/ru/mystamps/web/feature/series/AddSeriesForm.java | 2 +- .../ru/mystamps/web/feature/series/AddSimilarSeriesDto.java | 2 +- .../ru/mystamps/web/feature/series/AddSimilarSeriesForm.java | 2 +- .../ru/mystamps/web/feature/series/ByteArrayMultipartFile.java | 2 +- .../java/ru/mystamps/web/feature/series/CatalogInfoDto.java | 2 +- .../java/ru/mystamps/web/feature/series/CatalogNumbers.java | 2 +- .../ru/mystamps/web/feature/series/CatalogNumbersValidator.java | 2 +- src/main/java/ru/mystamps/web/feature/series/CatalogUtils.java | 2 +- .../mystamps/web/feature/series/DownloadImageInterceptor.java | 2 +- .../java/ru/mystamps/web/feature/series/DownloadResult.java | 2 +- .../java/ru/mystamps/web/feature/series/DownloaderService.java | 2 +- .../java/ru/mystamps/web/feature/series/HasImageOrImageUrl.java | 2 +- .../web/feature/series/HttpURLConnectionDownloaderService.java | 2 +- src/main/java/ru/mystamps/web/feature/series/JdbcSeriesDao.java | 2 +- .../java/ru/mystamps/web/feature/series/JdbcSeriesImageDao.java | 2 +- .../ru/mystamps/web/feature/series/JdbcStampsCatalogDao.java | 2 +- .../ru/mystamps/web/feature/series/ModifySeriesImageForm.java | 2 +- .../java/ru/mystamps/web/feature/series/NullableImageUrl.java | 2 +- .../mystamps/web/feature/series/ReleaseDateIsNotInFuture.java | 2 +- .../web/feature/series/ReleaseDateIsNotInFutureValidator.java | 2 +- .../java/ru/mystamps/web/feature/series/ReplaceImageDto.java | 2 +- .../ru/mystamps/web/feature/series/RequireImageOrImageUrl.java | 2 +- .../web/feature/series/RequireImageOrImageUrlValidator.java | 2 +- .../ru/mystamps/web/feature/series/RestSeriesController.java | 2 +- src/main/java/ru/mystamps/web/feature/series/RowMappers.java | 2 +- src/main/java/ru/mystamps/web/feature/series/SelectItem.java | 2 +- src/main/java/ru/mystamps/web/feature/series/SelectOption.java | 2 +- src/main/java/ru/mystamps/web/feature/series/SeriesConfig.java | 2 +- .../java/ru/mystamps/web/feature/series/SeriesController.java | 2 +- src/main/java/ru/mystamps/web/feature/series/SeriesDao.java | 2 +- src/main/java/ru/mystamps/web/feature/series/SeriesDb.java | 2 +- src/main/java/ru/mystamps/web/feature/series/SeriesDto.java | 2 +- .../java/ru/mystamps/web/feature/series/SeriesFullInfoDto.java | 2 +- .../java/ru/mystamps/web/feature/series/SeriesImageDao.java | 2 +- .../java/ru/mystamps/web/feature/series/SeriesImageService.java | 2 +- .../ru/mystamps/web/feature/series/SeriesImageServiceImpl.java | 2 +- .../java/ru/mystamps/web/feature/series/SeriesInGalleryDto.java | 2 +- src/main/java/ru/mystamps/web/feature/series/SeriesInfoDto.java | 2 +- src/main/java/ru/mystamps/web/feature/series/SeriesLinkDto.java | 2 +- src/main/java/ru/mystamps/web/feature/series/SeriesService.java | 2 +- .../java/ru/mystamps/web/feature/series/SeriesServiceImpl.java | 2 +- src/main/java/ru/mystamps/web/feature/series/SeriesUrl.java | 2 +- .../java/ru/mystamps/web/feature/series/SeriesValidation.java | 2 +- src/main/java/ru/mystamps/web/feature/series/StampsCatalog.java | 2 +- .../java/ru/mystamps/web/feature/series/StampsCatalogDao.java | 2 +- .../ru/mystamps/web/feature/series/StampsCatalogService.java | 2 +- .../mystamps/web/feature/series/StampsCatalogServiceImpl.java | 2 +- .../ru/mystamps/web/feature/series/TimedDownloaderService.java | 2 +- .../web/feature/series/importing/AddSeriesParsedDataDbDto.java | 2 +- .../feature/series/importing/ExpandCatalogNumbersEditor.java | 2 +- .../ru/mystamps/web/feature/series/importing/HasSiteParser.java | 2 +- .../web/feature/series/importing/HasSiteParserValidator.java | 2 +- .../mystamps/web/feature/series/importing/ImportRequestDto.java | 2 +- .../web/feature/series/importing/ImportRequestFullInfo.java | 2 +- .../web/feature/series/importing/ImportRequestInfo.java | 2 +- .../mystamps/web/feature/series/importing/ImportSellerForm.java | 2 +- .../web/feature/series/importing/ImportSeriesDbDto.java | 2 +- .../mystamps/web/feature/series/importing/ImportSeriesForm.java | 2 +- .../feature/series/importing/ImportSeriesFormTrimmerFilter.java | 2 +- .../web/feature/series/importing/ImportSeriesSalesForm.java | 2 +- .../web/feature/series/importing/JdbcSeriesImportDao.java | 2 +- .../mystamps/web/feature/series/importing/RawParsedDataDto.java | 2 +- .../mystamps/web/feature/series/importing/RequestImportDto.java | 2 +- .../web/feature/series/importing/RequestSeriesImportForm.java | 2 +- .../ru/mystamps/web/feature/series/importing/RowMappers.java | 2 +- .../web/feature/series/importing/SeriesExtractedInfo.java | 2 +- .../web/feature/series/importing/SeriesImportConfig.java | 2 +- .../web/feature/series/importing/SeriesImportController.java | 2 +- .../mystamps/web/feature/series/importing/SeriesImportDao.java | 2 +- .../mystamps/web/feature/series/importing/SeriesImportDb.java | 2 +- .../web/feature/series/importing/SeriesImportService.java | 2 +- .../web/feature/series/importing/SeriesImportServiceImpl.java | 2 +- .../mystamps/web/feature/series/importing/SeriesImportUrl.java | 2 +- .../web/feature/series/importing/SeriesImportValidation.java | 2 +- .../feature/series/importing/SeriesInfoExtractorService.java | 2 +- .../series/importing/SeriesInfoExtractorServiceImpl.java | 2 +- .../web/feature/series/importing/SeriesParsedDataDto.java | 2 +- .../series/importing/TimedSeriesInfoExtractorService.java | 2 +- .../series/importing/UpdateImportRequestStatusDbDto.java | 2 +- .../feature/series/importing/event/DownloadingSucceeded.java | 2 +- .../importing/event/DownloadingSucceededEventListener.java | 2 +- .../web/feature/series/importing/event/EventsConfig.java | 2 +- .../feature/series/importing/event/ImportRequestCreated.java | 2 +- .../importing/event/ImportRequestCreatedEventListener.java | 2 +- .../web/feature/series/importing/event/ParsingFailed.java | 2 +- .../series/importing/event/ParsingFailedEventListener.java | 2 +- .../web/feature/series/importing/event/RetryDownloading.java | 2 +- .../series/importing/event/RetryDownloadingEventListener.java | 2 +- .../feature/series/importing/extractor/JdbcSiteParserDao.java | 2 +- .../web/feature/series/importing/extractor/JsoupSiteParser.java | 2 +- .../web/feature/series/importing/extractor/SeriesInfo.java | 2 +- .../web/feature/series/importing/extractor/SiteParser.java | 2 +- .../series/importing/extractor/SiteParserConfiguration.java | 2 +- .../web/feature/series/importing/extractor/SiteParserDao.java | 2 +- .../feature/series/importing/extractor/SiteParserService.java | 2 +- .../series/importing/extractor/SiteParserServiceImpl.java | 2 +- .../web/feature/series/importing/extractor/TimedSiteParser.java | 2 +- .../feature/series/importing/sale/JdbcSeriesSalesImportDao.java | 2 +- .../series/importing/sale/RequestSeriesSaleImportForm.java | 2 +- .../mystamps/web/feature/series/importing/sale/RowMappers.java | 2 +- .../feature/series/importing/sale/SeriesSaleExtractedInfo.java | 2 +- .../series/importing/sale/SeriesSaleImportController.java | 2 +- .../feature/series/importing/sale/SeriesSaleParsedDataDto.java | 2 +- .../feature/series/importing/sale/SeriesSalesImportConfig.java | 2 +- .../web/feature/series/importing/sale/SeriesSalesImportDao.java | 2 +- .../feature/series/importing/sale/SeriesSalesImportService.java | 2 +- .../series/importing/sale/SeriesSalesImportServiceImpl.java | 2 +- .../web/feature/series/importing/sale/SeriesSalesImportUrl.java | 2 +- .../series/importing/sale/SeriesSalesParsedDataDbDto.java | 2 +- .../mystamps/web/feature/series/sale/AddSeriesSalesDbDto.java | 2 +- .../ru/mystamps/web/feature/series/sale/AddSeriesSalesDto.java | 2 +- .../ru/mystamps/web/feature/series/sale/AddSeriesSalesForm.java | 2 +- .../ru/mystamps/web/feature/series/sale/JdbcSeriesSalesDao.java | 2 +- .../java/ru/mystamps/web/feature/series/sale/RowMappers.java | 2 +- .../ru/mystamps/web/feature/series/sale/SeriesCondition.java | 2 +- .../java/ru/mystamps/web/feature/series/sale/SeriesSaleDto.java | 2 +- .../ru/mystamps/web/feature/series/sale/SeriesSalesConfig.java | 2 +- .../ru/mystamps/web/feature/series/sale/SeriesSalesDao.java | 2 +- .../java/ru/mystamps/web/feature/series/sale/SeriesSalesDb.java | 2 +- .../ru/mystamps/web/feature/series/sale/SeriesSalesService.java | 2 +- .../web/feature/series/sale/SeriesSalesServiceImpl.java | 2 +- .../mystamps/web/feature/series/sale/SeriesSalesValidation.java | 2 +- .../mystamps/web/feature/site/AddSuspiciousActivityDbDto.java | 2 +- src/main/java/ru/mystamps/web/feature/site/CronService.java | 2 +- src/main/java/ru/mystamps/web/feature/site/CronServiceImpl.java | 2 +- src/main/java/ru/mystamps/web/feature/site/CspController.java | 2 +- src/main/java/ru/mystamps/web/feature/site/ErrorController.java | 2 +- .../ru/mystamps/web/feature/site/JdbcSuspiciousActivityDao.java | 2 +- src/main/java/ru/mystamps/web/feature/site/MailService.java | 2 +- src/main/java/ru/mystamps/web/feature/site/MailServiceImpl.java | 2 +- src/main/java/ru/mystamps/web/feature/site/ResourceUrl.java | 2 +- .../java/ru/mystamps/web/feature/site/RobotsTxtController.java | 2 +- src/main/java/ru/mystamps/web/feature/site/RowMappers.java | 2 +- src/main/java/ru/mystamps/web/feature/site/SiteConfig.java | 2 +- src/main/java/ru/mystamps/web/feature/site/SiteController.java | 2 +- src/main/java/ru/mystamps/web/feature/site/SiteDb.java | 2 +- src/main/java/ru/mystamps/web/feature/site/SiteService.java | 2 +- src/main/java/ru/mystamps/web/feature/site/SiteServiceImpl.java | 2 +- src/main/java/ru/mystamps/web/feature/site/SiteUrl.java | 2 +- .../java/ru/mystamps/web/feature/site/SitemapController.java | 2 +- .../ru/mystamps/web/feature/site/SuspiciousActivityDao.java | 2 +- .../ru/mystamps/web/feature/site/SuspiciousActivityDto.java | 2 +- .../ru/mystamps/web/feature/site/SuspiciousActivityService.java | 2 +- .../web/feature/site/SuspiciousActivityServiceImpl.java | 2 +- .../mystamps/web/support/beanvalidation/BothOrNoneRequired.java | 2 +- .../web/support/beanvalidation/BothOrNoneRequiredValidator.java | 2 +- .../web/support/beanvalidation/ConstraintViolationUtils.java | 2 +- .../java/ru/mystamps/web/support/beanvalidation/DenyValues.java | 2 +- .../web/support/beanvalidation/DenyValuesValidator.java | 2 +- .../ru/mystamps/web/support/beanvalidation/FieldsMatch.java | 2 +- .../web/support/beanvalidation/FieldsMatchValidator.java | 2 +- .../ru/mystamps/web/support/beanvalidation/FieldsMismatch.java | 2 +- .../web/support/beanvalidation/FieldsMismatchValidator.java | 2 +- src/main/java/ru/mystamps/web/support/beanvalidation/Group.java | 2 +- .../java/ru/mystamps/web/support/beanvalidation/ImageFile.java | 2 +- .../mystamps/web/support/beanvalidation/ImageFileValidator.java | 2 +- .../ru/mystamps/web/support/beanvalidation/MaxFileSize.java | 2 +- .../web/support/beanvalidation/MaxFileSizeValidator.java | 2 +- .../ru/mystamps/web/support/beanvalidation/NotEmptyFile.java | 2 +- .../web/support/beanvalidation/NotEmptyFileValidator.java | 2 +- .../mystamps/web/support/beanvalidation/NotEmptyFilename.java | 2 +- .../web/support/beanvalidation/NotEmptyFilenameValidator.java | 2 +- .../web/support/beanvalidation/NotNullIfFirstField.java | 2 +- .../support/beanvalidation/NotNullIfFirstFieldValidator.java | 2 +- src/main/java/ru/mystamps/web/support/beanvalidation/Price.java | 2 +- .../ru/mystamps/web/support/liquibase/LiquibaseSupport.java | 2 +- .../web/support/mailgun/ApiMailgunEmailSendingStrategy.java | 2 +- .../ru/mystamps/web/support/mailgun/EmailSendingException.java | 2 +- src/main/java/ru/mystamps/web/support/mailgun/MailgunEmail.java | 2 +- .../web/support/mailgun/MailgunEmailSendingStrategy.java | 2 +- .../mystamps/web/support/spring/boot/ApplicationBootstrap.java | 2 +- .../mystamps/web/support/spring/boot/ErrorPagesCustomizer.java | 2 +- .../support/spring/boot/JettyWebServerFactoryCustomizer.java | 2 +- .../spring/boot/ThymeleafViewResolverInitializingBean.java | 2 +- .../spring/jdbc/MapIntegerIntegerResultSetExtractor.java | 2 +- .../support/spring/jdbc/MapStringIntegerResultSetExtractor.java | 2 +- .../support/spring/jdbc/MapStringStringResultSetExtractor.java | 2 +- .../ru/mystamps/web/support/spring/mvc/BigDecimalConverter.java | 2 +- .../java/ru/mystamps/web/support/spring/mvc/PatchRequest.java | 2 +- .../web/support/spring/mvc/ReplaceRepeatingSpacesEditor.java | 2 +- .../mystamps/web/support/spring/mvc/RestExceptionHandler.java | 2 +- .../ru/mystamps/web/support/spring/mvc/ValidationErrors.java | 2 +- .../support/spring/security/AuthenticationFailureListener.java | 2 +- .../java/ru/mystamps/web/support/spring/security/Authority.java | 2 +- .../spring/security/ContentSecurityPolicyHeaderWriter.java | 2 +- .../mystamps/web/support/spring/security/CustomUserDetails.java | 2 +- .../web/support/spring/security/CustomUserDetailsService.java | 2 +- .../ru/mystamps/web/support/spring/security/HasAuthority.java | 2 +- .../security/LogCsrfEventAndShow403PageForAccessDenied.java | 2 +- .../ru/mystamps/web/support/spring/security/SecurityConfig.java | 2 +- .../web/support/spring/security/SecurityContextUtils.java | 2 +- .../spring/security/SessionLocaleResolverAwareFilter.java | 2 +- .../mystamps/web/support/spring/security/StringAuthority.java | 2 +- .../web/support/spring/security/UserMdcLoggingFilter.java | 2 +- .../java/ru/mystamps/web/support/thymeleaf/GroupByParent.java | 2 +- src/main/java/ru/mystamps/web/support/togglz/Features.java | 2 +- src/main/java/ru/mystamps/web/support/togglz/TogglzConfig.java | 2 +- src/main/webapp/WEB-INF/views/account/activate.html | 2 +- src/main/webapp/WEB-INF/views/account/auth.html | 2 +- src/main/webapp/WEB-INF/views/account/register.html | 2 +- src/main/webapp/WEB-INF/views/category/add.html | 2 +- src/main/webapp/WEB-INF/views/category/info.html | 2 +- src/main/webapp/WEB-INF/views/category/list.html | 2 +- src/main/webapp/WEB-INF/views/collection/estimation.html | 2 +- src/main/webapp/WEB-INF/views/collection/info.html | 2 +- src/main/webapp/WEB-INF/views/country/add.html | 2 +- src/main/webapp/WEB-INF/views/country/info.html | 2 +- src/main/webapp/WEB-INF/views/country/list.html | 2 +- src/main/webapp/WEB-INF/views/error/status-code.html | 2 +- src/main/webapp/WEB-INF/views/participant/add.html | 2 +- src/main/webapp/WEB-INF/views/series/add.html | 2 +- src/main/webapp/WEB-INF/views/series/import/info.html | 2 +- src/main/webapp/WEB-INF/views/series/import/list.html | 2 +- src/main/webapp/WEB-INF/views/series/import/request.html | 2 +- src/main/webapp/WEB-INF/views/series/info.html | 2 +- src/main/webapp/WEB-INF/views/series/search_result.html | 2 +- src/main/webapp/WEB-INF/views/site/events.html | 2 +- src/main/webapp/WEB-INF/views/site/index.html | 2 +- src/test/groovy/ru/mystamps/web/common/LocaleUtilsTest.groovy | 2 +- src/test/groovy/ru/mystamps/web/common/PagerTest.groovy | 2 +- src/test/groovy/ru/mystamps/web/common/SlugUtilsTest.groovy | 2 +- .../ru/mystamps/web/feature/account/UserServiceImplTest.groovy | 2 +- .../web/feature/account/UsersActivationServiceImplTest.groovy | 2 +- .../web/feature/category/CategoryServiceImplTest.groovy | 2 +- .../web/feature/collection/CollectionServiceImplTest.groovy | 2 +- .../mystamps/web/feature/country/CountryServiceImplTest.groovy | 2 +- .../feature/image/DatabaseImagePersistenceStrategyTest.groovy | 2 +- .../feature/image/FilesystemImagePersistenceStrategyTest.groovy | 2 +- .../ru/mystamps/web/feature/image/ImageServiceImplTest.groovy | 2 +- .../web/feature/image/TimedImagePreviewStrategyTest.groovy | 2 +- .../web/feature/participant/ParticipantServiceImplTest.groovy | 2 +- .../ru/mystamps/web/feature/series/CatalogUtilsTest.groovy | 2 +- .../ru/mystamps/web/feature/series/SeriesServiceImplTest.groovy | 2 +- .../web/feature/series/StampsCatalogServiceImplTest.groovy | 2 +- .../feature/series/importing/SeriesImportServiceImplTest.groovy | 2 +- .../series/importing/SeriesInfoExtractorServiceImplTest.groovy | 2 +- .../series/importing/TimedSeriesInfoExtractorServiceTest.groovy | 2 +- .../importing/sale/SeriesSalesImportServiceImplTest.groovy | 2 +- .../web/feature/series/sale/SeriesSalesServiceImplTest.groovy | 2 +- .../ru/mystamps/web/feature/site/CronServiceImplTest.groovy | 2 +- .../ru/mystamps/web/feature/site/SiteServiceImplTest.groovy | 2 +- .../web/feature/site/SuspiciousActivityServiceImplTest.groovy | 2 +- .../ru/mystamps/web/feature/category/JdbcCategoryDaoTest.java | 2 +- .../ru/mystamps/web/feature/country/JdbcCountryDaoTest.java | 2 +- .../feature/series/importing/extractor/JsoupSiteParserTest.java | 2 +- src/test/java/ru/mystamps/web/service/TestObjects.java | 2 +- .../spring/security/ContentSecurityPolicyHeaderWriterTest.java | 2 +- src/test/java/ru/mystamps/web/tests/DateUtils.java | 2 +- src/test/java/ru/mystamps/web/tests/Random.java | 2 +- 406 files changed, 406 insertions(+), 406 deletions(-) diff --git a/pom.xml b/pom.xml index 5d664ec379..b40488d422 100644 --- a/pom.xml +++ b/pom.xml @@ -784,7 +784,7 @@ SLASHSTAR_STYLE - ${project.inceptionYear}-2023 + ${project.inceptionYear}-2024 ${project.developers[0].name} ${project.developers[0].email} diff --git a/src/main/config/nginx/503.en.html b/src/main/config/nginx/503.en.html index 86f2ff1086..0f6de0e372 100644 --- a/src/main/config/nginx/503.en.html +++ b/src/main/config/nginx/503.en.html @@ -71,7 +71,7 @@

diff --git a/src/main/config/nginx/503.ru.html b/src/main/config/nginx/503.ru.html index 2b2421d130..94fbfdcdd4 100644 --- a/src/main/config/nginx/503.ru.html +++ b/src/main/config/nginx/503.ru.html @@ -71,7 +71,7 @@

diff --git a/src/main/java/ru/mystamps/web/common/ControllerUtils.java b/src/main/java/ru/mystamps/web/common/ControllerUtils.java index 6f161bf264..9717255b4e 100644 --- a/src/main/java/ru/mystamps/web/common/ControllerUtils.java +++ b/src/main/java/ru/mystamps/web/common/ControllerUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/common/Currency.java b/src/main/java/ru/mystamps/web/common/Currency.java index b023952c50..46040683ab 100644 --- a/src/main/java/ru/mystamps/web/common/Currency.java +++ b/src/main/java/ru/mystamps/web/common/Currency.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/common/EntityWithParentDto.java b/src/main/java/ru/mystamps/web/common/EntityWithParentDto.java index 78a5f1a19b..cc8c779943 100644 --- a/src/main/java/ru/mystamps/web/common/EntityWithParentDto.java +++ b/src/main/java/ru/mystamps/web/common/EntityWithParentDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/common/JdbcUtils.java b/src/main/java/ru/mystamps/web/common/JdbcUtils.java index d887300170..d7104e43fd 100644 --- a/src/main/java/ru/mystamps/web/common/JdbcUtils.java +++ b/src/main/java/ru/mystamps/web/common/JdbcUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/common/LinkEntityDto.java b/src/main/java/ru/mystamps/web/common/LinkEntityDto.java index ae0dac176e..ff93f7488d 100644 --- a/src/main/java/ru/mystamps/web/common/LinkEntityDto.java +++ b/src/main/java/ru/mystamps/web/common/LinkEntityDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/common/LocaleUtils.java b/src/main/java/ru/mystamps/web/common/LocaleUtils.java index 32b0344232..87e100edea 100644 --- a/src/main/java/ru/mystamps/web/common/LocaleUtils.java +++ b/src/main/java/ru/mystamps/web/common/LocaleUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/common/Pager.java b/src/main/java/ru/mystamps/web/common/Pager.java index 305bd833c8..caf2d5e6c6 100644 --- a/src/main/java/ru/mystamps/web/common/Pager.java +++ b/src/main/java/ru/mystamps/web/common/Pager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/common/RowMappers.java b/src/main/java/ru/mystamps/web/common/RowMappers.java index f65bf435aa..6ad43b9e32 100644 --- a/src/main/java/ru/mystamps/web/common/RowMappers.java +++ b/src/main/java/ru/mystamps/web/common/RowMappers.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/common/SitemapInfoDto.java b/src/main/java/ru/mystamps/web/common/SitemapInfoDto.java index 93ab148a0f..d9e6433cf5 100644 --- a/src/main/java/ru/mystamps/web/common/SitemapInfoDto.java +++ b/src/main/java/ru/mystamps/web/common/SitemapInfoDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/common/SlugUtils.java b/src/main/java/ru/mystamps/web/common/SlugUtils.java index cae5cf11d3..a0ed9f97c0 100644 --- a/src/main/java/ru/mystamps/web/common/SlugUtils.java +++ b/src/main/java/ru/mystamps/web/common/SlugUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/config/ApplicationContext.java b/src/main/java/ru/mystamps/web/config/ApplicationContext.java index 4856087bc8..2f67d49db0 100755 --- a/src/main/java/ru/mystamps/web/config/ApplicationContext.java +++ b/src/main/java/ru/mystamps/web/config/ApplicationContext.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/config/DaoConfig.java b/src/main/java/ru/mystamps/web/config/DaoConfig.java index fe76b34222..8abdd85dc1 100644 --- a/src/main/java/ru/mystamps/web/config/DaoConfig.java +++ b/src/main/java/ru/mystamps/web/config/DaoConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/config/DispatcherServletContext.java b/src/main/java/ru/mystamps/web/config/DispatcherServletContext.java index accffbb130..3c2f3040be 100644 --- a/src/main/java/ru/mystamps/web/config/DispatcherServletContext.java +++ b/src/main/java/ru/mystamps/web/config/DispatcherServletContext.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/config/MvcConfig.java b/src/main/java/ru/mystamps/web/config/MvcConfig.java index cb2976e9cd..6bbe24017c 100755 --- a/src/main/java/ru/mystamps/web/config/MvcConfig.java +++ b/src/main/java/ru/mystamps/web/config/MvcConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/config/ServicesConfig.java b/src/main/java/ru/mystamps/web/config/ServicesConfig.java index c388afbb64..d704b90cf4 100644 --- a/src/main/java/ru/mystamps/web/config/ServicesConfig.java +++ b/src/main/java/ru/mystamps/web/config/ServicesConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/config/TaskExecutorConfig.java b/src/main/java/ru/mystamps/web/config/TaskExecutorConfig.java index 59ff96a783..9ec9a379e9 100644 --- a/src/main/java/ru/mystamps/web/config/TaskExecutorConfig.java +++ b/src/main/java/ru/mystamps/web/config/TaskExecutorConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/account/AccountConfig.java b/src/main/java/ru/mystamps/web/feature/account/AccountConfig.java index b209b9e769..0eb8e68e9f 100644 --- a/src/main/java/ru/mystamps/web/feature/account/AccountConfig.java +++ b/src/main/java/ru/mystamps/web/feature/account/AccountConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/account/AccountController.java b/src/main/java/ru/mystamps/web/feature/account/AccountController.java index 24c85ce75e..824ff0a0cf 100644 --- a/src/main/java/ru/mystamps/web/feature/account/AccountController.java +++ b/src/main/java/ru/mystamps/web/feature/account/AccountController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/account/AccountDb.java b/src/main/java/ru/mystamps/web/feature/account/AccountDb.java index cb223963c0..975a425f27 100644 --- a/src/main/java/ru/mystamps/web/feature/account/AccountDb.java +++ b/src/main/java/ru/mystamps/web/feature/account/AccountDb.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/account/AccountUrl.java b/src/main/java/ru/mystamps/web/feature/account/AccountUrl.java index 9a3c020015..5eb65296b1 100644 --- a/src/main/java/ru/mystamps/web/feature/account/AccountUrl.java +++ b/src/main/java/ru/mystamps/web/feature/account/AccountUrl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/account/AccountValidation.java b/src/main/java/ru/mystamps/web/feature/account/AccountValidation.java index 2e9ccac991..c2daabb372 100644 --- a/src/main/java/ru/mystamps/web/feature/account/AccountValidation.java +++ b/src/main/java/ru/mystamps/web/feature/account/AccountValidation.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/account/ActivateAccountDto.java b/src/main/java/ru/mystamps/web/feature/account/ActivateAccountDto.java index 3590c4c877..1f46a66f78 100644 --- a/src/main/java/ru/mystamps/web/feature/account/ActivateAccountDto.java +++ b/src/main/java/ru/mystamps/web/feature/account/ActivateAccountDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/account/ActivateAccountForm.java b/src/main/java/ru/mystamps/web/feature/account/ActivateAccountForm.java index 81b711fa51..b37705dfd9 100644 --- a/src/main/java/ru/mystamps/web/feature/account/ActivateAccountForm.java +++ b/src/main/java/ru/mystamps/web/feature/account/ActivateAccountForm.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/account/AddUserDbDto.java b/src/main/java/ru/mystamps/web/feature/account/AddUserDbDto.java index 25c087772c..551d36d64e 100644 --- a/src/main/java/ru/mystamps/web/feature/account/AddUserDbDto.java +++ b/src/main/java/ru/mystamps/web/feature/account/AddUserDbDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/account/AddUsersActivationDbDto.java b/src/main/java/ru/mystamps/web/feature/account/AddUsersActivationDbDto.java index 001d68bb61..e97afb965a 100644 --- a/src/main/java/ru/mystamps/web/feature/account/AddUsersActivationDbDto.java +++ b/src/main/java/ru/mystamps/web/feature/account/AddUsersActivationDbDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/account/ExistingActivationKey.java b/src/main/java/ru/mystamps/web/feature/account/ExistingActivationKey.java index 4e8d76512b..5c9d427774 100644 --- a/src/main/java/ru/mystamps/web/feature/account/ExistingActivationKey.java +++ b/src/main/java/ru/mystamps/web/feature/account/ExistingActivationKey.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/account/ExistingActivationKeyValidator.java b/src/main/java/ru/mystamps/web/feature/account/ExistingActivationKeyValidator.java index 7fc816a663..67dc11a7ea 100644 --- a/src/main/java/ru/mystamps/web/feature/account/ExistingActivationKeyValidator.java +++ b/src/main/java/ru/mystamps/web/feature/account/ExistingActivationKeyValidator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/account/JdbcUserDao.java b/src/main/java/ru/mystamps/web/feature/account/JdbcUserDao.java index e7bb72656e..863b4fc195 100644 --- a/src/main/java/ru/mystamps/web/feature/account/JdbcUserDao.java +++ b/src/main/java/ru/mystamps/web/feature/account/JdbcUserDao.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/account/JdbcUsersActivationDao.java b/src/main/java/ru/mystamps/web/feature/account/JdbcUsersActivationDao.java index fe5b732d3e..043141138b 100644 --- a/src/main/java/ru/mystamps/web/feature/account/JdbcUsersActivationDao.java +++ b/src/main/java/ru/mystamps/web/feature/account/JdbcUsersActivationDao.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/account/RegisterAccountDto.java b/src/main/java/ru/mystamps/web/feature/account/RegisterAccountDto.java index cecde8638d..b2ddb5e180 100644 --- a/src/main/java/ru/mystamps/web/feature/account/RegisterAccountDto.java +++ b/src/main/java/ru/mystamps/web/feature/account/RegisterAccountDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/account/RegisterAccountForm.java b/src/main/java/ru/mystamps/web/feature/account/RegisterAccountForm.java index c4108d6f64..e320fb19e1 100644 --- a/src/main/java/ru/mystamps/web/feature/account/RegisterAccountForm.java +++ b/src/main/java/ru/mystamps/web/feature/account/RegisterAccountForm.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/account/RowMappers.java b/src/main/java/ru/mystamps/web/feature/account/RowMappers.java index a1c2cab3ca..8137d01656 100644 --- a/src/main/java/ru/mystamps/web/feature/account/RowMappers.java +++ b/src/main/java/ru/mystamps/web/feature/account/RowMappers.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/account/SendUsersActivationDto.java b/src/main/java/ru/mystamps/web/feature/account/SendUsersActivationDto.java index af67055621..7ebf0699e1 100644 --- a/src/main/java/ru/mystamps/web/feature/account/SendUsersActivationDto.java +++ b/src/main/java/ru/mystamps/web/feature/account/SendUsersActivationDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/account/UniqueLogin.java b/src/main/java/ru/mystamps/web/feature/account/UniqueLogin.java index fa6e6ac9f8..01c45d7fcb 100644 --- a/src/main/java/ru/mystamps/web/feature/account/UniqueLogin.java +++ b/src/main/java/ru/mystamps/web/feature/account/UniqueLogin.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/account/UniqueLoginValidator.java b/src/main/java/ru/mystamps/web/feature/account/UniqueLoginValidator.java index 42683f2e04..0b7bd8b31c 100644 --- a/src/main/java/ru/mystamps/web/feature/account/UniqueLoginValidator.java +++ b/src/main/java/ru/mystamps/web/feature/account/UniqueLoginValidator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/account/UserDao.java b/src/main/java/ru/mystamps/web/feature/account/UserDao.java index 9803718798..8a60e89e98 100644 --- a/src/main/java/ru/mystamps/web/feature/account/UserDao.java +++ b/src/main/java/ru/mystamps/web/feature/account/UserDao.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/account/UserDetails.java b/src/main/java/ru/mystamps/web/feature/account/UserDetails.java index 67040cdac2..0b1d681b8d 100644 --- a/src/main/java/ru/mystamps/web/feature/account/UserDetails.java +++ b/src/main/java/ru/mystamps/web/feature/account/UserDetails.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/account/UserService.java b/src/main/java/ru/mystamps/web/feature/account/UserService.java index 7935f899d4..ed88d0a394 100644 --- a/src/main/java/ru/mystamps/web/feature/account/UserService.java +++ b/src/main/java/ru/mystamps/web/feature/account/UserService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/account/UserServiceImpl.java b/src/main/java/ru/mystamps/web/feature/account/UserServiceImpl.java index edce5e6004..2649e01eb3 100644 --- a/src/main/java/ru/mystamps/web/feature/account/UserServiceImpl.java +++ b/src/main/java/ru/mystamps/web/feature/account/UserServiceImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/account/UsersActivationDao.java b/src/main/java/ru/mystamps/web/feature/account/UsersActivationDao.java index f758a14b83..a37d671a54 100644 --- a/src/main/java/ru/mystamps/web/feature/account/UsersActivationDao.java +++ b/src/main/java/ru/mystamps/web/feature/account/UsersActivationDao.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/account/UsersActivationDto.java b/src/main/java/ru/mystamps/web/feature/account/UsersActivationDto.java index c267a3ac28..3ca9bbbd07 100644 --- a/src/main/java/ru/mystamps/web/feature/account/UsersActivationDto.java +++ b/src/main/java/ru/mystamps/web/feature/account/UsersActivationDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/account/UsersActivationFullDto.java b/src/main/java/ru/mystamps/web/feature/account/UsersActivationFullDto.java index 3e49ae016d..4c32389e91 100644 --- a/src/main/java/ru/mystamps/web/feature/account/UsersActivationFullDto.java +++ b/src/main/java/ru/mystamps/web/feature/account/UsersActivationFullDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/account/UsersActivationService.java b/src/main/java/ru/mystamps/web/feature/account/UsersActivationService.java index 1e09740361..5d38975fc8 100644 --- a/src/main/java/ru/mystamps/web/feature/account/UsersActivationService.java +++ b/src/main/java/ru/mystamps/web/feature/account/UsersActivationService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/account/UsersActivationServiceImpl.java b/src/main/java/ru/mystamps/web/feature/account/UsersActivationServiceImpl.java index 401906e71a..2c87ef91bc 100644 --- a/src/main/java/ru/mystamps/web/feature/account/UsersActivationServiceImpl.java +++ b/src/main/java/ru/mystamps/web/feature/account/UsersActivationServiceImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/category/AddCategoryDbDto.java b/src/main/java/ru/mystamps/web/feature/category/AddCategoryDbDto.java index b3acc23f7a..79f02d447a 100644 --- a/src/main/java/ru/mystamps/web/feature/category/AddCategoryDbDto.java +++ b/src/main/java/ru/mystamps/web/feature/category/AddCategoryDbDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/category/AddCategoryDto.java b/src/main/java/ru/mystamps/web/feature/category/AddCategoryDto.java index 30888bee94..21eec1de1a 100644 --- a/src/main/java/ru/mystamps/web/feature/category/AddCategoryDto.java +++ b/src/main/java/ru/mystamps/web/feature/category/AddCategoryDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/category/AddCategoryForm.java b/src/main/java/ru/mystamps/web/feature/category/AddCategoryForm.java index 485cfe0dd5..cbc2be82f3 100644 --- a/src/main/java/ru/mystamps/web/feature/category/AddCategoryForm.java +++ b/src/main/java/ru/mystamps/web/feature/category/AddCategoryForm.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/category/ApiCategoryService.java b/src/main/java/ru/mystamps/web/feature/category/ApiCategoryService.java index ceeb70ed6e..232afa4889 100644 --- a/src/main/java/ru/mystamps/web/feature/category/ApiCategoryService.java +++ b/src/main/java/ru/mystamps/web/feature/category/ApiCategoryService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/category/Category.java b/src/main/java/ru/mystamps/web/feature/category/Category.java index 3285ba5ac5..8002095ea0 100644 --- a/src/main/java/ru/mystamps/web/feature/category/Category.java +++ b/src/main/java/ru/mystamps/web/feature/category/Category.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/category/CategoryConfig.java b/src/main/java/ru/mystamps/web/feature/category/CategoryConfig.java index a68fd4f1f9..806815b216 100644 --- a/src/main/java/ru/mystamps/web/feature/category/CategoryConfig.java +++ b/src/main/java/ru/mystamps/web/feature/category/CategoryConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/category/CategoryController.java b/src/main/java/ru/mystamps/web/feature/category/CategoryController.java index 883daea4a8..38e9b7ccfe 100644 --- a/src/main/java/ru/mystamps/web/feature/category/CategoryController.java +++ b/src/main/java/ru/mystamps/web/feature/category/CategoryController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/category/CategoryDao.java b/src/main/java/ru/mystamps/web/feature/category/CategoryDao.java index f71e64e98d..cba45eb364 100644 --- a/src/main/java/ru/mystamps/web/feature/category/CategoryDao.java +++ b/src/main/java/ru/mystamps/web/feature/category/CategoryDao.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/category/CategoryDb.java b/src/main/java/ru/mystamps/web/feature/category/CategoryDb.java index efb2d632fc..015d661ccb 100644 --- a/src/main/java/ru/mystamps/web/feature/category/CategoryDb.java +++ b/src/main/java/ru/mystamps/web/feature/category/CategoryDb.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/category/CategoryLinkEntityDtoConverter.java b/src/main/java/ru/mystamps/web/feature/category/CategoryLinkEntityDtoConverter.java index 0e3543385b..eaa16a5bd1 100644 --- a/src/main/java/ru/mystamps/web/feature/category/CategoryLinkEntityDtoConverter.java +++ b/src/main/java/ru/mystamps/web/feature/category/CategoryLinkEntityDtoConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/category/CategoryService.java b/src/main/java/ru/mystamps/web/feature/category/CategoryService.java index 07be1a51fa..d3dabbbd61 100644 --- a/src/main/java/ru/mystamps/web/feature/category/CategoryService.java +++ b/src/main/java/ru/mystamps/web/feature/category/CategoryService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/category/CategoryServiceImpl.java b/src/main/java/ru/mystamps/web/feature/category/CategoryServiceImpl.java index 477a5f9df5..7a1135e6a3 100644 --- a/src/main/java/ru/mystamps/web/feature/category/CategoryServiceImpl.java +++ b/src/main/java/ru/mystamps/web/feature/category/CategoryServiceImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/category/CategoryUrl.java b/src/main/java/ru/mystamps/web/feature/category/CategoryUrl.java index b43048c164..869ede5b71 100644 --- a/src/main/java/ru/mystamps/web/feature/category/CategoryUrl.java +++ b/src/main/java/ru/mystamps/web/feature/category/CategoryUrl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/category/CategoryValidation.java b/src/main/java/ru/mystamps/web/feature/category/CategoryValidation.java index cfb90954a2..f5424764d7 100644 --- a/src/main/java/ru/mystamps/web/feature/category/CategoryValidation.java +++ b/src/main/java/ru/mystamps/web/feature/category/CategoryValidation.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/category/JdbcCategoryDao.java b/src/main/java/ru/mystamps/web/feature/category/JdbcCategoryDao.java index 62f1b43cb2..17a7d056b1 100644 --- a/src/main/java/ru/mystamps/web/feature/category/JdbcCategoryDao.java +++ b/src/main/java/ru/mystamps/web/feature/category/JdbcCategoryDao.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/category/SuggestionController.java b/src/main/java/ru/mystamps/web/feature/category/SuggestionController.java index ed206dd09d..4f44cffaa0 100644 --- a/src/main/java/ru/mystamps/web/feature/category/SuggestionController.java +++ b/src/main/java/ru/mystamps/web/feature/category/SuggestionController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/category/TogglzWithFallbackCategoryService.java b/src/main/java/ru/mystamps/web/feature/category/TogglzWithFallbackCategoryService.java index d3c08aad5a..2ebd460f74 100644 --- a/src/main/java/ru/mystamps/web/feature/category/TogglzWithFallbackCategoryService.java +++ b/src/main/java/ru/mystamps/web/feature/category/TogglzWithFallbackCategoryService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/category/UniqueCategoryName.java b/src/main/java/ru/mystamps/web/feature/category/UniqueCategoryName.java index 427d6d100c..f2578c92ce 100644 --- a/src/main/java/ru/mystamps/web/feature/category/UniqueCategoryName.java +++ b/src/main/java/ru/mystamps/web/feature/category/UniqueCategoryName.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/category/UniqueCategoryNameValidator.java b/src/main/java/ru/mystamps/web/feature/category/UniqueCategoryNameValidator.java index f731cedbab..8a646b7124 100644 --- a/src/main/java/ru/mystamps/web/feature/category/UniqueCategoryNameValidator.java +++ b/src/main/java/ru/mystamps/web/feature/category/UniqueCategoryNameValidator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/category/UniqueCategorySlug.java b/src/main/java/ru/mystamps/web/feature/category/UniqueCategorySlug.java index 45ca5f81d0..0e3ec09a73 100644 --- a/src/main/java/ru/mystamps/web/feature/category/UniqueCategorySlug.java +++ b/src/main/java/ru/mystamps/web/feature/category/UniqueCategorySlug.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/category/UniqueCategorySlugValidator.java b/src/main/java/ru/mystamps/web/feature/category/UniqueCategorySlugValidator.java index 39bee43de4..c758880d76 100644 --- a/src/main/java/ru/mystamps/web/feature/category/UniqueCategorySlugValidator.java +++ b/src/main/java/ru/mystamps/web/feature/category/UniqueCategorySlugValidator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/collection/AddCollectionDbDto.java b/src/main/java/ru/mystamps/web/feature/collection/AddCollectionDbDto.java index 33c0b8e6c4..bfc0e58c7f 100644 --- a/src/main/java/ru/mystamps/web/feature/collection/AddCollectionDbDto.java +++ b/src/main/java/ru/mystamps/web/feature/collection/AddCollectionDbDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/collection/AddToCollectionDbDto.java b/src/main/java/ru/mystamps/web/feature/collection/AddToCollectionDbDto.java index 540df14c74..901422ca07 100644 --- a/src/main/java/ru/mystamps/web/feature/collection/AddToCollectionDbDto.java +++ b/src/main/java/ru/mystamps/web/feature/collection/AddToCollectionDbDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/collection/AddToCollectionDto.java b/src/main/java/ru/mystamps/web/feature/collection/AddToCollectionDto.java index d251412729..1e4e69503a 100644 --- a/src/main/java/ru/mystamps/web/feature/collection/AddToCollectionDto.java +++ b/src/main/java/ru/mystamps/web/feature/collection/AddToCollectionDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/collection/AddToCollectionForm.java b/src/main/java/ru/mystamps/web/feature/collection/AddToCollectionForm.java index c6725d31d3..c4348685df 100644 --- a/src/main/java/ru/mystamps/web/feature/collection/AddToCollectionForm.java +++ b/src/main/java/ru/mystamps/web/feature/collection/AddToCollectionForm.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/collection/CollectionConfig.java b/src/main/java/ru/mystamps/web/feature/collection/CollectionConfig.java index 6dba8a6fb0..f571d0e4bb 100644 --- a/src/main/java/ru/mystamps/web/feature/collection/CollectionConfig.java +++ b/src/main/java/ru/mystamps/web/feature/collection/CollectionConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/collection/CollectionController.java b/src/main/java/ru/mystamps/web/feature/collection/CollectionController.java index 15d06391d3..6eccc8fd26 100644 --- a/src/main/java/ru/mystamps/web/feature/collection/CollectionController.java +++ b/src/main/java/ru/mystamps/web/feature/collection/CollectionController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/collection/CollectionDao.java b/src/main/java/ru/mystamps/web/feature/collection/CollectionDao.java index 7205af2c02..e39e62a17a 100644 --- a/src/main/java/ru/mystamps/web/feature/collection/CollectionDao.java +++ b/src/main/java/ru/mystamps/web/feature/collection/CollectionDao.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/collection/CollectionInfoDto.java b/src/main/java/ru/mystamps/web/feature/collection/CollectionInfoDto.java index 17daa6f01c..3dd66a94ff 100644 --- a/src/main/java/ru/mystamps/web/feature/collection/CollectionInfoDto.java +++ b/src/main/java/ru/mystamps/web/feature/collection/CollectionInfoDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/collection/CollectionService.java b/src/main/java/ru/mystamps/web/feature/collection/CollectionService.java index ffbcfa033f..77ec11a29e 100644 --- a/src/main/java/ru/mystamps/web/feature/collection/CollectionService.java +++ b/src/main/java/ru/mystamps/web/feature/collection/CollectionService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/collection/CollectionServiceImpl.java b/src/main/java/ru/mystamps/web/feature/collection/CollectionServiceImpl.java index 75b5c2b8f3..081425b392 100644 --- a/src/main/java/ru/mystamps/web/feature/collection/CollectionServiceImpl.java +++ b/src/main/java/ru/mystamps/web/feature/collection/CollectionServiceImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/collection/CollectionUrl.java b/src/main/java/ru/mystamps/web/feature/collection/CollectionUrl.java index 095588978d..63bec32c82 100644 --- a/src/main/java/ru/mystamps/web/feature/collection/CollectionUrl.java +++ b/src/main/java/ru/mystamps/web/feature/collection/CollectionUrl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/collection/JdbcCollectionDao.java b/src/main/java/ru/mystamps/web/feature/collection/JdbcCollectionDao.java index e6fdea8c86..3057eeb7b7 100644 --- a/src/main/java/ru/mystamps/web/feature/collection/JdbcCollectionDao.java +++ b/src/main/java/ru/mystamps/web/feature/collection/JdbcCollectionDao.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/collection/MaxNumberOfStamps.java b/src/main/java/ru/mystamps/web/feature/collection/MaxNumberOfStamps.java index b12f08ea34..fd95b4f806 100644 --- a/src/main/java/ru/mystamps/web/feature/collection/MaxNumberOfStamps.java +++ b/src/main/java/ru/mystamps/web/feature/collection/MaxNumberOfStamps.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/collection/MaxNumberOfStampsValidator.java b/src/main/java/ru/mystamps/web/feature/collection/MaxNumberOfStampsValidator.java index 23aa8328d5..d87394d731 100644 --- a/src/main/java/ru/mystamps/web/feature/collection/MaxNumberOfStampsValidator.java +++ b/src/main/java/ru/mystamps/web/feature/collection/MaxNumberOfStampsValidator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/collection/RowMappers.java b/src/main/java/ru/mystamps/web/feature/collection/RowMappers.java index 08887aab0d..855a97793f 100644 --- a/src/main/java/ru/mystamps/web/feature/collection/RowMappers.java +++ b/src/main/java/ru/mystamps/web/feature/collection/RowMappers.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/collection/SeriesInCollectionDto.java b/src/main/java/ru/mystamps/web/feature/collection/SeriesInCollectionDto.java index e753d42346..834730bf68 100644 --- a/src/main/java/ru/mystamps/web/feature/collection/SeriesInCollectionDto.java +++ b/src/main/java/ru/mystamps/web/feature/collection/SeriesInCollectionDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/collection/SeriesInCollectionWithPriceDto.java b/src/main/java/ru/mystamps/web/feature/collection/SeriesInCollectionWithPriceDto.java index 3471faaa65..714fcf7a23 100644 --- a/src/main/java/ru/mystamps/web/feature/collection/SeriesInCollectionWithPriceDto.java +++ b/src/main/java/ru/mystamps/web/feature/collection/SeriesInCollectionWithPriceDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/country/AddCountryDbDto.java b/src/main/java/ru/mystamps/web/feature/country/AddCountryDbDto.java index b581ac25d8..ffdadc15cd 100644 --- a/src/main/java/ru/mystamps/web/feature/country/AddCountryDbDto.java +++ b/src/main/java/ru/mystamps/web/feature/country/AddCountryDbDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/country/AddCountryDto.java b/src/main/java/ru/mystamps/web/feature/country/AddCountryDto.java index b01fc5a89e..225f9d58e0 100644 --- a/src/main/java/ru/mystamps/web/feature/country/AddCountryDto.java +++ b/src/main/java/ru/mystamps/web/feature/country/AddCountryDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/country/AddCountryForm.java b/src/main/java/ru/mystamps/web/feature/country/AddCountryForm.java index bb8f8ab299..c455d50a6b 100644 --- a/src/main/java/ru/mystamps/web/feature/country/AddCountryForm.java +++ b/src/main/java/ru/mystamps/web/feature/country/AddCountryForm.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/country/ApiCountryService.java b/src/main/java/ru/mystamps/web/feature/country/ApiCountryService.java index f2eced06aa..e8dfee455d 100644 --- a/src/main/java/ru/mystamps/web/feature/country/ApiCountryService.java +++ b/src/main/java/ru/mystamps/web/feature/country/ApiCountryService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/country/Country.java b/src/main/java/ru/mystamps/web/feature/country/Country.java index 89301b6b6b..5988e794ed 100644 --- a/src/main/java/ru/mystamps/web/feature/country/Country.java +++ b/src/main/java/ru/mystamps/web/feature/country/Country.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/country/CountryConfig.java b/src/main/java/ru/mystamps/web/feature/country/CountryConfig.java index 9afeddb703..33fee63e81 100644 --- a/src/main/java/ru/mystamps/web/feature/country/CountryConfig.java +++ b/src/main/java/ru/mystamps/web/feature/country/CountryConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/country/CountryController.java b/src/main/java/ru/mystamps/web/feature/country/CountryController.java index dfe7ed59c9..1bb5c9ad41 100644 --- a/src/main/java/ru/mystamps/web/feature/country/CountryController.java +++ b/src/main/java/ru/mystamps/web/feature/country/CountryController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/country/CountryDao.java b/src/main/java/ru/mystamps/web/feature/country/CountryDao.java index bad89c3d1a..4f9d8d2662 100644 --- a/src/main/java/ru/mystamps/web/feature/country/CountryDao.java +++ b/src/main/java/ru/mystamps/web/feature/country/CountryDao.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/country/CountryDb.java b/src/main/java/ru/mystamps/web/feature/country/CountryDb.java index be0a8d7cf1..15ded807ac 100644 --- a/src/main/java/ru/mystamps/web/feature/country/CountryDb.java +++ b/src/main/java/ru/mystamps/web/feature/country/CountryDb.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/country/CountryLinkEntityDtoConverter.java b/src/main/java/ru/mystamps/web/feature/country/CountryLinkEntityDtoConverter.java index 814fd73baf..102222a00f 100644 --- a/src/main/java/ru/mystamps/web/feature/country/CountryLinkEntityDtoConverter.java +++ b/src/main/java/ru/mystamps/web/feature/country/CountryLinkEntityDtoConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/country/CountryService.java b/src/main/java/ru/mystamps/web/feature/country/CountryService.java index 04230cbda4..e0672f3fce 100644 --- a/src/main/java/ru/mystamps/web/feature/country/CountryService.java +++ b/src/main/java/ru/mystamps/web/feature/country/CountryService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/country/CountryServiceImpl.java b/src/main/java/ru/mystamps/web/feature/country/CountryServiceImpl.java index 5cf6456fcf..5c0e19ff02 100644 --- a/src/main/java/ru/mystamps/web/feature/country/CountryServiceImpl.java +++ b/src/main/java/ru/mystamps/web/feature/country/CountryServiceImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/country/CountryUrl.java b/src/main/java/ru/mystamps/web/feature/country/CountryUrl.java index 96f15ce2f9..f0b386b635 100644 --- a/src/main/java/ru/mystamps/web/feature/country/CountryUrl.java +++ b/src/main/java/ru/mystamps/web/feature/country/CountryUrl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/country/CountryValidation.java b/src/main/java/ru/mystamps/web/feature/country/CountryValidation.java index f58b8ab148..3966880bf4 100644 --- a/src/main/java/ru/mystamps/web/feature/country/CountryValidation.java +++ b/src/main/java/ru/mystamps/web/feature/country/CountryValidation.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/country/JdbcCountryDao.java b/src/main/java/ru/mystamps/web/feature/country/JdbcCountryDao.java index 1946ad9a35..3adb0f9ec5 100644 --- a/src/main/java/ru/mystamps/web/feature/country/JdbcCountryDao.java +++ b/src/main/java/ru/mystamps/web/feature/country/JdbcCountryDao.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/country/SuggestionController.java b/src/main/java/ru/mystamps/web/feature/country/SuggestionController.java index 17f07ed389..a1b8818c46 100644 --- a/src/main/java/ru/mystamps/web/feature/country/SuggestionController.java +++ b/src/main/java/ru/mystamps/web/feature/country/SuggestionController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/country/TogglzWithFallbackCountryService.java b/src/main/java/ru/mystamps/web/feature/country/TogglzWithFallbackCountryService.java index 15c92b6b2d..41615efabd 100644 --- a/src/main/java/ru/mystamps/web/feature/country/TogglzWithFallbackCountryService.java +++ b/src/main/java/ru/mystamps/web/feature/country/TogglzWithFallbackCountryService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/country/UniqueCountryName.java b/src/main/java/ru/mystamps/web/feature/country/UniqueCountryName.java index 931dbc7f2e..5ec0ee3782 100644 --- a/src/main/java/ru/mystamps/web/feature/country/UniqueCountryName.java +++ b/src/main/java/ru/mystamps/web/feature/country/UniqueCountryName.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/country/UniqueCountryNameValidator.java b/src/main/java/ru/mystamps/web/feature/country/UniqueCountryNameValidator.java index 4dc9c31157..26a255cfd6 100644 --- a/src/main/java/ru/mystamps/web/feature/country/UniqueCountryNameValidator.java +++ b/src/main/java/ru/mystamps/web/feature/country/UniqueCountryNameValidator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/country/UniqueCountrySlug.java b/src/main/java/ru/mystamps/web/feature/country/UniqueCountrySlug.java index cefe420f7a..a8166d0da5 100644 --- a/src/main/java/ru/mystamps/web/feature/country/UniqueCountrySlug.java +++ b/src/main/java/ru/mystamps/web/feature/country/UniqueCountrySlug.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/country/UniqueCountrySlugValidator.java b/src/main/java/ru/mystamps/web/feature/country/UniqueCountrySlugValidator.java index bbbe988aa5..9e4eaa3085 100644 --- a/src/main/java/ru/mystamps/web/feature/country/UniqueCountrySlugValidator.java +++ b/src/main/java/ru/mystamps/web/feature/country/UniqueCountrySlugValidator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/image/AddImageDataDbDto.java b/src/main/java/ru/mystamps/web/feature/image/AddImageDataDbDto.java index bffa5f36dd..bcf484b7c2 100644 --- a/src/main/java/ru/mystamps/web/feature/image/AddImageDataDbDto.java +++ b/src/main/java/ru/mystamps/web/feature/image/AddImageDataDbDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/image/CreateImagePreviewException.java b/src/main/java/ru/mystamps/web/feature/image/CreateImagePreviewException.java index 7c2cfa003c..03847dca3c 100644 --- a/src/main/java/ru/mystamps/web/feature/image/CreateImagePreviewException.java +++ b/src/main/java/ru/mystamps/web/feature/image/CreateImagePreviewException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/image/DatabaseImagePersistenceStrategy.java b/src/main/java/ru/mystamps/web/feature/image/DatabaseImagePersistenceStrategy.java index 014e80044a..4513d61fc1 100644 --- a/src/main/java/ru/mystamps/web/feature/image/DatabaseImagePersistenceStrategy.java +++ b/src/main/java/ru/mystamps/web/feature/image/DatabaseImagePersistenceStrategy.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/image/FilesystemImagePersistenceStrategy.java b/src/main/java/ru/mystamps/web/feature/image/FilesystemImagePersistenceStrategy.java index 7c3a2c5907..d5c8ccadbe 100644 --- a/src/main/java/ru/mystamps/web/feature/image/FilesystemImagePersistenceStrategy.java +++ b/src/main/java/ru/mystamps/web/feature/image/FilesystemImagePersistenceStrategy.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/image/ImageConfig.java b/src/main/java/ru/mystamps/web/feature/image/ImageConfig.java index f35c36576d..85716a2427 100644 --- a/src/main/java/ru/mystamps/web/feature/image/ImageConfig.java +++ b/src/main/java/ru/mystamps/web/feature/image/ImageConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/image/ImageController.java b/src/main/java/ru/mystamps/web/feature/image/ImageController.java index 06f72c0e1c..66b0e58f04 100644 --- a/src/main/java/ru/mystamps/web/feature/image/ImageController.java +++ b/src/main/java/ru/mystamps/web/feature/image/ImageController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/image/ImageDao.java b/src/main/java/ru/mystamps/web/feature/image/ImageDao.java index 07422aeff0..f3e53329be 100644 --- a/src/main/java/ru/mystamps/web/feature/image/ImageDao.java +++ b/src/main/java/ru/mystamps/web/feature/image/ImageDao.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/image/ImageDataDao.java b/src/main/java/ru/mystamps/web/feature/image/ImageDataDao.java index da530a97f7..fe6e08e216 100644 --- a/src/main/java/ru/mystamps/web/feature/image/ImageDataDao.java +++ b/src/main/java/ru/mystamps/web/feature/image/ImageDataDao.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/image/ImageDb.java b/src/main/java/ru/mystamps/web/feature/image/ImageDb.java index a20799e11d..0073bfdfda 100644 --- a/src/main/java/ru/mystamps/web/feature/image/ImageDb.java +++ b/src/main/java/ru/mystamps/web/feature/image/ImageDb.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/image/ImageDto.java b/src/main/java/ru/mystamps/web/feature/image/ImageDto.java index b6a1f647ea..e855cb96b5 100644 --- a/src/main/java/ru/mystamps/web/feature/image/ImageDto.java +++ b/src/main/java/ru/mystamps/web/feature/image/ImageDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/image/ImageInfoDto.java b/src/main/java/ru/mystamps/web/feature/image/ImageInfoDto.java index 2f1b9666db..b55859d31a 100644 --- a/src/main/java/ru/mystamps/web/feature/image/ImageInfoDto.java +++ b/src/main/java/ru/mystamps/web/feature/image/ImageInfoDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/image/ImagePersistenceException.java b/src/main/java/ru/mystamps/web/feature/image/ImagePersistenceException.java index 97122c657a..c83d7ddf2f 100644 --- a/src/main/java/ru/mystamps/web/feature/image/ImagePersistenceException.java +++ b/src/main/java/ru/mystamps/web/feature/image/ImagePersistenceException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/image/ImagePersistenceStrategy.java b/src/main/java/ru/mystamps/web/feature/image/ImagePersistenceStrategy.java index c14fbf5eaa..feaba0f447 100644 --- a/src/main/java/ru/mystamps/web/feature/image/ImagePersistenceStrategy.java +++ b/src/main/java/ru/mystamps/web/feature/image/ImagePersistenceStrategy.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/image/ImagePreviewStrategy.java b/src/main/java/ru/mystamps/web/feature/image/ImagePreviewStrategy.java index eb1270003e..18e37267e0 100644 --- a/src/main/java/ru/mystamps/web/feature/image/ImagePreviewStrategy.java +++ b/src/main/java/ru/mystamps/web/feature/image/ImagePreviewStrategy.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/image/ImageService.java b/src/main/java/ru/mystamps/web/feature/image/ImageService.java index d4447bdd05..3d1a07249d 100644 --- a/src/main/java/ru/mystamps/web/feature/image/ImageService.java +++ b/src/main/java/ru/mystamps/web/feature/image/ImageService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/image/ImageServiceImpl.java b/src/main/java/ru/mystamps/web/feature/image/ImageServiceImpl.java index be162c1017..4cc293b5ab 100644 --- a/src/main/java/ru/mystamps/web/feature/image/ImageServiceImpl.java +++ b/src/main/java/ru/mystamps/web/feature/image/ImageServiceImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/image/ImageUrl.java b/src/main/java/ru/mystamps/web/feature/image/ImageUrl.java index cb311f1c99..1106b4911d 100644 --- a/src/main/java/ru/mystamps/web/feature/image/ImageUrl.java +++ b/src/main/java/ru/mystamps/web/feature/image/ImageUrl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/image/ImageValidation.java b/src/main/java/ru/mystamps/web/feature/image/ImageValidation.java index 74b9586ef7..e911f41ae1 100644 --- a/src/main/java/ru/mystamps/web/feature/image/ImageValidation.java +++ b/src/main/java/ru/mystamps/web/feature/image/ImageValidation.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/image/JdbcImageDao.java b/src/main/java/ru/mystamps/web/feature/image/JdbcImageDao.java index 89dbfc5d05..846a6ee463 100644 --- a/src/main/java/ru/mystamps/web/feature/image/JdbcImageDao.java +++ b/src/main/java/ru/mystamps/web/feature/image/JdbcImageDao.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/image/JdbcImageDataDao.java b/src/main/java/ru/mystamps/web/feature/image/JdbcImageDataDao.java index 6723724d72..d18ea818e4 100644 --- a/src/main/java/ru/mystamps/web/feature/image/JdbcImageDataDao.java +++ b/src/main/java/ru/mystamps/web/feature/image/JdbcImageDataDao.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/image/ReplaceImageDataDbDto.java b/src/main/java/ru/mystamps/web/feature/image/ReplaceImageDataDbDto.java index a8070fca23..0ab5975b90 100644 --- a/src/main/java/ru/mystamps/web/feature/image/ReplaceImageDataDbDto.java +++ b/src/main/java/ru/mystamps/web/feature/image/ReplaceImageDataDbDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/image/RowMappers.java b/src/main/java/ru/mystamps/web/feature/image/RowMappers.java index 998e393633..f1be903d9d 100644 --- a/src/main/java/ru/mystamps/web/feature/image/RowMappers.java +++ b/src/main/java/ru/mystamps/web/feature/image/RowMappers.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/image/ThumbnailatorImagePreviewStrategy.java b/src/main/java/ru/mystamps/web/feature/image/ThumbnailatorImagePreviewStrategy.java index 5eaa5084b1..cb4b1fec87 100644 --- a/src/main/java/ru/mystamps/web/feature/image/ThumbnailatorImagePreviewStrategy.java +++ b/src/main/java/ru/mystamps/web/feature/image/ThumbnailatorImagePreviewStrategy.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/image/TimedImagePreviewStrategy.java b/src/main/java/ru/mystamps/web/feature/image/TimedImagePreviewStrategy.java index c03ce4f6da..51cf683e59 100644 --- a/src/main/java/ru/mystamps/web/feature/image/TimedImagePreviewStrategy.java +++ b/src/main/java/ru/mystamps/web/feature/image/TimedImagePreviewStrategy.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/participant/AddParticipantDbDto.java b/src/main/java/ru/mystamps/web/feature/participant/AddParticipantDbDto.java index 9199407cc6..e037cb53e6 100644 --- a/src/main/java/ru/mystamps/web/feature/participant/AddParticipantDbDto.java +++ b/src/main/java/ru/mystamps/web/feature/participant/AddParticipantDbDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/participant/AddParticipantDto.java b/src/main/java/ru/mystamps/web/feature/participant/AddParticipantDto.java index 490eef10b5..b8e9c09080 100644 --- a/src/main/java/ru/mystamps/web/feature/participant/AddParticipantDto.java +++ b/src/main/java/ru/mystamps/web/feature/participant/AddParticipantDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/participant/AddParticipantForm.java b/src/main/java/ru/mystamps/web/feature/participant/AddParticipantForm.java index 8982cc8a44..f97f4f04cd 100644 --- a/src/main/java/ru/mystamps/web/feature/participant/AddParticipantForm.java +++ b/src/main/java/ru/mystamps/web/feature/participant/AddParticipantForm.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/participant/EntityWithIdDto.java b/src/main/java/ru/mystamps/web/feature/participant/EntityWithIdDto.java index 9c375a15f7..268b367479 100644 --- a/src/main/java/ru/mystamps/web/feature/participant/EntityWithIdDto.java +++ b/src/main/java/ru/mystamps/web/feature/participant/EntityWithIdDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/participant/JdbcParticipantDao.java b/src/main/java/ru/mystamps/web/feature/participant/JdbcParticipantDao.java index 419eaf8e10..7ef133892a 100644 --- a/src/main/java/ru/mystamps/web/feature/participant/JdbcParticipantDao.java +++ b/src/main/java/ru/mystamps/web/feature/participant/JdbcParticipantDao.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/participant/ParticipantConfig.java b/src/main/java/ru/mystamps/web/feature/participant/ParticipantConfig.java index 05ec7754d8..eb28d1b7a0 100644 --- a/src/main/java/ru/mystamps/web/feature/participant/ParticipantConfig.java +++ b/src/main/java/ru/mystamps/web/feature/participant/ParticipantConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/participant/ParticipantController.java b/src/main/java/ru/mystamps/web/feature/participant/ParticipantController.java index 26278abb81..d6abb57f1c 100644 --- a/src/main/java/ru/mystamps/web/feature/participant/ParticipantController.java +++ b/src/main/java/ru/mystamps/web/feature/participant/ParticipantController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/participant/ParticipantDao.java b/src/main/java/ru/mystamps/web/feature/participant/ParticipantDao.java index c4ebdc6a90..193c817e66 100644 --- a/src/main/java/ru/mystamps/web/feature/participant/ParticipantDao.java +++ b/src/main/java/ru/mystamps/web/feature/participant/ParticipantDao.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/participant/ParticipantDb.java b/src/main/java/ru/mystamps/web/feature/participant/ParticipantDb.java index 068beb8da1..a43c24964d 100644 --- a/src/main/java/ru/mystamps/web/feature/participant/ParticipantDb.java +++ b/src/main/java/ru/mystamps/web/feature/participant/ParticipantDb.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/participant/ParticipantService.java b/src/main/java/ru/mystamps/web/feature/participant/ParticipantService.java index 94e8f21a6f..f16b694e64 100644 --- a/src/main/java/ru/mystamps/web/feature/participant/ParticipantService.java +++ b/src/main/java/ru/mystamps/web/feature/participant/ParticipantService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/participant/ParticipantServiceImpl.java b/src/main/java/ru/mystamps/web/feature/participant/ParticipantServiceImpl.java index 9ed4eebc38..fbd39f947b 100644 --- a/src/main/java/ru/mystamps/web/feature/participant/ParticipantServiceImpl.java +++ b/src/main/java/ru/mystamps/web/feature/participant/ParticipantServiceImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/participant/ParticipantUrl.java b/src/main/java/ru/mystamps/web/feature/participant/ParticipantUrl.java index 3ec233c5c3..8f087e5d10 100644 --- a/src/main/java/ru/mystamps/web/feature/participant/ParticipantUrl.java +++ b/src/main/java/ru/mystamps/web/feature/participant/ParticipantUrl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/participant/ParticipantValidation.java b/src/main/java/ru/mystamps/web/feature/participant/ParticipantValidation.java index ecec782859..bc5888e207 100644 --- a/src/main/java/ru/mystamps/web/feature/participant/ParticipantValidation.java +++ b/src/main/java/ru/mystamps/web/feature/participant/ParticipantValidation.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/participant/RowMappers.java b/src/main/java/ru/mystamps/web/feature/participant/RowMappers.java index 8552cd16b5..ba1696de12 100644 --- a/src/main/java/ru/mystamps/web/feature/participant/RowMappers.java +++ b/src/main/java/ru/mystamps/web/feature/participant/RowMappers.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/report/AdminDailyReport.java b/src/main/java/ru/mystamps/web/feature/report/AdminDailyReport.java index 23dc73cd14..7ec8d96059 100644 --- a/src/main/java/ru/mystamps/web/feature/report/AdminDailyReport.java +++ b/src/main/java/ru/mystamps/web/feature/report/AdminDailyReport.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/report/ReportConfig.java b/src/main/java/ru/mystamps/web/feature/report/ReportConfig.java index b621572ef3..498e109489 100644 --- a/src/main/java/ru/mystamps/web/feature/report/ReportConfig.java +++ b/src/main/java/ru/mystamps/web/feature/report/ReportConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/report/ReportController.java b/src/main/java/ru/mystamps/web/feature/report/ReportController.java index 21e7dbe52f..5808aee1c9 100644 --- a/src/main/java/ru/mystamps/web/feature/report/ReportController.java +++ b/src/main/java/ru/mystamps/web/feature/report/ReportController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/report/ReportService.java b/src/main/java/ru/mystamps/web/feature/report/ReportService.java index bf3dac85cd..628143f269 100644 --- a/src/main/java/ru/mystamps/web/feature/report/ReportService.java +++ b/src/main/java/ru/mystamps/web/feature/report/ReportService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/report/ReportServiceImpl.java b/src/main/java/ru/mystamps/web/feature/report/ReportServiceImpl.java index e70a5d570d..23aba350e2 100644 --- a/src/main/java/ru/mystamps/web/feature/report/ReportServiceImpl.java +++ b/src/main/java/ru/mystamps/web/feature/report/ReportServiceImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/report/ReportUrl.java b/src/main/java/ru/mystamps/web/feature/report/ReportUrl.java index 04f5671724..45bb90a1ba 100644 --- a/src/main/java/ru/mystamps/web/feature/report/ReportUrl.java +++ b/src/main/java/ru/mystamps/web/feature/report/ReportUrl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/AddCatalogPriceDbDto.java b/src/main/java/ru/mystamps/web/feature/series/AddCatalogPriceDbDto.java index 130f610980..eadb08a1d1 100644 --- a/src/main/java/ru/mystamps/web/feature/series/AddCatalogPriceDbDto.java +++ b/src/main/java/ru/mystamps/web/feature/series/AddCatalogPriceDbDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/AddCommentDbDto.java b/src/main/java/ru/mystamps/web/feature/series/AddCommentDbDto.java index b8b4ad8a68..d232df1054 100644 --- a/src/main/java/ru/mystamps/web/feature/series/AddCommentDbDto.java +++ b/src/main/java/ru/mystamps/web/feature/series/AddCommentDbDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/AddImageDto.java b/src/main/java/ru/mystamps/web/feature/series/AddImageDto.java index f045b4c3e6..72a5938a64 100644 --- a/src/main/java/ru/mystamps/web/feature/series/AddImageDto.java +++ b/src/main/java/ru/mystamps/web/feature/series/AddImageDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/AddImageForm.java b/src/main/java/ru/mystamps/web/feature/series/AddImageForm.java index b9e8afdd20..9d2f1f75cb 100644 --- a/src/main/java/ru/mystamps/web/feature/series/AddImageForm.java +++ b/src/main/java/ru/mystamps/web/feature/series/AddImageForm.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/AddReleaseYearDbDto.java b/src/main/java/ru/mystamps/web/feature/series/AddReleaseYearDbDto.java index 5ec4879a67..52e0456242 100644 --- a/src/main/java/ru/mystamps/web/feature/series/AddReleaseYearDbDto.java +++ b/src/main/java/ru/mystamps/web/feature/series/AddReleaseYearDbDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/AddSeriesDbDto.java b/src/main/java/ru/mystamps/web/feature/series/AddSeriesDbDto.java index c7663aca29..f508757dbd 100644 --- a/src/main/java/ru/mystamps/web/feature/series/AddSeriesDbDto.java +++ b/src/main/java/ru/mystamps/web/feature/series/AddSeriesDbDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/AddSeriesDto.java b/src/main/java/ru/mystamps/web/feature/series/AddSeriesDto.java index f301d4094b..a1f8221a93 100644 --- a/src/main/java/ru/mystamps/web/feature/series/AddSeriesDto.java +++ b/src/main/java/ru/mystamps/web/feature/series/AddSeriesDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/AddSeriesForm.java b/src/main/java/ru/mystamps/web/feature/series/AddSeriesForm.java index f620164eff..86ef5b5b8c 100644 --- a/src/main/java/ru/mystamps/web/feature/series/AddSeriesForm.java +++ b/src/main/java/ru/mystamps/web/feature/series/AddSeriesForm.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/AddSimilarSeriesDto.java b/src/main/java/ru/mystamps/web/feature/series/AddSimilarSeriesDto.java index 7b702ae945..d72c297b2a 100644 --- a/src/main/java/ru/mystamps/web/feature/series/AddSimilarSeriesDto.java +++ b/src/main/java/ru/mystamps/web/feature/series/AddSimilarSeriesDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/AddSimilarSeriesForm.java b/src/main/java/ru/mystamps/web/feature/series/AddSimilarSeriesForm.java index 03b00cc18d..472b5a7a8e 100644 --- a/src/main/java/ru/mystamps/web/feature/series/AddSimilarSeriesForm.java +++ b/src/main/java/ru/mystamps/web/feature/series/AddSimilarSeriesForm.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/ByteArrayMultipartFile.java b/src/main/java/ru/mystamps/web/feature/series/ByteArrayMultipartFile.java index e395608db0..89091cf466 100644 --- a/src/main/java/ru/mystamps/web/feature/series/ByteArrayMultipartFile.java +++ b/src/main/java/ru/mystamps/web/feature/series/ByteArrayMultipartFile.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/CatalogInfoDto.java b/src/main/java/ru/mystamps/web/feature/series/CatalogInfoDto.java index 4378c4ccfa..84ba39d41d 100644 --- a/src/main/java/ru/mystamps/web/feature/series/CatalogInfoDto.java +++ b/src/main/java/ru/mystamps/web/feature/series/CatalogInfoDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/CatalogNumbers.java b/src/main/java/ru/mystamps/web/feature/series/CatalogNumbers.java index d43d7aca68..70c8660375 100644 --- a/src/main/java/ru/mystamps/web/feature/series/CatalogNumbers.java +++ b/src/main/java/ru/mystamps/web/feature/series/CatalogNumbers.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/CatalogNumbersValidator.java b/src/main/java/ru/mystamps/web/feature/series/CatalogNumbersValidator.java index 79a8113f83..5fdd63f4bd 100644 --- a/src/main/java/ru/mystamps/web/feature/series/CatalogNumbersValidator.java +++ b/src/main/java/ru/mystamps/web/feature/series/CatalogNumbersValidator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/CatalogUtils.java b/src/main/java/ru/mystamps/web/feature/series/CatalogUtils.java index 28f3dc1453..2bda4bb1e0 100644 --- a/src/main/java/ru/mystamps/web/feature/series/CatalogUtils.java +++ b/src/main/java/ru/mystamps/web/feature/series/CatalogUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/DownloadImageInterceptor.java b/src/main/java/ru/mystamps/web/feature/series/DownloadImageInterceptor.java index 7a654ca52c..142fbbc3e3 100644 --- a/src/main/java/ru/mystamps/web/feature/series/DownloadImageInterceptor.java +++ b/src/main/java/ru/mystamps/web/feature/series/DownloadImageInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/DownloadResult.java b/src/main/java/ru/mystamps/web/feature/series/DownloadResult.java index 3ae892b151..26b6711651 100644 --- a/src/main/java/ru/mystamps/web/feature/series/DownloadResult.java +++ b/src/main/java/ru/mystamps/web/feature/series/DownloadResult.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/DownloaderService.java b/src/main/java/ru/mystamps/web/feature/series/DownloaderService.java index 565c29c396..bd9776dd7f 100644 --- a/src/main/java/ru/mystamps/web/feature/series/DownloaderService.java +++ b/src/main/java/ru/mystamps/web/feature/series/DownloaderService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/HasImageOrImageUrl.java b/src/main/java/ru/mystamps/web/feature/series/HasImageOrImageUrl.java index 04408e5a38..b28bfeb2e2 100644 --- a/src/main/java/ru/mystamps/web/feature/series/HasImageOrImageUrl.java +++ b/src/main/java/ru/mystamps/web/feature/series/HasImageOrImageUrl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/HttpURLConnectionDownloaderService.java b/src/main/java/ru/mystamps/web/feature/series/HttpURLConnectionDownloaderService.java index 9fe9585925..a2d1d01758 100644 --- a/src/main/java/ru/mystamps/web/feature/series/HttpURLConnectionDownloaderService.java +++ b/src/main/java/ru/mystamps/web/feature/series/HttpURLConnectionDownloaderService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/JdbcSeriesDao.java b/src/main/java/ru/mystamps/web/feature/series/JdbcSeriesDao.java index d14d49d61d..259afaa0b7 100644 --- a/src/main/java/ru/mystamps/web/feature/series/JdbcSeriesDao.java +++ b/src/main/java/ru/mystamps/web/feature/series/JdbcSeriesDao.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/JdbcSeriesImageDao.java b/src/main/java/ru/mystamps/web/feature/series/JdbcSeriesImageDao.java index ff5dbb0ccd..3f029d8128 100644 --- a/src/main/java/ru/mystamps/web/feature/series/JdbcSeriesImageDao.java +++ b/src/main/java/ru/mystamps/web/feature/series/JdbcSeriesImageDao.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/JdbcStampsCatalogDao.java b/src/main/java/ru/mystamps/web/feature/series/JdbcStampsCatalogDao.java index 55a16fd2db..b339530c38 100644 --- a/src/main/java/ru/mystamps/web/feature/series/JdbcStampsCatalogDao.java +++ b/src/main/java/ru/mystamps/web/feature/series/JdbcStampsCatalogDao.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/ModifySeriesImageForm.java b/src/main/java/ru/mystamps/web/feature/series/ModifySeriesImageForm.java index cce903ee2b..6fabfe74df 100644 --- a/src/main/java/ru/mystamps/web/feature/series/ModifySeriesImageForm.java +++ b/src/main/java/ru/mystamps/web/feature/series/ModifySeriesImageForm.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/NullableImageUrl.java b/src/main/java/ru/mystamps/web/feature/series/NullableImageUrl.java index d633825cc3..be84ede35c 100644 --- a/src/main/java/ru/mystamps/web/feature/series/NullableImageUrl.java +++ b/src/main/java/ru/mystamps/web/feature/series/NullableImageUrl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/ReleaseDateIsNotInFuture.java b/src/main/java/ru/mystamps/web/feature/series/ReleaseDateIsNotInFuture.java index 771e5c4bc8..7b23e5d3d7 100644 --- a/src/main/java/ru/mystamps/web/feature/series/ReleaseDateIsNotInFuture.java +++ b/src/main/java/ru/mystamps/web/feature/series/ReleaseDateIsNotInFuture.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/ReleaseDateIsNotInFutureValidator.java b/src/main/java/ru/mystamps/web/feature/series/ReleaseDateIsNotInFutureValidator.java index 3433d522f8..616db2123a 100644 --- a/src/main/java/ru/mystamps/web/feature/series/ReleaseDateIsNotInFutureValidator.java +++ b/src/main/java/ru/mystamps/web/feature/series/ReleaseDateIsNotInFutureValidator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/ReplaceImageDto.java b/src/main/java/ru/mystamps/web/feature/series/ReplaceImageDto.java index be7570c158..f6f9eff490 100644 --- a/src/main/java/ru/mystamps/web/feature/series/ReplaceImageDto.java +++ b/src/main/java/ru/mystamps/web/feature/series/ReplaceImageDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/RequireImageOrImageUrl.java b/src/main/java/ru/mystamps/web/feature/series/RequireImageOrImageUrl.java index 299d945a80..d463f38ee5 100644 --- a/src/main/java/ru/mystamps/web/feature/series/RequireImageOrImageUrl.java +++ b/src/main/java/ru/mystamps/web/feature/series/RequireImageOrImageUrl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/RequireImageOrImageUrlValidator.java b/src/main/java/ru/mystamps/web/feature/series/RequireImageOrImageUrlValidator.java index 0319686e35..88dfeb867b 100644 --- a/src/main/java/ru/mystamps/web/feature/series/RequireImageOrImageUrlValidator.java +++ b/src/main/java/ru/mystamps/web/feature/series/RequireImageOrImageUrlValidator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/RestSeriesController.java b/src/main/java/ru/mystamps/web/feature/series/RestSeriesController.java index e338413ca2..673b9970d1 100644 --- a/src/main/java/ru/mystamps/web/feature/series/RestSeriesController.java +++ b/src/main/java/ru/mystamps/web/feature/series/RestSeriesController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/RowMappers.java b/src/main/java/ru/mystamps/web/feature/series/RowMappers.java index fd901d728e..81067f36ad 100644 --- a/src/main/java/ru/mystamps/web/feature/series/RowMappers.java +++ b/src/main/java/ru/mystamps/web/feature/series/RowMappers.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/SelectItem.java b/src/main/java/ru/mystamps/web/feature/series/SelectItem.java index cac7ca2b5c..f15605ea76 100644 --- a/src/main/java/ru/mystamps/web/feature/series/SelectItem.java +++ b/src/main/java/ru/mystamps/web/feature/series/SelectItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/SelectOption.java b/src/main/java/ru/mystamps/web/feature/series/SelectOption.java index 9327df221c..5676ac1d73 100644 --- a/src/main/java/ru/mystamps/web/feature/series/SelectOption.java +++ b/src/main/java/ru/mystamps/web/feature/series/SelectOption.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/SeriesConfig.java b/src/main/java/ru/mystamps/web/feature/series/SeriesConfig.java index ec533b13bb..c01e3a38f6 100644 --- a/src/main/java/ru/mystamps/web/feature/series/SeriesConfig.java +++ b/src/main/java/ru/mystamps/web/feature/series/SeriesConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/SeriesController.java b/src/main/java/ru/mystamps/web/feature/series/SeriesController.java index 4c3f59243b..3b4963d52a 100644 --- a/src/main/java/ru/mystamps/web/feature/series/SeriesController.java +++ b/src/main/java/ru/mystamps/web/feature/series/SeriesController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/SeriesDao.java b/src/main/java/ru/mystamps/web/feature/series/SeriesDao.java index 4524801203..819d00154f 100644 --- a/src/main/java/ru/mystamps/web/feature/series/SeriesDao.java +++ b/src/main/java/ru/mystamps/web/feature/series/SeriesDao.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/SeriesDb.java b/src/main/java/ru/mystamps/web/feature/series/SeriesDb.java index d9a8488b9e..5ad6336f4f 100644 --- a/src/main/java/ru/mystamps/web/feature/series/SeriesDb.java +++ b/src/main/java/ru/mystamps/web/feature/series/SeriesDb.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/SeriesDto.java b/src/main/java/ru/mystamps/web/feature/series/SeriesDto.java index 390bac858e..00ba4ab6bf 100644 --- a/src/main/java/ru/mystamps/web/feature/series/SeriesDto.java +++ b/src/main/java/ru/mystamps/web/feature/series/SeriesDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/SeriesFullInfoDto.java b/src/main/java/ru/mystamps/web/feature/series/SeriesFullInfoDto.java index a4dff02495..09c6939667 100644 --- a/src/main/java/ru/mystamps/web/feature/series/SeriesFullInfoDto.java +++ b/src/main/java/ru/mystamps/web/feature/series/SeriesFullInfoDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/SeriesImageDao.java b/src/main/java/ru/mystamps/web/feature/series/SeriesImageDao.java index 955d1a1873..46d6dd463e 100644 --- a/src/main/java/ru/mystamps/web/feature/series/SeriesImageDao.java +++ b/src/main/java/ru/mystamps/web/feature/series/SeriesImageDao.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/SeriesImageService.java b/src/main/java/ru/mystamps/web/feature/series/SeriesImageService.java index 7e59cbd84f..656a685b37 100644 --- a/src/main/java/ru/mystamps/web/feature/series/SeriesImageService.java +++ b/src/main/java/ru/mystamps/web/feature/series/SeriesImageService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/SeriesImageServiceImpl.java b/src/main/java/ru/mystamps/web/feature/series/SeriesImageServiceImpl.java index ab6003997b..1f1b816def 100644 --- a/src/main/java/ru/mystamps/web/feature/series/SeriesImageServiceImpl.java +++ b/src/main/java/ru/mystamps/web/feature/series/SeriesImageServiceImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/SeriesInGalleryDto.java b/src/main/java/ru/mystamps/web/feature/series/SeriesInGalleryDto.java index bd72381b71..6d67b7a31e 100644 --- a/src/main/java/ru/mystamps/web/feature/series/SeriesInGalleryDto.java +++ b/src/main/java/ru/mystamps/web/feature/series/SeriesInGalleryDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/SeriesInfoDto.java b/src/main/java/ru/mystamps/web/feature/series/SeriesInfoDto.java index 4ebcf93f0f..3cbf859549 100644 --- a/src/main/java/ru/mystamps/web/feature/series/SeriesInfoDto.java +++ b/src/main/java/ru/mystamps/web/feature/series/SeriesInfoDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/SeriesLinkDto.java b/src/main/java/ru/mystamps/web/feature/series/SeriesLinkDto.java index 5ce051e865..c120e54d4a 100644 --- a/src/main/java/ru/mystamps/web/feature/series/SeriesLinkDto.java +++ b/src/main/java/ru/mystamps/web/feature/series/SeriesLinkDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/SeriesService.java b/src/main/java/ru/mystamps/web/feature/series/SeriesService.java index 19e14c5126..151c5f6cba 100644 --- a/src/main/java/ru/mystamps/web/feature/series/SeriesService.java +++ b/src/main/java/ru/mystamps/web/feature/series/SeriesService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/SeriesServiceImpl.java b/src/main/java/ru/mystamps/web/feature/series/SeriesServiceImpl.java index 035434fe83..690115a1f6 100644 --- a/src/main/java/ru/mystamps/web/feature/series/SeriesServiceImpl.java +++ b/src/main/java/ru/mystamps/web/feature/series/SeriesServiceImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/SeriesUrl.java b/src/main/java/ru/mystamps/web/feature/series/SeriesUrl.java index cfc992dfa9..4c1e33fd89 100644 --- a/src/main/java/ru/mystamps/web/feature/series/SeriesUrl.java +++ b/src/main/java/ru/mystamps/web/feature/series/SeriesUrl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/SeriesValidation.java b/src/main/java/ru/mystamps/web/feature/series/SeriesValidation.java index c78cd80d6e..ef16ed94e0 100644 --- a/src/main/java/ru/mystamps/web/feature/series/SeriesValidation.java +++ b/src/main/java/ru/mystamps/web/feature/series/SeriesValidation.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/StampsCatalog.java b/src/main/java/ru/mystamps/web/feature/series/StampsCatalog.java index 2c381b596e..892f49d9b2 100644 --- a/src/main/java/ru/mystamps/web/feature/series/StampsCatalog.java +++ b/src/main/java/ru/mystamps/web/feature/series/StampsCatalog.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/StampsCatalogDao.java b/src/main/java/ru/mystamps/web/feature/series/StampsCatalogDao.java index 1f9842dc63..e43ae27726 100644 --- a/src/main/java/ru/mystamps/web/feature/series/StampsCatalogDao.java +++ b/src/main/java/ru/mystamps/web/feature/series/StampsCatalogDao.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/StampsCatalogService.java b/src/main/java/ru/mystamps/web/feature/series/StampsCatalogService.java index dc04902a17..2f33e5f55c 100644 --- a/src/main/java/ru/mystamps/web/feature/series/StampsCatalogService.java +++ b/src/main/java/ru/mystamps/web/feature/series/StampsCatalogService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/StampsCatalogServiceImpl.java b/src/main/java/ru/mystamps/web/feature/series/StampsCatalogServiceImpl.java index 4826742ff9..07ffc2aceb 100644 --- a/src/main/java/ru/mystamps/web/feature/series/StampsCatalogServiceImpl.java +++ b/src/main/java/ru/mystamps/web/feature/series/StampsCatalogServiceImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/TimedDownloaderService.java b/src/main/java/ru/mystamps/web/feature/series/TimedDownloaderService.java index 8d01056f3a..c3a48f0fc9 100644 --- a/src/main/java/ru/mystamps/web/feature/series/TimedDownloaderService.java +++ b/src/main/java/ru/mystamps/web/feature/series/TimedDownloaderService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/AddSeriesParsedDataDbDto.java b/src/main/java/ru/mystamps/web/feature/series/importing/AddSeriesParsedDataDbDto.java index bd75f0cbcc..2c796227f0 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/AddSeriesParsedDataDbDto.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/AddSeriesParsedDataDbDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/ExpandCatalogNumbersEditor.java b/src/main/java/ru/mystamps/web/feature/series/importing/ExpandCatalogNumbersEditor.java index 847d3d9c1d..ea37d37968 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/ExpandCatalogNumbersEditor.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/ExpandCatalogNumbersEditor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/HasSiteParser.java b/src/main/java/ru/mystamps/web/feature/series/importing/HasSiteParser.java index 5301e9eca4..78d8bc4b40 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/HasSiteParser.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/HasSiteParser.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/HasSiteParserValidator.java b/src/main/java/ru/mystamps/web/feature/series/importing/HasSiteParserValidator.java index 5fa99d0525..0daa75ac26 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/HasSiteParserValidator.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/HasSiteParserValidator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/ImportRequestDto.java b/src/main/java/ru/mystamps/web/feature/series/importing/ImportRequestDto.java index dfb8cc9c21..fe7d057c2b 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/ImportRequestDto.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/ImportRequestDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/ImportRequestFullInfo.java b/src/main/java/ru/mystamps/web/feature/series/importing/ImportRequestFullInfo.java index 5144f7f3b4..b5a1a0cd50 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/ImportRequestFullInfo.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/ImportRequestFullInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/ImportRequestInfo.java b/src/main/java/ru/mystamps/web/feature/series/importing/ImportRequestInfo.java index 8fd6f32729..45c35abd8c 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/ImportRequestInfo.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/ImportRequestInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/ImportSellerForm.java b/src/main/java/ru/mystamps/web/feature/series/importing/ImportSellerForm.java index f04368fda4..3814224b3b 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/ImportSellerForm.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/ImportSellerForm.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/ImportSeriesDbDto.java b/src/main/java/ru/mystamps/web/feature/series/importing/ImportSeriesDbDto.java index 9bdd7b598b..e0e8e34cdc 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/ImportSeriesDbDto.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/ImportSeriesDbDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/ImportSeriesForm.java b/src/main/java/ru/mystamps/web/feature/series/importing/ImportSeriesForm.java index 83ab94ede6..40e7300153 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/ImportSeriesForm.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/ImportSeriesForm.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/ImportSeriesFormTrimmerFilter.java b/src/main/java/ru/mystamps/web/feature/series/importing/ImportSeriesFormTrimmerFilter.java index 081acd6482..d7534e7560 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/ImportSeriesFormTrimmerFilter.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/ImportSeriesFormTrimmerFilter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/ImportSeriesSalesForm.java b/src/main/java/ru/mystamps/web/feature/series/importing/ImportSeriesSalesForm.java index 8eaa671ad7..391b6c823b 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/ImportSeriesSalesForm.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/ImportSeriesSalesForm.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/JdbcSeriesImportDao.java b/src/main/java/ru/mystamps/web/feature/series/importing/JdbcSeriesImportDao.java index 98029e3069..5f9ee411fe 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/JdbcSeriesImportDao.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/JdbcSeriesImportDao.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/RawParsedDataDto.java b/src/main/java/ru/mystamps/web/feature/series/importing/RawParsedDataDto.java index aecef4f03e..b263656b77 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/RawParsedDataDto.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/RawParsedDataDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/RequestImportDto.java b/src/main/java/ru/mystamps/web/feature/series/importing/RequestImportDto.java index cc06a7955e..2efec4a3d6 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/RequestImportDto.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/RequestImportDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/RequestSeriesImportForm.java b/src/main/java/ru/mystamps/web/feature/series/importing/RequestSeriesImportForm.java index ca42479664..8ab2211063 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/RequestSeriesImportForm.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/RequestSeriesImportForm.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/RowMappers.java b/src/main/java/ru/mystamps/web/feature/series/importing/RowMappers.java index 572c1ccb76..56456de9c5 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/RowMappers.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/RowMappers.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/SeriesExtractedInfo.java b/src/main/java/ru/mystamps/web/feature/series/importing/SeriesExtractedInfo.java index 09d3df0bd8..d415ad14dd 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/SeriesExtractedInfo.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/SeriesExtractedInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/SeriesImportConfig.java b/src/main/java/ru/mystamps/web/feature/series/importing/SeriesImportConfig.java index 11d99e0aa1..e3641fb590 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/SeriesImportConfig.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/SeriesImportConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/SeriesImportController.java b/src/main/java/ru/mystamps/web/feature/series/importing/SeriesImportController.java index f504bd1f5b..dab06299b9 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/SeriesImportController.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/SeriesImportController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/SeriesImportDao.java b/src/main/java/ru/mystamps/web/feature/series/importing/SeriesImportDao.java index 13b6aca375..e5035930b9 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/SeriesImportDao.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/SeriesImportDao.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/SeriesImportDb.java b/src/main/java/ru/mystamps/web/feature/series/importing/SeriesImportDb.java index 139d3702be..f4199595d2 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/SeriesImportDb.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/SeriesImportDb.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/SeriesImportService.java b/src/main/java/ru/mystamps/web/feature/series/importing/SeriesImportService.java index 2e5137d509..f70510bbd6 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/SeriesImportService.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/SeriesImportService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/SeriesImportServiceImpl.java b/src/main/java/ru/mystamps/web/feature/series/importing/SeriesImportServiceImpl.java index 2e8cb5dc58..c14cc16d8f 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/SeriesImportServiceImpl.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/SeriesImportServiceImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/SeriesImportUrl.java b/src/main/java/ru/mystamps/web/feature/series/importing/SeriesImportUrl.java index 16531c459a..2928b578b1 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/SeriesImportUrl.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/SeriesImportUrl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/SeriesImportValidation.java b/src/main/java/ru/mystamps/web/feature/series/importing/SeriesImportValidation.java index d948909fa4..4a4ed206d5 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/SeriesImportValidation.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/SeriesImportValidation.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/SeriesInfoExtractorService.java b/src/main/java/ru/mystamps/web/feature/series/importing/SeriesInfoExtractorService.java index 5eee44893c..e2f5f9ec24 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/SeriesInfoExtractorService.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/SeriesInfoExtractorService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/SeriesInfoExtractorServiceImpl.java b/src/main/java/ru/mystamps/web/feature/series/importing/SeriesInfoExtractorServiceImpl.java index d876becd6e..02a11cacb9 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/SeriesInfoExtractorServiceImpl.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/SeriesInfoExtractorServiceImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/SeriesParsedDataDto.java b/src/main/java/ru/mystamps/web/feature/series/importing/SeriesParsedDataDto.java index 684822d4b3..614b2eeb20 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/SeriesParsedDataDto.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/SeriesParsedDataDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/TimedSeriesInfoExtractorService.java b/src/main/java/ru/mystamps/web/feature/series/importing/TimedSeriesInfoExtractorService.java index 68fd1e89b1..2e25bcd9f9 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/TimedSeriesInfoExtractorService.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/TimedSeriesInfoExtractorService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/UpdateImportRequestStatusDbDto.java b/src/main/java/ru/mystamps/web/feature/series/importing/UpdateImportRequestStatusDbDto.java index 79fa1c2743..7b6bd2143e 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/UpdateImportRequestStatusDbDto.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/UpdateImportRequestStatusDbDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/event/DownloadingSucceeded.java b/src/main/java/ru/mystamps/web/feature/series/importing/event/DownloadingSucceeded.java index fff5a42190..8de52553dd 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/event/DownloadingSucceeded.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/event/DownloadingSucceeded.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/event/DownloadingSucceededEventListener.java b/src/main/java/ru/mystamps/web/feature/series/importing/event/DownloadingSucceededEventListener.java index fc35fb1bd9..cf706725d1 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/event/DownloadingSucceededEventListener.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/event/DownloadingSucceededEventListener.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/event/EventsConfig.java b/src/main/java/ru/mystamps/web/feature/series/importing/event/EventsConfig.java index 435890f55f..fe64ba0181 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/event/EventsConfig.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/event/EventsConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/event/ImportRequestCreated.java b/src/main/java/ru/mystamps/web/feature/series/importing/event/ImportRequestCreated.java index b1446e7422..80022b77a4 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/event/ImportRequestCreated.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/event/ImportRequestCreated.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/event/ImportRequestCreatedEventListener.java b/src/main/java/ru/mystamps/web/feature/series/importing/event/ImportRequestCreatedEventListener.java index 493a497dac..05c2d66f47 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/event/ImportRequestCreatedEventListener.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/event/ImportRequestCreatedEventListener.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/event/ParsingFailed.java b/src/main/java/ru/mystamps/web/feature/series/importing/event/ParsingFailed.java index 285948b370..5abe9f86ed 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/event/ParsingFailed.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/event/ParsingFailed.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/event/ParsingFailedEventListener.java b/src/main/java/ru/mystamps/web/feature/series/importing/event/ParsingFailedEventListener.java index 6eb6918a44..8cac20dce7 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/event/ParsingFailedEventListener.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/event/ParsingFailedEventListener.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/event/RetryDownloading.java b/src/main/java/ru/mystamps/web/feature/series/importing/event/RetryDownloading.java index aa97fc0fd9..8ef928c8f9 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/event/RetryDownloading.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/event/RetryDownloading.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/event/RetryDownloadingEventListener.java b/src/main/java/ru/mystamps/web/feature/series/importing/event/RetryDownloadingEventListener.java index 25103c96c2..7ffac5831b 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/event/RetryDownloadingEventListener.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/event/RetryDownloadingEventListener.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/extractor/JdbcSiteParserDao.java b/src/main/java/ru/mystamps/web/feature/series/importing/extractor/JdbcSiteParserDao.java index d3ed7d0841..1c19dbe163 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/extractor/JdbcSiteParserDao.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/extractor/JdbcSiteParserDao.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/extractor/JsoupSiteParser.java b/src/main/java/ru/mystamps/web/feature/series/importing/extractor/JsoupSiteParser.java index 9c61e9a082..0f6ad7b903 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/extractor/JsoupSiteParser.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/extractor/JsoupSiteParser.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/extractor/SeriesInfo.java b/src/main/java/ru/mystamps/web/feature/series/importing/extractor/SeriesInfo.java index 6f8265f103..2ac30f3665 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/extractor/SeriesInfo.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/extractor/SeriesInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/extractor/SiteParser.java b/src/main/java/ru/mystamps/web/feature/series/importing/extractor/SiteParser.java index 97e354f414..922eea9125 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/extractor/SiteParser.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/extractor/SiteParser.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/extractor/SiteParserConfiguration.java b/src/main/java/ru/mystamps/web/feature/series/importing/extractor/SiteParserConfiguration.java index b5e491f0bf..783cdc6603 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/extractor/SiteParserConfiguration.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/extractor/SiteParserConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/extractor/SiteParserDao.java b/src/main/java/ru/mystamps/web/feature/series/importing/extractor/SiteParserDao.java index 691f208dca..c178aa5373 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/extractor/SiteParserDao.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/extractor/SiteParserDao.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/extractor/SiteParserService.java b/src/main/java/ru/mystamps/web/feature/series/importing/extractor/SiteParserService.java index 00ff26c002..d3a6832067 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/extractor/SiteParserService.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/extractor/SiteParserService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/extractor/SiteParserServiceImpl.java b/src/main/java/ru/mystamps/web/feature/series/importing/extractor/SiteParserServiceImpl.java index 7e913aaa2f..8a008e9b0b 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/extractor/SiteParserServiceImpl.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/extractor/SiteParserServiceImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/extractor/TimedSiteParser.java b/src/main/java/ru/mystamps/web/feature/series/importing/extractor/TimedSiteParser.java index e4889c2ef9..09bbe819ab 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/extractor/TimedSiteParser.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/extractor/TimedSiteParser.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/sale/JdbcSeriesSalesImportDao.java b/src/main/java/ru/mystamps/web/feature/series/importing/sale/JdbcSeriesSalesImportDao.java index 5ac3a9a9bf..c39a4b391f 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/sale/JdbcSeriesSalesImportDao.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/sale/JdbcSeriesSalesImportDao.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/sale/RequestSeriesSaleImportForm.java b/src/main/java/ru/mystamps/web/feature/series/importing/sale/RequestSeriesSaleImportForm.java index 6fe94a3de1..23f3664a4f 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/sale/RequestSeriesSaleImportForm.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/sale/RequestSeriesSaleImportForm.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/sale/RowMappers.java b/src/main/java/ru/mystamps/web/feature/series/importing/sale/RowMappers.java index 353d21be3c..0570aefc03 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/sale/RowMappers.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/sale/RowMappers.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/sale/SeriesSaleExtractedInfo.java b/src/main/java/ru/mystamps/web/feature/series/importing/sale/SeriesSaleExtractedInfo.java index 750fbbe921..5fc7cae8cd 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/sale/SeriesSaleExtractedInfo.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/sale/SeriesSaleExtractedInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/sale/SeriesSaleImportController.java b/src/main/java/ru/mystamps/web/feature/series/importing/sale/SeriesSaleImportController.java index ad05526a25..6123687a09 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/sale/SeriesSaleImportController.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/sale/SeriesSaleImportController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/sale/SeriesSaleParsedDataDto.java b/src/main/java/ru/mystamps/web/feature/series/importing/sale/SeriesSaleParsedDataDto.java index 61e982a861..f30f0c0995 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/sale/SeriesSaleParsedDataDto.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/sale/SeriesSaleParsedDataDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/sale/SeriesSalesImportConfig.java b/src/main/java/ru/mystamps/web/feature/series/importing/sale/SeriesSalesImportConfig.java index 551ec236bc..e88dd63f2c 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/sale/SeriesSalesImportConfig.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/sale/SeriesSalesImportConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/sale/SeriesSalesImportDao.java b/src/main/java/ru/mystamps/web/feature/series/importing/sale/SeriesSalesImportDao.java index b14da1d28d..860e0fe69e 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/sale/SeriesSalesImportDao.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/sale/SeriesSalesImportDao.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/sale/SeriesSalesImportService.java b/src/main/java/ru/mystamps/web/feature/series/importing/sale/SeriesSalesImportService.java index d93f7e7c73..49dd50d25a 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/sale/SeriesSalesImportService.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/sale/SeriesSalesImportService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/sale/SeriesSalesImportServiceImpl.java b/src/main/java/ru/mystamps/web/feature/series/importing/sale/SeriesSalesImportServiceImpl.java index b41377646e..68a7792547 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/sale/SeriesSalesImportServiceImpl.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/sale/SeriesSalesImportServiceImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/sale/SeriesSalesImportUrl.java b/src/main/java/ru/mystamps/web/feature/series/importing/sale/SeriesSalesImportUrl.java index 8dc694ad70..ba6978eb35 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/sale/SeriesSalesImportUrl.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/sale/SeriesSalesImportUrl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/importing/sale/SeriesSalesParsedDataDbDto.java b/src/main/java/ru/mystamps/web/feature/series/importing/sale/SeriesSalesParsedDataDbDto.java index 2f94e16aea..269506852a 100644 --- a/src/main/java/ru/mystamps/web/feature/series/importing/sale/SeriesSalesParsedDataDbDto.java +++ b/src/main/java/ru/mystamps/web/feature/series/importing/sale/SeriesSalesParsedDataDbDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/sale/AddSeriesSalesDbDto.java b/src/main/java/ru/mystamps/web/feature/series/sale/AddSeriesSalesDbDto.java index 76f56b29cf..0879807f70 100644 --- a/src/main/java/ru/mystamps/web/feature/series/sale/AddSeriesSalesDbDto.java +++ b/src/main/java/ru/mystamps/web/feature/series/sale/AddSeriesSalesDbDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/sale/AddSeriesSalesDto.java b/src/main/java/ru/mystamps/web/feature/series/sale/AddSeriesSalesDto.java index 88048d390e..ea9e5a8450 100644 --- a/src/main/java/ru/mystamps/web/feature/series/sale/AddSeriesSalesDto.java +++ b/src/main/java/ru/mystamps/web/feature/series/sale/AddSeriesSalesDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/sale/AddSeriesSalesForm.java b/src/main/java/ru/mystamps/web/feature/series/sale/AddSeriesSalesForm.java index 69a775bf66..2e0014563d 100644 --- a/src/main/java/ru/mystamps/web/feature/series/sale/AddSeriesSalesForm.java +++ b/src/main/java/ru/mystamps/web/feature/series/sale/AddSeriesSalesForm.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/sale/JdbcSeriesSalesDao.java b/src/main/java/ru/mystamps/web/feature/series/sale/JdbcSeriesSalesDao.java index 36eccfcd6d..ea7ca5eb9d 100644 --- a/src/main/java/ru/mystamps/web/feature/series/sale/JdbcSeriesSalesDao.java +++ b/src/main/java/ru/mystamps/web/feature/series/sale/JdbcSeriesSalesDao.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/sale/RowMappers.java b/src/main/java/ru/mystamps/web/feature/series/sale/RowMappers.java index 037bbca982..e9cc990f0e 100644 --- a/src/main/java/ru/mystamps/web/feature/series/sale/RowMappers.java +++ b/src/main/java/ru/mystamps/web/feature/series/sale/RowMappers.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/sale/SeriesCondition.java b/src/main/java/ru/mystamps/web/feature/series/sale/SeriesCondition.java index 98bde0de93..b0fef245f7 100644 --- a/src/main/java/ru/mystamps/web/feature/series/sale/SeriesCondition.java +++ b/src/main/java/ru/mystamps/web/feature/series/sale/SeriesCondition.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/sale/SeriesSaleDto.java b/src/main/java/ru/mystamps/web/feature/series/sale/SeriesSaleDto.java index af84824478..6bcb767b2d 100644 --- a/src/main/java/ru/mystamps/web/feature/series/sale/SeriesSaleDto.java +++ b/src/main/java/ru/mystamps/web/feature/series/sale/SeriesSaleDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/sale/SeriesSalesConfig.java b/src/main/java/ru/mystamps/web/feature/series/sale/SeriesSalesConfig.java index 1d8abcd8c4..f333565b86 100644 --- a/src/main/java/ru/mystamps/web/feature/series/sale/SeriesSalesConfig.java +++ b/src/main/java/ru/mystamps/web/feature/series/sale/SeriesSalesConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/sale/SeriesSalesDao.java b/src/main/java/ru/mystamps/web/feature/series/sale/SeriesSalesDao.java index fc1a0589a0..ad8a5ad7fb 100644 --- a/src/main/java/ru/mystamps/web/feature/series/sale/SeriesSalesDao.java +++ b/src/main/java/ru/mystamps/web/feature/series/sale/SeriesSalesDao.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/sale/SeriesSalesDb.java b/src/main/java/ru/mystamps/web/feature/series/sale/SeriesSalesDb.java index 1cdb443ee6..3b761b4f83 100644 --- a/src/main/java/ru/mystamps/web/feature/series/sale/SeriesSalesDb.java +++ b/src/main/java/ru/mystamps/web/feature/series/sale/SeriesSalesDb.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/sale/SeriesSalesService.java b/src/main/java/ru/mystamps/web/feature/series/sale/SeriesSalesService.java index bcff649ddc..e8e28ca193 100644 --- a/src/main/java/ru/mystamps/web/feature/series/sale/SeriesSalesService.java +++ b/src/main/java/ru/mystamps/web/feature/series/sale/SeriesSalesService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/sale/SeriesSalesServiceImpl.java b/src/main/java/ru/mystamps/web/feature/series/sale/SeriesSalesServiceImpl.java index e1bf8c301e..50399c198a 100644 --- a/src/main/java/ru/mystamps/web/feature/series/sale/SeriesSalesServiceImpl.java +++ b/src/main/java/ru/mystamps/web/feature/series/sale/SeriesSalesServiceImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/series/sale/SeriesSalesValidation.java b/src/main/java/ru/mystamps/web/feature/series/sale/SeriesSalesValidation.java index 4f373d4a22..0ce14451bd 100644 --- a/src/main/java/ru/mystamps/web/feature/series/sale/SeriesSalesValidation.java +++ b/src/main/java/ru/mystamps/web/feature/series/sale/SeriesSalesValidation.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/site/AddSuspiciousActivityDbDto.java b/src/main/java/ru/mystamps/web/feature/site/AddSuspiciousActivityDbDto.java index ed65e5ac54..8da8d60c06 100644 --- a/src/main/java/ru/mystamps/web/feature/site/AddSuspiciousActivityDbDto.java +++ b/src/main/java/ru/mystamps/web/feature/site/AddSuspiciousActivityDbDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/site/CronService.java b/src/main/java/ru/mystamps/web/feature/site/CronService.java index b369bd727a..9b1aaa9d02 100644 --- a/src/main/java/ru/mystamps/web/feature/site/CronService.java +++ b/src/main/java/ru/mystamps/web/feature/site/CronService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/site/CronServiceImpl.java b/src/main/java/ru/mystamps/web/feature/site/CronServiceImpl.java index cfa8173990..829b74f7d9 100644 --- a/src/main/java/ru/mystamps/web/feature/site/CronServiceImpl.java +++ b/src/main/java/ru/mystamps/web/feature/site/CronServiceImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/site/CspController.java b/src/main/java/ru/mystamps/web/feature/site/CspController.java index 6f18062b96..9c734ccb52 100644 --- a/src/main/java/ru/mystamps/web/feature/site/CspController.java +++ b/src/main/java/ru/mystamps/web/feature/site/CspController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/site/ErrorController.java b/src/main/java/ru/mystamps/web/feature/site/ErrorController.java index faf8ace73e..f3cb8ee1c3 100644 --- a/src/main/java/ru/mystamps/web/feature/site/ErrorController.java +++ b/src/main/java/ru/mystamps/web/feature/site/ErrorController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/site/JdbcSuspiciousActivityDao.java b/src/main/java/ru/mystamps/web/feature/site/JdbcSuspiciousActivityDao.java index 087ac68cb3..5622c49adc 100644 --- a/src/main/java/ru/mystamps/web/feature/site/JdbcSuspiciousActivityDao.java +++ b/src/main/java/ru/mystamps/web/feature/site/JdbcSuspiciousActivityDao.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/site/MailService.java b/src/main/java/ru/mystamps/web/feature/site/MailService.java index 8715331d0f..f8ee2b7270 100644 --- a/src/main/java/ru/mystamps/web/feature/site/MailService.java +++ b/src/main/java/ru/mystamps/web/feature/site/MailService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/site/MailServiceImpl.java b/src/main/java/ru/mystamps/web/feature/site/MailServiceImpl.java index e51db05fd0..59b805c3ac 100644 --- a/src/main/java/ru/mystamps/web/feature/site/MailServiceImpl.java +++ b/src/main/java/ru/mystamps/web/feature/site/MailServiceImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/site/ResourceUrl.java b/src/main/java/ru/mystamps/web/feature/site/ResourceUrl.java index 7c8ccf2827..f111e517ca 100644 --- a/src/main/java/ru/mystamps/web/feature/site/ResourceUrl.java +++ b/src/main/java/ru/mystamps/web/feature/site/ResourceUrl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/site/RobotsTxtController.java b/src/main/java/ru/mystamps/web/feature/site/RobotsTxtController.java index 4dbeb5bca6..ca70e9f8c0 100644 --- a/src/main/java/ru/mystamps/web/feature/site/RobotsTxtController.java +++ b/src/main/java/ru/mystamps/web/feature/site/RobotsTxtController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/site/RowMappers.java b/src/main/java/ru/mystamps/web/feature/site/RowMappers.java index edd8c67ca2..5240af7c55 100644 --- a/src/main/java/ru/mystamps/web/feature/site/RowMappers.java +++ b/src/main/java/ru/mystamps/web/feature/site/RowMappers.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/site/SiteConfig.java b/src/main/java/ru/mystamps/web/feature/site/SiteConfig.java index 6224a4b6a9..b08e5079fc 100644 --- a/src/main/java/ru/mystamps/web/feature/site/SiteConfig.java +++ b/src/main/java/ru/mystamps/web/feature/site/SiteConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/site/SiteController.java b/src/main/java/ru/mystamps/web/feature/site/SiteController.java index 27b82fad31..41f1d52f80 100644 --- a/src/main/java/ru/mystamps/web/feature/site/SiteController.java +++ b/src/main/java/ru/mystamps/web/feature/site/SiteController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/site/SiteDb.java b/src/main/java/ru/mystamps/web/feature/site/SiteDb.java index 877e7937d4..18ba5c00f0 100644 --- a/src/main/java/ru/mystamps/web/feature/site/SiteDb.java +++ b/src/main/java/ru/mystamps/web/feature/site/SiteDb.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/site/SiteService.java b/src/main/java/ru/mystamps/web/feature/site/SiteService.java index 25d1e2b2f0..4cd11fe3ed 100644 --- a/src/main/java/ru/mystamps/web/feature/site/SiteService.java +++ b/src/main/java/ru/mystamps/web/feature/site/SiteService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/site/SiteServiceImpl.java b/src/main/java/ru/mystamps/web/feature/site/SiteServiceImpl.java index 9b49b815ed..3658bf1071 100644 --- a/src/main/java/ru/mystamps/web/feature/site/SiteServiceImpl.java +++ b/src/main/java/ru/mystamps/web/feature/site/SiteServiceImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/site/SiteUrl.java b/src/main/java/ru/mystamps/web/feature/site/SiteUrl.java index e07928a660..0529e55ec8 100644 --- a/src/main/java/ru/mystamps/web/feature/site/SiteUrl.java +++ b/src/main/java/ru/mystamps/web/feature/site/SiteUrl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/site/SitemapController.java b/src/main/java/ru/mystamps/web/feature/site/SitemapController.java index 96d5bd5c17..fc9635f06f 100644 --- a/src/main/java/ru/mystamps/web/feature/site/SitemapController.java +++ b/src/main/java/ru/mystamps/web/feature/site/SitemapController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/site/SuspiciousActivityDao.java b/src/main/java/ru/mystamps/web/feature/site/SuspiciousActivityDao.java index 0466335a2b..b185bedac0 100644 --- a/src/main/java/ru/mystamps/web/feature/site/SuspiciousActivityDao.java +++ b/src/main/java/ru/mystamps/web/feature/site/SuspiciousActivityDao.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/site/SuspiciousActivityDto.java b/src/main/java/ru/mystamps/web/feature/site/SuspiciousActivityDto.java index f49f966e29..be5c7fc70d 100644 --- a/src/main/java/ru/mystamps/web/feature/site/SuspiciousActivityDto.java +++ b/src/main/java/ru/mystamps/web/feature/site/SuspiciousActivityDto.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/site/SuspiciousActivityService.java b/src/main/java/ru/mystamps/web/feature/site/SuspiciousActivityService.java index c50fdb6e7b..5fd1ce1665 100644 --- a/src/main/java/ru/mystamps/web/feature/site/SuspiciousActivityService.java +++ b/src/main/java/ru/mystamps/web/feature/site/SuspiciousActivityService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/feature/site/SuspiciousActivityServiceImpl.java b/src/main/java/ru/mystamps/web/feature/site/SuspiciousActivityServiceImpl.java index 0db733fc04..eccaf26384 100644 --- a/src/main/java/ru/mystamps/web/feature/site/SuspiciousActivityServiceImpl.java +++ b/src/main/java/ru/mystamps/web/feature/site/SuspiciousActivityServiceImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/support/beanvalidation/BothOrNoneRequired.java b/src/main/java/ru/mystamps/web/support/beanvalidation/BothOrNoneRequired.java index bdf9aa9fbd..15ecdfe57d 100644 --- a/src/main/java/ru/mystamps/web/support/beanvalidation/BothOrNoneRequired.java +++ b/src/main/java/ru/mystamps/web/support/beanvalidation/BothOrNoneRequired.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/support/beanvalidation/BothOrNoneRequiredValidator.java b/src/main/java/ru/mystamps/web/support/beanvalidation/BothOrNoneRequiredValidator.java index 2d3ed5cb6f..5edd7f939f 100644 --- a/src/main/java/ru/mystamps/web/support/beanvalidation/BothOrNoneRequiredValidator.java +++ b/src/main/java/ru/mystamps/web/support/beanvalidation/BothOrNoneRequiredValidator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/support/beanvalidation/ConstraintViolationUtils.java b/src/main/java/ru/mystamps/web/support/beanvalidation/ConstraintViolationUtils.java index 746bd0d2af..66490aa3f7 100644 --- a/src/main/java/ru/mystamps/web/support/beanvalidation/ConstraintViolationUtils.java +++ b/src/main/java/ru/mystamps/web/support/beanvalidation/ConstraintViolationUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/support/beanvalidation/DenyValues.java b/src/main/java/ru/mystamps/web/support/beanvalidation/DenyValues.java index e6f91b418e..623320d684 100644 --- a/src/main/java/ru/mystamps/web/support/beanvalidation/DenyValues.java +++ b/src/main/java/ru/mystamps/web/support/beanvalidation/DenyValues.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/support/beanvalidation/DenyValuesValidator.java b/src/main/java/ru/mystamps/web/support/beanvalidation/DenyValuesValidator.java index f83faab0e1..dac417cf5a 100644 --- a/src/main/java/ru/mystamps/web/support/beanvalidation/DenyValuesValidator.java +++ b/src/main/java/ru/mystamps/web/support/beanvalidation/DenyValuesValidator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/support/beanvalidation/FieldsMatch.java b/src/main/java/ru/mystamps/web/support/beanvalidation/FieldsMatch.java index d8edde8e44..ea27e44dfc 100644 --- a/src/main/java/ru/mystamps/web/support/beanvalidation/FieldsMatch.java +++ b/src/main/java/ru/mystamps/web/support/beanvalidation/FieldsMatch.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/support/beanvalidation/FieldsMatchValidator.java b/src/main/java/ru/mystamps/web/support/beanvalidation/FieldsMatchValidator.java index e25861db02..2a244d4b8b 100644 --- a/src/main/java/ru/mystamps/web/support/beanvalidation/FieldsMatchValidator.java +++ b/src/main/java/ru/mystamps/web/support/beanvalidation/FieldsMatchValidator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/support/beanvalidation/FieldsMismatch.java b/src/main/java/ru/mystamps/web/support/beanvalidation/FieldsMismatch.java index 1487989cca..c5dfae85a2 100644 --- a/src/main/java/ru/mystamps/web/support/beanvalidation/FieldsMismatch.java +++ b/src/main/java/ru/mystamps/web/support/beanvalidation/FieldsMismatch.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/support/beanvalidation/FieldsMismatchValidator.java b/src/main/java/ru/mystamps/web/support/beanvalidation/FieldsMismatchValidator.java index 1f68055bd0..d68a1195f5 100644 --- a/src/main/java/ru/mystamps/web/support/beanvalidation/FieldsMismatchValidator.java +++ b/src/main/java/ru/mystamps/web/support/beanvalidation/FieldsMismatchValidator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/support/beanvalidation/Group.java b/src/main/java/ru/mystamps/web/support/beanvalidation/Group.java index 73fd431b0e..73325c28a0 100644 --- a/src/main/java/ru/mystamps/web/support/beanvalidation/Group.java +++ b/src/main/java/ru/mystamps/web/support/beanvalidation/Group.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/support/beanvalidation/ImageFile.java b/src/main/java/ru/mystamps/web/support/beanvalidation/ImageFile.java index 9203144cc8..510dd731d5 100644 --- a/src/main/java/ru/mystamps/web/support/beanvalidation/ImageFile.java +++ b/src/main/java/ru/mystamps/web/support/beanvalidation/ImageFile.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/support/beanvalidation/ImageFileValidator.java b/src/main/java/ru/mystamps/web/support/beanvalidation/ImageFileValidator.java index 569686c4cb..ea0bb4cf90 100644 --- a/src/main/java/ru/mystamps/web/support/beanvalidation/ImageFileValidator.java +++ b/src/main/java/ru/mystamps/web/support/beanvalidation/ImageFileValidator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/support/beanvalidation/MaxFileSize.java b/src/main/java/ru/mystamps/web/support/beanvalidation/MaxFileSize.java index 6a15a70a2a..69654fc6d2 100644 --- a/src/main/java/ru/mystamps/web/support/beanvalidation/MaxFileSize.java +++ b/src/main/java/ru/mystamps/web/support/beanvalidation/MaxFileSize.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/support/beanvalidation/MaxFileSizeValidator.java b/src/main/java/ru/mystamps/web/support/beanvalidation/MaxFileSizeValidator.java index 1db55f0cbb..c5cb98c909 100644 --- a/src/main/java/ru/mystamps/web/support/beanvalidation/MaxFileSizeValidator.java +++ b/src/main/java/ru/mystamps/web/support/beanvalidation/MaxFileSizeValidator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/support/beanvalidation/NotEmptyFile.java b/src/main/java/ru/mystamps/web/support/beanvalidation/NotEmptyFile.java index 74da353b19..0b8057f49b 100644 --- a/src/main/java/ru/mystamps/web/support/beanvalidation/NotEmptyFile.java +++ b/src/main/java/ru/mystamps/web/support/beanvalidation/NotEmptyFile.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/support/beanvalidation/NotEmptyFileValidator.java b/src/main/java/ru/mystamps/web/support/beanvalidation/NotEmptyFileValidator.java index 8930fc9799..e5cac46c57 100644 --- a/src/main/java/ru/mystamps/web/support/beanvalidation/NotEmptyFileValidator.java +++ b/src/main/java/ru/mystamps/web/support/beanvalidation/NotEmptyFileValidator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/support/beanvalidation/NotEmptyFilename.java b/src/main/java/ru/mystamps/web/support/beanvalidation/NotEmptyFilename.java index efa715b74e..663541040f 100644 --- a/src/main/java/ru/mystamps/web/support/beanvalidation/NotEmptyFilename.java +++ b/src/main/java/ru/mystamps/web/support/beanvalidation/NotEmptyFilename.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/support/beanvalidation/NotEmptyFilenameValidator.java b/src/main/java/ru/mystamps/web/support/beanvalidation/NotEmptyFilenameValidator.java index 26b7f0d722..ae9a7cf727 100644 --- a/src/main/java/ru/mystamps/web/support/beanvalidation/NotEmptyFilenameValidator.java +++ b/src/main/java/ru/mystamps/web/support/beanvalidation/NotEmptyFilenameValidator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/support/beanvalidation/NotNullIfFirstField.java b/src/main/java/ru/mystamps/web/support/beanvalidation/NotNullIfFirstField.java index 44348afb52..6ac00b5739 100644 --- a/src/main/java/ru/mystamps/web/support/beanvalidation/NotNullIfFirstField.java +++ b/src/main/java/ru/mystamps/web/support/beanvalidation/NotNullIfFirstField.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/support/beanvalidation/NotNullIfFirstFieldValidator.java b/src/main/java/ru/mystamps/web/support/beanvalidation/NotNullIfFirstFieldValidator.java index a78e2aaa1a..a6973435b2 100644 --- a/src/main/java/ru/mystamps/web/support/beanvalidation/NotNullIfFirstFieldValidator.java +++ b/src/main/java/ru/mystamps/web/support/beanvalidation/NotNullIfFirstFieldValidator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/support/beanvalidation/Price.java b/src/main/java/ru/mystamps/web/support/beanvalidation/Price.java index 525113fef2..31332239c6 100644 --- a/src/main/java/ru/mystamps/web/support/beanvalidation/Price.java +++ b/src/main/java/ru/mystamps/web/support/beanvalidation/Price.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/support/liquibase/LiquibaseSupport.java b/src/main/java/ru/mystamps/web/support/liquibase/LiquibaseSupport.java index 9bb8b49449..09302e9944 100644 --- a/src/main/java/ru/mystamps/web/support/liquibase/LiquibaseSupport.java +++ b/src/main/java/ru/mystamps/web/support/liquibase/LiquibaseSupport.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/support/mailgun/ApiMailgunEmailSendingStrategy.java b/src/main/java/ru/mystamps/web/support/mailgun/ApiMailgunEmailSendingStrategy.java index 620b7a9e8f..71b9b1e02a 100644 --- a/src/main/java/ru/mystamps/web/support/mailgun/ApiMailgunEmailSendingStrategy.java +++ b/src/main/java/ru/mystamps/web/support/mailgun/ApiMailgunEmailSendingStrategy.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/support/mailgun/EmailSendingException.java b/src/main/java/ru/mystamps/web/support/mailgun/EmailSendingException.java index 1e9b347309..2df38139b4 100644 --- a/src/main/java/ru/mystamps/web/support/mailgun/EmailSendingException.java +++ b/src/main/java/ru/mystamps/web/support/mailgun/EmailSendingException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/support/mailgun/MailgunEmail.java b/src/main/java/ru/mystamps/web/support/mailgun/MailgunEmail.java index d14abe72b1..bc3a443514 100644 --- a/src/main/java/ru/mystamps/web/support/mailgun/MailgunEmail.java +++ b/src/main/java/ru/mystamps/web/support/mailgun/MailgunEmail.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/support/mailgun/MailgunEmailSendingStrategy.java b/src/main/java/ru/mystamps/web/support/mailgun/MailgunEmailSendingStrategy.java index 4b9a7dce71..1311b14de3 100644 --- a/src/main/java/ru/mystamps/web/support/mailgun/MailgunEmailSendingStrategy.java +++ b/src/main/java/ru/mystamps/web/support/mailgun/MailgunEmailSendingStrategy.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/support/spring/boot/ApplicationBootstrap.java b/src/main/java/ru/mystamps/web/support/spring/boot/ApplicationBootstrap.java index 782760e43b..8854f65b58 100755 --- a/src/main/java/ru/mystamps/web/support/spring/boot/ApplicationBootstrap.java +++ b/src/main/java/ru/mystamps/web/support/spring/boot/ApplicationBootstrap.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/support/spring/boot/ErrorPagesCustomizer.java b/src/main/java/ru/mystamps/web/support/spring/boot/ErrorPagesCustomizer.java index c21776b6c9..db0ca64ad9 100644 --- a/src/main/java/ru/mystamps/web/support/spring/boot/ErrorPagesCustomizer.java +++ b/src/main/java/ru/mystamps/web/support/spring/boot/ErrorPagesCustomizer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/support/spring/boot/JettyWebServerFactoryCustomizer.java b/src/main/java/ru/mystamps/web/support/spring/boot/JettyWebServerFactoryCustomizer.java index d51063e6e3..28096159b0 100644 --- a/src/main/java/ru/mystamps/web/support/spring/boot/JettyWebServerFactoryCustomizer.java +++ b/src/main/java/ru/mystamps/web/support/spring/boot/JettyWebServerFactoryCustomizer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/support/spring/boot/ThymeleafViewResolverInitializingBean.java b/src/main/java/ru/mystamps/web/support/spring/boot/ThymeleafViewResolverInitializingBean.java index b01dbf950a..a8cb5251bf 100644 --- a/src/main/java/ru/mystamps/web/support/spring/boot/ThymeleafViewResolverInitializingBean.java +++ b/src/main/java/ru/mystamps/web/support/spring/boot/ThymeleafViewResolverInitializingBean.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/support/spring/jdbc/MapIntegerIntegerResultSetExtractor.java b/src/main/java/ru/mystamps/web/support/spring/jdbc/MapIntegerIntegerResultSetExtractor.java index 16dfdee9af..d84a2e88ac 100644 --- a/src/main/java/ru/mystamps/web/support/spring/jdbc/MapIntegerIntegerResultSetExtractor.java +++ b/src/main/java/ru/mystamps/web/support/spring/jdbc/MapIntegerIntegerResultSetExtractor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/support/spring/jdbc/MapStringIntegerResultSetExtractor.java b/src/main/java/ru/mystamps/web/support/spring/jdbc/MapStringIntegerResultSetExtractor.java index a5c4ce958b..03c37a1fea 100644 --- a/src/main/java/ru/mystamps/web/support/spring/jdbc/MapStringIntegerResultSetExtractor.java +++ b/src/main/java/ru/mystamps/web/support/spring/jdbc/MapStringIntegerResultSetExtractor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/support/spring/jdbc/MapStringStringResultSetExtractor.java b/src/main/java/ru/mystamps/web/support/spring/jdbc/MapStringStringResultSetExtractor.java index 4e59755c5d..2888369e6d 100644 --- a/src/main/java/ru/mystamps/web/support/spring/jdbc/MapStringStringResultSetExtractor.java +++ b/src/main/java/ru/mystamps/web/support/spring/jdbc/MapStringStringResultSetExtractor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/support/spring/mvc/BigDecimalConverter.java b/src/main/java/ru/mystamps/web/support/spring/mvc/BigDecimalConverter.java index 94ac899904..e4e7e0a15a 100644 --- a/src/main/java/ru/mystamps/web/support/spring/mvc/BigDecimalConverter.java +++ b/src/main/java/ru/mystamps/web/support/spring/mvc/BigDecimalConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/support/spring/mvc/PatchRequest.java b/src/main/java/ru/mystamps/web/support/spring/mvc/PatchRequest.java index 93060bf416..3571d3e685 100644 --- a/src/main/java/ru/mystamps/web/support/spring/mvc/PatchRequest.java +++ b/src/main/java/ru/mystamps/web/support/spring/mvc/PatchRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/support/spring/mvc/ReplaceRepeatingSpacesEditor.java b/src/main/java/ru/mystamps/web/support/spring/mvc/ReplaceRepeatingSpacesEditor.java index 00d55f52d6..abb549f3a5 100644 --- a/src/main/java/ru/mystamps/web/support/spring/mvc/ReplaceRepeatingSpacesEditor.java +++ b/src/main/java/ru/mystamps/web/support/spring/mvc/ReplaceRepeatingSpacesEditor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/support/spring/mvc/RestExceptionHandler.java b/src/main/java/ru/mystamps/web/support/spring/mvc/RestExceptionHandler.java index 51ae2eb212..d387e5a6c1 100644 --- a/src/main/java/ru/mystamps/web/support/spring/mvc/RestExceptionHandler.java +++ b/src/main/java/ru/mystamps/web/support/spring/mvc/RestExceptionHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/support/spring/mvc/ValidationErrors.java b/src/main/java/ru/mystamps/web/support/spring/mvc/ValidationErrors.java index fc4bf2d55f..772c708ef1 100644 --- a/src/main/java/ru/mystamps/web/support/spring/mvc/ValidationErrors.java +++ b/src/main/java/ru/mystamps/web/support/spring/mvc/ValidationErrors.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/support/spring/security/AuthenticationFailureListener.java b/src/main/java/ru/mystamps/web/support/spring/security/AuthenticationFailureListener.java index 02b1b7e260..970601795a 100644 --- a/src/main/java/ru/mystamps/web/support/spring/security/AuthenticationFailureListener.java +++ b/src/main/java/ru/mystamps/web/support/spring/security/AuthenticationFailureListener.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/support/spring/security/Authority.java b/src/main/java/ru/mystamps/web/support/spring/security/Authority.java index c08a079525..12a9fc6385 100644 --- a/src/main/java/ru/mystamps/web/support/spring/security/Authority.java +++ b/src/main/java/ru/mystamps/web/support/spring/security/Authority.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/support/spring/security/ContentSecurityPolicyHeaderWriter.java b/src/main/java/ru/mystamps/web/support/spring/security/ContentSecurityPolicyHeaderWriter.java index 63866983ae..b843e3e933 100644 --- a/src/main/java/ru/mystamps/web/support/spring/security/ContentSecurityPolicyHeaderWriter.java +++ b/src/main/java/ru/mystamps/web/support/spring/security/ContentSecurityPolicyHeaderWriter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/support/spring/security/CustomUserDetails.java b/src/main/java/ru/mystamps/web/support/spring/security/CustomUserDetails.java index 1ce717e904..89b66c153f 100644 --- a/src/main/java/ru/mystamps/web/support/spring/security/CustomUserDetails.java +++ b/src/main/java/ru/mystamps/web/support/spring/security/CustomUserDetails.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/support/spring/security/CustomUserDetailsService.java b/src/main/java/ru/mystamps/web/support/spring/security/CustomUserDetailsService.java index 3711560b47..7b6699bc1a 100644 --- a/src/main/java/ru/mystamps/web/support/spring/security/CustomUserDetailsService.java +++ b/src/main/java/ru/mystamps/web/support/spring/security/CustomUserDetailsService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/support/spring/security/HasAuthority.java b/src/main/java/ru/mystamps/web/support/spring/security/HasAuthority.java index 3dccaca69d..8f736333a5 100644 --- a/src/main/java/ru/mystamps/web/support/spring/security/HasAuthority.java +++ b/src/main/java/ru/mystamps/web/support/spring/security/HasAuthority.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/support/spring/security/LogCsrfEventAndShow403PageForAccessDenied.java b/src/main/java/ru/mystamps/web/support/spring/security/LogCsrfEventAndShow403PageForAccessDenied.java index 6e8ff7daa5..b93d132152 100644 --- a/src/main/java/ru/mystamps/web/support/spring/security/LogCsrfEventAndShow403PageForAccessDenied.java +++ b/src/main/java/ru/mystamps/web/support/spring/security/LogCsrfEventAndShow403PageForAccessDenied.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/support/spring/security/SecurityConfig.java b/src/main/java/ru/mystamps/web/support/spring/security/SecurityConfig.java index 9011ba131b..c6d84df8a0 100644 --- a/src/main/java/ru/mystamps/web/support/spring/security/SecurityConfig.java +++ b/src/main/java/ru/mystamps/web/support/spring/security/SecurityConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/support/spring/security/SecurityContextUtils.java b/src/main/java/ru/mystamps/web/support/spring/security/SecurityContextUtils.java index 0a94f4fb70..1ca088a76c 100644 --- a/src/main/java/ru/mystamps/web/support/spring/security/SecurityContextUtils.java +++ b/src/main/java/ru/mystamps/web/support/spring/security/SecurityContextUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/support/spring/security/SessionLocaleResolverAwareFilter.java b/src/main/java/ru/mystamps/web/support/spring/security/SessionLocaleResolverAwareFilter.java index 187b9d9e76..bae74082bc 100644 --- a/src/main/java/ru/mystamps/web/support/spring/security/SessionLocaleResolverAwareFilter.java +++ b/src/main/java/ru/mystamps/web/support/spring/security/SessionLocaleResolverAwareFilter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/support/spring/security/StringAuthority.java b/src/main/java/ru/mystamps/web/support/spring/security/StringAuthority.java index 404023b414..34f93ced07 100644 --- a/src/main/java/ru/mystamps/web/support/spring/security/StringAuthority.java +++ b/src/main/java/ru/mystamps/web/support/spring/security/StringAuthority.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/support/spring/security/UserMdcLoggingFilter.java b/src/main/java/ru/mystamps/web/support/spring/security/UserMdcLoggingFilter.java index 30a6673b82..a64a023ead 100644 --- a/src/main/java/ru/mystamps/web/support/spring/security/UserMdcLoggingFilter.java +++ b/src/main/java/ru/mystamps/web/support/spring/security/UserMdcLoggingFilter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/support/thymeleaf/GroupByParent.java b/src/main/java/ru/mystamps/web/support/thymeleaf/GroupByParent.java index 92a7404c54..85cbfaa393 100644 --- a/src/main/java/ru/mystamps/web/support/thymeleaf/GroupByParent.java +++ b/src/main/java/ru/mystamps/web/support/thymeleaf/GroupByParent.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/support/togglz/Features.java b/src/main/java/ru/mystamps/web/support/togglz/Features.java index 01f39e7085..6007745042 100644 --- a/src/main/java/ru/mystamps/web/support/togglz/Features.java +++ b/src/main/java/ru/mystamps/web/support/togglz/Features.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/java/ru/mystamps/web/support/togglz/TogglzConfig.java b/src/main/java/ru/mystamps/web/support/togglz/TogglzConfig.java index 94d3402976..5025c7c65c 100644 --- a/src/main/java/ru/mystamps/web/support/togglz/TogglzConfig.java +++ b/src/main/java/ru/mystamps/web/support/togglz/TogglzConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/main/webapp/WEB-INF/views/account/activate.html b/src/main/webapp/WEB-INF/views/account/activate.html index 6dedb47039..5def63a5e8 100644 --- a/src/main/webapp/WEB-INF/views/account/activate.html +++ b/src/main/webapp/WEB-INF/views/account/activate.html @@ -169,7 +169,7 @@

diff --git a/src/main/webapp/WEB-INF/views/account/auth.html b/src/main/webapp/WEB-INF/views/account/auth.html index bce4c79d2a..a66f3f6149 100644 --- a/src/main/webapp/WEB-INF/views/account/auth.html +++ b/src/main/webapp/WEB-INF/views/account/auth.html @@ -132,7 +132,7 @@

diff --git a/src/main/webapp/WEB-INF/views/account/register.html b/src/main/webapp/WEB-INF/views/account/register.html index 5e8b578fe0..930863dd0c 100644 --- a/src/main/webapp/WEB-INF/views/account/register.html +++ b/src/main/webapp/WEB-INF/views/account/register.html @@ -124,7 +124,7 @@

diff --git a/src/main/webapp/WEB-INF/views/category/add.html b/src/main/webapp/WEB-INF/views/category/add.html index 2f84e61aea..1541f018f6 100644 --- a/src/main/webapp/WEB-INF/views/category/add.html +++ b/src/main/webapp/WEB-INF/views/category/add.html @@ -112,7 +112,7 @@

diff --git a/src/main/webapp/WEB-INF/views/category/info.html b/src/main/webapp/WEB-INF/views/category/info.html index a0dcb1654a..52d15096df 100644 --- a/src/main/webapp/WEB-INF/views/category/info.html +++ b/src/main/webapp/WEB-INF/views/category/info.html @@ -120,7 +120,7 @@

diff --git a/src/main/webapp/WEB-INF/views/category/list.html b/src/main/webapp/WEB-INF/views/category/list.html index 6d90f91b28..c05050259f 100644 --- a/src/main/webapp/WEB-INF/views/category/list.html +++ b/src/main/webapp/WEB-INF/views/category/list.html @@ -83,7 +83,7 @@

diff --git a/src/main/webapp/WEB-INF/views/collection/estimation.html b/src/main/webapp/WEB-INF/views/collection/estimation.html index 0c21031cca..aad973eeb6 100644 --- a/src/main/webapp/WEB-INF/views/collection/estimation.html +++ b/src/main/webapp/WEB-INF/views/collection/estimation.html @@ -140,7 +140,7 @@

diff --git a/src/main/webapp/WEB-INF/views/collection/info.html b/src/main/webapp/WEB-INF/views/collection/info.html index ae616440ec..2b441a3a85 100644 --- a/src/main/webapp/WEB-INF/views/collection/info.html +++ b/src/main/webapp/WEB-INF/views/collection/info.html @@ -230,7 +230,7 @@

Stamps by categories
diff --git a/src/main/webapp/WEB-INF/views/country/add.html b/src/main/webapp/WEB-INF/views/country/add.html index 8eb8cb3a6b..19db77d3de 100644 --- a/src/main/webapp/WEB-INF/views/country/add.html +++ b/src/main/webapp/WEB-INF/views/country/add.html @@ -112,7 +112,7 @@

diff --git a/src/main/webapp/WEB-INF/views/country/info.html b/src/main/webapp/WEB-INF/views/country/info.html index a28471eb03..35555ff6fe 100644 --- a/src/main/webapp/WEB-INF/views/country/info.html +++ b/src/main/webapp/WEB-INF/views/country/info.html @@ -173,7 +173,7 @@

diff --git a/src/main/webapp/WEB-INF/views/country/list.html b/src/main/webapp/WEB-INF/views/country/list.html index e81393cc8b..a0d7ce427b 100644 --- a/src/main/webapp/WEB-INF/views/country/list.html +++ b/src/main/webapp/WEB-INF/views/country/list.html @@ -83,7 +83,7 @@

diff --git a/src/main/webapp/WEB-INF/views/error/status-code.html b/src/main/webapp/WEB-INF/views/error/status-code.html index 074f853b0c..88c456cda4 100644 --- a/src/main/webapp/WEB-INF/views/error/status-code.html +++ b/src/main/webapp/WEB-INF/views/error/status-code.html @@ -85,7 +85,7 @@

diff --git a/src/main/webapp/WEB-INF/views/participant/add.html b/src/main/webapp/WEB-INF/views/participant/add.html index 36af75019d..521d7ed5f0 100644 --- a/src/main/webapp/WEB-INF/views/participant/add.html +++ b/src/main/webapp/WEB-INF/views/participant/add.html @@ -160,7 +160,7 @@

diff --git a/src/main/webapp/WEB-INF/views/series/add.html b/src/main/webapp/WEB-INF/views/series/add.html index 9bea39fa2b..e3a1f3ec7e 100644 --- a/src/main/webapp/WEB-INF/views/series/add.html +++ b/src/main/webapp/WEB-INF/views/series/add.html @@ -518,7 +518,7 @@

diff --git a/src/main/webapp/WEB-INF/views/series/import/info.html b/src/main/webapp/WEB-INF/views/series/import/info.html index e8be6baafa..fbeba8ff30 100644 --- a/src/main/webapp/WEB-INF/views/series/import/info.html +++ b/src/main/webapp/WEB-INF/views/series/import/info.html @@ -698,7 +698,7 @@

diff --git a/src/main/webapp/WEB-INF/views/series/import/list.html b/src/main/webapp/WEB-INF/views/series/import/list.html index dca03d0f8e..4e5c7070db 100644 --- a/src/main/webapp/WEB-INF/views/series/import/list.html +++ b/src/main/webapp/WEB-INF/views/series/import/list.html @@ -123,7 +123,7 @@

diff --git a/src/main/webapp/WEB-INF/views/series/import/request.html b/src/main/webapp/WEB-INF/views/series/import/request.html index 482d06dc75..23bd3e6ec9 100644 --- a/src/main/webapp/WEB-INF/views/series/import/request.html +++ b/src/main/webapp/WEB-INF/views/series/import/request.html @@ -99,7 +99,7 @@

diff --git a/src/main/webapp/WEB-INF/views/series/info.html b/src/main/webapp/WEB-INF/views/series/info.html index 367925ab9f..b9d154bc81 100644 --- a/src/main/webapp/WEB-INF/views/series/info.html +++ b/src/main/webapp/WEB-INF/views/series/info.html @@ -868,7 +868,7 @@

Add info about selling/buying thi
diff --git a/src/main/webapp/WEB-INF/views/series/search_result.html b/src/main/webapp/WEB-INF/views/series/search_result.html index da17db8048..1fbd535338 100644 --- a/src/main/webapp/WEB-INF/views/series/search_result.html +++ b/src/main/webapp/WEB-INF/views/series/search_result.html @@ -113,7 +113,7 @@

diff --git a/src/main/webapp/WEB-INF/views/site/events.html b/src/main/webapp/WEB-INF/views/site/events.html index e581f7a97b..d2f622bfa4 100644 --- a/src/main/webapp/WEB-INF/views/site/events.html +++ b/src/main/webapp/WEB-INF/views/site/events.html @@ -196,7 +196,7 @@

diff --git a/src/main/webapp/WEB-INF/views/site/index.html b/src/main/webapp/WEB-INF/views/site/index.html index df459bc952..5dbe4e0a6a 100644 --- a/src/main/webapp/WEB-INF/views/site/index.html +++ b/src/main/webapp/WEB-INF/views/site/index.html @@ -197,7 +197,7 @@

Search by catalog

diff --git a/src/test/groovy/ru/mystamps/web/common/LocaleUtilsTest.groovy b/src/test/groovy/ru/mystamps/web/common/LocaleUtilsTest.groovy index 28b8f34fa8..0208fe1035 100644 --- a/src/test/groovy/ru/mystamps/web/common/LocaleUtilsTest.groovy +++ b/src/test/groovy/ru/mystamps/web/common/LocaleUtilsTest.groovy @@ -1,5 +1,5 @@ /** - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test/groovy/ru/mystamps/web/common/PagerTest.groovy b/src/test/groovy/ru/mystamps/web/common/PagerTest.groovy index b4356868c9..cec8ff9688 100644 --- a/src/test/groovy/ru/mystamps/web/common/PagerTest.groovy +++ b/src/test/groovy/ru/mystamps/web/common/PagerTest.groovy @@ -1,5 +1,5 @@ /** - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test/groovy/ru/mystamps/web/common/SlugUtilsTest.groovy b/src/test/groovy/ru/mystamps/web/common/SlugUtilsTest.groovy index 0f8615796d..fccf077f65 100644 --- a/src/test/groovy/ru/mystamps/web/common/SlugUtilsTest.groovy +++ b/src/test/groovy/ru/mystamps/web/common/SlugUtilsTest.groovy @@ -1,5 +1,5 @@ /** - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test/groovy/ru/mystamps/web/feature/account/UserServiceImplTest.groovy b/src/test/groovy/ru/mystamps/web/feature/account/UserServiceImplTest.groovy index 30dad73b76..d99f17fc46 100644 --- a/src/test/groovy/ru/mystamps/web/feature/account/UserServiceImplTest.groovy +++ b/src/test/groovy/ru/mystamps/web/feature/account/UserServiceImplTest.groovy @@ -1,5 +1,5 @@ /** - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test/groovy/ru/mystamps/web/feature/account/UsersActivationServiceImplTest.groovy b/src/test/groovy/ru/mystamps/web/feature/account/UsersActivationServiceImplTest.groovy index 96426bee1e..86f3de438d 100644 --- a/src/test/groovy/ru/mystamps/web/feature/account/UsersActivationServiceImplTest.groovy +++ b/src/test/groovy/ru/mystamps/web/feature/account/UsersActivationServiceImplTest.groovy @@ -1,5 +1,5 @@ /** - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test/groovy/ru/mystamps/web/feature/category/CategoryServiceImplTest.groovy b/src/test/groovy/ru/mystamps/web/feature/category/CategoryServiceImplTest.groovy index a2d0a10d9e..bb174e5d00 100644 --- a/src/test/groovy/ru/mystamps/web/feature/category/CategoryServiceImplTest.groovy +++ b/src/test/groovy/ru/mystamps/web/feature/category/CategoryServiceImplTest.groovy @@ -1,5 +1,5 @@ /** - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test/groovy/ru/mystamps/web/feature/collection/CollectionServiceImplTest.groovy b/src/test/groovy/ru/mystamps/web/feature/collection/CollectionServiceImplTest.groovy index 9c3b813132..09b3b7dde4 100644 --- a/src/test/groovy/ru/mystamps/web/feature/collection/CollectionServiceImplTest.groovy +++ b/src/test/groovy/ru/mystamps/web/feature/collection/CollectionServiceImplTest.groovy @@ -1,5 +1,5 @@ /** - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test/groovy/ru/mystamps/web/feature/country/CountryServiceImplTest.groovy b/src/test/groovy/ru/mystamps/web/feature/country/CountryServiceImplTest.groovy index 53438f5e52..5c157c6ae5 100644 --- a/src/test/groovy/ru/mystamps/web/feature/country/CountryServiceImplTest.groovy +++ b/src/test/groovy/ru/mystamps/web/feature/country/CountryServiceImplTest.groovy @@ -1,5 +1,5 @@ /** - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test/groovy/ru/mystamps/web/feature/image/DatabaseImagePersistenceStrategyTest.groovy b/src/test/groovy/ru/mystamps/web/feature/image/DatabaseImagePersistenceStrategyTest.groovy index fa658165d8..1b7a77760f 100644 --- a/src/test/groovy/ru/mystamps/web/feature/image/DatabaseImagePersistenceStrategyTest.groovy +++ b/src/test/groovy/ru/mystamps/web/feature/image/DatabaseImagePersistenceStrategyTest.groovy @@ -1,5 +1,5 @@ /** - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test/groovy/ru/mystamps/web/feature/image/FilesystemImagePersistenceStrategyTest.groovy b/src/test/groovy/ru/mystamps/web/feature/image/FilesystemImagePersistenceStrategyTest.groovy index 90698d669b..730bc83b72 100644 --- a/src/test/groovy/ru/mystamps/web/feature/image/FilesystemImagePersistenceStrategyTest.groovy +++ b/src/test/groovy/ru/mystamps/web/feature/image/FilesystemImagePersistenceStrategyTest.groovy @@ -1,5 +1,5 @@ /** - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test/groovy/ru/mystamps/web/feature/image/ImageServiceImplTest.groovy b/src/test/groovy/ru/mystamps/web/feature/image/ImageServiceImplTest.groovy index 1886074419..a054ca265d 100644 --- a/src/test/groovy/ru/mystamps/web/feature/image/ImageServiceImplTest.groovy +++ b/src/test/groovy/ru/mystamps/web/feature/image/ImageServiceImplTest.groovy @@ -1,5 +1,5 @@ /** - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test/groovy/ru/mystamps/web/feature/image/TimedImagePreviewStrategyTest.groovy b/src/test/groovy/ru/mystamps/web/feature/image/TimedImagePreviewStrategyTest.groovy index 4bf160960f..025871ff70 100644 --- a/src/test/groovy/ru/mystamps/web/feature/image/TimedImagePreviewStrategyTest.groovy +++ b/src/test/groovy/ru/mystamps/web/feature/image/TimedImagePreviewStrategyTest.groovy @@ -1,5 +1,5 @@ /** - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test/groovy/ru/mystamps/web/feature/participant/ParticipantServiceImplTest.groovy b/src/test/groovy/ru/mystamps/web/feature/participant/ParticipantServiceImplTest.groovy index df1f1fbe08..c1e80d648a 100644 --- a/src/test/groovy/ru/mystamps/web/feature/participant/ParticipantServiceImplTest.groovy +++ b/src/test/groovy/ru/mystamps/web/feature/participant/ParticipantServiceImplTest.groovy @@ -1,5 +1,5 @@ /** - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test/groovy/ru/mystamps/web/feature/series/CatalogUtilsTest.groovy b/src/test/groovy/ru/mystamps/web/feature/series/CatalogUtilsTest.groovy index 849295c09c..e6f524a6d1 100644 --- a/src/test/groovy/ru/mystamps/web/feature/series/CatalogUtilsTest.groovy +++ b/src/test/groovy/ru/mystamps/web/feature/series/CatalogUtilsTest.groovy @@ -1,5 +1,5 @@ /** - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test/groovy/ru/mystamps/web/feature/series/SeriesServiceImplTest.groovy b/src/test/groovy/ru/mystamps/web/feature/series/SeriesServiceImplTest.groovy index fae7f88568..2f8d6f3c2c 100644 --- a/src/test/groovy/ru/mystamps/web/feature/series/SeriesServiceImplTest.groovy +++ b/src/test/groovy/ru/mystamps/web/feature/series/SeriesServiceImplTest.groovy @@ -1,5 +1,5 @@ /** - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test/groovy/ru/mystamps/web/feature/series/StampsCatalogServiceImplTest.groovy b/src/test/groovy/ru/mystamps/web/feature/series/StampsCatalogServiceImplTest.groovy index d385278ff3..2522a2e111 100644 --- a/src/test/groovy/ru/mystamps/web/feature/series/StampsCatalogServiceImplTest.groovy +++ b/src/test/groovy/ru/mystamps/web/feature/series/StampsCatalogServiceImplTest.groovy @@ -1,5 +1,5 @@ /** - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test/groovy/ru/mystamps/web/feature/series/importing/SeriesImportServiceImplTest.groovy b/src/test/groovy/ru/mystamps/web/feature/series/importing/SeriesImportServiceImplTest.groovy index 4b91c585ab..6ae03e0690 100644 --- a/src/test/groovy/ru/mystamps/web/feature/series/importing/SeriesImportServiceImplTest.groovy +++ b/src/test/groovy/ru/mystamps/web/feature/series/importing/SeriesImportServiceImplTest.groovy @@ -1,5 +1,5 @@ /** - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test/groovy/ru/mystamps/web/feature/series/importing/SeriesInfoExtractorServiceImplTest.groovy b/src/test/groovy/ru/mystamps/web/feature/series/importing/SeriesInfoExtractorServiceImplTest.groovy index 22d7be1fb9..610a572a21 100644 --- a/src/test/groovy/ru/mystamps/web/feature/series/importing/SeriesInfoExtractorServiceImplTest.groovy +++ b/src/test/groovy/ru/mystamps/web/feature/series/importing/SeriesInfoExtractorServiceImplTest.groovy @@ -1,5 +1,5 @@ /** - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test/groovy/ru/mystamps/web/feature/series/importing/TimedSeriesInfoExtractorServiceTest.groovy b/src/test/groovy/ru/mystamps/web/feature/series/importing/TimedSeriesInfoExtractorServiceTest.groovy index e6c62775e0..9c0e7f80ea 100644 --- a/src/test/groovy/ru/mystamps/web/feature/series/importing/TimedSeriesInfoExtractorServiceTest.groovy +++ b/src/test/groovy/ru/mystamps/web/feature/series/importing/TimedSeriesInfoExtractorServiceTest.groovy @@ -1,5 +1,5 @@ /** - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test/groovy/ru/mystamps/web/feature/series/importing/sale/SeriesSalesImportServiceImplTest.groovy b/src/test/groovy/ru/mystamps/web/feature/series/importing/sale/SeriesSalesImportServiceImplTest.groovy index 1119f8b1cb..5b09e4e75b 100644 --- a/src/test/groovy/ru/mystamps/web/feature/series/importing/sale/SeriesSalesImportServiceImplTest.groovy +++ b/src/test/groovy/ru/mystamps/web/feature/series/importing/sale/SeriesSalesImportServiceImplTest.groovy @@ -1,5 +1,5 @@ /** - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test/groovy/ru/mystamps/web/feature/series/sale/SeriesSalesServiceImplTest.groovy b/src/test/groovy/ru/mystamps/web/feature/series/sale/SeriesSalesServiceImplTest.groovy index 7e7c5db37f..4f1cf0b8d7 100644 --- a/src/test/groovy/ru/mystamps/web/feature/series/sale/SeriesSalesServiceImplTest.groovy +++ b/src/test/groovy/ru/mystamps/web/feature/series/sale/SeriesSalesServiceImplTest.groovy @@ -1,5 +1,5 @@ /** - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test/groovy/ru/mystamps/web/feature/site/CronServiceImplTest.groovy b/src/test/groovy/ru/mystamps/web/feature/site/CronServiceImplTest.groovy index 59bac3faa2..1b4c27e112 100644 --- a/src/test/groovy/ru/mystamps/web/feature/site/CronServiceImplTest.groovy +++ b/src/test/groovy/ru/mystamps/web/feature/site/CronServiceImplTest.groovy @@ -1,5 +1,5 @@ /** - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test/groovy/ru/mystamps/web/feature/site/SiteServiceImplTest.groovy b/src/test/groovy/ru/mystamps/web/feature/site/SiteServiceImplTest.groovy index ad7ef61706..678b63534c 100644 --- a/src/test/groovy/ru/mystamps/web/feature/site/SiteServiceImplTest.groovy +++ b/src/test/groovy/ru/mystamps/web/feature/site/SiteServiceImplTest.groovy @@ -1,5 +1,5 @@ /** - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test/groovy/ru/mystamps/web/feature/site/SuspiciousActivityServiceImplTest.groovy b/src/test/groovy/ru/mystamps/web/feature/site/SuspiciousActivityServiceImplTest.groovy index 86f9caa13b..117149911c 100644 --- a/src/test/groovy/ru/mystamps/web/feature/site/SuspiciousActivityServiceImplTest.groovy +++ b/src/test/groovy/ru/mystamps/web/feature/site/SuspiciousActivityServiceImplTest.groovy @@ -1,5 +1,5 @@ /** - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test/java/ru/mystamps/web/feature/category/JdbcCategoryDaoTest.java b/src/test/java/ru/mystamps/web/feature/category/JdbcCategoryDaoTest.java index aa8fa5b919..989bef6f0f 100644 --- a/src/test/java/ru/mystamps/web/feature/category/JdbcCategoryDaoTest.java +++ b/src/test/java/ru/mystamps/web/feature/category/JdbcCategoryDaoTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test/java/ru/mystamps/web/feature/country/JdbcCountryDaoTest.java b/src/test/java/ru/mystamps/web/feature/country/JdbcCountryDaoTest.java index 7cab3e6603..8179116b71 100644 --- a/src/test/java/ru/mystamps/web/feature/country/JdbcCountryDaoTest.java +++ b/src/test/java/ru/mystamps/web/feature/country/JdbcCountryDaoTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test/java/ru/mystamps/web/feature/series/importing/extractor/JsoupSiteParserTest.java b/src/test/java/ru/mystamps/web/feature/series/importing/extractor/JsoupSiteParserTest.java index 58fc0c7545..c4c93f62c6 100644 --- a/src/test/java/ru/mystamps/web/feature/series/importing/extractor/JsoupSiteParserTest.java +++ b/src/test/java/ru/mystamps/web/feature/series/importing/extractor/JsoupSiteParserTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test/java/ru/mystamps/web/service/TestObjects.java b/src/test/java/ru/mystamps/web/service/TestObjects.java index 1351304170..0c7dbd54ad 100644 --- a/src/test/java/ru/mystamps/web/service/TestObjects.java +++ b/src/test/java/ru/mystamps/web/service/TestObjects.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test/java/ru/mystamps/web/support/spring/security/ContentSecurityPolicyHeaderWriterTest.java b/src/test/java/ru/mystamps/web/support/spring/security/ContentSecurityPolicyHeaderWriterTest.java index c2ba15bb49..d2996556b4 100644 --- a/src/test/java/ru/mystamps/web/support/spring/security/ContentSecurityPolicyHeaderWriterTest.java +++ b/src/test/java/ru/mystamps/web/support/spring/security/ContentSecurityPolicyHeaderWriterTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test/java/ru/mystamps/web/tests/DateUtils.java b/src/test/java/ru/mystamps/web/tests/DateUtils.java index 7123babf7c..a99e7d7c57 100644 --- a/src/test/java/ru/mystamps/web/tests/DateUtils.java +++ b/src/test/java/ru/mystamps/web/tests/DateUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/test/java/ru/mystamps/web/tests/Random.java b/src/test/java/ru/mystamps/web/tests/Random.java index 7d22e26de8..1049aeb906 100644 --- a/src/test/java/ru/mystamps/web/tests/Random.java +++ b/src/test/java/ru/mystamps/web/tests/Random.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2023 Slava Semushin + * Copyright (C) 2009-2024 Slava Semushin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by From aea4c11bd2489f2e676a8cd3c3b81369b143c2d2 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Mon, 8 Jan 2024 12:46:51 +0700 Subject: [PATCH 094/342] chore: install nodejs and npm to cache Part of #1656 [skip ci] --- .github/workflows/populate-maven-cache.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/populate-maven-cache.yml b/.github/workflows/populate-maven-cache.yml index 27204d431c..b3f84c98bd 100644 --- a/.github/workflows/populate-maven-cache.yml +++ b/.github/workflows/populate-maven-cache.yml @@ -53,5 +53,8 @@ jobs: - name: Download all dependencies run: mvn dependency:go-offline + - name: Install NodeJS and npm + run: mvn frontend:install-node-and-npm --activate-profiles frontend + - name: List downloaded artifacts run: find ~/.m2/repository -type f -name '*.jar' From 9b339809f3e2fe2e0324dd5c491ab1eef63c9735 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 12 Jan 2024 01:07:49 +0000 Subject: [PATCH 095/342] ci: bump actions/cache from 3.3.2 to 3.3.3 Bumps [actions/cache](https://github.com/actions/cache) from 3.3.2 to 3.3.3. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/v3.3.2...v3.3.3) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/deploy.yml | 2 +- .github/workflows/integration-tests-h2.yml | 2 +- .github/workflows/integration-tests-mysql.yml | 2 +- .github/workflows/integration-tests-postgres.yml | 2 +- .github/workflows/populate-maven-cache.yml | 2 +- .github/workflows/static-analysis.yml | 14 +++++++------- .github/workflows/unit-tests.yml | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 7fc3693a2d..c528dfd3eb 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -38,7 +38,7 @@ jobs: java-version: '8' # https://github.com/actions/setup-java#supported-version-syntax - name: Restore existing cache - uses: actions/cache@v3.3.2 # https://github.com/actions/cache + uses: actions/cache@v3.3.3 # https://github.com/actions/cache with: # https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#input-parameters-for-the-cache-action key: maven-repository-${{ hashFiles('pom.xml') }} diff --git a/.github/workflows/integration-tests-h2.yml b/.github/workflows/integration-tests-h2.yml index 6a5e93601d..1354a6bf2f 100644 --- a/.github/workflows/integration-tests-h2.yml +++ b/.github/workflows/integration-tests-h2.yml @@ -46,7 +46,7 @@ jobs: distribution: 'adopt' # https://github.com/actions/setup-java#supported-distributions java-version: ${{ matrix.java-version }} # https://github.com/actions/setup-java#supported-version-syntax - name: Restore existing cache - uses: actions/cache@v3.3.2 # https://github.com/actions/cache + uses: actions/cache@v3.3.3 # https://github.com/actions/cache with: # https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#input-parameters-for-the-cache-action key: maven-repository-${{ hashFiles('pom.xml') }} diff --git a/.github/workflows/integration-tests-mysql.yml b/.github/workflows/integration-tests-mysql.yml index 3be03bdf74..f98c7e911a 100644 --- a/.github/workflows/integration-tests-mysql.yml +++ b/.github/workflows/integration-tests-mysql.yml @@ -58,7 +58,7 @@ jobs: distribution: 'adopt' # https://github.com/actions/setup-java#supported-distributions java-version: '8' # https://github.com/actions/setup-java#supported-version-syntax - name: Restore existing cache - uses: actions/cache@v3.3.2 # https://github.com/actions/cache + uses: actions/cache@v3.3.3 # https://github.com/actions/cache with: # https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#input-parameters-for-the-cache-action key: maven-repository-${{ hashFiles('pom.xml') }} diff --git a/.github/workflows/integration-tests-postgres.yml b/.github/workflows/integration-tests-postgres.yml index f7b79280ab..0721c34029 100644 --- a/.github/workflows/integration-tests-postgres.yml +++ b/.github/workflows/integration-tests-postgres.yml @@ -49,7 +49,7 @@ jobs: distribution: 'adopt' # https://github.com/actions/setup-java#supported-distributions java-version: '8' # https://github.com/actions/setup-java#supported-version-syntax - name: Restore existing cache - uses: actions/cache@v3.3.2 # https://github.com/actions/cache + uses: actions/cache@v3.3.3 # https://github.com/actions/cache with: # https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#input-parameters-for-the-cache-action key: maven-repository-${{ hashFiles('pom.xml') }} diff --git a/.github/workflows/populate-maven-cache.yml b/.github/workflows/populate-maven-cache.yml index b3f84c98bd..a74d916375 100644 --- a/.github/workflows/populate-maven-cache.yml +++ b/.github/workflows/populate-maven-cache.yml @@ -43,7 +43,7 @@ jobs: java-version: '8' # https://github.com/actions/setup-java#supported-version-syntax - name: Restore existing cache - uses: actions/cache@v3.3.2 # https://github.com/actions/cache + uses: actions/cache@v3.3.3 # https://github.com/actions/cache with: # https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#input-parameters-for-the-cache-action key: maven-repository-${{ hashFiles('pom.xml') }} diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index b7f4391da2..ae6e7ddd9f 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -31,7 +31,7 @@ jobs: distribution: 'adopt' # https://github.com/actions/setup-java#supported-distributions java-version: '8' # https://github.com/actions/setup-java#supported-version-syntax - name: Restore existing cache - uses: actions/cache@v3.3.2 # https://github.com/actions/cache + uses: actions/cache@v3.3.3 # https://github.com/actions/cache with: # https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#input-parameters-for-the-cache-action key: maven-repository-${{ hashFiles('pom.xml') }} @@ -56,7 +56,7 @@ jobs: distribution: 'adopt' # https://github.com/actions/setup-java#supported-distributions java-version: '8' # https://github.com/actions/setup-java#supported-version-syntax - name: Restore existing cache - uses: actions/cache@v3.3.2 # https://github.com/actions/cache + uses: actions/cache@v3.3.3 # https://github.com/actions/cache with: # https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#input-parameters-for-the-cache-action key: maven-repository-${{ hashFiles('pom.xml') }} @@ -81,7 +81,7 @@ jobs: distribution: 'adopt' # https://github.com/actions/setup-java#supported-distributions java-version: '8' # https://github.com/actions/setup-java#supported-version-syntax - name: Restore existing cache - uses: actions/cache@v3.3.2 # https://github.com/actions/cache + uses: actions/cache@v3.3.3 # https://github.com/actions/cache with: # https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#input-parameters-for-the-cache-action key: maven-repository-${{ hashFiles('pom.xml') }} @@ -106,7 +106,7 @@ jobs: distribution: 'adopt' # https://github.com/actions/setup-java#supported-distributions java-version: '8' # https://github.com/actions/setup-java#supported-version-syntax - name: Restore existing cache - uses: actions/cache@v3.3.2 # https://github.com/actions/cache + uses: actions/cache@v3.3.3 # https://github.com/actions/cache with: # https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#input-parameters-for-the-cache-action key: maven-repository-${{ hashFiles('pom.xml') }} @@ -217,7 +217,7 @@ jobs: distribution: 'adopt' # https://github.com/actions/setup-java#supported-distributions java-version: '8' # https://github.com/actions/setup-java#supported-version-syntax - name: Restore existing cache - uses: actions/cache@v3.3.2 # https://github.com/actions/cache + uses: actions/cache@v3.3.3 # https://github.com/actions/cache with: # https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#input-parameters-for-the-cache-action key: maven-repository-${{ hashFiles('pom.xml') }} @@ -242,7 +242,7 @@ jobs: distribution: 'adopt' # https://github.com/actions/setup-java#supported-distributions java-version: '8' # https://github.com/actions/setup-java#supported-version-syntax - name: Restore existing cache - uses: actions/cache@v3.3.2 # https://github.com/actions/cache + uses: actions/cache@v3.3.3 # https://github.com/actions/cache with: # https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#input-parameters-for-the-cache-action key: maven-repository-${{ hashFiles('pom.xml') }} @@ -274,7 +274,7 @@ jobs: distribution: 'adopt' # https://github.com/actions/setup-java#supported-distributions java-version: '8' # https://github.com/actions/setup-java#supported-version-syntax - name: Restore existing cache - uses: actions/cache@v3.3.2 # https://github.com/actions/cache + uses: actions/cache@v3.3.3 # https://github.com/actions/cache with: # https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#input-parameters-for-the-cache-action key: maven-repository-${{ hashFiles('pom.xml') }} diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 839c7b4e26..9c0accf0c1 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -31,7 +31,7 @@ jobs: distribution: 'adopt' # https://github.com/actions/setup-java#supported-distributions java-version: '8' # https://github.com/actions/setup-java#supported-version-syntax - name: Restore existing cache - uses: actions/cache@v3.3.2 # https://github.com/actions/cache + uses: actions/cache@v3.3.3 # https://github.com/actions/cache with: # https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#input-parameters-for-the-cache-action key: maven-repository-${{ hashFiles('pom.xml') }} @@ -56,7 +56,7 @@ jobs: distribution: 'adopt' # https://github.com/actions/setup-java#supported-distributions java-version: '8' # https://github.com/actions/setup-java#supported-version-syntax - name: Restore existing cache - uses: actions/cache@v3.3.2 # https://github.com/actions/cache + uses: actions/cache@v3.3.3 # https://github.com/actions/cache with: # https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#input-parameters-for-the-cache-action key: maven-repository-${{ hashFiles('pom.xml') }} From 9b46d2323711689dfd4d08f201c15666adad8896 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Sun, 14 Jan 2024 13:42:03 +0700 Subject: [PATCH 096/342] ci: don't modify pdd.xml back and forth when commit author has changed Fix #1659 --- .github/workflows/todos-extract-from-code.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/todos-extract-from-code.yml b/.github/workflows/todos-extract-from-code.yml index 738f83b943..75a279a9a3 100644 --- a/.github/workflows/todos-extract-from-code.yml +++ b/.github/workflows/todos-extract-from-code.yml @@ -63,6 +63,10 @@ jobs: - name: Remove the current date from pdd.xml run: sed -i -E '/