This is an automated email from the ASF dual-hosted git repository.

andy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git

commit 7c82b10d4acf47e5b521a32349463090725a9809
Author: Andy Seaborne <[email protected]>
AuthorDate: Mon Mar 11 19:14:35 2024 +0000

    Tidy up test logging configuration
---
 apache-jena/log4j2.properties                                      | 7 ++-----
 jena-arq/src/test/resources/log4j2.properties                      | 4 ----
 jena-fuseki2/apache-jena-fuseki/log4j2.properties                  | 7 ++-----
 .../jena-fuseki-access/src/test/resources/log4j2.properties        | 4 ----
 jena-fuseki2/jena-fuseki-docker/log4j2.properties                  | 7 ++-----
 .../jena-fuseki-geosparql/src/test/resources/log4j2.properties     | 4 ----
 jena-fuseki2/jena-fuseki-main/src/test/resources/log4j2.properties | 4 ----
 jena-fuseki2/jena-fuseki-webapp/src/main/webapp/log4j2.properties  | 4 +---
 .../jena-fuseki-webapp/src/test/resources/log4j2.properties        | 7 ++-----
 jena-geosparql/src/test/resources/log4j2.properties                | 4 ----
 jena-integration-tests/src/test/resources/log4j2.properties        | 4 ----
 11 files changed, 9 insertions(+), 47 deletions(-)

diff --git a/apache-jena/log4j2.properties b/apache-jena/log4j2.properties
index a7756e27f6..7a6e435070 100644
--- a/apache-jena/log4j2.properties
+++ b/apache-jena/log4j2.properties
@@ -49,13 +49,10 @@ logger.fuseki-admin.level = INFO
 logger.jetty.name  = org.eclipse.jetty
 logger.jetty.level = WARN
 
-# May be useful to turn up to DEBUG if debugging HTTP communication issues
-logger.apache-http.name   = org.apache.http
-logger.apache-http.level  = WARN
-
 logger.shiro.name = org.apache.shiro
 logger.shiro.level = WARN
-# Hide bug in Shiro 1.5.0
+
+# Hide issue with Shiro 1.5.0+, 2.0.0
 logger.shiro-realm.name = org.apache.shiro.realm.text.IniRealm
 logger.shiro-realm.level = ERROR
 
diff --git a/jena-arq/src/test/resources/log4j2.properties 
b/jena-arq/src/test/resources/log4j2.properties
index b4d38967a2..a1a1ef3824 100644
--- a/jena-arq/src/test/resources/log4j2.properties
+++ b/jena-arq/src/test/resources/log4j2.properties
@@ -25,7 +25,3 @@ logger.arq-info.level = INFO
 
 logger.riot.name  = org.apache.jena.riot
 logger.riot.level = INFO
-
-# May be useful to turn up to DEBUG if debugging HTTP communication issues
-logger.apache-http.name   = org.apache.http
-logger.apache-http.level  = WARN
diff --git a/jena-fuseki2/apache-jena-fuseki/log4j2.properties 
b/jena-fuseki2/apache-jena-fuseki/log4j2.properties
index 73746a3aec..81dac1df7b 100644
--- a/jena-fuseki2/apache-jena-fuseki/log4j2.properties
+++ b/jena-fuseki2/apache-jena-fuseki/log4j2.properties
@@ -46,13 +46,10 @@ logger.fuseki-admin.level = INFO
 logger.jetty.name  = org.eclipse.jetty
 logger.jetty.level = WARN
 
-# May be useful to turn up to DEBUG if debugging HTTP communication issues
-logger.apache-http.name   = org.apache.http
-logger.apache-http.level  = WARN
-
 logger.shiro.name = org.apache.shiro
 logger.shiro.level = WARN
-# Hide bug in Shiro 1.5.0
+
+# Hide bug with Shiro 1.5.0+, 2.0.0
 logger.shiro-realm.name = org.apache.shiro.realm.text.IniRealm
 logger.shiro-realm.level = ERROR
 
