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/10/03 19:34:48 UTC
[62/65] [abbrv] jena git commit: JENA-1397: Put TDB2 into the main
build
JENA-1397: Put TDB2 into the main build
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/93f7422b
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/93f7422b
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/93f7422b
Branch: refs/heads/master
Commit: 93f7422b1b56097d131055736c70b2079ae628c8
Parents: b729916
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Oct 3 17:40:25 2017 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Oct 3 20:10:49 2017 +0100
----------------------------------------------------------------------
apache-jena-libs/pom.xml | 6 +++
jena-db/jena-dboe-base/pom.xml | 2 +-
jena-db/jena-dboe-index-test/pom.xml | 8 +--
jena-db/jena-dboe-index/pom.xml | 2 +-
jena-db/jena-dboe-trans-data/pom.xml | 2 +-
jena-db/jena-dboe-transaction/pom.xml | 2 +-
jena-db/jena-tdb2/pom.xml | 2 +-
jena-db/pom.xml | 4 +-
jena-integration-tests/pom.xml | 9 ++++
pom.xml | 78 ++++++++++++++++++------------
10 files changed, 70 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/93f7422b/apache-jena-libs/pom.xml
----------------------------------------------------------------------
diff --git a/apache-jena-libs/pom.xml b/apache-jena-libs/pom.xml
index ad9d6bc..b9d91f1 100644
--- a/apache-jena-libs/pom.xml
+++ b/apache-jena-libs/pom.xml
@@ -48,6 +48,12 @@
<dependency>
<groupId>org.apache.jena</groupId>
+ <artifactId>jena-tdb2</artifactId>
+ <version>3.5.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.jena</groupId>
<artifactId>jena-rdfconnection</artifactId>
<version>3.5.0-SNAPSHOT</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/jena/blob/93f7422b/jena-db/jena-dboe-base/pom.xml
----------------------------------------------------------------------
diff --git a/jena-db/jena-dboe-base/pom.xml b/jena-db/jena-dboe-base/pom.xml
index f017b53..ee0cd34 100644
--- a/jena-db/jena-dboe-base/pom.xml
+++ b/jena-db/jena-dboe-base/pom.xml
@@ -22,7 +22,7 @@
<artifactId>jena-dboe-base</artifactId>
<packaging>jar</packaging>
- <name>Apache Jena (${project.artifactId})</name>
+ <name>Apache Jena - DBOE Base</name>
<parent>
<groupId>org.apache.jena</groupId>
http://git-wip-us.apache.org/repos/asf/jena/blob/93f7422b/jena-db/jena-dboe-index-test/pom.xml
----------------------------------------------------------------------
diff --git a/jena-db/jena-dboe-index-test/pom.xml b/jena-db/jena-dboe-index-test/pom.xml
index a076277..b946017 100644
--- a/jena-db/jena-dboe-index-test/pom.xml
+++ b/jena-db/jena-dboe-index-test/pom.xml
@@ -22,7 +22,7 @@
<artifactId>jena-dboe-index-test</artifactId>
<packaging>jar</packaging>
- <name>Apache Jena (${project.artifactId})</name>
+ <name>Apache Jena - DBOE Index test suite</name>
<parent>
<groupId>org.apache.jena</groupId>
@@ -39,12 +39,6 @@
</dependency>
<dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-cmds</artifactId>
- <version>3.5.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
<!-- Bring junit into scope-compile -->
<groupId>junit</groupId>
<artifactId>junit</artifactId>
http://git-wip-us.apache.org/repos/asf/jena/blob/93f7422b/jena-db/jena-dboe-index/pom.xml
----------------------------------------------------------------------
diff --git a/jena-db/jena-dboe-index/pom.xml b/jena-db/jena-dboe-index/pom.xml
index f3127aa..cc7cb17 100644
--- a/jena-db/jena-dboe-index/pom.xml
+++ b/jena-db/jena-dboe-index/pom.xml
@@ -22,7 +22,7 @@
<artifactId>jena-dboe-index</artifactId>
<packaging>jar</packaging>
- <name>Apache Jena (${project.artifactId})</name>
+ <name>Apache Jena - DBOE Indexes</name>
<parent>
<groupId>org.apache.jena</groupId>
http://git-wip-us.apache.org/repos/asf/jena/blob/93f7422b/jena-db/jena-dboe-trans-data/pom.xml
----------------------------------------------------------------------
diff --git a/jena-db/jena-dboe-trans-data/pom.xml b/jena-db/jena-dboe-trans-data/pom.xml
index 044f3a3..3aae6a2 100644
--- a/jena-db/jena-dboe-trans-data/pom.xml
+++ b/jena-db/jena-dboe-trans-data/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>jena-dboe-trans-data</artifactId>
<packaging>jar</packaging>
- <name>Apache Jena (${project.artifactId})</name>
+ <name>Apache Jena - DBOE Transactional Datastructures</name>
<parent>
<groupId>org.apache.jena</groupId>
http://git-wip-us.apache.org/repos/asf/jena/blob/93f7422b/jena-db/jena-dboe-transaction/pom.xml
----------------------------------------------------------------------
diff --git a/jena-db/jena-dboe-transaction/pom.xml b/jena-db/jena-dboe-transaction/pom.xml
index 94591ef..e159b28 100644
--- a/jena-db/jena-dboe-transaction/pom.xml
+++ b/jena-db/jena-dboe-transaction/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>jena-dboe-transaction</artifactId>
<packaging>jar</packaging>
- <name>Apache Jena (${project.artifactId})</name>
+ <name>Apache Jena - DBOE Transactions</name>
<parent>
<groupId>org.apache.jena</groupId>
http://git-wip-us.apache.org/repos/asf/jena/blob/93f7422b/jena-db/jena-tdb2/pom.xml
----------------------------------------------------------------------
diff --git a/jena-db/jena-tdb2/pom.xml b/jena-db/jena-tdb2/pom.xml
index 940ca9c..69f3eb2 100644
--- a/jena-db/jena-tdb2/pom.xml
+++ b/jena-db/jena-tdb2/pom.xml
@@ -23,7 +23,7 @@
<artifactId>jena-tdb2</artifactId>
<packaging>jar</packaging>
- <name>Apache Jena (${project.artifactId})</name>
+ <name>Apache Jena - TDB2</name>
<parent>
<groupId>org.apache.jena</groupId>
http://git-wip-us.apache.org/repos/asf/jena/blob/93f7422b/jena-db/pom.xml
----------------------------------------------------------------------
diff --git a/jena-db/pom.xml b/jena-db/pom.xml
index dae8cff..d5026ed 100644
--- a/jena-db/pom.xml
+++ b/jena-db/pom.xml
@@ -23,7 +23,7 @@
<artifactId>jena-db</artifactId>
<packaging>pom</packaging>
<version>3.5.0-SNAPSHOT</version>
- <name>Apache Jena :: Database Operation Environment</name>
+ <name>Apache Jena - Database Operation Environment</name>
<url>http://jena.apache.org/</url>
<parent>
@@ -47,8 +47,6 @@
<module>jena-dboe-index-test</module>
<module>jena-dboe-trans-data</module>
<module>jena-tdb2</module>
- <module>jena-tdb2-cmds</module>
- <module>jena-fuseki-tdb2</module>
</modules>
<dependencies>
http://git-wip-us.apache.org/repos/asf/jena/blob/93f7422b/jena-integration-tests/pom.xml
----------------------------------------------------------------------
diff --git a/jena-integration-tests/pom.xml b/jena-integration-tests/pom.xml
index b6f7fc9..534d623 100644
--- a/jena-integration-tests/pom.xml
+++ b/jena-integration-tests/pom.xml
@@ -70,6 +70,7 @@
<groupId>org.apache.jena</groupId>
<artifactId>jena-cmds</artifactId>
<version>3.5.0-SNAPSHOT</version>
+
<scope>test</scope>
</dependency>
@@ -87,6 +88,14 @@
<artifactId>jena-dboe-index-test</artifactId>
<version>3.5.0-SNAPSHOT</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-dboe-trans-data</artifactId>
+ <version>3.5.0-SNAPSHOT</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.jena</groupId>
http://git-wip-us.apache.org/repos/asf/jena/blob/93f7422b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 68706eb..d09eef9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,49 +63,57 @@
It only builds the modules shipped in apache-jena binaries.
-->
<id>dev</id>
- <!-- The maven artifacts of the basic modules -->
+ <!-- The maven artifacts of the core development modules
+ See profile bootstrap for a first build from empty.
+ -->
<modules>
<module>jena-project</module>
- <!-- <module>jena-shaded-guava</module> -->
- <!-- <module>jena-iri</module> -->
+ <!-- <module>jena-shaded-guava</module> -->
+ <!-- <module>jena-iri</module> -->
<module>jena-base</module>
<module>jena-core</module>
<module>jena-arq</module>
<module>jena-rdfconnection</module>
<module>jena-tdb</module>
- <module>apache-jena-libs</module>
- <module>jena-cmds</module>
<module>jena-db</module>
+ <module>apache-jena-libs</module>
+
<module>jena-text</module>
- <!--<module>jena-text-es</module>-->
- <module>jena-spatial</module>
- <!--<module>jena-fuseki1</module>-->
+ <!-- <module>jena-text-es</module> -->
+ <!-- <module>jena-spatial</module> -->
+
+ <module>jena-cmds</module>
<module>jena-fuseki2</module>
<module>jena-integration-tests</module>
- <module>jena-permissions</module>
+ <!-- Binary distribution -->
+ <!-- <module>apache-jena</module> -->
- <!-- Slow to build - exclude from dev build -->
- <!-- <module>jena-jdbc</module> -->
+ <!-- <module>jena-fuseki1</module> -->
+ <!-- <module>jena-csv</module> -->
+ <!-- <module>jena-sdb</module> -->
<!-- <module>jena-maven-tools</module> -->
- <!-- <module>apache-jena-libs</module> -->
- <!-- <module>apache-jena</module> -->
- <!-- <module>jena-elephas</module> -->
- <!-- <module>jena-extras</module> -->
+
+ <!-- <module>jena-permissions</module> -->
+ <!-- <module>jena-extras</module> -->
+ <!-- <module>jena-jdbc</module> -->
+ <!-- <module>jena-elephas</module> -->
+ <!-- <module>apache-jena-osgi</module> -->
+
</modules>
</profile>
<profile>
- <!-- From the start, up until profile "dev".
+ <!-- Build to get started, up to Fuseki2.
+ Includes modules skipped by "dev".
Use this (or a full build) when building locally
and there are no SNAPSHOTs in the "snapshots" repository.
This profile does a more complete "dev" build,
does not assume anything is already built,
and does not include the longer running modules.
-->
-
<id>bootstrap</id>
<modules>
<module>jena-project</module>
@@ -115,15 +123,17 @@
<module>jena-core</module>
<module>jena-arq</module>
<module>jena-rdfconnection</module>
- <module>jena-tdb</module>
+ <module>jena-tdb</module>
+ <module>jena-db</module>
<module>apache-jena-libs</module>
- <module>jena-cmds</module>
- <module>jena-db</module>
<module>jena-text</module>
<!--<module>jena-text-es</module>-->
<module>jena-spatial</module>
- <!--<module>jena-fuseki1</module>-->
+
+ <module>jena-cmds</module>
<module>jena-fuseki2</module>
+
+ <module>jena-integration-tests</module>
</modules>
</profile>
@@ -141,30 +151,29 @@
</property>
</activation>
<modules>
+ <!-- Parent - maven setup -->
<module>jena-project</module>
+
+ <!-- Basic modules -->
<module>jena-shaded-guava</module>
<module>jena-iri</module>
<module>jena-base</module>
+ <!-- Main modules -->
<module>jena-core</module>
<module>jena-arq</module>
<module>jena-rdfconnection</module>
<module>jena-tdb</module>
+ <module>jena-db</module>
<module>apache-jena-libs</module>
- <module>jena-cmds</module>
<module>jena-text</module>
<module>jena-text-es</module>
<module>jena-spatial</module>
- <module>jena-csv</module>
- <module>jena-sdb</module>
-
- <module>jena-fuseki1</module>
+ <module>jena-cmds</module>
<module>jena-fuseki2</module>
- <module>apache-jena</module>
-
<!--
Tests of artifacts that require additional
modules built later in the build process.
@@ -172,12 +181,21 @@
test remote client APIs.
-->
<module>jena-integration-tests</module>
+
+ <!-- Binary distribution -->
+ <module>apache-jena</module>
+
+ <!-- Old modules -->
+ <module>jena-fuseki1</module>
+ <module>jena-csv</module>
+ <module>jena-sdb</module>
+ <module>jena-maven-tools</module>
+ <!-- Other -->
<module>jena-permissions</module>
<module>jena-extras</module>
- <module>jena-maven-tools</module>
-
+ <!-- Slow building modules -->
<module>jena-jdbc</module>
<module>jena-elephas</module>
<module>apache-jena-osgi</module>