From 1de2893a48c037eb934061d6dd1f4a7d5ac28b88 Mon Sep 17 00:00:00 2001 From: Mohammad Abudayyeh <47318409+moabu@users.noreply.github.com> Date: Tue, 23 Jan 2024 07:02:28 +0000 Subject: [PATCH] ci: fix packages (#7496) * ci: fix packages Signed-off-by: moabu <47318409+moabu@users.noreply.github.com> * ci: fix packages Signed-off-by: moabu <47318409+moabu@users.noreply.github.com> --------- Signed-off-by: moabu <47318409+moabu@users.noreply.github.com> --- .github/CODEOWNERS | 12 ++++++------ .github/workflows/build-packages.yml | 2 +- automation/packaging/deb/focal/debian/control | 2 +- automation/packaging/deb/focal/debian/copyright | 2 +- automation/packaging/deb/jammy/debian/control | 2 +- automation/packaging/deb/jammy/debian/copyright | 2 +- .../scripts/tests/authorization_code_flow.jmx | 2 +- .../scripts/tests/implicit_flow.jmx | 2 +- .../tests/resource_owner_password_credentials.jmx | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 572f672a7e4..9891d5c623e 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -7,13 +7,13 @@ /jans-keycloak-integration/ @uprightech /jans-keycloak-link/ @shekhar16 /docker-jans-*/ @moabu @iromli -/automation/ @moabu -/charts/ @moabu +/automation/ @moabu @iromli +/charts/ @moabu @iromli /.github/ @moabu -/jans-*/version.txt @moabu -/jans-*/CHANGELOG.md @moabu +/jans-*/version.txt @moabu @mo-auto +/jans-*/CHANGELOG.md @moabu @mo-auto /jans-pycloudlib/ @moabu -/docker-jans-*/requirments.txt @mo-auto +/docker-jans-*/requirments.txt @iromli @mo-auto /jans-bom/ @yurem @yuriyz /jans-core/ @yurem @yuriyz /jans-orm/ @yurem @yuriyz @@ -25,7 +25,7 @@ /jans-config-api/ @pujavs @yuriyz @yurem /jans-cli-tui/ @devrimyatar /jans-linux-setup/ @devrimyatar @yuriyz @yurem -/jans-linux-setup/jans_setup/setup_app/version.py @moabu +/jans-linux-setup/jans_setup/setup_app/version.py @moabu @mo-auto /jans-linux-setup/static/scripts/admin_ui_plugin.py @devrimyatar @duttarnab /jans-cache-refresh/ @yurem @shekhar16 /jans-link/ @shekhar16 diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml index 73be5b36ee1..ceeef5d3231 100644 --- a/.github/workflows/build-packages.yml +++ b/.github/workflows/build-packages.yml @@ -62,7 +62,7 @@ jobs: sudo add-apt-repository ppa:deadsnakes/ppa sudo apt-get update sudo apt-get install -y python${{ matrix.python_version }} - sudo apt install -y build-essential devscripts debhelper rpm dpkg-sig python3-dev python3-ldap3 python3-requests python3-ruamel.yaml python3-pymysql python3-crypto python3-distutils python3-prompt-toolkit python${{ matrix.python_version }}-distutils libpq-dev python${{ matrix.python_version }}-dev + sudo apt install -y build-essential devscripts debhelper rpm dpkg-sig python3-dev python3-ldap3 python3-requests python3-ruamel.yaml python3-pymysql python3-crypto python3-distutils python3-prompt-toolkit python${{ matrix.python_version }}-distutils libpq-dev python${{ matrix.python_version }}-dev apache2 rsyslog python3-urllib3 python3-certifi postgresql postgresql-contrib sudo cp -r /usr/lib/python3/dist-packages /usr/lib/python${{ matrix.python_version }}/ sudo python${{ matrix.python_version }} -m pip install psycopg2-binary psycopg2 - name: Import GPG key diff --git a/automation/packaging/deb/focal/debian/control b/automation/packaging/deb/focal/debian/control index 47625ac5cb4..90866418cba 100644 --- a/automation/packaging/deb/focal/debian/control +++ b/automation/packaging/deb/focal/debian/control @@ -9,5 +9,5 @@ Homepage: https://jans.io Package: jans Architecture: any Multi-Arch: foreign -Depends: ${misc:Depends}, ${shlibs:Depends}, apache2, curl, wget, xz-utils, unzip, rsyslog, bzip2, python3-ldap3, python3-requests, python3-ruamel.yaml, python3-certifi, python3-pymysql, python3-crypto, python3-distutils, python3-prompt-toolkit, python3-psycopg2 +Depends: ${misc:Depends}, ${shlibs:Depends}, apache2, rsyslog, python3-urllib3, python3-certifi, postgresql, postgresql-contrib, python3-ldap3, python3-requests, python3-ruamel.yaml, python3-crypto, python3-psycopg2, curl, wget, xz-utils, unzip, rsyslog, bzip2 Description: Janssen enables organizations to build a scalable centralized authentication and authorization service using free open source software. diff --git a/automation/packaging/deb/focal/debian/copyright b/automation/packaging/deb/focal/debian/copyright index a9644e3693d..ed85895385a 100644 --- a/automation/packaging/deb/focal/debian/copyright +++ b/automation/packaging/deb/focal/debian/copyright @@ -3,5 +3,5 @@ Upstream-Name: jans Source: https://jans.io Files: * -Copyright: 2023 The Janssen Project. support@jans.io +Copyright: 2024 The Janssen Project. support@jans.io License: Apache-2.0 diff --git a/automation/packaging/deb/jammy/debian/control b/automation/packaging/deb/jammy/debian/control index 9bcb4aec5e8..9195468bb5a 100644 --- a/automation/packaging/deb/jammy/debian/control +++ b/automation/packaging/deb/jammy/debian/control @@ -9,5 +9,5 @@ Homepage: https://jans.io Package: jans Architecture: any Multi-Arch: foreign -Depends: ${misc:Depends}, ${shlibs:Depends}, apache2, curl, wget, xz-utils, unzip, rsyslog, bzip2, python3-urllib3, python3-certifi, python3-ldap3, python3-requests, python3-ruamel.yaml, python3-pymysql, python3-cryptography, python3-distutils, python3-psycopg2 +Depends: ${misc:Depends}, ${shlibs:Depends}, apache2, curl, wget, xz-utils, unzip, rsyslog, bzip2, python3-urllib3, python3-certifi, python3-ldap3, python3-requests, python3-ruamel.yaml, python3-pymysql, python3-cryptography, python3-distutils, python3-psycopg2, postgresql-contrib, postgresql Description: Janssen enables organizations to build a scalable centralized authentication and authorization service using free open source software. diff --git a/automation/packaging/deb/jammy/debian/copyright b/automation/packaging/deb/jammy/debian/copyright index a9644e3693d..ed85895385a 100644 --- a/automation/packaging/deb/jammy/debian/copyright +++ b/automation/packaging/deb/jammy/debian/copyright @@ -3,5 +3,5 @@ Upstream-Name: jans Source: https://jans.io Files: * -Copyright: 2023 The Janssen Project. support@jans.io +Copyright: 2024 The Janssen Project. support@jans.io License: Apache-2.0 diff --git a/demos/benchmarking/docker-jans-loadtesting-jmeter/scripts/tests/authorization_code_flow.jmx b/demos/benchmarking/docker-jans-loadtesting-jmeter/scripts/tests/authorization_code_flow.jmx index 345466bf9b8..19647ac67fc 100644 --- a/demos/benchmarking/docker-jans-loadtesting-jmeter/scripts/tests/authorization_code_flow.jmx +++ b/demos/benchmarking/docker-jans-loadtesting-jmeter/scripts/tests/authorization_code_flow.jmx @@ -49,7 +49,7 @@ location_regexp - Location: https:\/\/FQDN_PART1\.FQDN_PART2\.FQDN_PART3(.*) + location: https:\/\/FQDN_PART1\.FQDN_PART2\.FQDN_PART3(.*) = diff --git a/demos/benchmarking/docker-jans-loadtesting-jmeter/scripts/tests/implicit_flow.jmx b/demos/benchmarking/docker-jans-loadtesting-jmeter/scripts/tests/implicit_flow.jmx index a5fe2b82e7c..d9740e5b25d 100644 --- a/demos/benchmarking/docker-jans-loadtesting-jmeter/scripts/tests/implicit_flow.jmx +++ b/demos/benchmarking/docker-jans-loadtesting-jmeter/scripts/tests/implicit_flow.jmx @@ -81,7 +81,7 @@ continue false - 1 + -1 THREAD_COUNT 10 diff --git a/demos/benchmarking/docker-jans-loadtesting-jmeter/scripts/tests/resource_owner_password_credentials.jmx b/demos/benchmarking/docker-jans-loadtesting-jmeter/scripts/tests/resource_owner_password_credentials.jmx index 8653b7f5bba..e9344ff0226 100644 --- a/demos/benchmarking/docker-jans-loadtesting-jmeter/scripts/tests/resource_owner_password_credentials.jmx +++ b/demos/benchmarking/docker-jans-loadtesting-jmeter/scripts/tests/resource_owner_password_credentials.jmx @@ -66,7 +66,7 @@ continue false - 1 + -1 THREAD_COUNT 10