diff --git a/exaudfclient/base/javacontainer/javacontainer_impl.cc b/exaudfclient/base/javacontainer/javacontainer_impl.cc index 9f9b8b58..780bed0e 100644 --- a/exaudfclient/base/javacontainer/javacontainer_impl.cc +++ b/exaudfclient/base/javacontainer/javacontainer_impl.cc @@ -11,7 +11,7 @@ #include "base/debug_message.h" #include "base/javacontainer/javacontainer.h" #include "base/javacontainer/javacontainer_impl.h" -#include "base/javacontainer/script_options/scriptoptionlinesconverter.h" +#include "base/javacontainer/script_options/converter.h" using namespace SWIGVMContainers; diff --git a/exaudfclient/base/javacontainer/script_options/BUILD b/exaudfclient/base/javacontainer/script_options/BUILD index 5469fdd3..1fbe2387 100644 --- a/exaudfclient/base/javacontainer/script_options/BUILD +++ b/exaudfclient/base/javacontainer/script_options/BUILD @@ -3,7 +3,7 @@ package(default_visibility = ["//visibility:public"]) cc_library( name = "java_scriptoptionlines", - hdrs = [":scriptoptionlinesconverter.h"], - srcs = [":scriptoptionlinesparser.h", ":scriptoptionlinesconverter.h", ":scriptoptionlinesconverter.cc", ":scriptoptionlinesparserlegacy.h", ":scriptoptionlinesparserlegacy.cc"], + hdrs = [":converter.h"], + srcs = [":arser.h", ":converter.h", ":converter.cc", ":parserlegacy.h", ":parserlegacy.cc"], deps = ["//base/script_options_parser:scriptoptionlinesparser", "//base/exaudflib:header", "//base/exaudflib:exaudflib-deps"], ) diff --git a/exaudfclient/base/javacontainer/script_options/scriptoptionlinesconverter.cc b/exaudfclient/base/javacontainer/script_options/converter.cc similarity index 96% rename from exaudfclient/base/javacontainer/script_options/scriptoptionlinesconverter.cc rename to exaudfclient/base/javacontainer/script_options/converter.cc index 6acdf9ff..5a6895b1 100644 --- a/exaudfclient/base/javacontainer/script_options/scriptoptionlinesconverter.cc +++ b/exaudfclient/base/javacontainer/script_options/converter.cc @@ -1,5 +1,5 @@ -#include "base/javacontainer/script_options/scriptoptionlinesconverter.h" -#include "base/javacontainer/script_options/scriptoptionlinesparserlegacy.h" +#include "base/javacontainer/script_options/converter.h" +#include "base/javacontainer/script_options/parserlegacy.h" #include "base/exaudflib/swig/swig_meta_data.h" #include #include diff --git a/exaudfclient/base/javacontainer/script_options/scriptoptionlinesconverter.h b/exaudfclient/base/javacontainer/script_options/converter.h similarity index 94% rename from exaudfclient/base/javacontainer/script_options/scriptoptionlinesconverter.h rename to exaudfclient/base/javacontainer/script_options/converter.h index 36424c82..cf2bce0a 100644 --- a/exaudfclient/base/javacontainer/script_options/scriptoptionlinesconverter.h +++ b/exaudfclient/base/javacontainer/script_options/converter.h @@ -7,7 +7,7 @@ #include #include -#include "base/javacontainer/script_options/scriptoptionlinesparser.h" +#include "base/javacontainer/script_options/parser.h" diff --git a/exaudfclient/base/javacontainer/script_options/scriptoptionlinesparser.h b/exaudfclient/base/javacontainer/script_options/parser.h similarity index 100% rename from exaudfclient/base/javacontainer/script_options/scriptoptionlinesparser.h rename to exaudfclient/base/javacontainer/script_options/parser.h diff --git a/exaudfclient/base/javacontainer/script_options/scriptoptionlinesparserctpg.cc b/exaudfclient/base/javacontainer/script_options/parserctpg.cc similarity index 68% rename from exaudfclient/base/javacontainer/script_options/scriptoptionlinesparserctpg.cc rename to exaudfclient/base/javacontainer/script_options/parserctpg.cc index 9e3e55cb..8f606df0 100644 --- a/exaudfclient/base/javacontainer/script_options/scriptoptionlinesparserctpg.cc +++ b/exaudfclient/base/javacontainer/script_options/parserctpg.cc @@ -1,4 +1,4 @@ -#include "base/javacontainer/script_options.h" +#include "base/javacontainer/script_options/parserctpg.h" namespace SWIGVMContainers { diff --git a/exaudfclient/base/javacontainer/script_options/scriptoptionlinesparserctpg.h b/exaudfclient/base/javacontainer/script_options/parserctpg.h similarity index 100% rename from exaudfclient/base/javacontainer/script_options/scriptoptionlinesparserctpg.h rename to exaudfclient/base/javacontainer/script_options/parserctpg.h diff --git a/exaudfclient/base/javacontainer/script_options/scriptoptionlinesparserlegacy.cc b/exaudfclient/base/javacontainer/script_options/parserlegacy.cc similarity index 97% rename from exaudfclient/base/javacontainer/script_options/scriptoptionlinesparserlegacy.cc rename to exaudfclient/base/javacontainer/script_options/parserlegacy.cc index 4159e69d..b5820440 100644 --- a/exaudfclient/base/javacontainer/script_options/scriptoptionlinesparserlegacy.cc +++ b/exaudfclient/base/javacontainer/script_options/parserlegacy.cc @@ -1,4 +1,4 @@ -#include "base/javacontainer/script_options/scriptoptionlinesparserlegacy.h" +#include "base/javacontainer/script_options/parserlegacy.h" #include "base/script_options_parser/scriptoptionlines.h" diff --git a/exaudfclient/base/javacontainer/script_options/scriptoptionlinesparserlegacy.h b/exaudfclient/base/javacontainer/script_options/parserlegacy.h similarity index 96% rename from exaudfclient/base/javacontainer/script_options/scriptoptionlinesparserlegacy.h rename to exaudfclient/base/javacontainer/script_options/parserlegacy.h index 062d96de..5aac0f2b 100644 --- a/exaudfclient/base/javacontainer/script_options/scriptoptionlinesparserlegacy.h +++ b/exaudfclient/base/javacontainer/script_options/parserlegacy.h @@ -2,7 +2,7 @@ #define SCRIPTOPTIONLINEPARSERLEGACY_H 1 -#include "base/javacontainer/script_options/scriptoptionlinesparser.h" +#include "base/javacontainer/script_options/parser.h" namespace SWIGVMContainers { diff --git a/flavors/template-Exasol-all-python-3.10/flavor_base/udfclient_deps/packages/apt_get_packages b/flavors/template-Exasol-all-python-3.10/flavor_base/udfclient_deps/packages/apt_get_packages index 95c510e1..49dc6a1c 100644 --- a/flavors/template-Exasol-all-python-3.10/flavor_base/udfclient_deps/packages/apt_get_packages +++ b/flavors/template-Exasol-all-python-3.10/flavor_base/udfclient_deps/packages/apt_get_packages @@ -3,4 +3,4 @@ locales|2.35-0ubuntu3.8 libnss-db|2.2.3pre1-6ubuntu3 libzmq3-dev|4.3.4-2 libprotobuf-dev|3.12.4-1ubuntu7.22.04.1 -libssl-dev|3.0.2-0ubuntu1.17 +libssl-dev|3.0.2-0ubuntu1.18