[Git][java-team/apache-jena][experimental] 8 commits: B-D on libtitanium-json-ld-java
Markus Koschany (@apo)
gitlab at salsa.debian.org
Wed Aug 24 17:17:07 BST 2022
Markus Koschany pushed to branch experimental at Debian Java Maintainers / apache-jena
Commits:
29573d22 by Markus Koschany at 2022-08-18T20:42:59+02:00
B-D on libtitanium-json-ld-java
- - - - -
649f17e8 by Markus Koschany at 2022-08-18T20:44:30+02:00
Remove titanium from ignore rules
- - - - -
5a9973fc by Markus Koschany at 2022-08-18T20:47:33+02:00
B-D on libjsonp2-java
- - - - -
be3a5975 by Markus Koschany at 2022-08-18T20:48:49+02:00
Readd maven ignore rule
- - - - -
fb511547 by Markus Koschany at 2022-08-18T21:00:07+02:00
Add maven rule for jakarta.json
- - - - -
7a7d952e by Markus Koschany at 2022-08-18T21:05:00+02:00
Tighten dependency on libthrift-java
- - - - -
dc9e4673 by Markus Koschany at 2022-08-24T18:10:52+02:00
Add jena-db.patch
- - - - -
509f2594 by Markus Koschany at 2022-08-24T18:12:43+02:00
Don't ignore jena-shex
- - - - -
9 changed files:
- debian/control
- debian/libapache-jena-java.poms
- debian/maven.ignoreRules
- debian/maven.rules
- debian/patches/debian-system-guava.patch
- debian/patches/fuseki2-geosparql.patch
- + debian/patches/jena-db.patch
- debian/patches/jena-tdb2-javadoc.patch
- debian/patches/series
Changes:
=====================================
debian/control
=====================================
@@ -19,11 +19,13 @@ Build-Depends:
libguava-java,
libjackson2-databind-java,
libjsonld-java,
+ libjsonp2-java,
liblog4j2-java,
libmaven-bundle-plugin-java,
libprotobuf-java,
libslf4j-java,
- libthrift-java,
+ libthrift-java (>= 0.16.0),
+ libtitanium-json-ld-java,
maven-debian-helper
Standards-Version: 4.5.1
Vcs-Git: https://salsa.debian.org/java-team/apache-jena.git
=====================================
debian/libapache-jena-java.poms
=====================================
@@ -63,5 +63,5 @@ jena-permissions/pom.xml --ignore
jena-extras/pom.xml --ignore
jena-jdbc/pom.xml --ignore
jena-examples/pom.xml --ignore
-jena-shex/pom.xml --ignore
+jena-shex/pom.xml
=====================================
debian/maven.ignoreRules
=====================================
@@ -28,10 +28,8 @@ org.apache.jena jena-base jar * tests *
org.apache.jena jena-core jar * tests *
org.apache.jena jena-arq jar * tests *
org.apache.jena jena-shacl jar * tests *
-com.apicatalog titanium-json-ld * * * *
org.glassfish jakarta.json * * * *
-
org.graalvm.js * * * * *
org.python jython-standalone * * * *
=====================================
debian/maven.rules
=====================================
@@ -48,3 +48,4 @@ s/org.apache.jena/com.google.guava/ s/jena-shaded-guava/guava/ * s/.*/debian/ *
com.fasterxml.jackson.core jackson-databind * s/.*/2.x/ * *
s/org.apache.jena.ext.com.google.common/com.google.common/ * * s/.*/debian/ * *
+s/org.glassfish/jakarta.json/ s/jakarta.json/jakarta.json-api/ * * s/.*/debian/ * *
=====================================
debian/patches/debian-system-guava.patch
=====================================
@@ -2973,7 +2973,7 @@ index 71db913..aa5d6b5 100644
public class IndexTestLib {
diff --git a/jena-db/jena-dboe-trans-data/src/main/java/org/apache/jena/dboe/trans/bplustree/BlockTracker.java b/jena-db/jena-dboe-trans-data/src/main/java/org/apache/jena/dboe/trans/bplustree/BlockTracker.java
-index 8f54a9e..8b5b4f9 100644
+index 54cdada..349e098 100644
--- a/jena-db/jena-dboe-trans-data/src/main/java/org/apache/jena/dboe/trans/bplustree/BlockTracker.java
+++ b/jena-db/jena-dboe-trans-data/src/main/java/org/apache/jena/dboe/trans/bplustree/BlockTracker.java
@@ -39,8 +39,8 @@ import org.apache.jena.dboe.base.block.Block;
@@ -3029,7 +3029,7 @@ index 03540ca..e3bc767 100644
public class DateTimeNode
{
diff --git a/jena-fuseki2/jena-fuseki-access/src/main/java/org/apache/jena/fuseki/access/AssemblerSecurityRegistry.java b/jena-fuseki2/jena-fuseki-access/src/main/java/org/apache/jena/fuseki/access/AssemblerSecurityRegistry.java
-index 3461ac1..fdc4483 100644
+index 92bdf05..60823fe 100644
--- a/jena-fuseki2/jena-fuseki-access/src/main/java/org/apache/jena/fuseki/access/AssemblerSecurityRegistry.java
+++ b/jena-fuseki2/jena-fuseki-access/src/main/java/org/apache/jena/fuseki/access/AssemblerSecurityRegistry.java
@@ -29,8 +29,8 @@ import org.apache.jena.assembler.Mode;
@@ -3057,7 +3057,7 @@ index 83ac976..a51f091 100644
/** Dump the HTTP request */
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/DataService.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/DataService.java
-index 682d504..76cbc04 100644
+index 0f92122..9a73381 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/DataService.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/DataService.java
@@ -28,8 +28,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
@@ -3126,7 +3126,7 @@ index f597918..4a6733c 100644
import org.apache.jena.graph.Node;
import org.apache.jena.query.Query;
diff --git a/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/SparqlValidation.java b/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/SparqlValidation.java
-index 604d682..b9ae261 100644
+index d5f46d2..8f47dc6 100644
--- a/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/SparqlValidation.java
+++ b/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/SparqlValidation.java
@@ -24,7 +24,7 @@ import java.util.regex.Matcher;
@@ -3139,7 +3139,7 @@ index 604d682..b9ae261 100644
import org.apache.jena.graph.Node;
import org.apache.jena.graph.NodeFactory;
diff --git a/jena-shacl/src/main/java/org/apache/jena/shacl/parser/ConstraintComponents.java b/jena-shacl/src/main/java/org/apache/jena/shacl/parser/ConstraintComponents.java
-index 1d48b00..5742e78 100644
+index cd58dd1..ac7eb2d 100644
--- a/jena-shacl/src/main/java/org/apache/jena/shacl/parser/ConstraintComponents.java
+++ b/jena-shacl/src/main/java/org/apache/jena/shacl/parser/ConstraintComponents.java
@@ -24,8 +24,8 @@ import static org.apache.jena.shacl.lib.ShLib.displayStr;
@@ -3154,7 +3154,7 @@ index 1d48b00..5742e78 100644
import org.apache.jena.graph.Node;
import org.apache.jena.riot.other.G;
diff --git a/jena-shacl/src/main/java/org/apache/jena/shacl/parser/Parameters.java b/jena-shacl/src/main/java/org/apache/jena/shacl/parser/Parameters.java
-index c6d0313..987125c 100644
+index 196e843..36abe0a 100644
--- a/jena-shacl/src/main/java/org/apache/jena/shacl/parser/Parameters.java
+++ b/jena-shacl/src/main/java/org/apache/jena/shacl/parser/Parameters.java
@@ -23,8 +23,8 @@ import static org.apache.jena.shacl.sys.C.TRUE;
@@ -3242,7 +3242,7 @@ index d3a2d86..6f68b39 100644
import org.apache.jena.rdf.model.Resource ;
import org.apache.lucene.analysis.Analyzer ;
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java b/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java
-index a304051..5969c9a 100644
+index 178f6f7..4d85d99 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java
@@ -31,9 +31,9 @@ import org.apache.jena.atlas.lib.CacheFactory ;
=====================================
debian/patches/fuseki2-geosparql.patch
=====================================
@@ -10,10 +10,10 @@ It is currently not possible to ignore this module with a debian/*.poms file.
1 file changed, 1 deletion(-)
diff --git a/pom.xml b/pom.xml
-index c4fff46..b188258 100644
+index 15733b4..7e2e88d 100644
--- a/pom.xml
+++ b/pom.xml
-@@ -234,7 +234,6 @@
+@@ -244,7 +244,6 @@
<module>jena-fuseki2</module>
<module>jena-geosparql</module>
=====================================
debian/patches/jena-db.patch
=====================================
@@ -0,0 +1,115 @@
+From: Markus Koschany <apo at debian.org>
+Date: Wed, 24 Aug 2022 18:10:43 +0200
+Subject: jena-db
+
+---
+ jena-db/jena-dboe-base/pom.xml | 8 --------
+ jena-db/jena-dboe-storage/pom.xml | 8 --------
+ jena-db/jena-dboe-trans-data/pom.xml | 15 ---------------
+ jena-db/jena-tdb2/pom.xml | 16 ----------------
+ jena-db/pom.xml | 1 -
+ 5 files changed, 48 deletions(-)
+
+diff --git a/jena-db/jena-dboe-base/pom.xml b/jena-db/jena-dboe-base/pom.xml
+index a97b05c..5d4d498 100644
+--- a/jena-db/jena-dboe-base/pom.xml
++++ b/jena-db/jena-dboe-base/pom.xml
+@@ -42,14 +42,6 @@
+ <version>4.5.0</version>
+ </dependency>
+
+- <dependency>
+- <groupId>org.apache.jena</groupId>
+- <artifactId>jena-arq</artifactId>
+- <version>4.5.0</version>
+- <classifier>tests</classifier>
+- <scope>test</scope>
+- </dependency>
+-
+ </dependencies>
+
+ <build>
+diff --git a/jena-db/jena-dboe-storage/pom.xml b/jena-db/jena-dboe-storage/pom.xml
+index d27a312..9e6dcb4 100644
+--- a/jena-db/jena-dboe-storage/pom.xml
++++ b/jena-db/jena-dboe-storage/pom.xml
+@@ -44,14 +44,6 @@
+ <version>4.5.0</version>
+ </dependency>
+
+- <dependency>
+- <groupId>org.apache.jena</groupId>
+- <artifactId>jena-arq</artifactId>
+- <version>4.5.0</version>
+- <classifier>tests</classifier>
+- <scope>test</scope>
+- </dependency>
+-
+ </dependencies>
+
+ <scm>
+diff --git a/jena-db/jena-dboe-trans-data/pom.xml b/jena-db/jena-dboe-trans-data/pom.xml
+index bacec20..dd2cd3e 100644
+--- a/jena-db/jena-dboe-trans-data/pom.xml
++++ b/jena-db/jena-dboe-trans-data/pom.xml
+@@ -47,21 +47,6 @@
+ <version>4.5.0</version>
+ </dependency>
+
+- <dependency>
+- <groupId>org.apache.jena</groupId>
+- <artifactId>jena-dboe-index-test</artifactId>
+- <version>4.5.0</version>
+- <scope>test</scope>
+- </dependency>
+-
+- <dependency>
+- <groupId>org.apache.jena</groupId>
+- <artifactId>jena-dboe-base</artifactId>
+- <version>4.5.0</version>
+- <classifier>tests</classifier>
+- <scope>test</scope>
+- </dependency>
+-
+ </dependencies>
+
+ <build>
+diff --git a/jena-db/jena-tdb2/pom.xml b/jena-db/jena-tdb2/pom.xml
+index f93edae..031e304 100644
+--- a/jena-db/jena-tdb2/pom.xml
++++ b/jena-db/jena-tdb2/pom.xml
+@@ -44,22 +44,6 @@
+ <version>4.5.0</version>
+ </dependency>
+
+- <dependency>
+- <groupId>org.apache.jena</groupId>
+- <artifactId>jena-core</artifactId>
+- <version>4.5.0</version>
+- <classifier>tests</classifier>
+- <scope>test</scope>
+- </dependency>
+-
+- <dependency>
+- <groupId>org.apache.jena</groupId>
+- <artifactId>jena-arq</artifactId>
+- <version>4.5.0</version>
+- <classifier>tests</classifier>
+- <scope>test</scope>
+- </dependency>
+-
+ </dependencies>
+
+ <build>
+diff --git a/jena-db/pom.xml b/jena-db/pom.xml
+index 2ed0546..414a939 100644
+--- a/jena-db/pom.xml
++++ b/jena-db/pom.xml
+@@ -44,7 +44,6 @@
+ <module>jena-dboe-base</module>
+ <module>jena-dboe-transaction</module>
+ <module>jena-dboe-index</module>
+- <module>jena-dboe-index-test</module>
+ <module>jena-dboe-trans-data</module>
+ <module>jena-dboe-storage</module>
+ <module>jena-tdb2</module>
=====================================
debian/patches/jena-tdb2-javadoc.patch
=====================================
@@ -7,7 +7,7 @@ Subject: jena-tdb2 javadoc
1 file changed, 14 deletions(-)
diff --git a/jena-db/jena-tdb2/pom.xml b/jena-db/jena-tdb2/pom.xml
-index db431db..092fe85 100644
+index 4ed35fa..f93edae 100644
--- a/jena-db/jena-tdb2/pom.xml
+++ b/jena-db/jena-tdb2/pom.xml
@@ -105,20 +105,6 @@
=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
jena-tdb2-javadoc.patch
debian-system-guava.patch
fuseki2-geosparql.patch
+jena-db.patch
View it on GitLab: https://salsa.debian.org/java-team/apache-jena/-/compare/f72aa79b773b725bc4e478604821fef624537b21...509f25941d93b7b239b93452f81162f8d4ce090a
--
View it on GitLab: https://salsa.debian.org/java-team/apache-jena/-/compare/f72aa79b773b725bc4e478604821fef624537b21...509f25941d93b7b239b93452f81162f8d4ce090a
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20220824/4bd2fc1f/attachment.htm>
More information about the pkg-java-commits
mailing list