From 535a58ba548bf75afe051353d13eba80daf19c9a Mon Sep 17 00:00:00 2001 From: ckunki Date: Thu, 19 Dec 2024 13:31:59 +0100 Subject: [PATCH 01/12] Updated script update_apt_package_in_package_list.sh --- scripts/update_apt_package_in_package_list.sh | 41 +++++++++---------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/scripts/update_apt_package_in_package_list.sh b/scripts/update_apt_package_in_package_list.sh index e92f11a71..dbe8db420 100644 --- a/scripts/update_apt_package_in_package_list.sh +++ b/scripts/update_apt_package_in_package_list.sh @@ -3,34 +3,33 @@ set -o errexit set -o nounset set -o pipefail -if [ $# -eq 0 ]; -then - echo '"Package|Installed|Candidate" SEARCH_DIRECTORY REPLACE' - exit 1 +if [ $# == 0 ]; then + echo '"Package|Installed|Candidate" [SEARCH_DIRECTORY] [REPLACE]' + echo '- SEARCH_DIRECTORY: default .' + echo '- REPLACE: either yes or no, default: no' + exit 1 fi LIST_NEWEST_VERSION_OUTPUT=$1 # Package|Installed|Candidate -SEARCH_DIRECTORY=$2 -REPLACE=$3 +SEARCH_DIRECTORY=${2:-.} +REPLACE=${3:-no} PACKAGE=$(echo "$LIST_NEWEST_VERSION_OUTPUT" | cut -f 1 -d "|") CANDIDATE_VERSION=$(echo "$LIST_NEWEST_VERSION_OUTPUT" | cut -f 3 -d "|") CURRENT_VERSION=$(echo "$LIST_NEWEST_VERSION_OUTPUT" | cut -f 2 -d "|") FILES=$(grep -R "^$PACKAGE|$CURRENT_VERSION" "$SEARCH_DIRECTORY" | cut -f 1 -d ":") -for FILE in $FILES -do - echo "Found package $PACKAGE|$CURRENT_VERSION in $FILE" - echo "Original lines:" - grep "^$PACKAGE|$CURRENT_VERSION" "$FILE" - echo "Updated lines:" - CURRENT_VERSION_ESCAPE=${CURRENT_VERSION//\~/\\~} - SEARCH_REPLACE_PATTERN="s/^($PACKAGE\|$CURRENT_VERSION_ESCAPE).*$/$PACKAGE|$CANDIDATE_VERSION/g" - sed -E "$SEARCH_REPLACE_PATTERN" "$FILE" | grep "^$PACKAGE|" - if [[ "$REPLACE" == "yes" ]] - then - echo "Updating file $FILE:" - sed -E -i "$SEARCH_REPLACE_PATTERN" "$FILE" - fi - echo +for FILE in $FILES; do + echo "Found package $PACKAGE|$CURRENT_VERSION in $FILE" + echo "Original lines:" + grep "^$PACKAGE|$CURRENT_VERSION" "$FILE" + echo "Updated lines:" + CURRENT_VERSION_ESCAPE=${CURRENT_VERSION//\~/\\~} + SEARCH_REPLACE_PATTERN="s/^($PACKAGE\|$CURRENT_VERSION_ESCAPE).*$/$PACKAGE|$CANDIDATE_VERSION/g" + sed -E "$SEARCH_REPLACE_PATTERN" "$FILE" | grep "^$PACKAGE|" + if [ "$REPLACE" == "yes" ]; then + echo "Updating file $FILE:" + sed -E -i "$SEARCH_REPLACE_PATTERN" "$FILE" + fi + echo done From d796fc4472e3b7da82799f3985834ff272eca788 Mon Sep 17 00:00:00 2001 From: ckunki Date: Thu, 19 Dec 2024 13:33:24 +0100 Subject: [PATCH 02/12] Updated script update_apt_packages_in_package_list.sh --- scripts/update_apt_packages_in_package_list.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/update_apt_packages_in_package_list.sh b/scripts/update_apt_packages_in_package_list.sh index 6789a81c9..9305adf3c 100644 --- a/scripts/update_apt_packages_in_package_list.sh +++ b/scripts/update_apt_packages_in_package_list.sh @@ -6,15 +6,15 @@ set -o pipefail SCRIPT_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" -if [ $# -eq 0 ]; -then - echo 'SEARCH_DIRECTORY REPLACE' - exit 1 +if [ $# -eq 0 ]; then + echo 'SEARCH_DIRECTORY REPLACE' + exit 1 fi SEARCH_DIRECTORY=$1 REPLACE=$2 -while read -r LIST_NEWEST_VERSION_OUTPUT; do - bash "$SCRIPT_DIR/update_apt_package_in_package_list.sh" "$LIST_NEWEST_VERSION_OUTPUT" "$SEARCH_DIRECTORY" "$REPLACE" || true +while read -r LIST_NEWEST_VERSION_OUTPUT; do + bash "$SCRIPT_DIR/update_apt_package_in_package_list.sh" \ + "$LIST_NEWEST_VERSION_OUTPUT" "$SEARCH_DIRECTORY" "$REPLACE" || true done From 61fc076b5779ac85c86ce1d33d471c69e829d0d2 Mon Sep 17 00:00:00 2001 From: ckunki Date: Thu, 19 Dec 2024 13:33:44 +0100 Subject: [PATCH 03/12] Updated curl from 7.81.0-1ubuntu1.19 to .20 --- .../test_files/apt/with_versions/all_versions_specified | 2 +- .../test_files/apt/with_versions/some_missing_versions | 2 +- .../flavor_base/conda_deps/packages/apt_get_packages | 2 +- .../flavor_base/build_deps/packages/apt_get_packages | 2 +- .../flavor_base/language_deps/packages/apt_get_packages | 2 +- .../flavor_base/conda_deps/packages/apt_get_packages | 2 +- .../flavor_base/build_deps/packages/apt_get_packages | 2 +- .../flavor_base/language_deps/packages/apt_get_packages | 2 +- .../flavor_base/conda_deps/packages/apt_get_packages | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ext/scripts/tests/install_scripts/test_files/apt/with_versions/all_versions_specified b/ext/scripts/tests/install_scripts/test_files/apt/with_versions/all_versions_specified index 52a2d1eac..9d83e7152 100644 --- a/ext/scripts/tests/install_scripts/test_files/apt/with_versions/all_versions_specified +++ b/ext/scripts/tests/install_scripts/test_files/apt/with_versions/all_versions_specified @@ -1,2 +1,2 @@ -curl|7.81.0-1ubuntu1.19 # t1 +curl|7.81.0-1ubuntu1.20 wget|1.21.2-2ubuntu1.1 # t2 diff --git a/ext/scripts/tests/install_scripts/test_files/apt/with_versions/some_missing_versions b/ext/scripts/tests/install_scripts/test_files/apt/with_versions/some_missing_versions index 0e1c4960b..3e6a72ab4 100644 --- a/ext/scripts/tests/install_scripts/test_files/apt/with_versions/some_missing_versions +++ b/ext/scripts/tests/install_scripts/test_files/apt/with_versions/some_missing_versions @@ -1,3 +1,3 @@ -curl|7.81.0-1ubuntu1.19 # t1 +curl|7.81.0-1ubuntu1.20 wget| # t2 git| diff --git a/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/conda_deps/packages/apt_get_packages b/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/conda_deps/packages/apt_get_packages index f2c20f198..ebb154384 100644 --- a/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/conda_deps/packages/apt_get_packages +++ b/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/conda_deps/packages/apt_get_packages @@ -1,5 +1,5 @@ coreutils|8.32-4.1ubuntu1.2 locales|2.35-0ubuntu3.8 -curl|7.81.0-1ubuntu1.19 +curl|7.81.0-1ubuntu1.20 ca-certificates|20240203~22.04.1 bzip2|1.0.8-5build1 diff --git a/flavors/template-Exasol-all-java-17/flavor_base/build_deps/packages/apt_get_packages b/flavors/template-Exasol-all-java-17/flavor_base/build_deps/packages/apt_get_packages index 2abb6fa00..85031757d 100644 --- a/flavors/template-Exasol-all-java-17/flavor_base/build_deps/packages/apt_get_packages +++ b/flavors/template-Exasol-all-java-17/flavor_base/build_deps/packages/apt_get_packages @@ -1,7 +1,7 @@ coreutils|8.32-4.1ubuntu1.2 locales|2.35-0ubuntu3.8 tar|1.34+dfsg-1ubuntu0.1.22.04.2 -curl|7.81.0-1ubuntu1.19 +curl|7.81.0-1ubuntu1.20 openjdk-17-jdk-headless|17.0.13+11-2ubuntu1~22.04 build-essential|12.9ubuntu3 libpcre3-dev|2:8.39-13ubuntu0.22.04.1 diff --git a/flavors/template-Exasol-all-java-17/flavor_base/language_deps/packages/apt_get_packages b/flavors/template-Exasol-all-java-17/flavor_base/language_deps/packages/apt_get_packages index 894d32467..174a666de 100644 --- a/flavors/template-Exasol-all-java-17/flavor_base/language_deps/packages/apt_get_packages +++ b/flavors/template-Exasol-all-java-17/flavor_base/language_deps/packages/apt_get_packages @@ -1,3 +1,3 @@ ca-certificates|20240203~22.04.1 -curl|7.81.0-1ubuntu1.19 +curl|7.81.0-1ubuntu1.20 openjdk-17-jdk-headless|17.0.13+11-2ubuntu1~22.04 diff --git a/flavors/template-Exasol-all-python-3.10-conda/flavor_base/conda_deps/packages/apt_get_packages b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/conda_deps/packages/apt_get_packages index f2c20f198..ebb154384 100644 --- a/flavors/template-Exasol-all-python-3.10-conda/flavor_base/conda_deps/packages/apt_get_packages +++ b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/conda_deps/packages/apt_get_packages @@ -1,5 +1,5 @@ coreutils|8.32-4.1ubuntu1.2 locales|2.35-0ubuntu3.8 -curl|7.81.0-1ubuntu1.19 +curl|7.81.0-1ubuntu1.20 ca-certificates|20240203~22.04.1 bzip2|1.0.8-5build1 diff --git a/flavors/template-Exasol-all-python-3.10/flavor_base/build_deps/packages/apt_get_packages b/flavors/template-Exasol-all-python-3.10/flavor_base/build_deps/packages/apt_get_packages index a99d228f6..29d7f5de4 100644 --- a/flavors/template-Exasol-all-python-3.10/flavor_base/build_deps/packages/apt_get_packages +++ b/flavors/template-Exasol-all-python-3.10/flavor_base/build_deps/packages/apt_get_packages @@ -1,7 +1,7 @@ coreutils|8.32-4.1ubuntu1.2 locales|2.35-0ubuntu3.8 tar|1.34+dfsg-1ubuntu0.1.22.04.2 -curl|7.81.0-1ubuntu1.19 +curl|7.81.0-1ubuntu1.20 openjdk-11-jdk|11.0.25+9-1ubuntu1~22.04 build-essential|12.9ubuntu3 libpcre3-dev|2:8.39-13ubuntu0.22.04.1 diff --git a/flavors/template-Exasol-all-python-3.10/flavor_base/language_deps/packages/apt_get_packages b/flavors/template-Exasol-all-python-3.10/flavor_base/language_deps/packages/apt_get_packages index 988edf9b6..cc4b85603 100644 --- a/flavors/template-Exasol-all-python-3.10/flavor_base/language_deps/packages/apt_get_packages +++ b/flavors/template-Exasol-all-python-3.10/flavor_base/language_deps/packages/apt_get_packages @@ -1,4 +1,4 @@ ca-certificates|20240203~22.04.1 python3.10-dev|3.10.12-1~22.04.7 python3-distutils|3.10.8-1~22.04 -curl|7.81.0-1ubuntu1.19 +curl|7.81.0-1ubuntu1.20 diff --git a/flavors/test-Exasol-8-cuda-ml/flavor_base/conda_deps/packages/apt_get_packages b/flavors/test-Exasol-8-cuda-ml/flavor_base/conda_deps/packages/apt_get_packages index f2c20f198..ebb154384 100644 --- a/flavors/test-Exasol-8-cuda-ml/flavor_base/conda_deps/packages/apt_get_packages +++ b/flavors/test-Exasol-8-cuda-ml/flavor_base/conda_deps/packages/apt_get_packages @@ -1,5 +1,5 @@ coreutils|8.32-4.1ubuntu1.2 locales|2.35-0ubuntu3.8 -curl|7.81.0-1ubuntu1.19 +curl|7.81.0-1ubuntu1.20 ca-certificates|20240203~22.04.1 bzip2|1.0.8-5build1 From eeed56f593a7c8a3560a92e5509cf38bae46b6bb Mon Sep 17 00:00:00 2001 From: ckunki Date: Thu, 19 Dec 2024 13:50:23 +0100 Subject: [PATCH 04/12] Updated script update_apt_package_in_package_list.sh once again --- scripts/update_apt_package_in_package_list.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/update_apt_package_in_package_list.sh b/scripts/update_apt_package_in_package_list.sh index dbe8db420..3b29d4661 100644 --- a/scripts/update_apt_package_in_package_list.sh +++ b/scripts/update_apt_package_in_package_list.sh @@ -15,8 +15,8 @@ SEARCH_DIRECTORY=${2:-.} REPLACE=${3:-no} PACKAGE=$(echo "$LIST_NEWEST_VERSION_OUTPUT" | cut -f 1 -d "|") -CANDIDATE_VERSION=$(echo "$LIST_NEWEST_VERSION_OUTPUT" | cut -f 3 -d "|") CURRENT_VERSION=$(echo "$LIST_NEWEST_VERSION_OUTPUT" | cut -f 2 -d "|") +CANDIDATE_VERSION=$(echo "$LIST_NEWEST_VERSION_OUTPUT" | cut -f 3 -d "|") FILES=$(grep -R "^$PACKAGE|$CURRENT_VERSION" "$SEARCH_DIRECTORY" | cut -f 1 -d ":") for FILE in $FILES; do From 7e8e0e3d4302a08993371ba9c641c3c4dc8648e7 Mon Sep 17 00:00:00 2001 From: ckunki Date: Thu, 19 Dec 2024 13:58:30 +0100 Subject: [PATCH 05/12] Updated script update_apt_package_in_package_list.sh 3 --- scripts/update_apt_package_in_package_list.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/update_apt_package_in_package_list.sh b/scripts/update_apt_package_in_package_list.sh index 3b29d4661..5d98d98d0 100644 --- a/scripts/update_apt_package_in_package_list.sh +++ b/scripts/update_apt_package_in_package_list.sh @@ -10,13 +10,15 @@ if [ $# == 0 ]; then exit 1 fi -LIST_NEWEST_VERSION_OUTPUT=$1 # Package|Installed|Candidate +# Format of $1: Package|Installed|Candidate +# Set array variable SPEC. +IFS='|' read -ra SPEC <<< "$1" SEARCH_DIRECTORY=${2:-.} REPLACE=${3:-no} -PACKAGE=$(echo "$LIST_NEWEST_VERSION_OUTPUT" | cut -f 1 -d "|") -CURRENT_VERSION=$(echo "$LIST_NEWEST_VERSION_OUTPUT" | cut -f 2 -d "|") -CANDIDATE_VERSION=$(echo "$LIST_NEWEST_VERSION_OUTPUT" | cut -f 3 -d "|") +PACKAGE=${SPEC[0]} +CURRENT_VERSION=${SPEC[1]} +CANDIDATE_VERSION=${SPEC[2]} FILES=$(grep -R "^$PACKAGE|$CURRENT_VERSION" "$SEARCH_DIRECTORY" | cut -f 1 -d ":") for FILE in $FILES; do From 4007fa1b62998b40d2b3afa5b74550c542ab7004 Mon Sep 17 00:00:00 2001 From: ckunki Date: Thu, 19 Dec 2024 14:04:23 +0100 Subject: [PATCH 06/12] Added comment to pyproject.toml --- pyproject.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index d2aecfba7..df69523bb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,8 @@ [tool.poetry] package-mode = false name = "exasol-script-languages" +# should we increase this version? +# Are there other files that need to be updated? version = "8.1.0" description = "Script Languages" From 55acc3a00fab329b67f4bcf83ad607422d0c5293 Mon Sep 17 00:00:00 2001 From: ckunki Date: Thu, 19 Dec 2024 14:17:35 +0100 Subject: [PATCH 07/12] Updated java rules in base.MODULE.bazel --- exaudfclient/base/base.MODULE.bazel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exaudfclient/base/base.MODULE.bazel b/exaudfclient/base/base.MODULE.bazel index 0dc34e5df..4c4bfa390 100644 --- a/exaudfclient/base/base.MODULE.bazel +++ b/exaudfclient/base/base.MODULE.bazel @@ -1,6 +1,6 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "googletest", version = "1.15.0") -bazel_dep(name = "rules_java", version = "6.1.1") +bazel_dep(name = "rules_java", version = "7.6.1") bazel_dep(name = "rules_jvm_external", version = "6.2") python_local_repository = use_repo_rule("//base:python_repository.bzl", "python_local_repository") From 6da955550238de8d1b780f90d0545703057277a6 Mon Sep 17 00:00:00 2001 From: ckunki Date: Thu, 19 Dec 2024 14:19:42 +0100 Subject: [PATCH 08/12] included cstdint in string_ops.cc --- exaudfclient/base/javacontainer/script_options/string_ops.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/exaudfclient/base/javacontainer/script_options/string_ops.cc b/exaudfclient/base/javacontainer/script_options/string_ops.cc index 4f37fb978..4f7f7f301 100644 --- a/exaudfclient/base/javacontainer/script_options/string_ops.cc +++ b/exaudfclient/base/javacontainer/script_options/string_ops.cc @@ -1,6 +1,7 @@ #include "base/javacontainer/script_options/string_ops.h" #include #include +#include namespace SWIGVMContainers { From e1dc686113ea16b28844a2e13715d3c7dc34858e Mon Sep 17 00:00:00 2001 From: ckunki Date: Thu, 19 Dec 2024 14:30:54 +0100 Subject: [PATCH 09/12] Update version number --- pyproject.toml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index df69523bb..ca4a431f2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,9 +1,7 @@ [tool.poetry] package-mode = false name = "exasol-script-languages" -# should we increase this version? -# Are there other files that need to be updated? -version = "8.1.0" +version = "9.1.0" description = "Script Languages" license = "MIT" From b77de02ef475ae481f66b73466d7730977fd2d02 Mon Sep 17 00:00:00 2001 From: ckunki Date: Thu, 19 Dec 2024 15:35:32 +0100 Subject: [PATCH 10/12] Re-added comment t1 to curl package references --- .../test_files/apt/with_versions/all_versions_specified | 2 +- .../test_files/apt/with_versions/some_missing_versions | 2 +- .../flavor_base/conda_deps/packages/apt_get_packages | 2 +- .../flavor_base/build_deps/packages/apt_get_packages | 2 +- .../flavor_base/language_deps/packages/apt_get_packages | 2 +- .../flavor_base/conda_deps/packages/apt_get_packages | 2 +- .../flavor_base/build_deps/packages/apt_get_packages | 2 +- .../flavor_base/language_deps/packages/apt_get_packages | 2 +- .../flavor_base/conda_deps/packages/apt_get_packages | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ext/scripts/tests/install_scripts/test_files/apt/with_versions/all_versions_specified b/ext/scripts/tests/install_scripts/test_files/apt/with_versions/all_versions_specified index 9d83e7152..19082daab 100644 --- a/ext/scripts/tests/install_scripts/test_files/apt/with_versions/all_versions_specified +++ b/ext/scripts/tests/install_scripts/test_files/apt/with_versions/all_versions_specified @@ -1,2 +1,2 @@ -curl|7.81.0-1ubuntu1.20 +curl|7.81.0-1ubuntu1.20 #t1 wget|1.21.2-2ubuntu1.1 # t2 diff --git a/ext/scripts/tests/install_scripts/test_files/apt/with_versions/some_missing_versions b/ext/scripts/tests/install_scripts/test_files/apt/with_versions/some_missing_versions index 3e6a72ab4..ee51c0a17 100644 --- a/ext/scripts/tests/install_scripts/test_files/apt/with_versions/some_missing_versions +++ b/ext/scripts/tests/install_scripts/test_files/apt/with_versions/some_missing_versions @@ -1,3 +1,3 @@ -curl|7.81.0-1ubuntu1.20 +curl|7.81.0-1ubuntu1.20 #t1 wget| # t2 git| diff --git a/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/conda_deps/packages/apt_get_packages b/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/conda_deps/packages/apt_get_packages index ebb154384..e162f9654 100644 --- a/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/conda_deps/packages/apt_get_packages +++ b/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/conda_deps/packages/apt_get_packages @@ -1,5 +1,5 @@ coreutils|8.32-4.1ubuntu1.2 locales|2.35-0ubuntu3.8 -curl|7.81.0-1ubuntu1.20 +curl|7.81.0-1ubuntu1.20 #t1 ca-certificates|20240203~22.04.1 bzip2|1.0.8-5build1 diff --git a/flavors/template-Exasol-all-java-17/flavor_base/build_deps/packages/apt_get_packages b/flavors/template-Exasol-all-java-17/flavor_base/build_deps/packages/apt_get_packages index 85031757d..6fa0f68c9 100644 --- a/flavors/template-Exasol-all-java-17/flavor_base/build_deps/packages/apt_get_packages +++ b/flavors/template-Exasol-all-java-17/flavor_base/build_deps/packages/apt_get_packages @@ -1,7 +1,7 @@ coreutils|8.32-4.1ubuntu1.2 locales|2.35-0ubuntu3.8 tar|1.34+dfsg-1ubuntu0.1.22.04.2 -curl|7.81.0-1ubuntu1.20 +curl|7.81.0-1ubuntu1.20 #t1 openjdk-17-jdk-headless|17.0.13+11-2ubuntu1~22.04 build-essential|12.9ubuntu3 libpcre3-dev|2:8.39-13ubuntu0.22.04.1 diff --git a/flavors/template-Exasol-all-java-17/flavor_base/language_deps/packages/apt_get_packages b/flavors/template-Exasol-all-java-17/flavor_base/language_deps/packages/apt_get_packages index 174a666de..f8bac0901 100644 --- a/flavors/template-Exasol-all-java-17/flavor_base/language_deps/packages/apt_get_packages +++ b/flavors/template-Exasol-all-java-17/flavor_base/language_deps/packages/apt_get_packages @@ -1,3 +1,3 @@ ca-certificates|20240203~22.04.1 -curl|7.81.0-1ubuntu1.20 +curl|7.81.0-1ubuntu1.20 #t1 openjdk-17-jdk-headless|17.0.13+11-2ubuntu1~22.04 diff --git a/flavors/template-Exasol-all-python-3.10-conda/flavor_base/conda_deps/packages/apt_get_packages b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/conda_deps/packages/apt_get_packages index ebb154384..e162f9654 100644 --- a/flavors/template-Exasol-all-python-3.10-conda/flavor_base/conda_deps/packages/apt_get_packages +++ b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/conda_deps/packages/apt_get_packages @@ -1,5 +1,5 @@ coreutils|8.32-4.1ubuntu1.2 locales|2.35-0ubuntu3.8 -curl|7.81.0-1ubuntu1.20 +curl|7.81.0-1ubuntu1.20 #t1 ca-certificates|20240203~22.04.1 bzip2|1.0.8-5build1 diff --git a/flavors/template-Exasol-all-python-3.10/flavor_base/build_deps/packages/apt_get_packages b/flavors/template-Exasol-all-python-3.10/flavor_base/build_deps/packages/apt_get_packages index 29d7f5de4..366d6839d 100644 --- a/flavors/template-Exasol-all-python-3.10/flavor_base/build_deps/packages/apt_get_packages +++ b/flavors/template-Exasol-all-python-3.10/flavor_base/build_deps/packages/apt_get_packages @@ -1,7 +1,7 @@ coreutils|8.32-4.1ubuntu1.2 locales|2.35-0ubuntu3.8 tar|1.34+dfsg-1ubuntu0.1.22.04.2 -curl|7.81.0-1ubuntu1.20 +curl|7.81.0-1ubuntu1.20 #t1 openjdk-11-jdk|11.0.25+9-1ubuntu1~22.04 build-essential|12.9ubuntu3 libpcre3-dev|2:8.39-13ubuntu0.22.04.1 diff --git a/flavors/template-Exasol-all-python-3.10/flavor_base/language_deps/packages/apt_get_packages b/flavors/template-Exasol-all-python-3.10/flavor_base/language_deps/packages/apt_get_packages index cc4b85603..c9c5b5583 100644 --- a/flavors/template-Exasol-all-python-3.10/flavor_base/language_deps/packages/apt_get_packages +++ b/flavors/template-Exasol-all-python-3.10/flavor_base/language_deps/packages/apt_get_packages @@ -1,4 +1,4 @@ ca-certificates|20240203~22.04.1 python3.10-dev|3.10.12-1~22.04.7 python3-distutils|3.10.8-1~22.04 -curl|7.81.0-1ubuntu1.20 +curl|7.81.0-1ubuntu1.20 #t1 diff --git a/flavors/test-Exasol-8-cuda-ml/flavor_base/conda_deps/packages/apt_get_packages b/flavors/test-Exasol-8-cuda-ml/flavor_base/conda_deps/packages/apt_get_packages index ebb154384..e162f9654 100644 --- a/flavors/test-Exasol-8-cuda-ml/flavor_base/conda_deps/packages/apt_get_packages +++ b/flavors/test-Exasol-8-cuda-ml/flavor_base/conda_deps/packages/apt_get_packages @@ -1,5 +1,5 @@ coreutils|8.32-4.1ubuntu1.2 locales|2.35-0ubuntu3.8 -curl|7.81.0-1ubuntu1.20 +curl|7.81.0-1ubuntu1.20 #t1 ca-certificates|20240203~22.04.1 bzip2|1.0.8-5build1 From 0a9b1f7320ed13a8d7c2a1cfd18f54145c0980e7 Mon Sep 17 00:00:00 2001 From: ckunki Date: Thu, 19 Dec 2024 15:40:20 +0100 Subject: [PATCH 11/12] Removed comment t1 from curl package references ... but left it in the tests --- .../test_files/apt/with_versions/all_versions_specified | 2 +- .../test_files/apt/with_versions/some_missing_versions | 2 +- .../flavor_base/conda_deps/packages/apt_get_packages | 2 +- .../flavor_base/build_deps/packages/apt_get_packages | 2 +- .../flavor_base/language_deps/packages/apt_get_packages | 2 +- .../flavor_base/conda_deps/packages/apt_get_packages | 2 +- .../flavor_base/build_deps/packages/apt_get_packages | 2 +- .../flavor_base/language_deps/packages/apt_get_packages | 2 +- .../flavor_base/conda_deps/packages/apt_get_packages | 2 +- scripts/update_apt_package_in_package_list.sh | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ext/scripts/tests/install_scripts/test_files/apt/with_versions/all_versions_specified b/ext/scripts/tests/install_scripts/test_files/apt/with_versions/all_versions_specified index 19082daab..5d0fd27d3 100644 --- a/ext/scripts/tests/install_scripts/test_files/apt/with_versions/all_versions_specified +++ b/ext/scripts/tests/install_scripts/test_files/apt/with_versions/all_versions_specified @@ -1,2 +1,2 @@ -curl|7.81.0-1ubuntu1.20 #t1 +curl|7.81.0-1ubuntu1.20 # t1 wget|1.21.2-2ubuntu1.1 # t2 diff --git a/ext/scripts/tests/install_scripts/test_files/apt/with_versions/some_missing_versions b/ext/scripts/tests/install_scripts/test_files/apt/with_versions/some_missing_versions index ee51c0a17..7eb3db113 100644 --- a/ext/scripts/tests/install_scripts/test_files/apt/with_versions/some_missing_versions +++ b/ext/scripts/tests/install_scripts/test_files/apt/with_versions/some_missing_versions @@ -1,3 +1,3 @@ -curl|7.81.0-1ubuntu1.20 #t1 +curl|7.81.0-1ubuntu1.20 # t1 wget| # t2 git| diff --git a/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/conda_deps/packages/apt_get_packages b/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/conda_deps/packages/apt_get_packages index e162f9654..ebb154384 100644 --- a/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/conda_deps/packages/apt_get_packages +++ b/flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/conda_deps/packages/apt_get_packages @@ -1,5 +1,5 @@ coreutils|8.32-4.1ubuntu1.2 locales|2.35-0ubuntu3.8 -curl|7.81.0-1ubuntu1.20 #t1 +curl|7.81.0-1ubuntu1.20 ca-certificates|20240203~22.04.1 bzip2|1.0.8-5build1 diff --git a/flavors/template-Exasol-all-java-17/flavor_base/build_deps/packages/apt_get_packages b/flavors/template-Exasol-all-java-17/flavor_base/build_deps/packages/apt_get_packages index 6fa0f68c9..85031757d 100644 --- a/flavors/template-Exasol-all-java-17/flavor_base/build_deps/packages/apt_get_packages +++ b/flavors/template-Exasol-all-java-17/flavor_base/build_deps/packages/apt_get_packages @@ -1,7 +1,7 @@ coreutils|8.32-4.1ubuntu1.2 locales|2.35-0ubuntu3.8 tar|1.34+dfsg-1ubuntu0.1.22.04.2 -curl|7.81.0-1ubuntu1.20 #t1 +curl|7.81.0-1ubuntu1.20 openjdk-17-jdk-headless|17.0.13+11-2ubuntu1~22.04 build-essential|12.9ubuntu3 libpcre3-dev|2:8.39-13ubuntu0.22.04.1 diff --git a/flavors/template-Exasol-all-java-17/flavor_base/language_deps/packages/apt_get_packages b/flavors/template-Exasol-all-java-17/flavor_base/language_deps/packages/apt_get_packages index f8bac0901..174a666de 100644 --- a/flavors/template-Exasol-all-java-17/flavor_base/language_deps/packages/apt_get_packages +++ b/flavors/template-Exasol-all-java-17/flavor_base/language_deps/packages/apt_get_packages @@ -1,3 +1,3 @@ ca-certificates|20240203~22.04.1 -curl|7.81.0-1ubuntu1.20 #t1 +curl|7.81.0-1ubuntu1.20 openjdk-17-jdk-headless|17.0.13+11-2ubuntu1~22.04 diff --git a/flavors/template-Exasol-all-python-3.10-conda/flavor_base/conda_deps/packages/apt_get_packages b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/conda_deps/packages/apt_get_packages index e162f9654..ebb154384 100644 --- a/flavors/template-Exasol-all-python-3.10-conda/flavor_base/conda_deps/packages/apt_get_packages +++ b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/conda_deps/packages/apt_get_packages @@ -1,5 +1,5 @@ coreutils|8.32-4.1ubuntu1.2 locales|2.35-0ubuntu3.8 -curl|7.81.0-1ubuntu1.20 #t1 +curl|7.81.0-1ubuntu1.20 ca-certificates|20240203~22.04.1 bzip2|1.0.8-5build1 diff --git a/flavors/template-Exasol-all-python-3.10/flavor_base/build_deps/packages/apt_get_packages b/flavors/template-Exasol-all-python-3.10/flavor_base/build_deps/packages/apt_get_packages index 366d6839d..29d7f5de4 100644 --- a/flavors/template-Exasol-all-python-3.10/flavor_base/build_deps/packages/apt_get_packages +++ b/flavors/template-Exasol-all-python-3.10/flavor_base/build_deps/packages/apt_get_packages @@ -1,7 +1,7 @@ coreutils|8.32-4.1ubuntu1.2 locales|2.35-0ubuntu3.8 tar|1.34+dfsg-1ubuntu0.1.22.04.2 -curl|7.81.0-1ubuntu1.20 #t1 +curl|7.81.0-1ubuntu1.20 openjdk-11-jdk|11.0.25+9-1ubuntu1~22.04 build-essential|12.9ubuntu3 libpcre3-dev|2:8.39-13ubuntu0.22.04.1 diff --git a/flavors/template-Exasol-all-python-3.10/flavor_base/language_deps/packages/apt_get_packages b/flavors/template-Exasol-all-python-3.10/flavor_base/language_deps/packages/apt_get_packages index c9c5b5583..cc4b85603 100644 --- a/flavors/template-Exasol-all-python-3.10/flavor_base/language_deps/packages/apt_get_packages +++ b/flavors/template-Exasol-all-python-3.10/flavor_base/language_deps/packages/apt_get_packages @@ -1,4 +1,4 @@ ca-certificates|20240203~22.04.1 python3.10-dev|3.10.12-1~22.04.7 python3-distutils|3.10.8-1~22.04 -curl|7.81.0-1ubuntu1.20 #t1 +curl|7.81.0-1ubuntu1.20 diff --git a/flavors/test-Exasol-8-cuda-ml/flavor_base/conda_deps/packages/apt_get_packages b/flavors/test-Exasol-8-cuda-ml/flavor_base/conda_deps/packages/apt_get_packages index e162f9654..ebb154384 100644 --- a/flavors/test-Exasol-8-cuda-ml/flavor_base/conda_deps/packages/apt_get_packages +++ b/flavors/test-Exasol-8-cuda-ml/flavor_base/conda_deps/packages/apt_get_packages @@ -1,5 +1,5 @@ coreutils|8.32-4.1ubuntu1.2 locales|2.35-0ubuntu3.8 -curl|7.81.0-1ubuntu1.20 #t1 +curl|7.81.0-1ubuntu1.20 ca-certificates|20240203~22.04.1 bzip2|1.0.8-5build1 diff --git a/scripts/update_apt_package_in_package_list.sh b/scripts/update_apt_package_in_package_list.sh index 5d98d98d0..5f068a018 100644 --- a/scripts/update_apt_package_in_package_list.sh +++ b/scripts/update_apt_package_in_package_list.sh @@ -13,7 +13,7 @@ fi # Format of $1: Package|Installed|Candidate # Set array variable SPEC. IFS='|' read -ra SPEC <<< "$1" -SEARCH_DIRECTORY=${2:-.} +SEARCH_DIRECTORY=${2:-flavors} REPLACE=${3:-no} PACKAGE=${SPEC[0]} From a85f74e9056a9fd26b093185d6cb29b0dccc7be9 Mon Sep 17 00:00:00 2001 From: ckunki Date: Fri, 20 Dec 2024 10:34:15 +0100 Subject: [PATCH 12/12] Updated libcurl4-openssl-dev|7.81.0-1ubuntu1.19|7.81.0-1ubuntu1.20 --- .../flavor_base/flavor_base_deps/packages/apt_get_packages | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flavors/template-Exasol-all-python-3.10/flavor_base/flavor_base_deps/packages/apt_get_packages b/flavors/template-Exasol-all-python-3.10/flavor_base/flavor_base_deps/packages/apt_get_packages index f245ce3c6..68916f4be 100644 --- a/flavors/template-Exasol-all-python-3.10/flavor_base/flavor_base_deps/packages/apt_get_packages +++ b/flavors/template-Exasol-all-python-3.10/flavor_base/flavor_base_deps/packages/apt_get_packages @@ -1,4 +1,4 @@ unzip|6.0-26ubuntu3.2 git|1:2.34.1-1ubuntu1.11 -libcurl4-openssl-dev|7.81.0-1ubuntu1.19 +libcurl4-openssl-dev|7.81.0-1ubuntu1.20 build-essential|12.9ubuntu3