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 2017/07/10 12:42:06 UTC
[1/5] jena git commit: JENA-1184: Fixing comment syntax makes it
compile.
Repository: jena
Updated Branches:
refs/heads/master 12db8b972 -> 1bd0c4cd7
JENA-1184: Fixing comment syntax makes it compile.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/26b72619
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/26b72619
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/26b72619
Branch: refs/heads/master
Commit: 26b72619074364712480cda1afe13217cde04468
Parents: 12db8b9
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Jul 9 21:04:59 2017 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Jul 9 21:04:59 2017 +0100
----------------------------------------------------------------------
jena-maven-tools/pom.xml | 10 +++----
.../jena/tools/schemagen/SchemagenMojo.java | 28 ++++++++++----------
.../jena/tools/schemagen/SchemagenOptions.java | 22 +++++----------
3 files changed, 26 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/26b72619/jena-maven-tools/pom.xml
----------------------------------------------------------------------
diff --git a/jena-maven-tools/pom.xml b/jena-maven-tools/pom.xml
index 021e9c3..42f97f8 100644
--- a/jena-maven-tools/pom.xml
+++ b/jena-maven-tools/pom.xml
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>jena-maven-tools</artifactId>
<packaging>maven-plugin</packaging>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
<name>Apache Jena - Maven Plugins, including schemagen</name>
<description>Plugins for Apache Maven to perform source management activities,
such as generating Java files from RDF vocabulary sources using
@@ -29,9 +29,9 @@
<parent>
<groupId>org.apache.jena</groupId>
- <artifactId>jena-parent</artifactId>
- <version>18-SNAPSHOT</version>
- <relativePath>../jena-parent</relativePath>
+ <artifactId>jena-project</artifactId>
+ <version>3.4.0-SNAPSHOT</version>
+ <relativePath>../jena-project</relativePath>
</parent>
<developers>
@@ -188,7 +188,7 @@
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-cmds</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
http://git-wip-us.apache.org/repos/asf/jena/blob/26b72619/jena-maven-tools/src/main/java/org/apache/jena/tools/schemagen/SchemagenMojo.java
----------------------------------------------------------------------
diff --git a/jena-maven-tools/src/main/java/org/apache/jena/tools/schemagen/SchemagenMojo.java b/jena-maven-tools/src/main/java/org/apache/jena/tools/schemagen/SchemagenMojo.java
index 985ca88..d8d6b19 100644
--- a/jena-maven-tools/src/main/java/org/apache/jena/tools/schemagen/SchemagenMojo.java
+++ b/jena-maven-tools/src/main/java/org/apache/jena/tools/schemagen/SchemagenMojo.java
@@ -55,9 +55,9 @@ import org.codehaus.plexus.util.DirectoryScanner;
public class SchemagenMojo
extends AbstractMojo
{
- /***********************************/
+ /* ******************************* */
/* Constants */
- /***********************************/
+ /* ******************************* */
/** Default output location */
public static final String GENERATED_SOURCES = File.separator + "generated-sources";
@@ -67,13 +67,13 @@ public class SchemagenMojo
/** Name of default options element */
public static final String DEFAULT_OPTIONS_ELEM = "default";
- /***********************************/
+ /* ******************************* */
/* Static variables */
- /***********************************/
+ /* ******************************* */
- /***********************************/
+ /* ******************************* */
/* Instance variables */
- /***********************************/
+ /* ******************************* */
/**
* @parameter property="project.build.directory"
@@ -113,13 +113,13 @@ public class SchemagenMojo
/** Map of source options, indexed by name */
private Map<String, SchemagenOptions> optIndex = new HashMap<>();
- /***********************************/
+ /* ******************************* */
/* Constructors */
- /***********************************/
+ /* ******************************* */
- /***********************************/
+ /* ******************************* */
/* External signature methods */
- /***********************************/
+ /* ******************************* */
@Override
public void execute() throws MojoExecutionException, MojoFailureException {
@@ -274,9 +274,9 @@ public class SchemagenMojo
}
- /***********************************/
+ /* ******************************* */
/* Internal implementation methods */
- /***********************************/
+ /* ******************************* */
public void setExcludes( String[] excludes ) {
this.excludes = excludes;
@@ -350,9 +350,9 @@ public class SchemagenMojo
return projectBuildDir + GENERATED_SOURCES;
}
- /***********************************/
+ /* ******************************* */
/* Inner classes */
- /***********************************/
+ /* ******************************* */
/**
* Adapter class to invoke the schemagen tool with a given set of options
http://git-wip-us.apache.org/repos/asf/jena/blob/26b72619/jena-maven-tools/src/main/java/org/apache/jena/tools/schemagen/SchemagenOptions.java
----------------------------------------------------------------------
diff --git a/jena-maven-tools/src/main/java/org/apache/jena/tools/schemagen/SchemagenOptions.java b/jena-maven-tools/src/main/java/org/apache/jena/tools/schemagen/SchemagenOptions.java
index b4bcbad..6efb195 100644
--- a/jena-maven-tools/src/main/java/org/apache/jena/tools/schemagen/SchemagenOptions.java
+++ b/jena-maven-tools/src/main/java/org/apache/jena/tools/schemagen/SchemagenOptions.java
@@ -42,17 +42,9 @@ import org.apache.jena.rdf.model.* ;
public class SchemagenOptions
extends schemagen.SchemagenOptionsImpl
{
- /***********************************/
- /* Constants */
- /***********************************/
-
- /***********************************/
- /* Static variables */
- /***********************************/
-
- /***********************************/
+ /* ******************************* */
/* Instance variables */
- /***********************************/
+ /* ******************************* */
/** The parent options for this options instance */
private SchemagenOptions parent;
@@ -83,9 +75,9 @@ public class SchemagenOptions
}
}
- /***********************************/
+ /* ******************************* */
/* External signature methods */
- /***********************************/
+ /* ******************************* */
/**
* Set the parent options object for this object
@@ -178,9 +170,9 @@ public class SchemagenOptions
getConfigRoot().addProperty( od.getDeclarationProperty(), value );
}
- /***********************************/
+ /* ******************************* */
/* Internal implementation methods */
- /***********************************/
+ /* ******************************* */
/**
* Configure SchemagenOptions from Source object
@@ -287,4 +279,4 @@ public class SchemagenOptions
return (l.isEmpty() && hasParent()) ? getParent().getAllValues( option ) : l;
}
-}
\ No newline at end of file
+}
[5/5] jena git commit: JENA-1373: Merge commit 'refs/pull/269/head'
of github.com:apache/jena
Posted by an...@apache.org.
JENA-1373: Merge commit 'refs/pull/269/head' of github.com:apache/jena
This closes #269.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/1bd0c4cd
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/1bd0c4cd
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/1bd0c4cd
Branch: refs/heads/master
Commit: 1bd0c4cd7748fdd5605e801e2aff963ebf1cda8c
Parents: 254fcfd db8131d
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Jul 10 13:33:15 2017 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Jul 10 13:33:15 2017 +0100
----------------------------------------------------------------------
apache-jena-libs/pom.xml | 6 +-
apache-jena-osgi/jena-osgi-test/pom.xml | 10 +-
apache-jena-osgi/pom.xml | 6 +-
apache-jena/pom.xml | 6 +-
jena-arq/pom.xml | 6 +-
jena-base/pom.xml | 6 +-
jena-cmds/pom.xml | 6 +-
jena-core/pom.xml | 6 +-
jena-csv/pom.xml | 6 +-
jena-elephas/pom.xml | 6 +-
jena-extras/pom.xml | 6 +-
jena-fuseki1/pom.xml | 8 +-
jena-fuseki2/apache-jena-fuseki/pom.xml | 4 +-
jena-fuseki2/jena-fuseki-basic/pom.xml | 4 +-
jena-fuseki2/jena-fuseki-core/pom.xml | 2 +-
jena-fuseki2/jena-fuseki-embedded/pom.xml | 4 +-
jena-fuseki2/jena-fuseki-server/pom.xml | 2 +-
jena-fuseki2/jena-fuseki-war/pom.xml | 2 +-
jena-fuseki2/pom.xml | 8 +-
jena-integration-tests/pom.xml | 8 +-
jena-iri/pom.xml | 6 +-
jena-jdbc/jena-jdbc-driver-bundle/pom.xml | 9 +-
jena-jdbc/jena-jdbc-driver-remote/pom.xml | 4 +-
jena-jdbc/pom.xml | 6 +-
jena-maven-tools/pom.xml | 10 +-
.../jena/tools/schemagen/SchemagenMojo.java | 28 +-
.../jena/tools/schemagen/SchemagenOptions.java | 22 +-
jena-parent/DEPENDENCIES | 11 -
jena-parent/LICENSE | 202 -----
jena-parent/NOTICE | 5 -
jena-parent/pom.xml | 857 -------------------
jena-permissions/pom.xml | 6 +-
jena-project/DEPENDENCIES | 11 +
jena-project/LICENSE | 202 +++++
jena-project/NOTICE | 5 +
jena-project/pom.xml | 857 +++++++++++++++++++
jena-rdfconnection/pom.xml | 6 +-
jena-sdb/pom.xml | 6 +-
jena-shaded-guava/pom.xml | 8 +-
jena-spatial/pom.xml | 6 +-
jena-tdb/pom.xml | 6 +-
jena-text-es/pom.xml | 6 +-
jena-text/pom.xml | 6 +-
pom.xml | 20 +-
44 files changed, 1200 insertions(+), 1217 deletions(-)
----------------------------------------------------------------------
[3/5] jena git commit: JENA-1373: Unify version number
Posted by an...@apache.org.
JENA-1373: Unify version number
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/db8131d5
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/db8131d5
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/db8131d5
Branch: refs/heads/master
Commit: db8131d52dde881234c3e3aad1f9d196edd7bc5a
Parents: 26b7261
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Jul 9 21:25:40 2017 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Jul 9 21:25:40 2017 +0100
----------------------------------------------------------------------
apache-jena-libs/pom.xml | 6 +-
apache-jena-osgi/jena-osgi-test/pom.xml | 10 +-
apache-jena-osgi/pom.xml | 6 +-
apache-jena/pom.xml | 6 +-
jena-arq/pom.xml | 6 +-
jena-base/pom.xml | 6 +-
jena-cmds/pom.xml | 6 +-
jena-core/pom.xml | 6 +-
jena-csv/pom.xml | 6 +-
jena-elephas/pom.xml | 6 +-
jena-extras/pom.xml | 6 +-
jena-fuseki1/pom.xml | 8 +-
jena-fuseki2/apache-jena-fuseki/pom.xml | 4 +-
jena-fuseki2/jena-fuseki-basic/pom.xml | 4 +-
jena-fuseki2/jena-fuseki-core/pom.xml | 2 +-
jena-fuseki2/jena-fuseki-embedded/pom.xml | 4 +-
jena-fuseki2/jena-fuseki-server/pom.xml | 2 +-
jena-fuseki2/jena-fuseki-war/pom.xml | 2 +-
jena-fuseki2/pom.xml | 8 +-
jena-integration-tests/pom.xml | 8 +-
jena-iri/pom.xml | 6 +-
jena-jdbc/jena-jdbc-driver-bundle/pom.xml | 9 +-
jena-jdbc/jena-jdbc-driver-remote/pom.xml | 4 +-
jena-jdbc/pom.xml | 6 +-
jena-parent/DEPENDENCIES | 11 -
jena-parent/LICENSE | 202 ------
jena-parent/NOTICE | 5 -
jena-parent/pom.xml | 857 -------------------------
jena-permissions/pom.xml | 6 +-
jena-project/DEPENDENCIES | 11 +
jena-project/LICENSE | 202 ++++++
jena-project/NOTICE | 5 +
jena-project/pom.xml | 857 +++++++++++++++++++++++++
jena-rdfconnection/pom.xml | 6 +-
jena-sdb/pom.xml | 6 +-
jena-shaded-guava/pom.xml | 8 +-
jena-spatial/pom.xml | 6 +-
jena-tdb/pom.xml | 6 +-
jena-text-es/pom.xml | 6 +-
jena-text/pom.xml | 6 +-
pom.xml | 20 +-
41 files changed, 1174 insertions(+), 1183 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/db8131d5/apache-jena-libs/pom.xml
----------------------------------------------------------------------
diff --git a/apache-jena-libs/pom.xml b/apache-jena-libs/pom.xml
index ee3dd16..99567d2 100644
--- a/apache-jena-libs/pom.xml
+++ b/apache-jena-libs/pom.xml
@@ -19,9 +19,9 @@
<parent>
<groupId>org.apache.jena</groupId>
- <artifactId>jena-parent</artifactId>
- <version>20-SNAPSHOT</version>
- <relativePath>../jena-parent</relativePath>
+ <artifactId>jena-project</artifactId>
+ <version>3.4.0-SNAPSHOT</version>
+ <relativePath>../jena-project</relativePath>
</parent>
<!-- Need if the parent is a snapshot -->
http://git-wip-us.apache.org/repos/asf/jena/blob/db8131d5/apache-jena-osgi/jena-osgi-test/pom.xml
----------------------------------------------------------------------
diff --git a/apache-jena-osgi/jena-osgi-test/pom.xml b/apache-jena-osgi/jena-osgi-test/pom.xml
index eb7ff67..fa9b570 100644
--- a/apache-jena-osgi/jena-osgi-test/pom.xml
+++ b/apache-jena-osgi/jena-osgi-test/pom.xml
@@ -22,13 +22,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.jena</groupId>
- <artifactId>jena-parent</artifactId>
- <version>18-SNAPSHOT</version>
+ <artifactId>jena-project</artifactId>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<artifactId>jena-osgi-test</artifactId>
<!-- Same as jena-osgi -->
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
<name>Apache Jena - OSGi integration tests</name>
<description>Tests for jena-osgi as a bundle</description>
<packaging>bundle</packaging>
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-osgi-features</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
<type>bundle</type>
<scope>test</scope>
</dependency>
@@ -60,7 +60,7 @@
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-osgi</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
<type>bundle</type>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/jena/blob/db8131d5/apache-jena-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/apache-jena-osgi/pom.xml b/apache-jena-osgi/pom.xml
index 5e0ae2e..f1a0d12 100644
--- a/apache-jena-osgi/pom.xml
+++ b/apache-jena-osgi/pom.xml
@@ -20,9 +20,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.jena</groupId>
- <artifactId>jena-parent</artifactId>
- <version>20-SNAPSHOT</version>
- <relativePath>../jena-parent</relativePath>
+ <artifactId>jena-project</artifactId>
+ <version>3.4.0-SNAPSHOT</version>
+ <relativePath>../jena-project</relativePath>
</parent>
<name>Apache Jena - OSGi</name>
http://git-wip-us.apache.org/repos/asf/jena/blob/db8131d5/apache-jena/pom.xml
----------------------------------------------------------------------
diff --git a/apache-jena/pom.xml b/apache-jena/pom.xml
index 0c1c5db..acec1c3 100644
--- a/apache-jena/pom.xml
+++ b/apache-jena/pom.xml
@@ -36,9 +36,9 @@
<parent>
<groupId>org.apache.jena</groupId>
- <artifactId>jena-parent</artifactId>
- <version>20-SNAPSHOT</version>
- <relativePath>../jena-parent</relativePath>
+ <artifactId>jena-project</artifactId>
+ <version>3.4.0-SNAPSHOT</version>
+ <relativePath>../jena-project</relativePath>
</parent>
<organization>
http://git-wip-us.apache.org/repos/asf/jena/blob/db8131d5/jena-arq/pom.xml
----------------------------------------------------------------------
diff --git a/jena-arq/pom.xml b/jena-arq/pom.xml
index 6c4d825..39e9f86 100644
--- a/jena-arq/pom.xml
+++ b/jena-arq/pom.xml
@@ -25,9 +25,9 @@
<parent>
<groupId>org.apache.jena</groupId>
- <artifactId>jena-parent</artifactId>
- <version>20-SNAPSHOT</version>
- <relativePath>../jena-parent</relativePath>
+ <artifactId>jena-project</artifactId>
+ <version>3.4.0-SNAPSHOT</version>
+ <relativePath>../jena-project</relativePath>
</parent>
<!-- Need if the parent is a snapshot -->
http://git-wip-us.apache.org/repos/asf/jena/blob/db8131d5/jena-base/pom.xml
----------------------------------------------------------------------
diff --git a/jena-base/pom.xml b/jena-base/pom.xml
index 8b97c68..c0930ad 100644
--- a/jena-base/pom.xml
+++ b/jena-base/pom.xml
@@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.jena</groupId>
- <artifactId>jena-parent</artifactId>
- <version>20-SNAPSHOT</version>
- <relativePath>../jena-parent</relativePath>
+ <artifactId>jena-project</artifactId>
+ <version>3.4.0-SNAPSHOT</version>
+ <relativePath>../jena-project</relativePath>
</parent>
<artifactId>jena-base</artifactId>
<version>3.4.0-SNAPSHOT</version>
http://git-wip-us.apache.org/repos/asf/jena/blob/db8131d5/jena-cmds/pom.xml
----------------------------------------------------------------------
diff --git a/jena-cmds/pom.xml b/jena-cmds/pom.xml
index e571691..9a9d439 100644
--- a/jena-cmds/pom.xml
+++ b/jena-cmds/pom.xml
@@ -20,9 +20,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.jena</groupId>
- <artifactId>jena-parent</artifactId>
- <version>20-SNAPSHOT</version>
- <relativePath>../jena-parent</relativePath>
+ <artifactId>jena-project</artifactId>
+ <version>3.4.0-SNAPSHOT</version>
+ <relativePath>../jena-project</relativePath>
</parent>
<name>Apache Jena - Command line tools</name>
http://git-wip-us.apache.org/repos/asf/jena/blob/db8131d5/jena-core/pom.xml
----------------------------------------------------------------------
diff --git a/jena-core/pom.xml b/jena-core/pom.xml
index dddf03e..83967a7 100644
--- a/jena-core/pom.xml
+++ b/jena-core/pom.xml
@@ -26,9 +26,9 @@
<parent>
<groupId>org.apache.jena</groupId>
- <artifactId>jena-parent</artifactId>
- <version>20-SNAPSHOT</version>
- <relativePath>../jena-parent</relativePath>
+ <artifactId>jena-project</artifactId>
+ <version>3.4.0-SNAPSHOT</version>
+ <relativePath>../jena-project</relativePath>
</parent>
<description>Jena is a Java framework for building Semantic Web applications. It provides a programmatic environment for RDF, RDFS and OWL, SPARQL and includes a rule-based inference engine.</description>
http://git-wip-us.apache.org/repos/asf/jena/blob/db8131d5/jena-csv/pom.xml
----------------------------------------------------------------------
diff --git a/jena-csv/pom.xml b/jena-csv/pom.xml
index c0c1537..61106b1 100644
--- a/jena-csv/pom.xml
+++ b/jena-csv/pom.xml
@@ -25,9 +25,9 @@
<parent>
<groupId>org.apache.jena</groupId>
- <artifactId>jena-parent</artifactId>
- <version>20-SNAPSHOT</version>
- <relativePath>../jena-parent</relativePath>
+ <artifactId>jena-project</artifactId>
+ <version>3.4.0-SNAPSHOT</version>
+ <relativePath>../jena-project</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/jena/blob/db8131d5/jena-elephas/pom.xml
----------------------------------------------------------------------
diff --git a/jena-elephas/pom.xml b/jena-elephas/pom.xml
index 8be0898..56f15fe 100644
--- a/jena-elephas/pom.xml
+++ b/jena-elephas/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.jena</groupId>
- <artifactId>jena-parent</artifactId>
- <version>20-SNAPSHOT</version>
- <relativePath>../jena-parent</relativePath>
+ <artifactId>jena-project</artifactId>
+ <version>3.4.0-SNAPSHOT</version>
+ <relativePath>../jena-project</relativePath>
</parent>
<name>Apache Jena - Elephas</name>
http://git-wip-us.apache.org/repos/asf/jena/blob/db8131d5/jena-extras/pom.xml
----------------------------------------------------------------------
diff --git a/jena-extras/pom.xml b/jena-extras/pom.xml
index 6c67f2d..fb9f770 100644
--- a/jena-extras/pom.xml
+++ b/jena-extras/pom.xml
@@ -28,9 +28,9 @@ limitations under the License.
<parent>
<groupId>org.apache.jena</groupId>
- <artifactId>jena-parent</artifactId>
- <version>20-SNAPSHOT</version>
- <relativePath>../jena-parent</relativePath>
+ <artifactId>jena-project</artifactId>
+ <version>3.4.0-SNAPSHOT</version>
+ <relativePath>../jena-project</relativePath>
</parent>
<!-- Need if the parent is a snapshot -->
http://git-wip-us.apache.org/repos/asf/jena/blob/db8131d5/jena-fuseki1/pom.xml
----------------------------------------------------------------------
diff --git a/jena-fuseki1/pom.xml b/jena-fuseki1/pom.xml
index 4b94f4a..c898738 100644
--- a/jena-fuseki1/pom.xml
+++ b/jena-fuseki1/pom.xml
@@ -21,15 +21,15 @@
<artifactId>jena-fuseki1</artifactId>
<packaging>jar</packaging>
<name>Apache Jena - Fuseki1</name>
- <version>1.7.0-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
<description>Fuseki is a SPARQL 1.1 Server</description>
<url>http://jena.apache.org/</url>
<parent>
<groupId>org.apache.jena</groupId>
- <artifactId>jena-parent</artifactId>
- <version>20-SNAPSHOT</version>
- <relativePath>../jena-parent</relativePath>
+ <artifactId>jena-project</artifactId>
+ <version>3.4.0-SNAPSHOT</version>
+ <relativePath>../jena-project</relativePath>
</parent>
<!-- Need if the parent is a snapshot -->
http://git-wip-us.apache.org/repos/asf/jena/blob/db8131d5/jena-fuseki2/apache-jena-fuseki/pom.xml
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/pom.xml b/jena-fuseki2/apache-jena-fuseki/pom.xml
index dd44b38..b3d1c7e 100644
--- a/jena-fuseki2/apache-jena-fuseki/pom.xml
+++ b/jena-fuseki2/apache-jena-fuseki/pom.xml
@@ -21,13 +21,13 @@
<name>Apache Jena - Fuseki Binary Distribution</name>
<artifactId>apache-jena-fuseki</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
<groupId>org.apache.jena</groupId>
<artifactId>jena-fuseki</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/jena/blob/db8131d5/jena-fuseki2/jena-fuseki-basic/pom.xml
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-basic/pom.xml b/jena-fuseki2/jena-fuseki-basic/pom.xml
index 7f20361..309eebb 100644
--- a/jena-fuseki2/jena-fuseki-basic/pom.xml
+++ b/jena-fuseki2/jena-fuseki-basic/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.jena</groupId>
<artifactId>jena-fuseki</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<packaging>jar</packaging>
@@ -60,7 +60,7 @@
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-fuseki-embedded</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
<!-- No specific logging - leave to the application -->
<exclusions>
http://git-wip-us.apache.org/repos/asf/jena/blob/db8131d5/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 d7e70a7..d3f3d9a 100644
--- a/jena-fuseki2/jena-fuseki-core/pom.xml
+++ b/jena-fuseki2/jena-fuseki-core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.jena</groupId>
<artifactId>jena-fuseki</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/jena/blob/db8131d5/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 cb38ccd..de40d2e 100644
--- a/jena-fuseki2/jena-fuseki-embedded/pom.xml
+++ b/jena-fuseki2/jena-fuseki-embedded/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.jena</groupId>
<artifactId>jena-fuseki</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<packaging>jar</packaging>
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-fuseki-core</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
<!-- No specific logging - leave to the application -->
<exclusions>
http://git-wip-us.apache.org/repos/asf/jena/blob/db8131d5/jena-fuseki2/jena-fuseki-server/pom.xml
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-server/pom.xml b/jena-fuseki2/jena-fuseki-server/pom.xml
index 1732797..cb2f189 100644
--- a/jena-fuseki2/jena-fuseki-server/pom.xml
+++ b/jena-fuseki2/jena-fuseki-server/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.jena</groupId>
<artifactId>jena-fuseki</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/jena/blob/db8131d5/jena-fuseki2/jena-fuseki-war/pom.xml
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-war/pom.xml b/jena-fuseki2/jena-fuseki-war/pom.xml
index e954cc8..2e060be 100644
--- a/jena-fuseki2/jena-fuseki-war/pom.xml
+++ b/jena-fuseki2/jena-fuseki-war/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.jena</groupId>
<artifactId>jena-fuseki</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/jena/blob/db8131d5/jena-fuseki2/pom.xml
----------------------------------------------------------------------
diff --git a/jena-fuseki2/pom.xml b/jena-fuseki2/pom.xml
index 1986f2a..0b09ab6 100644
--- a/jena-fuseki2/pom.xml
+++ b/jena-fuseki2/pom.xml
@@ -20,14 +20,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.jena</groupId>
- <artifactId>jena-parent</artifactId>
- <version>20-SNAPSHOT</version>
- <relativePath>../jena-parent</relativePath>
+ <artifactId>jena-project</artifactId>
+ <version>3.4.0-SNAPSHOT</version>
+ <relativePath>../jena-project</relativePath>
</parent>
<name>Apache Jena - Fuseki - A SPARQL 1.1 Server</name>
<artifactId>jena-fuseki</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
<description>Fuseki is a SPARQL 1.1 Server which provides the SPARQL query,
SPARQL update and SPARQL graph store protocols.
http://git-wip-us.apache.org/repos/asf/jena/blob/db8131d5/jena-integration-tests/pom.xml
----------------------------------------------------------------------
diff --git a/jena-integration-tests/pom.xml b/jena-integration-tests/pom.xml
index eeeb00d..3ae0a67 100644
--- a/jena-integration-tests/pom.xml
+++ b/jena-integration-tests/pom.xml
@@ -31,9 +31,9 @@
<parent>
<groupId>org.apache.jena</groupId>
- <artifactId>jena-parent</artifactId>
- <version>20-SNAPSHOT</version>
- <relativePath>../jena-parent</relativePath>
+ <artifactId>jena-project</artifactId>
+ <version>3.4.0-SNAPSHOT</version>
+ <relativePath>../jena-project</relativePath>
</parent>
<licenses>
@@ -94,7 +94,7 @@
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-fuseki-embedded</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/jena/blob/db8131d5/jena-iri/pom.xml
----------------------------------------------------------------------
diff --git a/jena-iri/pom.xml b/jena-iri/pom.xml
index 246dc40..9ad0b4e 100644
--- a/jena-iri/pom.xml
+++ b/jena-iri/pom.xml
@@ -26,9 +26,9 @@
<version>3.4.0-SNAPSHOT</version>
<parent>
<groupId>org.apache.jena</groupId>
- <artifactId>jena-parent</artifactId>
- <version>20-SNAPSHOT</version>
- <relativePath>../jena-parent</relativePath>
+ <artifactId>jena-project</artifactId>
+ <version>3.4.0-SNAPSHOT</version>
+ <relativePath>../jena-project</relativePath>
</parent>
<description>
http://git-wip-us.apache.org/repos/asf/jena/blob/db8131d5/jena-jdbc/jena-jdbc-driver-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/jena-jdbc/jena-jdbc-driver-bundle/pom.xml b/jena-jdbc/jena-jdbc-driver-bundle/pom.xml
index 42b869a..eb6a9fb 100644
--- a/jena-jdbc/jena-jdbc-driver-bundle/pom.xml
+++ b/jena-jdbc/jena-jdbc-driver-bundle/pom.xml
@@ -95,14 +95,7 @@
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-fuseki-embedded</artifactId>
- <version>2.7.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-fuseki1</artifactId>
- <version>1.7.0-SNAPSHOT</version>
- <classifier>tests</classifier>
+ <version>3.4.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/jena/blob/db8131d5/jena-jdbc/jena-jdbc-driver-remote/pom.xml
----------------------------------------------------------------------
diff --git a/jena-jdbc/jena-jdbc-driver-remote/pom.xml b/jena-jdbc/jena-jdbc-driver-remote/pom.xml
index 109ffe2..2ced2c0 100644
--- a/jena-jdbc/jena-jdbc-driver-remote/pom.xml
+++ b/jena-jdbc/jena-jdbc-driver-remote/pom.xml
@@ -49,13 +49,13 @@
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-fuseki-embedded</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-fuseki-embedded</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
<scope>test</scope>
<classifier>tests</classifier>
</dependency>
http://git-wip-us.apache.org/repos/asf/jena/blob/db8131d5/jena-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/jena-jdbc/pom.xml b/jena-jdbc/pom.xml
index e09697c..a5b394c 100644
--- a/jena-jdbc/pom.xml
+++ b/jena-jdbc/pom.xml
@@ -28,9 +28,9 @@
<parent>
<groupId>org.apache.jena</groupId>
- <artifactId>jena-parent</artifactId>
- <version>20-SNAPSHOT</version>
- <relativePath>../jena-parent</relativePath>
+ <artifactId>jena-project</artifactId>
+ <version>3.4.0-SNAPSHOT</version>
+ <relativePath>../jena-project</relativePath>
</parent>
<!-- Need if the parent is a snapshot -->
http://git-wip-us.apache.org/repos/asf/jena/blob/db8131d5/jena-parent/DEPENDENCIES
----------------------------------------------------------------------
diff --git a/jena-parent/DEPENDENCIES b/jena-parent/DEPENDENCIES
deleted file mode 100644
index 1aa6767..0000000
--- a/jena-parent/DEPENDENCIES
+++ /dev/null
@@ -1,11 +0,0 @@
-This file lists the dependences for Apache Jena.
-
- Version numbers are given in the POM file for a particular distribution.
- Additional dependencies may be specified in individual modules.
-
-SLF4J : http://www.slf4j.org/
- Copyright (c) 2004-2008 QOS.ch
- MIT License
-
-JUnit : http://junit.org/
- Common Public License - v1.0
http://git-wip-us.apache.org/repos/asf/jena/blob/db8131d5/jena-parent/LICENSE
----------------------------------------------------------------------
diff --git a/jena-parent/LICENSE b/jena-parent/LICENSE
deleted file mode 100644
index d645695..0000000
--- a/jena-parent/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
http://git-wip-us.apache.org/repos/asf/jena/blob/db8131d5/jena-parent/NOTICE
----------------------------------------------------------------------
diff --git a/jena-parent/NOTICE b/jena-parent/NOTICE
deleted file mode 100644
index c1042f4..0000000
--- a/jena-parent/NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Jena
-Copyright 2011-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/jena/blob/db8131d5/jena-parent/pom.xml
----------------------------------------------------------------------
diff --git a/jena-parent/pom.xml b/jena-parent/pom.xml
deleted file mode 100644
index e8d3686..0000000
--- a/jena-parent/pom.xml
+++ /dev/null
@@ -1,857 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-parent</artifactId>
- <packaging>pom</packaging>
- <url>http://jena.apache.org/</url>
- <version>20-SNAPSHOT</version>
- <name>Apache Jena - Parent</name>
-
- <parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <!-- This version number is also in the top POM -->
- <version>18</version>
- <relativePath />
- </parent>
-
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
-
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
-
- <properties>
- <ver.slf4j>1.7.25</ver.slf4j>
- <ver.log4j>1.2.17</ver.log4j>
- <ver.junit>4.12</ver.junit>
- <ver.xerces>2.11.0</ver.xerces>
- <ver.libthrift>0.9.3</ver.libthrift>
- <!-- the following three libraries must work together
- consult jsonld-java's POM for the correct dependency versions -->
- <ver.jsonldjava>0.9.0</ver.jsonldjava>
- <ver.jackson>2.7.4</ver.jackson>
- <ver.commonsio>2.5</ver.commonsio>
- <ver.commonscli>1.4</ver.commonscli>
-
- <ver.commonslang3>3.4</ver.commonslang3>
- <ver.commonscsv>1.4</ver.commonscsv>
- <ver.dexxcollection>0.7</ver.dexxcollection>
-
- <ver.httpclient>4.5.3</ver.httpclient>
- <ver.httpcore>4.4.6</ver.httpcore>
- <!-- Normally, these are the same as the above
- In the case of 4.2.6, there isn't a httpcore-osgi.
- -->
- <ver.httpcore-osgi>${ver.httpcore}</ver.httpcore-osgi>
- <ver.httpclient-osgi>${ver.httpclient}</ver.httpclient-osgi>
-
- <ver.commons-codec>1.10</ver.commons-codec>
- <ver.lucene>6.4.1</ver.lucene>
-
- <ver.elasticsearch>5.2.2</ver.elasticsearch>
- <!-- elasticsearch uses this by reflection -->
- <ver.log4j2>2.7</ver.log4j2>
-
- <ver.spatial4j>0.6</ver.spatial4j>
-
- <ver.mockito>1.9.5</ver.mockito>
- <ver.awaitility>1.7.0</ver.awaitility>
-
- <jdk.version>1.8</jdk.version>
- <targetJdk>${jdk.version}</targetJdk> <!-- MPMD-86 workaround -->
-
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ssZ</maven.build.timestamp.format>
- <ver.contract.tests>0.1.5</ver.contract.tests>
- </properties>
-
- <profiles>
- <profile>
- <!-- Turn of doclint for java8 and later -->
- <id>doclint-java8-disable</id>
- <activation>
- <jdk>[1.8,)</jdk>
- </activation>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <additionalparam>-Xdoclint:none</additionalparam>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
- <!-- Version management -->
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${ver.junit}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>${ver.xerces}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient-cache</artifactId>
- <version>${ver.httpclient}</version>
- <exclusions>
- <!-- Replace with slf4j adapter -->
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>${ver.httpclient}</version>
- <exclusions>
- <!-- Replace with slf4j adapter -->
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>${ver.commons-codec}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- <version>${ver.libthrift}</version>
- <exclusions>
- <!-- Use whatever version Jena is using -->
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-csv</artifactId>
- <version>${ver.commonscsv}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>${ver.commonslang3}</version>
- </dependency>
-
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>1.3.2</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-collections4</artifactId>
- <version>4.1</version>
- </dependency>
-
- <!-- supports persistent data structures -->
- <dependency>
- <groupId>com.github.andrewoma.dexx</groupId>
- <artifactId>collection</artifactId>
- <version>${ver.dexxcollection}</version>
- </dependency>
-
- <dependency>
- <groupId>com.github.jsonld-java</groupId>
- <artifactId>jsonld-java</artifactId>
- <version>${ver.jsonldjava}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <!-- Exclude so we use our choice of versions -->
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient-cache</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient-osgi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore-osgi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <!-- Lucene dependencies -->
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-core</artifactId>
- <version>${ver.lucene}</version>
- <type>jar</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-analyzers-common</artifactId>
- <version>${ver.lucene}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-queryparser</artifactId>
- <version>${ver.lucene}</version>
- </dependency>
-
- <!-- For jena-spatial -->
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-spatial</artifactId>
- <version>${ver.lucene}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-spatial-extras</artifactId>
- <version>${ver.lucene}</version>
- </dependency>
-
- <dependency>
- <groupId>org.locationtech.spatial4j</groupId>
- <artifactId>spatial4j</artifactId>
- <version>${ver.spatial4j}</version>
- </dependency>
-
- <!-- Elasticsearch dependencies -->
-
- <dependency>
- <groupId>org.elasticsearch.client</groupId>
- <artifactId>transport</artifactId>
- <version>${ver.elasticsearch}</version>
- </dependency>
-
- <!-- Elasticsearch Server
- <dependency>
- <groupId>org.elasticsearch</groupId>
- <artifactId>elasticsearch</artifactId>
- <version>${ver.elasticsearch}</version>
- </dependency>
- -->
-
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- <version>${ver.log4j2}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-to-slf4j</artifactId>
- <version>${ver.log4j2}</version>
- </dependency>
-
- <!-- Logging -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${ver.slf4j}</version>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <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>
- <version>${ver.slf4j}</version>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${ver.log4j}</version>
- </dependency>
-
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>${ver.commonscli}</version>
- </dependency>
-
- <dependency>
- <groupId>org.xenei</groupId>
- <artifactId>junit-contracts</artifactId>
- <version>${ver.contract.tests}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <artifactId>commons-cli</artifactId>
- <groupId>commons-cli</groupId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.xenei</groupId>
- <artifactId>contract-test-maven-plugin</artifactId>
- <version>${ver.contract.tests}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>${ver.mockito}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>com.jayway.awaitility</groupId>
- <artifactId>awaitility</artifactId>
- <version>${ver.awaitility}</version>
- </dependency>
- </dependencies>
-
- </dependencyManagement>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <optional>true</optional>
- </dependency>
-
- </dependencies>
-
- <build>
- <!-- Run the enforcer plugin automatically at compile time -->
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration combine.self="override">
- <rules>
- <requireJavaVersion>
- <version>1.8.0</version>
- </requireJavaVersion>
- <requirePluginVersions>
- <message>Best practice is to always define plugin versions!</message>
- <banLatest>true</banLatest>
- <banRelease>true</banRelease>
- </requirePluginVersions>
- <requireReleaseDeps>
- <message>No SNAPSHOT dependencies are allowed!</message>
- <onlyWhenRelease>true</onlyWhenRelease>
- </requireReleaseDeps>
- </rules>
- <fail>true</fail>
- <failFast>true</failFast>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <!-- Run the RAT Plugin -->
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>0.12</version>
- <executions>
- <execution>
- <id>rat-checks</id>
- <phase>validate</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <excludeSubProjects>true</excludeSubProjects>
- <excludes>
- <exclude>**/hs_err_pid*.log</exclude>
- <exclude>**/.project</exclude>
- <exclude>**/.settings/**</exclude>
- <exclude>**/.classpath</exclude>
- <exclude>**/README.*</exclude>
- <exclude>**/META-INF/services/*</exclude>
- <!--
- jena-core exclusions
- -->
- <exclude>**/src-examples/data/*</exclude>
-
- <!--
- jena-fuseki exclusions
- -->
- <exclude>**/dist/ABOUT</exclude>
- <exclude>**/SEE_FUSEKI2</exclude>
- <!--
- Need to exclude JS and CSS since much of it comes from other Apache licensed projects
- e.g. Bootstrap, Qonsole
-
- -->
- <exclude>**/src/main/webapp/css/*</exclude>
- <exclude>**/src/main/webapp/fonts/*</exclude>
- <exclude>**/src/main/webapp/js/**/*</exclude>
-
- <!-- General exclusions -->
- <!--
- Vocabularies are often just local copies of vocabularies
- published by others
- -->
- <exclude>**/vocabularies/*</exclude>
- <exclude>**/Vocabularies/*</exclude>
-
- <!--
- Javadoc add-ons files are required to be simple and our javadoc configuration
- will ensure appropriate license and copyright statements are inserted
- into generated documentation anyway so no need to put license statements in these
- files
- -->
- <exclude>**/src/main/**/*.html</exclude>
- <exclude>**/src/**/package-info.java</exclude>
-
- <exclude>**/DEPENDENCIES</exclude>
-
- <!--
- Text and Markdown files are typically used only for documentation purposes
- and license declarations are usually spurious in these files since often they
- will refer to the LICENSE/NOTICE for users to find the actual licenses
- -->
- <exclude>**/*.txt</exclude>
- <exclude>**/*.md</exclude>
-
- <!--
- META-INF services files can include comments but a license header would be
- unecessarily clutter so we exclude these
- -->
- <exclude>**/META-INF/services/*</exclude>
-
- <!--
- Jena historically has large numbers of small test file
- with no license headers. Such small files are not required
- to have headers.
-
- In addition, there are files with different Licenses
- (e.g. W3C Software Licence, W3C Test Suite License) as
- noted in the code tree.
- -->
- <exclude>**/src/test/resources/**/*</exclude>
- <exclude>**/testing/**/*</exclude>
-
- <exclude>**/log4j.properties</exclude>
- <exclude>**/log4j-testing.properties</exclude>
- <exclude>**/derby.log</exclude>
- <exclude>**/DB/**/*</exclude>
- <!-- TDB config files JSON - no comments allowed -->
- <exclude>**/tdb*.cfg</exclude>
- <!-- Fuseki2 server "run" area -->
- <exclude>**/run/**/*</exclude>
- <!-- Cached classpath for commands - autogenerated -->
- <exclude>**/*.classpath</exclude>
-
- <!-- Exclude anything created during the build (plugin generated files) ->-->
- <exclude>**/target/**/*</exclude>
- <!-- MSHADE-124 -->
- <exclude>**/dependency-reduced-pom.xml</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- </plugin>
- </plugins>
-
- <!-- Plugin version list: http://maven.apache.org/plugins/index.html -->
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <encoding>UTF-8</encoding>
- <debug>true</debug>
- <debuglevel>source,lines,vars</debuglevel>
- <optimize>true</optimize>
- <source>${jdk.version}</source>
- <target>${jdk.version}</target>
- </configuration>
- </plugin>
-
- <!-- Avoid the warnings and errors from m2e -->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <!--
- Warning:
- "maven-remote-resources-plugin (goal "process") is ignored by m2e."
- -->
- <pluginExecutionFilter>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <versionRange>[1.0.0,)</versionRange>
- <goals>
- <goal>enforce</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
- <pluginExecution>
- <!--
- Warning:
- "maven-enforcer-plugin (goal "enforce") is ignored by m2e."
- -->
- <pluginExecutionFilter>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <versionRange>[1.0.0,)</versionRange>
- <goals>
- <goal>process</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
-
- <pluginExecution>
- <!--
- Error:
- Plugin execution not covered by lifecycle configuration
- -->
- <pluginExecutionFilter>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <versionRange>[0.11,)</versionRange>
- <goals>
- <goal>check</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
-
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.xenei</groupId>
- <artifactId>contract-test-maven-plugin</artifactId>
- <versionRange>[0.1.5,)</versionRange>
- <goals>
- <goal>contract-test</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
-
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar-no-fork</goal>
- </goals>
- </execution>
- <!-- Only needed in some jars <execution> <id>attach-sources-test</id>
- <goals> <goal>test-jar-no-fork</goal> </goals> </execution> -->
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <version>true</version>
- <show>public</show>
- <quiet>true</quiet>
- <encoding>UTF-8</encoding>
- <windowtitle>${project.name} ${project.version}</windowtitle>
- <doctitle>${project.name} ${project.version}</doctitle>
- <bottom>Licensed under the Apache License, Version 2.0</bottom>
- <links>
- <link>http://jena.apache.org/documentation/javadoc/jena/</link>
- <link>http://jena.apache.org/documentation/javadoc/arq/</link>
- <link>http://jena.apache.org/documentation/javadoc/tdb/</link>
- <link>http://jena.apache.org/documentation/javadoc/text/</link>
- <link>http://jena.apache.org/documentation/javadoc/spatial/</link>
- <link>http://jena.apache.org/documentation/javadoc/fuseki2/</link>
- <link>http://jena.apache.org/documentation/javadoc/permissions/</link>
- <link>http://jena.apache.org/documentation/javadoc/jdbc/</link>
- <link>http://jena.apache.org/documentation/javadoc/elephas/</link>
- </links>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <configuration>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
-
- <!-- Temp fix for remote-resources while waiting for remote-resources >1.5
- 1.6 should fix this - SNAPSHOT already does.
- -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.5</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-filtering</artifactId>
- <version>1.2</version>
- </dependency>
- </dependencies>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <configuration>
- <overWriteReleases>false</overWriteReleases>
- <overWriteIfNewer>true</overWriteIfNewer>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <version>2.9</version>
- <configuration>
- <!-- By default, have separate Eclipse and maven build areas -->
- <buildOutputDirectory>${project.build.directory}/classes-eclipse</buildOutputDirectory>
- <downloadSources>true</downloadSources>
- <downloadJavadocs>false</downloadJavadocs>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <rules>
- <requirePluginVersions>
- <message>Best practice is to always define plugin versions!</message>
- <banLatest>true</banLatest>
- <banRelease>true</banRelease>
- </requirePluginVersions>
- <requireReleaseDeps>
- <message>No SNAPSHOT dependencies are allowed!</message>
- <onlyWhenRelease>true</onlyWhenRelease>
- </requireReleaseDeps>
- <DependencyConvergence />
- </rules>
- <fail>true</fail>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>2.5.3</version>
- <extensions>true</extensions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>2.3</version>
- </plugin>
-
-
- </plugins>
- </pluginManagement>
- </build>
-
- <reporting>
- <!-- <outputDirectory>${project.build.directory}/site</outputDirectory> -->
-
- <plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.18.1</version>
- <configuration>
- <outputDirectory>${project.basedir}/target/surefire-reports-html</outputDirectory>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>2.7</version>
- <configuration>
- <instrumentation>
- <ignores>
- <ignore>org.slf4j.*</ignore>
- </ignores>
- </instrumentation>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.15</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- <version>2.5</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>3.4</version>
- <configuration>
- <linkXref>true</linkXref>
- <sourceEncoding>utf-8</sourceEncoding>
- <minimumTokens>100</minimumTokens>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>3.0.1</version>
- </plugin>
-
- </plugins>
-
- </reporting>
-</project>
http://git-wip-us.apache.org/repos/asf/jena/blob/db8131d5/jena-permissions/pom.xml
----------------------------------------------------------------------
diff --git a/jena-permissions/pom.xml b/jena-permissions/pom.xml
index bb5cd12..3daea65 100644
--- a/jena-permissions/pom.xml
+++ b/jena-permissions/pom.xml
@@ -33,9 +33,9 @@
<parent>
<groupId>org.apache.jena</groupId>
- <artifactId>jena-parent</artifactId>
- <version>20-SNAPSHOT</version>
- <relativePath>../jena-parent</relativePath>
+ <artifactId>jena-project</artifactId>
+ <version>3.4.0-SNAPSHOT</version>
+ <relativePath>../jena-project</relativePath>
</parent>
<organization>
<name>The Apache Software Foundation</name>
http://git-wip-us.apache.org/repos/asf/jena/blob/db8131d5/jena-project/DEPENDENCIES
----------------------------------------------------------------------
diff --git a/jena-project/DEPENDENCIES b/jena-project/DEPENDENCIES
new file mode 100644
index 0000000..1aa6767
--- /dev/null
+++ b/jena-project/DEPENDENCIES
@@ -0,0 +1,11 @@
+This file lists the dependences for Apache Jena.
+
+ Version numbers are given in the POM file for a particular distribution.
+ Additional dependencies may be specified in individual modules.
+
+SLF4J : http://www.slf4j.org/
+ Copyright (c) 2004-2008 QOS.ch
+ MIT License
+
+JUnit : http://junit.org/
+ Common Public License - v1.0
http://git-wip-us.apache.org/repos/asf/jena/blob/db8131d5/jena-project/LICENSE
----------------------------------------------------------------------
diff --git a/jena-project/LICENSE b/jena-project/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/jena-project/LICENSE
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
http://git-wip-us.apache.org/repos/asf/jena/blob/db8131d5/jena-project/NOTICE
----------------------------------------------------------------------
diff --git a/jena-project/NOTICE b/jena-project/NOTICE
new file mode 100644
index 0000000..c1042f4
--- /dev/null
+++ b/jena-project/NOTICE
@@ -0,0 +1,5 @@
+Apache Jena
+Copyright 2011-2017 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
[4/5] jena git commit: Update javadoc
Posted by an...@apache.org.
Update javadoc
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/254fcfd0
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/254fcfd0
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/254fcfd0
Branch: refs/heads/master
Commit: 254fcfd075cd4d292ab05998c93ce09a02e66671
Parents: 12db8b9
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Jul 10 13:33:09 2017 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Jul 10 13:33:09 2017 +0100
----------------------------------------------------------------------
jena-core/src/main/java/org/apache/jena/graph/Node.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/254fcfd0/jena-core/src/main/java/org/apache/jena/graph/Node.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/graph/Node.java b/jena-core/src/main/java/org/apache/jena/graph/Node.java
index 67c7dab..2251767 100644
--- a/jena-core/src/main/java/org/apache/jena/graph/Node.java
+++ b/jena-core/src/main/java/org/apache/jena/graph/Node.java
@@ -237,9 +237,8 @@ public abstract class Node implements Serializable {
* Test that two nodes are semantically equivalent.
* In some cases this may be the same as equals, in others
* equals is stricter. For example, two xsd:int literals with
- * the same value but different language tag are semantically
- * equivalent but distinguished by the java equality function
- * in order to support round-tripping.
+ * the same value but different lexical form are semantically
+ * equivalent but distinguished by the java equals function.
* <p>Default implementation is to use equals, subclasses should
* override this.</p>
*/
[2/5] jena git commit: JENA-1373: Unify version number
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/jena/blob/db8131d5/jena-project/pom.xml
----------------------------------------------------------------------
diff --git a/jena-project/pom.xml b/jena-project/pom.xml
new file mode 100644
index 0000000..f03602e
--- /dev/null
+++ b/jena-project/pom.xml
@@ -0,0 +1,857 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-project</artifactId>
+ <packaging>pom</packaging>
+ <url>http://jena.apache.org/</url>
+ <version>3.4.0-SNAPSHOT</version>
+ <name>Apache Jena - Parent</name>
+
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <!-- This version number is also in the top POM -->
+ <version>18</version>
+ <relativePath />
+ </parent>
+
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+
+ <properties>
+ <ver.slf4j>1.7.25</ver.slf4j>
+ <ver.log4j>1.2.17</ver.log4j>
+ <ver.junit>4.12</ver.junit>
+ <ver.xerces>2.11.0</ver.xerces>
+ <ver.libthrift>0.9.3</ver.libthrift>
+ <!-- the following three libraries must work together
+ consult jsonld-java's POM for the correct dependency versions -->
+ <ver.jsonldjava>0.9.0</ver.jsonldjava>
+ <ver.jackson>2.7.4</ver.jackson>
+ <ver.commonsio>2.5</ver.commonsio>
+ <ver.commonscli>1.4</ver.commonscli>
+
+ <ver.commonslang3>3.4</ver.commonslang3>
+ <ver.commonscsv>1.4</ver.commonscsv>
+ <ver.dexxcollection>0.7</ver.dexxcollection>
+
+ <ver.httpclient>4.5.3</ver.httpclient>
+ <ver.httpcore>4.4.6</ver.httpcore>
+ <!-- Normally, these are the same as the above
+ In the case of 4.2.6, there isn't a httpcore-osgi.
+ -->
+ <ver.httpcore-osgi>${ver.httpcore}</ver.httpcore-osgi>
+ <ver.httpclient-osgi>${ver.httpclient}</ver.httpclient-osgi>
+
+ <ver.commons-codec>1.10</ver.commons-codec>
+ <ver.lucene>6.4.1</ver.lucene>
+
+ <ver.elasticsearch>5.2.2</ver.elasticsearch>
+ <!-- elasticsearch uses this by reflection -->
+ <ver.log4j2>2.7</ver.log4j2>
+
+ <ver.spatial4j>0.6</ver.spatial4j>
+
+ <ver.mockito>1.9.5</ver.mockito>
+ <ver.awaitility>1.7.0</ver.awaitility>
+
+ <jdk.version>1.8</jdk.version>
+ <targetJdk>${jdk.version}</targetJdk> <!-- MPMD-86 workaround -->
+
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ssZ</maven.build.timestamp.format>
+ <ver.contract.tests>0.1.5</ver.contract.tests>
+ </properties>
+
+ <profiles>
+ <profile>
+ <!-- Turn of doclint for java8 and later -->
+ <id>doclint-java8-disable</id>
+ <activation>
+ <jdk>[1.8,)</jdk>
+ </activation>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <additionalparam>-Xdoclint:none</additionalparam>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+ <!-- Version management -->
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${ver.junit}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>${ver.xerces}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient-cache</artifactId>
+ <version>${ver.httpclient}</version>
+ <exclusions>
+ <!-- Replace with slf4j adapter -->
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>${ver.httpclient}</version>
+ <exclusions>
+ <!-- Replace with slf4j adapter -->
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>${ver.commons-codec}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ <version>${ver.libthrift}</version>
+ <exclusions>
+ <!-- Use whatever version Jena is using -->
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-csv</artifactId>
+ <version>${ver.commonscsv}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>${ver.commonslang3}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>1.3.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ <version>4.1</version>
+ </dependency>
+
+ <!-- supports persistent data structures -->
+ <dependency>
+ <groupId>com.github.andrewoma.dexx</groupId>
+ <artifactId>collection</artifactId>
+ <version>${ver.dexxcollection}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.github.jsonld-java</groupId>
+ <artifactId>jsonld-java</artifactId>
+ <version>${ver.jsonldjava}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <!-- Exclude so we use our choice of versions -->
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient-cache</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient-osgi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore-osgi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- Lucene dependencies -->
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
+ <version>${ver.lucene}</version>
+ <type>jar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-analyzers-common</artifactId>
+ <version>${ver.lucene}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-queryparser</artifactId>
+ <version>${ver.lucene}</version>
+ </dependency>
+
+ <!-- For jena-spatial -->
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-spatial</artifactId>
+ <version>${ver.lucene}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-spatial-extras</artifactId>
+ <version>${ver.lucene}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.locationtech.spatial4j</groupId>
+ <artifactId>spatial4j</artifactId>
+ <version>${ver.spatial4j}</version>
+ </dependency>
+
+ <!-- Elasticsearch dependencies -->
+
+ <dependency>
+ <groupId>org.elasticsearch.client</groupId>
+ <artifactId>transport</artifactId>
+ <version>${ver.elasticsearch}</version>
+ </dependency>
+
+ <!-- Elasticsearch Server
+ <dependency>
+ <groupId>org.elasticsearch</groupId>
+ <artifactId>elasticsearch</artifactId>
+ <version>${ver.elasticsearch}</version>
+ </dependency>
+ -->
+
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>${ver.log4j2}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-to-slf4j</artifactId>
+ <version>${ver.log4j2}</version>
+ </dependency>
+
+ <!-- Logging -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${ver.slf4j}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <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>
+ <version>${ver.slf4j}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${ver.log4j}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>${ver.commonscli}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.xenei</groupId>
+ <artifactId>junit-contracts</artifactId>
+ <version>${ver.contract.tests}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-cli</artifactId>
+ <groupId>commons-cli</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.xenei</groupId>
+ <artifactId>contract-test-maven-plugin</artifactId>
+ <version>${ver.contract.tests}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <version>${ver.mockito}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.jayway.awaitility</groupId>
+ <artifactId>awaitility</artifactId>
+ <version>${ver.awaitility}</version>
+ </dependency>
+ </dependencies>
+
+ </dependencyManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <optional>true</optional>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <!-- Run the enforcer plugin automatically at compile time -->
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration combine.self="override">
+ <rules>
+ <requireJavaVersion>
+ <version>1.8.0</version>
+ </requireJavaVersion>
+ <requirePluginVersions>
+ <message>Best practice is to always define plugin versions!</message>
+ <banLatest>true</banLatest>
+ <banRelease>true</banRelease>
+ </requirePluginVersions>
+ <requireReleaseDeps>
+ <message>No SNAPSHOT dependencies are allowed!</message>
+ <onlyWhenRelease>true</onlyWhenRelease>
+ </requireReleaseDeps>
+ </rules>
+ <fail>true</fail>
+ <failFast>true</failFast>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- Run the RAT Plugin -->
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.12</version>
+ <executions>
+ <execution>
+ <id>rat-checks</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <excludeSubProjects>true</excludeSubProjects>
+ <excludes>
+ <exclude>**/hs_err_pid*.log</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.settings/**</exclude>
+ <exclude>**/.classpath</exclude>
+ <exclude>**/README.*</exclude>
+ <exclude>**/META-INF/services/*</exclude>
+ <!--
+ jena-core exclusions
+ -->
+ <exclude>**/src-examples/data/*</exclude>
+
+ <!--
+ jena-fuseki exclusions
+ -->
+ <exclude>**/dist/ABOUT</exclude>
+ <exclude>**/SEE_FUSEKI2</exclude>
+ <!--
+ Need to exclude JS and CSS since much of it comes from other Apache licensed projects
+ e.g. Bootstrap, Qonsole
+
+ -->
+ <exclude>**/src/main/webapp/css/*</exclude>
+ <exclude>**/src/main/webapp/fonts/*</exclude>
+ <exclude>**/src/main/webapp/js/**/*</exclude>
+
+ <!-- General exclusions -->
+ <!--
+ Vocabularies are often just local copies of vocabularies
+ published by others
+ -->
+ <exclude>**/vocabularies/*</exclude>
+ <exclude>**/Vocabularies/*</exclude>
+
+ <!--
+ Javadoc add-ons files are required to be simple and our javadoc configuration
+ will ensure appropriate license and copyright statements are inserted
+ into generated documentation anyway so no need to put license statements in these
+ files
+ -->
+ <exclude>**/src/main/**/*.html</exclude>
+ <exclude>**/src/**/package-info.java</exclude>
+
+ <exclude>**/DEPENDENCIES</exclude>
+
+ <!--
+ Text and Markdown files are typically used only for documentation purposes
+ and license declarations are usually spurious in these files since often they
+ will refer to the LICENSE/NOTICE for users to find the actual licenses
+ -->
+ <exclude>**/*.txt</exclude>
+ <exclude>**/*.md</exclude>
+
+ <!--
+ META-INF services files can include comments but a license header would be
+ unecessarily clutter so we exclude these
+ -->
+ <exclude>**/META-INF/services/*</exclude>
+
+ <!--
+ Jena historically has large numbers of small test file
+ with no license headers. Such small files are not required
+ to have headers.
+
+ In addition, there are files with different Licenses
+ (e.g. W3C Software Licence, W3C Test Suite License) as
+ noted in the code tree.
+ -->
+ <exclude>**/src/test/resources/**/*</exclude>
+ <exclude>**/testing/**/*</exclude>
+
+ <exclude>**/log4j.properties</exclude>
+ <exclude>**/log4j-testing.properties</exclude>
+ <exclude>**/derby.log</exclude>
+ <exclude>**/DB/**/*</exclude>
+ <!-- TDB config files JSON - no comments allowed -->
+ <exclude>**/tdb*.cfg</exclude>
+ <!-- Fuseki2 server "run" area -->
+ <exclude>**/run/**/*</exclude>
+ <!-- Cached classpath for commands - autogenerated -->
+ <exclude>**/*.classpath</exclude>
+
+ <!-- Exclude anything created during the build (plugin generated files) ->-->
+ <exclude>**/target/**/*</exclude>
+ <!-- MSHADE-124 -->
+ <exclude>**/dependency-reduced-pom.xml</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+
+ <!-- Plugin version list: http://maven.apache.org/plugins/index.html -->
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ <debug>true</debug>
+ <debuglevel>source,lines,vars</debuglevel>
+ <optimize>true</optimize>
+ <source>${jdk.version}</source>
+ <target>${jdk.version}</target>
+ </configuration>
+ </plugin>
+
+ <!-- Avoid the warnings and errors from m2e -->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <!--
+ Warning:
+ "maven-remote-resources-plugin (goal "process") is ignored by m2e."
+ -->
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <versionRange>[1.0.0,)</versionRange>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <!--
+ Warning:
+ "maven-enforcer-plugin (goal "enforce") is ignored by m2e."
+ -->
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <versionRange>[1.0.0,)</versionRange>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+
+ <pluginExecution>
+ <!--
+ Error:
+ Plugin execution not covered by lifecycle configuration
+ -->
+ <pluginExecutionFilter>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <versionRange>[0.11,)</versionRange>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.xenei</groupId>
+ <artifactId>contract-test-maven-plugin</artifactId>
+ <versionRange>[0.1.5,)</versionRange>
+ <goals>
+ <goal>contract-test</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ <!-- Only needed in some jars <execution> <id>attach-sources-test</id>
+ <goals> <goal>test-jar-no-fork</goal> </goals> </execution> -->
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <version>true</version>
+ <show>public</show>
+ <quiet>true</quiet>
+ <encoding>UTF-8</encoding>
+ <windowtitle>${project.name} ${project.version}</windowtitle>
+ <doctitle>${project.name} ${project.version}</doctitle>
+ <bottom>Licensed under the Apache License, Version 2.0</bottom>
+ <links>
+ <link>http://jena.apache.org/documentation/javadoc/jena/</link>
+ <link>http://jena.apache.org/documentation/javadoc/arq/</link>
+ <link>http://jena.apache.org/documentation/javadoc/tdb/</link>
+ <link>http://jena.apache.org/documentation/javadoc/text/</link>
+ <link>http://jena.apache.org/documentation/javadoc/spatial/</link>
+ <link>http://jena.apache.org/documentation/javadoc/fuseki2/</link>
+ <link>http://jena.apache.org/documentation/javadoc/permissions/</link>
+ <link>http://jena.apache.org/documentation/javadoc/jdbc/</link>
+ <link>http://jena.apache.org/documentation/javadoc/elephas/</link>
+ </links>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+
+ <!-- Temp fix for remote-resources while waiting for remote-resources >1.5
+ 1.6 should fix this - SNAPSHOT already does.
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.5</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-filtering</artifactId>
+ <version>1.2</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <configuration>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteIfNewer>true</overWriteIfNewer>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.9</version>
+ <configuration>
+ <!-- By default, have separate Eclipse and maven build areas -->
+ <buildOutputDirectory>${project.build.directory}/classes-eclipse</buildOutputDirectory>
+ <downloadSources>true</downloadSources>
+ <downloadJavadocs>false</downloadJavadocs>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <rules>
+ <requirePluginVersions>
+ <message>Best practice is to always define plugin versions!</message>
+ <banLatest>true</banLatest>
+ <banRelease>true</banRelease>
+ </requirePluginVersions>
+ <requireReleaseDeps>
+ <message>No SNAPSHOT dependencies are allowed!</message>
+ <onlyWhenRelease>true</onlyWhenRelease>
+ </requireReleaseDeps>
+ <DependencyConvergence />
+ </rules>
+ <fail>true</fail>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.5.3</version>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+
+
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <reporting>
+ <!-- <outputDirectory>${project.build.directory}/site</outputDirectory> -->
+
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.18.1</version>
+ <configuration>
+ <outputDirectory>${project.basedir}/target/surefire-reports-html</outputDirectory>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <version>2.7</version>
+ <configuration>
+ <instrumentation>
+ <ignores>
+ <ignore>org.slf4j.*</ignore>
+ </ignores>
+ </instrumentation>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.15</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>3.4</version>
+ <configuration>
+ <linkXref>true</linkXref>
+ <sourceEncoding>utf-8</sourceEncoding>
+ <minimumTokens>100</minimumTokens>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>3.0.1</version>
+ </plugin>
+
+ </plugins>
+
+ </reporting>
+</project>
http://git-wip-us.apache.org/repos/asf/jena/blob/db8131d5/jena-rdfconnection/pom.xml
----------------------------------------------------------------------
diff --git a/jena-rdfconnection/pom.xml b/jena-rdfconnection/pom.xml
index 9b1eb7d..5b307e6 100644
--- a/jena-rdfconnection/pom.xml
+++ b/jena-rdfconnection/pom.xml
@@ -31,9 +31,9 @@
<parent>
<groupId>org.apache.jena</groupId>
- <artifactId>jena-parent</artifactId>
- <version>20-SNAPSHOT</version>
- <relativePath>../jena-parent</relativePath>
+ <artifactId>jena-project</artifactId>
+ <version>3.4.0-SNAPSHOT</version>
+ <relativePath>../jena-project</relativePath>
</parent>
<licenses>
http://git-wip-us.apache.org/repos/asf/jena/blob/db8131d5/jena-sdb/pom.xml
----------------------------------------------------------------------
diff --git a/jena-sdb/pom.xml b/jena-sdb/pom.xml
index 101258f..1b7f6ca 100644
--- a/jena-sdb/pom.xml
+++ b/jena-sdb/pom.xml
@@ -25,9 +25,9 @@
<parent>
<groupId>org.apache.jena</groupId>
- <artifactId>jena-parent</artifactId>
- <version>20-SNAPSHOT</version>
- <relativePath>../jena-parent</relativePath>
+ <artifactId>jena-project</artifactId>
+ <version>3.4.0-SNAPSHOT</version>
+ <relativePath>../jena-project</relativePath>
</parent>
<description>SDB is a persistence layer for use with Apache Jena that uses an SQL database to store triples/quads.</description>
http://git-wip-us.apache.org/repos/asf/jena/blob/db8131d5/jena-shaded-guava/pom.xml
----------------------------------------------------------------------
diff --git a/jena-shaded-guava/pom.xml b/jena-shaded-guava/pom.xml
index 9059c32..729cbd3 100644
--- a/jena-shaded-guava/pom.xml
+++ b/jena-shaded-guava/pom.xml
@@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.jena</groupId>
- <artifactId>jena-parent</artifactId>
- <version>20-SNAPSHOT</version>
- <relativePath>../jena-parent</relativePath>
+ <artifactId>jena-project</artifactId>
+ <version>3.4.0-SNAPSHOT</version>
+ <relativePath>../jena-project</relativePath>
</parent>
<artifactId>jena-shaded-guava</artifactId>
<version>3.4.0-SNAPSHOT</version>
@@ -43,7 +43,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <!-- Version number specified explicitly and not in jena-parent,
+ <!-- Version number specified explicitly and not in jena-project,
as it should only be used here, and further shadowing/bundle/NOTICE
consideration might be needed on upgrade. -->
<version>21.0</version>
http://git-wip-us.apache.org/repos/asf/jena/blob/db8131d5/jena-spatial/pom.xml
----------------------------------------------------------------------
diff --git a/jena-spatial/pom.xml b/jena-spatial/pom.xml
index 6eaf760..39223bb 100644
--- a/jena-spatial/pom.xml
+++ b/jena-spatial/pom.xml
@@ -25,9 +25,9 @@
<parent>
<groupId>org.apache.jena</groupId>
- <artifactId>jena-parent</artifactId>
- <version>20-SNAPSHOT</version>
- <relativePath>../jena-parent</relativePath>
+ <artifactId>jena-project</artifactId>
+ <version>3.4.0-SNAPSHOT</version>
+ <relativePath>../jena-project</relativePath>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/jena/blob/db8131d5/jena-tdb/pom.xml
----------------------------------------------------------------------
diff --git a/jena-tdb/pom.xml b/jena-tdb/pom.xml
index 435f5a3..8c2f5ce 100644
--- a/jena-tdb/pom.xml
+++ b/jena-tdb/pom.xml
@@ -25,9 +25,9 @@
<parent>
<groupId>org.apache.jena</groupId>
- <artifactId>jena-parent</artifactId>
- <version>20-SNAPSHOT</version>
- <relativePath>../jena-parent</relativePath>
+ <artifactId>jena-project</artifactId>
+ <version>3.4.0-SNAPSHOT</version>
+ <relativePath>../jena-project</relativePath>
</parent>
<!-- Need if the parent is a snapshot -->
http://git-wip-us.apache.org/repos/asf/jena/blob/db8131d5/jena-text-es/pom.xml
----------------------------------------------------------------------
diff --git a/jena-text-es/pom.xml b/jena-text-es/pom.xml
index f631976..6ba8b4a 100644
--- a/jena-text-es/pom.xml
+++ b/jena-text-es/pom.xml
@@ -25,9 +25,9 @@
<parent>
<groupId>org.apache.jena</groupId>
- <artifactId>jena-parent</artifactId>
- <version>20-SNAPSHOT</version>
- <relativePath>../jena-parent</relativePath>
+ <artifactId>jena-project</artifactId>
+ <version>3.4.0-SNAPSHOT</version>
+ <relativePath>../jena-project</relativePath>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/jena/blob/db8131d5/jena-text/pom.xml
----------------------------------------------------------------------
diff --git a/jena-text/pom.xml b/jena-text/pom.xml
index 9e5c5d5..7d47768 100644
--- a/jena-text/pom.xml
+++ b/jena-text/pom.xml
@@ -25,9 +25,9 @@
<parent>
<groupId>org.apache.jena</groupId>
- <artifactId>jena-parent</artifactId>
- <version>20-SNAPSHOT</version>
- <relativePath>../jena-parent</relativePath>
+ <artifactId>jena-project</artifactId>
+ <version>3.4.0-SNAPSHOT</version>
+ <relativePath>../jena-project</relativePath>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/jena/blob/db8131d5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index acb8c74..3957a62 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
<url>http://jena.apache.org/</url>
<version>3.4.0-SNAPSHOT</version>
- <!-- The org.apache:apache version is also in jena-parent pom.xml -->
+ <!-- The org.apache:apache version is also in jena-project pom.xml -->
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
@@ -65,7 +65,7 @@
<id>dev</id>
<!-- The maven artifacts of the basic modules -->
<modules>
- <module>jena-parent</module>
+ <module>jena-project</module>
<!-- <module>jena-shaded-guava</module> -->
<!-- <module>jena-iri</module> -->
<module>jena-base</module>
@@ -108,7 +108,7 @@
<id>bootstrap</id>
<modules>
- <module>jena-parent</module>
+ <module>jena-project</module>
<module>jena-shaded-guava</module>
<module>jena-iri</module>
<module>jena-base</module>
@@ -140,7 +140,7 @@
</property>
</activation>
<modules>
- <module>jena-parent</module>
+ <module>jena-project</module>
<module>jena-shaded-guava</module>
<module>jena-iri</module>
<module>jena-base</module>
@@ -162,6 +162,8 @@
<module>jena-fuseki1</module>
<module>jena-fuseki2</module>
+ <module>apache-jena</module>
+
<!--
Tests of artifacts that require additional
modules built later in the build process.
@@ -173,14 +175,10 @@
<module>jena-permissions</module>
<module>jena-extras</module>
+ <module>jena-maven-tools</module>
+
<module>jena-jdbc</module>
- <!-- Removed because this breaks the build after the
- upgrade of Apache parent PM to v18 - see JENA-1184
- -->
- <!-- <module>jena-maven-tools</module> -->
<module>jena-elephas</module>
-
- <module>apache-jena</module>
<module>apache-jena-osgi</module>
</modules>
@@ -224,4 +222,4 @@
<url>http://issues.apache.org/jira/browse/JENA</url>
</issueManagement>
-</project>
+</project>
\ No newline at end of file