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 2019/04/12 17:27:05 UTC
[jena] branch master updated: Move dependency version management
This is an automated email from the ASF dual-hosted git repository.
andy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jena.git
The following commit(s) were added to refs/heads/master by this push:
new e647600 Move dependency version management
new 9a9e97e Merge pull request #556 from afs/dependency-mgt
e647600 is described below
commit e6476009c5f55388f9fcbd1711a62dbc967fd0c5
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Fri Apr 12 16:59:56 2019 +0100
Move dependency version management
---
jena-fuseki2/jena-fuseki-core/pom.xml | 3 ---
jena-fuseki2/jena-fuseki-webapp/pom.xml | 12 ---------
jena-text/pom.xml | 9 +++----
pom.xml | 43 +++++++++++++++++++++++++++++++--
4 files changed, 45 insertions(+), 22 deletions(-)
diff --git a/jena-fuseki2/jena-fuseki-core/pom.xml b/jena-fuseki2/jena-fuseki-core/pom.xml
index ab863a9..e4f771d 100644
--- a/jena-fuseki2/jena-fuseki-core/pom.xml
+++ b/jena-fuseki2/jena-fuseki-core/pom.xml
@@ -56,14 +56,11 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
- <version>${ver.jetty}</version>
</dependency>
- <!-- Jetty's useful servlets, inc compression -->
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlets</artifactId>
- <version>${ver.jetty}</version>
</dependency>
<!-- Logging : Needed because the Fuseki command line manages logging -->
diff --git a/jena-fuseki2/jena-fuseki-webapp/pom.xml b/jena-fuseki2/jena-fuseki-webapp/pom.xml
index f98b08d..f3f7715 100644
--- a/jena-fuseki2/jena-fuseki-webapp/pom.xml
+++ b/jena-fuseki2/jena-fuseki-webapp/pom.xml
@@ -46,17 +46,8 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
- <version>${ver.jetty}</version>
</dependency>
- <!--
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-runner</artifactId>
- <version>${ver.jetty}</version>
- </dependency>
- -->
-
<!-- Text and spatial -->
<dependency>
<groupId>org.apache.jena</groupId>
@@ -70,17 +61,14 @@
<version>3.11.0-SNAPSHOT</version>
</dependency>
- <!-- Apache Shiro -->
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-core</artifactId>
- <version>${ver.shiro}</version>
</dependency>
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-web</artifactId>
- <version>${ver.shiro}</version>
</dependency>
<!-- Logging : Needed because the Fuseki command line manages logging -->
diff --git a/jena-text/pom.xml b/jena-text/pom.xml
index 38ade81..6078cf8 100644
--- a/jena-text/pom.xml
+++ b/jena-text/pom.xml
@@ -85,13 +85,12 @@
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-highlighter</artifactId>
</dependency>
-
+
<dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-backward-codecs</artifactId>
- <version>${ver.lucene}</version>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-backward-codecs</artifactId>
</dependency>
-
+
</dependencies>
<build>
diff --git a/pom.xml b/pom.xml
index 0703818..ec66114 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,9 @@
<properties>
<ver.slf4j>1.7.26</ver.slf4j>
<ver.log4j>1.2.17</ver.log4j>
- <ver.junit>4.12</ver.junit>
+ <ver.junit>4.12</ver.junit>
+
+ <ver.jetty>9.4.12.v20180830</ver.jetty>
<ver.libthrift>0.12.0</ver.libthrift>
<!-- jsonld-java depends on depends on Jackson core
@@ -83,7 +85,7 @@
-->
<ver.httpcore-osgi>${ver.httpcore}</ver.httpcore-osgi>
<ver.httpclient-osgi>${ver.httpclient}</ver.httpclient-osgi>
-
+ <ver.shiro>1.2.6</ver.shiro>
<ver.lucene>7.4.0</ver.lucene>
<ver.elasticsearch>6.4.2</ver.elasticsearch>
@@ -421,6 +423,37 @@
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ <version>${ver.jetty}</version>
+ </dependency>
+
+ <!-- Jetty's useful servlets, inc compression -->
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlets</artifactId>
+ <version>${ver.jetty}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
+ <version>${ver.jetty}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-core</artifactId>
+ <version>${ver.shiro}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-web</artifactId>
+ <version>${ver.shiro}</version>
+ </dependency>
+
<!-- Lucene dependencies -->
<dependency>
<groupId>org.apache.lucene</groupId>
@@ -447,6 +480,12 @@
<version>${ver.lucene}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-backward-codecs</artifactId>
+ <version>${ver.lucene}</version>
+ </dependency>
+
<!-- For jena-spatial -->
<dependency>
<groupId>org.apache.lucene</groupId>