This is an automated email from the ASF dual-hosted git repository.
andy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git
The following commit(s) were added to refs/heads/main by this push:
new 1fb4c11901 GH-2160: Include jena-ontapi in distributions
1fb4c11901 is described below
commit 1fb4c119011f8ef9b758ce30023fd484216720aa
Author: Andy Seaborne <[email protected]>
AuthorDate: Sat Jul 6 15:41:41 2024 +0100
GH-2160: Include jena-ontapi in distributions
---
apache-jena-libs/pom.xml | 6 +++++
apache-jena/pom.xml | 22 ++++++++++++---
jena-bom/pom.xml | 6 +++++
jena-cmds/pom.xml | 31 ++++++++++++++++------
.../apache/jena/tdb1/setup/StoreParamsDynamic.java | 20 +++++++-------
.../jena/tdb2/params/StoreParamsDynamic.java | 6 +++--
6 files changed, 68 insertions(+), 23 deletions(-)
diff --git a/apache-jena-libs/pom.xml b/apache-jena-libs/pom.xml
index 496e47f8f2..99e92a2bad 100644
--- a/apache-jena-libs/pom.xml
+++ b/apache-jena-libs/pom.xml
@@ -49,6 +49,12 @@
<version>5.1.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-ontapi</artifactId>
+ <version>5.1.0-SNAPSHOT</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-shacl</artifactId>
diff --git a/apache-jena/pom.xml b/apache-jena/pom.xml
index 619de52dc5..90a8d5deb6 100644
--- a/apache-jena/pom.xml
+++ b/apache-jena/pom.xml
@@ -56,27 +56,41 @@
-->
<dependency>
<groupId>org.apache.jena</groupId>
- <artifactId>jena-arq</artifactId>
+ <artifactId>jena-core</artifactId>
<version>5.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
- <artifactId>jena-arq</artifactId>
+ <artifactId>jena-core</artifactId>
<version>5.1.0-SNAPSHOT</version>
<classifier>sources</classifier>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-ontapi</artifactId>
+ <version>5.1.0-SNAPSHOT</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.jena</groupId>
- <artifactId>jena-core</artifactId>
+ <artifactId>jena-ontapi</artifactId>
<version>5.1.0-SNAPSHOT</version>
+ <classifier>sources</classifier>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
- <artifactId>jena-core</artifactId>
+ <artifactId>jena-arq</artifactId>
+ <version>5.1.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-arq</artifactId>
<version>5.1.0-SNAPSHOT</version>
<classifier>sources</classifier>
<optional>true</optional>
diff --git a/jena-bom/pom.xml b/jena-bom/pom.xml
index 004cd614e9..8c1c905b4c 100644
--- a/jena-bom/pom.xml
+++ b/jena-bom/pom.xml
@@ -54,6 +54,12 @@
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-ontapi</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-arq</artifactId>
diff --git a/jena-cmds/pom.xml b/jena-cmds/pom.xml
index 68da11b6e4..75d8f755b5 100644
--- a/jena-cmds/pom.xml
+++ b/jena-cmds/pom.xml
@@ -51,26 +51,39 @@
<dependencies>
<!--
- This works ...
- except it breaks javadoc:javadoc building with Java11.
- But it does work if Java17 is used for the build
+ Does not work.
+ Breaks javadoc production in modules like jena-text
+ This makes the downstream brittle because it requires
+ downstream to adapt.
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>apache-jena-libs</artifactId>
- <version>4.7.0-SNAPSHOT</version>
+ <version>VERSION</version>
<type>pom</type>
</dependency>
-->
+ <!--
+ Places with commands.
+ Avoids depending on apache-jena-libs with its <type>pom</type>
+ -->
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-core</artifactId>
+ <version>5.1.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-arq</artifactId>
+ <version>5.1.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-rdfpatch</artifactId>
- <version>5.1.0-SNAPSHOT</version>
+ <version>5.1.0-SNAPSHOT</version>
</dependency>
- <!-- Copied from apache-jena-libs
- to avoid <type>pom</type>
- -->
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-shacl</artifactId>
@@ -101,6 +114,8 @@
<version>5.1.0-SNAPSHOT</version>
</dependency>
+ <!-- End places with commands -->
+
<dependency>
<artifactId>commons-cli</artifactId>
<groupId>commons-cli</groupId>
diff --git
a/jena-tdb1/src/main/java/org/apache/jena/tdb1/setup/StoreParamsDynamic.java
b/jena-tdb1/src/main/java/org/apache/jena/tdb1/setup/StoreParamsDynamic.java
index 0e1764de44..e473d26f7d 100644
--- a/jena-tdb1/src/main/java/org/apache/jena/tdb1/setup/StoreParamsDynamic.java
+++ b/jena-tdb1/src/main/java/org/apache/jena/tdb1/setup/StoreParamsDynamic.java
@@ -21,16 +21,16 @@ package org.apache.jena.tdb1.setup;
import org.apache.jena.tdb1.base.block.FileMode;
/** Store parameters that can be adjusted after a store has been created,
- * and given different values when the JVM attaches to a store area.
- * (They are still fixed for any given database once created in a JVM.)
+ * and given different values when the JVM attaches to a store area.
+ * (They are still fixed for any given database once created in a JVM.)
*/
public interface StoreParamsDynamic {
-
- /** Store-wide file access mode */
+
+ /** Store-wide file access mode */
public FileMode getFileMode() ;
public boolean isSetFileMode() ;
-
+
/** Block read cache (note: mapped files do not have a block cache) */
public Integer getBlockReadCacheSize() ;
public boolean isSetBlockReadCacheSize() ;
@@ -38,11 +38,11 @@ public interface StoreParamsDynamic {
/** Block write cache (note: mapped files do not have a block cache) */
public Integer getBlockWriteCacheSize() ;
public boolean isSetBlockWriteCacheSize() ;
-
+
/** Node cache for Node{@literal ->}NodeId. */
public Integer getNode2NodeIdCacheSize() ;
public boolean isSetNode2NodeIdCacheSize() ;
-
+
/** Node cache for NodeId{@literal ->}Node. Important for SPARQL results.
*/
public Integer getNodeId2NodeCacheSize() ;
public boolean isSetNodeId2NodeCacheSize() ;
@@ -53,8 +53,10 @@ public interface StoreParamsDynamic {
/**
* Initial capacity factor for node caches:
- * - if >= 0.0: initial capacity is set to the (maximum) size of the
cache multiplied by the factor
- * - if < 0.0: no initial capacity is set on the cache, i.e. its
internal default is used
+ * <ul>
+ * <li>if >= 0.0: initial capacity is set to the (maximum) size of the
cache multiplied by the factor</li>
+ * <li>if < 0.0: no initial capacity is set on the cache, i.e. its
internal default is used</li>
+ * </ul>
*/
public Double getNodeCacheInitialCapacityFactor();
public boolean isSetNodeCacheInitialCapacityFactor();
diff --git
a/jena-tdb2/src/main/java/org/apache/jena/tdb2/params/StoreParamsDynamic.java
b/jena-tdb2/src/main/java/org/apache/jena/tdb2/params/StoreParamsDynamic.java
index a1a0821b09..2c97d1d1c6 100644
---
a/jena-tdb2/src/main/java/org/apache/jena/tdb2/params/StoreParamsDynamic.java
+++
b/jena-tdb2/src/main/java/org/apache/jena/tdb2/params/StoreParamsDynamic.java
@@ -70,8 +70,10 @@ public interface StoreParamsDynamic {
/**
* Initial capacity factor for node caches:
- * - if >= 0.0: initial capacity is set to the (maximum) size of the
cache multiplied by the factor
- * - if < 0.0: no initial capacity is set on the cache, i.e. its
internal default is used
+ * <ul>
+ * <li>if >= 0.0: initial capacity is set to the (maximum) size of the
cache multiplied by the factor</li>
+ * <li>if < 0.0: no initial capacity is set on the cache, i.e. its
internal default is used</li>
+ * </ul>
*/
public Double getNodeCacheInitialCapacityFactor();
public boolean isSetNodeCacheInitialCapacityFactor();