diff --git 
a/jena-fuseki2/jena-fuseki-access/src/test/resources/log4j2.properties 
b/jena-fuseki2/jena-fuseki-access/src/test/resources/log4j2.properties
index a857ca8284..286860583b 100644
--- a/jena-fuseki2/jena-fuseki-access/src/test/resources/log4j2.properties
+++ b/jena-fuseki2/jena-fuseki-access/src/test/resources/log4j2.properties
@@ -40,10 +40,6 @@ logger.fuseki-admin.level = WARN
 logger.jetty.name  = org.eclipse.jetty
 logger.jetty.level = WARN
 
-# May be useful to turn up to DEBUG if debugging HTTP communication issues
-logger.apache-http.name   = org.apache.http
-logger.apache-http.level  = WARN
-
 # This goes out in NCSA format
 appender.plain.type = Console
 appender.plain.name = PLAIN
diff --git a/jena-fuseki2/jena-fuseki-docker/log4j2.properties 
b/jena-fuseki2/jena-fuseki-docker/log4j2.properties
index 07f360da58..4f219d5844 100644
--- a/jena-fuseki2/jena-fuseki-docker/log4j2.properties
+++ b/jena-fuseki2/jena-fuseki-docker/log4j2.properties
@@ -51,13 +51,10 @@ logger.fuseki-admin.level = INFO
 logger.jetty.name  = org.eclipse.jetty
 logger.jetty.level = WARN
 
-# May be useful to turn up to DEBUG if debugging HTTP communication issues
-logger.apache-http.name   = org.apache.http
-logger.apache-http.level  = WARN
-
 logger.shiro.name = org.apache.shiro
 logger.shiro.level = WARN
-# Hide bug in Shiro 1.5.x
+
+# Hide issue with Shiro 1.5.0+, 2.0.0
 logger.shiro-realm.name = org.apache.shiro.realm.text.IniRealm
 logger.shiro-realm.level = ERROR
 
diff --git 
a/jena-fuseki2/jena-fuseki-geosparql/src/test/resources/log4j2.properties 
b/jena-fuseki2/jena-fuseki-geosparql/src/test/resources/log4j2.properties
index bc633a6c14..f1fe56f2ce 100644
--- a/jena-fuseki2/jena-fuseki-geosparql/src/test/resources/log4j2.properties
+++ b/jena-fuseki2/jena-fuseki-geosparql/src/test/resources/log4j2.properties
@@ -52,10 +52,6 @@ logger.fuseki-admin.level = WARN
 logger.jetty.name  = org.eclipse.jetty
 logger.jetty.level = WARN
 
-# May be useful to turn up to DEBUG if debugging HTTP communication issues
-logger.apache-http.name   = org.apache.http
-logger.apache-http.level  = WARN
-
 # This goes out in NCSA format
 appender.plain.type = Console
 appender.plain.name = PLAIN
diff --git a/jena-fuseki2/jena-fuseki-main/src/test/resources/log4j2.properties 
b/jena-fuseki2/jena-fuseki-main/src/test/resources/log4j2.properties
index 4cbc992f92..6502551e14 100644
--- a/jena-fuseki2/jena-fuseki-main/src/test/resources/log4j2.properties
+++ b/jena-fuseki2/jena-fuseki-main/src/test/resources/log4j2.properties
@@ -54,10 +54,6 @@ logger.fuseki-autoload.level = ERROR
 logger.jetty.name  = org.eclipse.jetty
 logger.jetty.level = WARN
 
-# May be useful to turn up to DEBUG if debugging HTTP communication issues
-logger.apache-http.name   = org.apache.http
-logger.apache-http.level  = WARN
-
 # This goes out in NCSA format
 appender.plain.type = Console
 appender.plain.name = PLAIN
