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 2016/09/02 12:10:36 UTC
[2/3] jena git commit: fuseki-core to depend directly on jena-cmds
fuseki-core to depend directly on jena-cmds
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/37d3ea91
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/37d3ea91
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/37d3ea91
Branch: refs/heads/master
Commit: 37d3ea911b792b185f51a70bdf2712953667870f
Parents: 171d471
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Sep 2 12:41:14 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Sep 2 12:41:14 2016 +0100
----------------------------------------------------------------------
jena-fuseki2/jena-fuseki-core/pom.xml | 7 +++++++
jena-fuseki2/jena-fuseki-embedded/pom.xml | 24 ++++++++++++++++--------
2 files changed, 23 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/37d3ea91/jena-fuseki2/jena-fuseki-core/pom.xml
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/pom.xml b/jena-fuseki2/jena-fuseki-core/pom.xml
index dd8a538..47b7aa5 100644
--- a/jena-fuseki2/jena-fuseki-core/pom.xml
+++ b/jena-fuseki2/jena-fuseki-core/pom.xml
@@ -50,6 +50,13 @@
</dependency>
<dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-cmds</artifactId>
+ <version>3.1.1-SNAPSHOT</version>
+ <type>pom</type>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<exclusions>
http://git-wip-us.apache.org/repos/asf/jena/blob/37d3ea91/jena-fuseki2/jena-fuseki-embedded/pom.xml
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-embedded/pom.xml b/jena-fuseki2/jena-fuseki-embedded/pom.xml
index 72fc04e..58429a1 100644
--- a/jena-fuseki2/jena-fuseki-embedded/pom.xml
+++ b/jena-fuseki2/jena-fuseki-embedded/pom.xml
@@ -39,16 +39,13 @@
<version>2.4.1-SNAPSHOT</version>
<!-- No specific logging - leave to the application -->
<exclusions>
+
+ <!-- Parts of Jena not needed but picked up via jena-fuseki-core -->
<exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-cmds</artifactId>
</exclusion>
<exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- <!-- -->
- <exclusion>
<groupId>org.apache.jena</groupId>
<artifactId>jena-text</artifactId>
</exclusion>
@@ -56,6 +53,17 @@
<groupId>org.apache.jena</groupId>
<artifactId>jena-spatial</artifactId>
</exclusion>
+
+ <!-- Exclude choice of logging. Application responsibility. -->
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+
</exclusions>
</dependency>
@@ -68,7 +76,7 @@
</dependency>
-->
- <!-- Log4j
+ <!-- Log4j : need 2 dependencies.
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>