jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334381 )
Change subject: Move version of maven dependencies to parent pom
......................................................................
Move version of maven dependencies to parent pom
Moving the declaration of dependencies version in parent pom is the usual
approach with maven. It allows better control of the coherence of those
dependencies and ensure that all modules use the same versions.
Change-Id: I3b8ebccfa9f7b6b33df88f266b5a8a703937665a
---
M blazegraph/pom.xml
M common/pom.xml
M dist/pom.xml
M pom.xml
M tools/pom.xml
M war/pom.xml
6 files changed, 136 insertions(+), 42 deletions(-)
Approvals:
Smalyshev: Looks good to me, approved
jenkins-bot: Verified
diff --git a/blazegraph/pom.xml b/blazegraph/pom.xml
index a994b6a..387b590 100644
--- a/blazegraph/pom.xml
+++ b/blazegraph/pom.xml
@@ -32,37 +32,16 @@
<!-- Blazegraph needs http client to run services. -->
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-client</artifactId>
- <version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.wikidata.query.rdf</groupId>
<artifactId>testTools</artifactId>
- <version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.linkeddatafragments</groupId>
<artifactId>ldfserver</artifactId>
- <version>0.1.1-wmf2</version>
<classifier>classes</classifier>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlet</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
diff --git a/common/pom.xml b/common/pom.xml
index 2841dd8..738a2c6 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -22,13 +22,11 @@
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
- <version>2.7</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.10</version>
</dependency>
</dependencies>
diff --git a/dist/pom.xml b/dist/pom.xml
index ba8fd47..c8b00ee 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -23,18 +23,15 @@
<dependency>
<groupId>org.wikidata.query.rdf</groupId>
<artifactId>blazegraph-service</artifactId>
- <version>${project.parent.version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-runner</artifactId>
- <version>9.2.9.v20150224</version>
</dependency>
<dependency>
<groupId>org.jolokia</groupId>
<artifactId>jolokia-jvm</artifactId>
- <version>1.3.1</version>
<classifier>agent</classifier>
</dependency>
</dependencies>
diff --git a/pom.xml b/pom.xml
index 779838c..28e193d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,6 +60,7 @@
<blazegraph.version>2.1.4</blazegraph.version>
<sesame.version>2.7.12</sesame.version>
<jetty.version>9.2.9.v20150224</jetty.version>
+ <slf4j.version>1.7.10</slf4j.version>
</properties>
<distributionManagement>
@@ -366,6 +367,123 @@
<!-- Decalare the default parameters for some dependencies. -->
<dependencies>
<dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-runner</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.lexicalscope.jewelcli</groupId>
+ <artifactId>jewelcli</artifactId>
+ <version>0.8.9</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jolokia</groupId>
+ <artifactId>jolokia-jvm</artifactId>
+ <version>1.3.1</version>
+ <classifier>agent</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.openrdf.sesame</groupId>
+ <artifactId>sesame-rio-turtle</artifactId>
+ <version>${sesame.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.4</version>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>1.1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>io.dropwizard.metrics</groupId>
+ <artifactId>metrics-core</artifactId>
+ <version>3.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.nanohttpd</groupId>
+ <artifactId>nanohttpd</artifactId>
+ <version>2.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.openrdf.sesame</groupId>
+ <artifactId>sesame-queryresultio-binary</artifactId>
+ <version>${sesame.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wikidata.query.rdf</groupId>
+ <artifactId>testTools</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <version>2.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wikidata.query.rdf</groupId>
+ <artifactId>blazegraph-service</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.wikidata.query.rdf</groupId>
+ <artifactId>blazegraph</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.googlecode.json-simple</groupId>
+ <artifactId>json-simple</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.linkeddatafragments</groupId>
+ <artifactId>ldfserver</artifactId>
+ <version>0.1.1-wmf2</version>
+ <classifier>classes</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-client</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>18.0</version>
@@ -386,12 +504,30 @@
<version>${blazegraph.version}</version>
</dependency>
<dependency>
+ <groupId>com.blazegraph</groupId>
+ <artifactId>bigdata-war</artifactId>
+ <version>${blazegraph.version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>com.blazegraph</groupId>
+ <artifactId>bigdata-war</artifactId>
+ <version>${blazegraph.version}</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
<version>1.3</version>
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.linkeddatafragments</groupId>
+ <artifactId>ldfserver</artifactId>
+ <version>0.1.1-wmf2</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
diff --git a/tools/pom.xml b/tools/pom.xml
index 678dcaa..0354415 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -36,42 +36,34 @@
<dependency>
<groupId>com.lexicalscope.jewelcli</groupId>
<artifactId>jewelcli</artifactId>
- <version>0.8.9</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.10</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
- <version>1.7.10</version>
</dependency>
<dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
- <version>1.1</version>
</dependency>
<dependency>
<groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-rio-turtle</artifactId>
- <version>${sesame.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.4</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>1.1.2</version>
</dependency>
<dependency>
<groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-queryresultio-binary</artifactId>
- <version>${sesame.version}</version>
</dependency>
<dependency>
<groupId>org.openrdf.sesame</groupId>
@@ -80,23 +72,19 @@
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-core</artifactId>
- <version>3.1.0</version>
</dependency>
<dependency>
<!-- Tiny http server used with Munge's to option in port style -->
<groupId>com.nanohttpd</groupId>
<artifactId>nanohttpd</artifactId>
- <version>2.1.1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.4</version>
</dependency>
<dependency>
<groupId>org.wikidata.query.rdf</groupId>
<artifactId>testTools</artifactId>
- <version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/war/pom.xml b/war/pom.xml
index 58203f6..175363e 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -23,20 +23,17 @@
<dependency>
<groupId>com.blazegraph</groupId>
<artifactId>bigdata-war</artifactId>
- <version>${blazegraph.version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.linkeddatafragments</groupId>
<artifactId>ldfserver</artifactId>
- <version>0.1.1-wmf2</version>
<type>war</type>
</dependency>
<!-- include bigdata-war as a pom dependency to collect its transitive
dependencies -->
<dependency>
<groupId>com.blazegraph</groupId>
<artifactId>bigdata-war</artifactId>
- <version>${blazegraph.version}</version>
<type>pom</type>
</dependency>
<dependency>
@@ -46,7 +43,6 @@
<dependency>
<groupId>org.wikidata.query.rdf</groupId>
<artifactId>blazegraph</artifactId>
- <version>${project.parent.version}</version>
</dependency>
</dependencies>
--
To view, visit https://gerrit.wikimedia.org/r/334381
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3b8ebccfa9f7b6b33df88f266b5a8a703937665a
Gerrit-PatchSet: 2
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Gehel <gleder...@wikimedia.org>
Gerrit-Reviewer: Gehel <gleder...@wikimedia.org>
Gerrit-Reviewer: Smalyshev <smalys...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
