From 747e2acb80d005cf0a6b9aa8f48fc9a153963a8e Mon Sep 17 00:00:00 2001 From: Elmir Shamsutdinov Date: Thu, 6 Aug 2026 15:02:37 +0300 Subject: [PATCH 1/5] updated github action --- .github/workflows/main.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 1acf57c..3ab3e48 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -9,39 +9,39 @@ jobs: runs-on: ubuntu-latest name: Running Java 8 compile steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Set up JDK 1.8 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'temurin' java-version: '8' - name: Compile code - run: mvn compile + run: mvn compile -B -ntp test: runs-on: ubuntu-latest name: Running tests needs: compile steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Set up JDK 1.8 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'temurin' java-version: '8' - name: Run unit tests - run: mvn test -B verify + run: mvn test -B -ntp verify build: runs-on: ubuntu-latest name: mvn build needs: compile steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Set up JDK 1.8 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'temurin' java-version: '8' - name: build - run: mvn clean package -DskipTests + run: mvn clean package -DskipTests -B -ntp From 708a16569a7b6b29ad67a44a51d6c6d79e970d57 Mon Sep 17 00:00:00 2001 From: Elmir Shamsutdinov Date: Thu, 6 Aug 2026 15:02:44 +0300 Subject: [PATCH 2/5] code clean up --- .../modules/blocksjournal/view/BlocksJournalView.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/ru/taximaxim/pgsqlblocks/modules/blocksjournal/view/BlocksJournalView.java b/src/main/java/ru/taximaxim/pgsqlblocks/modules/blocksjournal/view/BlocksJournalView.java index 331bc88..958b9ee 100644 --- a/src/main/java/ru/taximaxim/pgsqlblocks/modules/blocksjournal/view/BlocksJournalView.java +++ b/src/main/java/ru/taximaxim/pgsqlblocks/modules/blocksjournal/view/BlocksJournalView.java @@ -20,7 +20,6 @@ import java.io.IOException; import java.nio.file.Path; import java.util.ArrayList; -import java.util.Arrays; import java.util.Comparator; import java.util.List; import java.util.ResourceBundle; From 4a14454aeaa9bffd4a870305f3deff31cabac338 Mon Sep 17 00:00:00 2001 From: Elmir Shamsutdinov Date: Thu, 6 Aug 2026 15:04:14 +0300 Subject: [PATCH 3/5] updated changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c75fc0..d3bb94e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ java-приложение для работы с блокировками в С ### Версии +2.0.0 + +* Обновлены action-ы в gitHubActions + 1.9.1 * Обновлена лицензия From 4b373fd66cc4b40c09dee33df2994f39c27d32e7 Mon Sep 17 00:00:00 2001 From: Elmir Shamsutdinov Date: Thu, 6 Aug 2026 15:15:04 +0300 Subject: [PATCH 4/5] updated changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d3bb94e..d0ec094 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ java-приложение для работы с блокировками в С ### Версии -2.0.0 +Новое * Обновлены action-ы в gitHubActions From 8b9703a98e605ffb8f87ed661282f4195879ce12 Mon Sep 17 00:00:00 2001 From: Elmir Shamsutdinov Date: Thu, 6 Aug 2026 15:18:47 +0300 Subject: [PATCH 5/5] updated by feedback --- CHANGELOG.md | 5 +---- pom.xml | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a701d9..fee3455 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,13 +6,10 @@ java-приложение для работы с блокировками в С Новое -* Обновлены action-ы в gitHubActions - -1.9.1 - * Обновлена лицензия * Обновлены библиотеки * Исправлена уязвимость при чтении XML +* Обновлены action-ы в gitHubActions 1.9.0 diff --git a/pom.xml b/pom.xml index d526b48..b9e9d3e 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ ru.taximaxim pgsqlblocks - 1.9.1 + 1.9.0 jar pgSqlBlocks