Gehel has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/337244 )
Change subject: Explicit dependencies on each module
......................................................................
Explicit dependencies on each module
Using mvn dependency:analyze, clean up dependencies of each module. This can
help analyze further the duplicate classes and help spot a few problems (for
example, there is a direct dependency on log4j that should probably not
exists).
Bug: T157703
Change-Id: I494ce81d56b978e59d9f1199dc779d97dffbbe5b
---
M blazegraph/pom.xml
M common/pom.xml
M pom.xml
M testTools/pom.xml
M tools/pom.xml
M war/pom.xml
6 files changed, 195 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/rdf
refs/changes/44/337244/1
diff --git a/blazegraph/pom.xml b/blazegraph/pom.xml
index 0ea96cc..a55a2f2 100644
--- a/blazegraph/pom.xml
+++ b/blazegraph/pom.xml
@@ -20,6 +20,22 @@
<dependencies>
<dependency>
+ <groupId>com.blazegraph</groupId>
+ <artifactId>bigdata-common-util</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-core</artifactId>
+ </dependency>
+ <dependency>
<!-- Blazegraph needs http client to run services. -->
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-client</artifactId>
@@ -30,8 +46,21 @@
<classifier>classes</classifier>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.wikidata.query.rdf</groupId>
<artifactId>common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.blazegraph</groupId>
+ <artifactId>bigdata-cache</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.blazegraph</groupId>
@@ -39,6 +68,46 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>com.blazegraph</groupId>
+ <artifactId>bigdata-util</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.blazegraph</groupId>
+ <artifactId>ctc-striterators</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.openrdf.sesame</groupId>
+ <artifactId>sesame-model</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.openrdf.sesame</groupId>
+ <artifactId>sesame-query</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.openrdf.sesame</groupId>
+ <artifactId>sesame-queryalgebra-evaluation</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-library</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.wikidata.query.rdf</groupId>
<artifactId>testTools</artifactId>
<scope>test</scope>
diff --git a/common/pom.xml b/common/pom.xml
index ab77b2f..92efc25 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -20,10 +20,6 @@
<dependencies>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<scope>test</scope>
diff --git a/pom.xml b/pom.xml
index 1132b16..76650c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,15 +82,35 @@
<version>1.1.2</version>
</dependency>
<dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ <version>1.1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>com.blazegraph</groupId>
+ <artifactId>bigdata-cache</artifactId>
+ <version>${blazegraph.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.blazegraph</groupId>
+ <artifactId>bigdata-common-util</artifactId>
+ <version>${blazegraph.version}</version>
+ </dependency>
+ <dependency>
<groupId>com.blazegraph</groupId>
<artifactId>bigdata-core</artifactId>
<version>${blazegraph.version}</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.blazegraph</groupId>
+ <artifactId>bigdata-util</artifactId>
+ <version>${blazegraph.version}</version>
</dependency>
<dependency>
<groupId>com.blazegraph</groupId>
@@ -109,6 +129,16 @@
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.blazegraph</groupId>
+ <artifactId>ctc-striterators</artifactId>
+ <version>${blazegraph.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>2.5</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
@@ -136,9 +166,19 @@
<version>3.1.0</version>
</dependency>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.1.0</version>
+ </dependency>
+ <dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>2.7</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.17</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -155,6 +195,22 @@
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>4.4</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-core</artifactId>
+ <version>2.13.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
@@ -208,12 +264,32 @@
</dependency>
<dependency>
<groupId>org.openrdf.sesame</groupId>
+ <artifactId>sesame-model</artifactId>
+ <version>${sesame.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-query</artifactId>
<version>${sesame.version}</version>
</dependency>
<dependency>
<groupId>org.openrdf.sesame</groupId>
+ <artifactId>sesame-queryalgebra-evaluation</artifactId>
+ <version>${sesame.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.openrdf.sesame</groupId>
+ <artifactId>sesame-queryresultio-api</artifactId>
+ <version>${sesame.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-queryresultio-binary</artifactId>
+ <version>${sesame.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.openrdf.sesame</groupId>
+ <artifactId>sesame-rio-api</artifactId>
<version>${sesame.version}</version>
</dependency>
<dependency>
@@ -248,6 +324,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>1.4.01</version>
+ </dependency>
+ <dependency>
<groupId>com.carrotsearch.randomizedtesting</groupId>
<artifactId>randomizedtesting-runner</artifactId>
<version>2.1.13</version>
diff --git a/testTools/pom.xml b/testTools/pom.xml
index cc47d04..cc8010e 100644
--- a/testTools/pom.xml
+++ b/testTools/pom.xml
@@ -45,9 +45,8 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>compile</scope>
+ <groupId>org.openrdf.sesame</groupId>
+ <artifactId>sesame-model</artifactId>
</dependency>
<dependency>
<groupId>org.openrdf.sesame</groupId>
diff --git a/tools/pom.xml b/tools/pom.xml
index 923fb63..d716bf7 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -30,6 +30,10 @@
<artifactId>logback-classic</artifactId>
</dependency>
<dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
@@ -59,8 +63,28 @@
<artifactId>httpclient</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-library</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.openrdf.sesame</groupId>
+ <artifactId>sesame-model</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-query</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.openrdf.sesame</groupId>
+ <artifactId>sesame-queryresultio-api</artifactId>
</dependency>
<dependency>
<groupId>org.openrdf.sesame</groupId>
@@ -68,11 +92,11 @@
</dependency>
<dependency>
<groupId>org.openrdf.sesame</groupId>
- <artifactId>sesame-rio-turtle</artifactId>
+ <artifactId>sesame-rio-api</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
+ <groupId>org.openrdf.sesame</groupId>
+ <artifactId>sesame-rio-turtle</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -83,6 +107,16 @@
<artifactId>common</artifactId>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.wikidata.query.rdf</groupId>
<artifactId>testTools</artifactId>
<scope>test</scope>
diff --git a/war/pom.xml b/war/pom.xml
index 4050ae8..3cd41a0 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -24,25 +24,30 @@
<groupId>com.blazegraph</groupId>
<artifactId>bigdata-war</artifactId>
<type>war</type>
+ <scope>runtime</scope>
</dependency>
<!-- include bigdata-war as a pom dependency to collect its transitive
dependencies -->
<dependency>
<groupId>com.blazegraph</groupId>
<artifactId>bigdata-war</artifactId>
<type>pom</type>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.linkeddatafragments</groupId>
<artifactId>ldfserver</artifactId>
<type>war</type>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.wikidata.query.rdf</groupId>
<artifactId>blazegraph</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.wikidata.query.rdf</groupId>
<artifactId>common</artifactId>
+ <scope>runtime</scope>
</dependency>
</dependencies>
--
To view, visit https://gerrit.wikimedia.org/r/337244
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I494ce81d56b978e59d9f1199dc779d97dffbbe5b
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Gehel <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
