This is an automated email from the ASF dual-hosted git repository.
fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
The following commit(s) were added to refs/heads/master by this push:
new aa6c763 Silence warning of tika about missing sqlite-jdbc dependency
aa6c763 is described below
commit aa6c7633d6ff8125d588071cb4739930a847e1fa
Author: Felix Schumacher <[email protected]>
AuthorDate: Thu Jan 14 20:13:13 2021 +0100
Silence warning of tika about missing sqlite-jdbc dependency
---
.gitignore | 1 +
bin/jmeter | 2 +-
bin/jmeter.bat | 2 +-
bin/tika-config.xml | 21 +++++++++++++++++++++
4 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore
index 1a0bc30..61df09b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,6 +53,7 @@
/bin/*.xml
# We need log4j2.xml even though we want to exclude xml created by batch tests
!/bin/log4j2.xml
+!/bin/tika-config.xml
build-local.properties
jmeter-fb.*
diff --git a/bin/jmeter b/bin/jmeter
index 5d5b949..fae82ff 100755
--- a/bin/jmeter
+++ b/bin/jmeter
@@ -187,7 +187,7 @@ esac
# Always dump on OOM (does not cost anything unless triggered)
DUMP="-XX:+HeapDumpOnOutOfMemoryError"
-SYSTEM_PROPS="-Djava.security.egd=file:/dev/urandom"
+SYSTEM_PROPS="-Djava.security.egd=file:/dev/urandom
-Dtika.config=${JMETER_HOME}/bin/tika-config.xml"
SERVER="-server"
if [ -z "${JMETER_COMPLETE_ARGS}" ]; then
diff --git a/bin/jmeter.bat b/bin/jmeter.bat
index 80fc534..2c96b54 100644
--- a/bin/jmeter.bat
+++ b/bin/jmeter.bat
@@ -162,7 +162,7 @@ if not defined GC_ALGO (
set GC_ALGO=-XX:+UseG1GC -XX:MaxGCPauseMillis=100 -XX:G1ReservePercent=20
)
-set SYSTEM_PROPS=-Djava.security.egd=file:/dev/urandom
+set SYSTEM_PROPS=-Djava.security.egd=file:/dev/urandom
-Dtika.config=%JMETER_BIN%tika-config.xml
rem Always dump on OOM (does not cost anything unless triggered)
set DUMP=-XX:+HeapDumpOnOutOfMemoryError
diff --git a/bin/tika-config.xml b/bin/tika-config.xml
new file mode 100644
index 0000000..f511df9
--- /dev/null
+++ b/bin/tika-config.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to you under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+<properties>
+ <service-loader initializableProblemHandler="ignore"/>
+</properties>
+
