You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2018/09/28 12:51:52 UTC
[2/3] jena git commit: JENA-1595: Revert to logging via scope-test
JENA-1595: Revert to logging via scope-test
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/0798976a
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/0798976a
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/0798976a
Branch: refs/heads/master
Commit: 0798976a4dddce97421f482e6048d64be1e9e7ed
Parents: 453af16
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Sep 28 13:49:01 2018 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Sep 28 13:49:01 2018 +0100
----------------------------------------------------------------------
apache-jena/pom.xml | 4 ++--
jena-cmds/pom.xml | 6 ++++--
jena-fuseki2/jena-fuseki-fulljar/pom.xml | 23 ++++++++++++++++++++++-
jena-fuseki2/jena-fuseki-webapp/pom.xml | 5 +++--
pom.xml | 18 ++++++++++++++----
5 files changed, 45 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/0798976a/apache-jena/pom.xml
----------------------------------------------------------------------
diff --git a/apache-jena/pom.xml b/apache-jena/pom.xml
index d2de116..68f89a2 100644
--- a/apache-jena/pom.xml
+++ b/apache-jena/pom.xml
@@ -151,7 +151,7 @@
<version>3.9.0-SNAPSHOT</version>
</dependency>
- <!-- Require a logging implementation -->
+ <!-- Require a logging implementation for command line tools -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
@@ -163,8 +163,8 @@
<artifactId>log4j</artifactId>
<scope>compile</scope>
</dependency>
- <!-- Logging -->
+ <!-- Logging -->
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-cmds</artifactId>
http://git-wip-us.apache.org/repos/asf/jena/blob/0798976a/jena-cmds/pom.xml
----------------------------------------------------------------------
diff --git a/jena-cmds/pom.xml b/jena-cmds/pom.xml
index 73ad144..b0c8835 100644
--- a/jena-cmds/pom.xml
+++ b/jena-cmds/pom.xml
@@ -73,13 +73,15 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <scope>runtime</scope>
+ <optional>false</optional>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <scope>runtime</scope>
+ <optional>false</optional>
+ <scope>compile</scope>
</dependency>
<!-- Testing -->
http://git-wip-us.apache.org/repos/asf/jena/blob/0798976a/jena-fuseki2/jena-fuseki-fulljar/pom.xml
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-fulljar/pom.xml b/jena-fuseki2/jena-fuseki-fulljar/pom.xml
index ed4c3e8..b5e17af 100644
--- a/jena-fuseki2/jena-fuseki-fulljar/pom.xml
+++ b/jena-fuseki2/jena-fuseki-fulljar/pom.xml
@@ -47,7 +47,28 @@
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-cmds</artifactId>
- <version>3.9.0-SNAPSHOT</version>
+ <version>${project.version}</version>
+ </dependency>
+
+ <!-- Logging : Needed because the Fuseki command line manages logging -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+
+ <!-- The jena parent POM has <optional>true</optional> -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <optional>false</optional>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <optional>false</optional>
+ <scope>compile</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/jena/blob/0798976a/jena-fuseki2/jena-fuseki-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-webapp/pom.xml b/jena-fuseki2/jena-fuseki-webapp/pom.xml
index 436e420..2647e74 100644
--- a/jena-fuseki2/jena-fuseki-webapp/pom.xml
+++ b/jena-fuseki2/jena-fuseki-webapp/pom.xml
@@ -89,16 +89,17 @@
<artifactId>slf4j-api</artifactId>
</dependency>
+ <!-- The jena parent POM has <optional>true</optional> -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <optional>true</optional>
+ <optional>false</optional>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <optional>true</optional>
+ <optional>false</optional>
</dependency>
<!-- Testing -->
http://git-wip-us.apache.org/repos/asf/jena/blob/0798976a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index aea0241..80e39a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -466,6 +466,7 @@
<version>${ver.log4j2}</version>
</dependency>
+ <!-- Intercept direct use of log4j2 -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
@@ -485,12 +486,9 @@
<version>${ver.slf4j}</version>
</dependency>
- <!-- And intercept any uses of Jakarta Commons Logging
- e.g. Apache Common HTTP client.
- -->
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
+ <artifactId>slf4j-jdk14</artifactId>
<version>${ver.slf4j}</version>
</dependency>
@@ -500,6 +498,16 @@
<version>${ver.log4j}</version>
</dependency>
+ <!-- And intercept any uses of Jakarta Commons Logging
+ e.g. Apache Common HTTP client.
+ -->
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>${ver.slf4j}</version>
+ </dependency>
+
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
@@ -558,12 +566,14 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
+ <!-- <optional>true</optional> -->
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
+ <!-- <optional>true</optional> -->
<scope>test</scope>
</dependency>