diff --git a/jena-fuseki2/jena-fuseki-webapp/src/main/webapp/log4j2.properties 
b/jena-fuseki2/jena-fuseki-webapp/src/main/webapp/log4j2.properties
index 14986c3bd6..0524e408b0 100644
--- a/jena-fuseki2/jena-fuseki-webapp/src/main/webapp/log4j2.properties
+++ b/jena-fuseki2/jena-fuseki-webapp/src/main/webapp/log4j2.properties
@@ -43,12 +43,10 @@ logger.fuseki-admin.level = INFO
 logger.jetty.name  = org.eclipse.jetty
 logger.jetty.level = WARN
 
-logger.apache-http.name   = org.apache.http
-logger.apache-http.level  = WARN
 logger.shiro.name = org.apache.shiro
 logger.shiro.level = WARN
 
-# Hide bug in Shiro 1.5.0
+# Hide issue with Shiro 1.5.0+, 2.0.0
 logger.shiro-realm.name = org.apache.shiro.realm.text.IniRealm
 logger.shiro-realm.level = ERROR
 
diff --git 
a/jena-fuseki2/jena-fuseki-webapp/src/test/resources/log4j2.properties 
b/jena-fuseki2/jena-fuseki-webapp/src/test/resources/log4j2.properties
index 7538a8ca91..9b915f0a7f 100644
--- a/jena-fuseki2/jena-fuseki-webapp/src/test/resources/log4j2.properties
+++ b/jena-fuseki2/jena-fuseki-webapp/src/test/resources/log4j2.properties
@@ -47,16 +47,13 @@ logger.fuseki-config.level = WARN
 logger.jetty.name  = org.eclipse.jetty
 logger.jetty.level = WARN
 
-# Hide bug in Shiro 1.5.0
 logger.shiro.name = org.apache.shiro
 logger.shiro.level = WARN
+
+# Hide issue with Shiro 1.5.0+, 2.0.0
 logger.shiro-realm.name = org.apache.shiro.realm.text.IniRealm
 logger.shiro-realm.level = ERROR
 
-# May be useful to turn up to DEBUG if debugging HTTP communication issues
-logger.apache-http.name   = org.apache.http
-logger.apache-http.level  = WARN
-
 # This goes out in NCSA format
 appender.plain.type = Console
 appender.plain.name = PLAIN
diff --git a/jena-geosparql/src/test/resources/log4j2.properties 
b/jena-geosparql/src/test/resources/log4j2.properties
index 5326bddb4e..4330ba0fc0 100644
--- a/jena-geosparql/src/test/resources/log4j2.properties
+++ b/jena-geosparql/src/test/resources/log4j2.properties
@@ -46,10 +46,6 @@ logger.fuseki-admin.level = WARN
 logger.jetty.name  = org.eclipse.jetty
 logger.jetty.level = WARN
 
-# May be useful to turn up to DEBUG if debugging HTTP communication issues
-logger.apache-http.name   = org.apache.http
-logger.apache-http.level  = WARN
-
 # This goes out in NCSA format
 appender.plain.type = Console
 appender.plain.name = PLAIN
diff --git a/jena-integration-tests/src/test/resources/log4j2.properties 
b/jena-integration-tests/src/test/resources/log4j2.properties
index 98766b0c03..6d3061598f 100644
--- a/jena-integration-tests/src/test/resources/log4j2.properties
+++ b/jena-integration-tests/src/test/resources/log4j2.properties
@@ -49,10 +49,6 @@ logger.jetty.level = WARN
 logger.geosparql-registry.name = 
org.apache.jena.geosparql.implementation.registry.SRSRegistry
 logger.geosparql-registry.level = ERROR
 
-# May be useful to turn up to DEBUG if debugging HTTP communication issues
-logger.apache-http.name   = org.apache.http
-logger.apache-http.level  = WARN
-
 # This goes out in NCSA format
 appender.plain.type = Console
 appender.plain.name = PLAIN

Reply via email to