diff options
| author | Arnstein Ressem <aressem@verizonmedia.com> | 2021-05-31 21:42:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-31 21:42:59 +0200 |
| commit | f420ed454bccf8069c027073bd60b915c8be9786 (patch) | |
| tree | 491a3eacc7b10fa51e7e91c13892124efcb0a3f6 | |
| parent | 86680800259f60a5491b79e2e4bfb4b673ad64b2 (diff) | |
| parent | 93660efac24c558abbd76f3fc94fbadb49ce6968 (diff) | |
Merge pull request #18044 from vespa-engine/revert-18043-bjorncs/vespa-feed-client-cli
Revert "Bjorncs/vespa feed client cli"
| -rw-r--r-- | dist/vespa.spec | 3 | ||||
| -rw-r--r-- | vespa-feed-client-cli/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | vespa-feed-client-cli/src/main/resources/logging.properties | 2 | ||||
| -rwxr-xr-x | vespa-feed-client-cli/src/main/sh/vespa-feed-client.sh | 2 |
4 files changed, 0 insertions, 8 deletions
diff --git a/dist/vespa.spec b/dist/vespa.spec index 34afc46c80c..de92077fdbd 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -724,12 +724,9 @@ fi %defattr(-,%{_vespa_user},%{_vespa_group},-) %endif %dir %{_prefix} -%dir %{_prefix}/conf -%dir %{_prefix}/conf/vespa-feed-client %dir %{_prefix}/lib %dir %{_prefix}/lib/jars %{_prefix}/bin/vespa-feed-client -%{_prefix}/conf/vespa-feed-client/logging.properties %{_prefix}/lib/jars/vespa-http-client-jar-with-dependencies.jar %{_prefix}/lib/jars/vespa-feed-client-cli.jar diff --git a/vespa-feed-client-cli/CMakeLists.txt b/vespa-feed-client-cli/CMakeLists.txt index 4f2f38686d8..a918981dcd3 100644 --- a/vespa-feed-client-cli/CMakeLists.txt +++ b/vespa-feed-client-cli/CMakeLists.txt @@ -2,4 +2,3 @@ install_java_artifact(vespa-feed-client-cli) vespa_install_script(src/main/sh/vespa-feed-client.sh vespa-feed-client bin) -configure_file(src/main/resources/logging.properties conf/vespa-feed-client/logging.properties @ONLY) diff --git a/vespa-feed-client-cli/src/main/resources/logging.properties b/vespa-feed-client-cli/src/main/resources/logging.properties deleted file mode 100644 index 3f0e8b24e78..00000000000 --- a/vespa-feed-client-cli/src/main/resources/logging.properties +++ /dev/null @@ -1,2 +0,0 @@ -# Disable verbose info logging from org.apache.hc.client5.http.impl.async.AsyncHttpRequestRetryExec -org.apache.hc.client5.http.impl.async.level = WARNING diff --git a/vespa-feed-client-cli/src/main/sh/vespa-feed-client.sh b/vespa-feed-client-cli/src/main/sh/vespa-feed-client.sh index ab43fca2f67..2a166dd40bb 100755 --- a/vespa-feed-client-cli/src/main/sh/vespa-feed-client.sh +++ b/vespa-feed-client-cli/src/main/sh/vespa-feed-client.sh @@ -79,6 +79,4 @@ exec java \ -Djava.library.path=${VESPA_HOME}/libexec64/native:${VESPA_HOME}/lib64 \ -Djava.awt.headless=true \ -Xms128m -Xmx2048m $(getJavaOptionsIPV46) \ ---add-opens=java.base/sun.security.ssl=ALL-UNNAMED \ --Djava.util.logging.config.file=${VESPA_HOME}/conf/vespa-feed-client/logging.properties \ -cp ${VESPA_HOME}/lib/jars/vespa-feed-client-cli.jar ai.vespa.feed.client.CliClient "$@" |