From eb235a904100285051c74b7e9dd7f97c73bc8441 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Apr 2024 05:52:18 +0000 Subject: [PATCH 1/2] build(deps): bump org.postgresql:postgresql in /src Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.6.1 to 42.7.3. - [Release notes](https://github.com/pgjdbc/pgjdbc/releases) - [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md) - [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.6.1...REL42.7.3) --- updated-dependencies: - dependency-name: org.postgresql:postgresql dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gradle/libs.versions.toml b/src/gradle/libs.versions.toml index 68a4ff9353..974e4a989c 100644 --- a/src/gradle/libs.versions.toml +++ b/src/gradle/libs.versions.toml @@ -124,7 +124,7 @@ logback-access = { module = "ch.qos.logback:logback-access", version.ref = "logb assertj-core = { module = "org.assertj:assertj-core", version = "3.24.2" } wiremock-standalone = { module = "org.wiremock:wiremock-standalone", version = "3.5.2" } -postgresql = { module = "org.postgresql:postgresql", version = "42.6.1" } +postgresql = { module = "org.postgresql:postgresql", version = "42.7.3" } hsqldb = { module = "org.hsqldb:hsqldb", version = "2.7.1" } liquibase-core = { module = "org.liquibase:liquibase-core", version = "4.25.0" } xerces-impl = { module = "xerces:xercesImpl", version = "2.12.2" } From d404ce56f4bcc11e4653f7d000fdaf6a42daf34d Mon Sep 17 00:00:00 2001 From: Ovidijus Narkevicius Date: Mon, 8 Apr 2024 15:01:37 +0300 Subject: [PATCH 2/2] chore: up postgresql lib version match jar file names in build scripts/specs Closes: XRDDEV-2612 --- src/packages/src/xroad/redhat/SPECS/xroad-base.spec | 4 ++-- src/packages/src/xroad/ubuntu/generic/xroad-base.install | 2 +- src/packages/src/xroad/ubuntu/generic/xroad-base.links | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/packages/src/xroad/redhat/SPECS/xroad-base.spec b/src/packages/src/xroad/redhat/SPECS/xroad-base.spec index 283f549643..c27dece6cf 100644 --- a/src/packages/src/xroad/redhat/SPECS/xroad-base.spec +++ b/src/packages/src/xroad/redhat/SPECS/xroad-base.spec @@ -51,12 +51,12 @@ mkdir -p %{buildroot}/var/lib/xroad/backup mkdir -p %{buildroot}/etc/xroad/backup.d ln -s /usr/share/xroad/jlib/common-db-1.0.jar %{buildroot}/usr/share/xroad/jlib/common-db.jar -ln -s /usr/share/xroad/jlib/postgresql-42.6.1.jar %{buildroot}/usr/share/xroad/jlib/postgresql.jar +ln -s /usr/share/xroad/jlib/postgresql-42.7.3.jar %{buildroot}/usr/share/xroad/jlib/postgresql.jar ln -s /usr/share/xroad/db/liquibase-core-4.19.0.jar %{buildroot}/usr/share/xroad/db/liquibase-core.jar cp -p %{_sourcedir}/base/xroad-base.service %{buildroot}%{_unitdir} cp -p %{srcdir}/../../../common/common-db/build/libs/common-db-1.0.jar %{buildroot}/usr/share/xroad/jlib/ -cp -p %{srcdir}/../../../security-server/admin-service/application/build/unpacked-libs/postgresql-42.6.1.jar %{buildroot}/usr/share/xroad/jlib/ +cp -p %{srcdir}/../../../security-server/admin-service/application/build/unpacked-libs/postgresql-42.7.3.jar %{buildroot}/usr/share/xroad/jlib/ cp -p %{srcdir}/default-configuration/common.ini %{buildroot}/etc/xroad/conf.d/ cp -p %{srcdir}/../../../LICENSE.txt %{buildroot}/usr/share/doc/%{name}/LICENSE.txt cp -p %{srcdir}/../../../3RD-PARTY-NOTICES.txt %{buildroot}/usr/share/doc/%{name}/3RD-PARTY-NOTICES.txt diff --git a/src/packages/src/xroad/ubuntu/generic/xroad-base.install b/src/packages/src/xroad/ubuntu/generic/xroad-base.install index c4e4590dd1..933c1a5873 100644 --- a/src/packages/src/xroad/ubuntu/generic/xroad-base.install +++ b/src/packages/src/xroad/ubuntu/generic/xroad-base.install @@ -2,7 +2,7 @@ ../../../../src/xroad/common/base/usr/* usr/ ../../../../src/xroad/default-configuration/common.ini etc/xroad/conf.d/ ../../../../../common/common-db/build/libs/common-db-1.0.jar usr/share/xroad/jlib/ -../../../../../security-server/admin-service/application/build/unpacked-libs/postgresql-42.6.1.jar usr/share/xroad/jlib/ +../../../../../security-server/admin-service/application/build/unpacked-libs/postgresql-42.7.3.jar usr/share/xroad/jlib/ ../../../../../3RD-PARTY-NOTICES.txt usr/share/doc/xroad-base/ ../../../../../../CHANGELOG.md usr/share/doc/xroad-base/ ../../../../../LICENSE.txt usr/share/doc/xroad-base/ diff --git a/src/packages/src/xroad/ubuntu/generic/xroad-base.links b/src/packages/src/xroad/ubuntu/generic/xroad-base.links index 22b896f608..8a066372f7 100644 --- a/src/packages/src/xroad/ubuntu/generic/xroad-base.links +++ b/src/packages/src/xroad/ubuntu/generic/xroad-base.links @@ -1,3 +1,3 @@ usr/share/xroad/jlib/common-db-1.0.jar usr/share/xroad/jlib/common-db.jar -usr/share/xroad/jlib/postgresql-42.6.1.jar usr/share/xroad/jlib/postgresql.jar +usr/share/xroad/jlib/postgresql-42.7.3.jar usr/share/xroad/jlib/postgresql.jar usr/share/xroad/db/liquibase-core-4.19.0.jar usr/share/xroad/db/liquibase-core.jar