Skip to content

Commit

Permalink
Merge pull request #2030 from nordic-institute/dependabot/gradle/src/…
Browse files Browse the repository at this point in the history
…org.postgresql-postgresql-42.7.3
  • Loading branch information
dependabot[bot] authored Apr 8, 2024
2 parents b17f3f9 + d404ce5 commit 5af26b2
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
4 changes: 2 additions & 2 deletions src/packages/src/xroad/redhat/SPECS/xroad-base.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/packages/src/xroad/ubuntu/generic/xroad-base.install
Original file line number Diff line number Diff line change
Expand Up @@ -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/
2 changes: 1 addition & 1 deletion src/packages/src/xroad/ubuntu/generic/xroad-base.links
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 5af26b2

Please sign in to comment.