[Git][java-team/apache-jena][master] 5 commits: Remove workaround for jena-tdb2 and B-D on libapache-jena-java.

[Markus Koschany (@apo)]

Markus Koschany pushed to branch master at Debian Java Maintainers / apache-jena


Commits:
90dd9e24 by Markus Koschany at 2021-05-02T16:53:42+02:00
Remove workaround for jena-tdb2 and B-D on libapache-jena-java.

- - - - -
d67bebda by Markus Koschany at 2021-05-02T17:01:00+02:00
Add jena-tdb2-javadoc.patch

- - - - -
c11cb71c by Markus Koschany at 2022-01-06T21:58:27+01:00
Update debian/copyright and document that DAWG and DAWG-Final directories are

also licensed under the W3C Software license.

- - - - -
9a887253 by Markus Koschany at 2022-02-07T22:43:43+01:00
Merge branch 'test'

- - - - -
c0040737 by Markus Koschany at 2022-02-07T22:46:13+01:00
Update changelog

- - - - -


5 changed files:

- debian/changelog
- debian/control
- debian/copyright
- debian/patches/jena-tdb2.patch → debian/patches/jena-tdb2-javadoc.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+apache-jena (3.17.0-2) unstable; urgency=medium
+
+  * Remove workaround for jena-tdb2 and B-D on libapache-jena-java.
+  * Add jena-tdb2-javadoc.patch.
+  * Update debian/copyright and document that DAWG and DAWG-Final directories
+    are also licensed under the W3C Software license.
+
+ -- Markus Koschany <apo at debian.org>  Mon, 07 Feb 2022 22:44:42 +0100
+
 apache-jena (3.17.0-1) unstable; urgency=medium
 
   * Initial release. (Closes: #986605)


=====================================
debian/control
=====================================
@@ -8,6 +8,7 @@ Build-Depends:
  debhelper-compat (= 13),
  default-jdk,
  libapache-pom-java,
+ libapache-jena-java,
  libcommons-cli-java,
  libcommons-codec-java,
  libcommons-compress-java,


=====================================
debian/copyright
=====================================
@@ -12,6 +12,8 @@ Files: jena-arq/testing/RIOT/Lang/NQuadsStd/*
        jena-arq/testing/RIOT/Lang/NTriplesStd/*
        jena-arq/testing/RIOT/Lang/TrigStd/*
        jena-arq/testing/RIOT/Lang/TurtleStd/*
+       jena-arq/testing/DAWG/*
+       jena-arq/testing/DAWG-Final/*
 Copyright: 2014, W3C Working Group
 License: W3C-Software-License
 


=====================================
debian/patches/jena-tdb2.patch → debian/patches/jena-tdb2-javadoc.patch
=====================================
@@ -1,49 +1,11 @@
 From: Markus Koschany <apo at debian.org>
-Date: Mon, 5 Apr 2021 21:06:57 +0200
-Subject: jena-tdb2
+Date: Sun, 2 May 2021 17:00:46 +0200
+Subject: jena-tdb2 javadoc
 
-Forwarded: not-needed
-
-Workaround to fix a FTBFS. The tdb2 artifact is not found which is also related
-to the fact that maven-debian-helper seems to get confused by modules inside
-modules.
 ---
- apache-jena-libs/pom.xml  | 19 +++++++++++++++++++
  jena-db/jena-tdb2/pom.xml | 14 --------------
- 2 files changed, 19 insertions(+), 14 deletions(-)
+ 1 file changed, 14 deletions(-)
 
-diff --git a/apache-jena-libs/pom.xml b/apache-jena-libs/pom.xml
-index d8372e3..280ee13 100644
---- a/apache-jena-libs/pom.xml
-+++ b/apache-jena-libs/pom.xml
-@@ -54,8 +54,27 @@
-       <groupId>org.apache.jena</groupId>
-       <artifactId>jena-tdb2</artifactId>
-       <version>3.17.0</version>
-+      <scope>system</scope>
-+    <systemPath>${user.dir}/jena-db/jena-tdb2/target/jena-tdb2-3.17.0.jar</systemPath>
-     </dependency>
- 
-+    <dependency>
-+      <groupId>org.apache.jena</groupId>
-+      <artifactId>jena-dboe-base</artifactId>
-+      <version>3.17.0</version>
-+      <scope>system</scope>
-+    <systemPath>${user.dir}/jena-db/jena-dboe-base/target/jena-dboe-base-3.17.0.jar</systemPath>
-+    </dependency>
-+
-+    <dependency>
-+      <groupId>org.apache.jena</groupId>
-+      <artifactId>jena-dboe-storage</artifactId>
-+      <version>3.17.0</version>
-+      <scope>system</scope>
-+    <systemPath>${user.dir}/jena-db/jena-dboe-storage/target/jena-dboe-storage-3.17.0.jar</systemPath>
-+    </dependency>
-+
-+
-     <dependency>
-       <groupId>org.apache.jena</groupId>
-       <artifactId>jena-rdfconnection</artifactId>
 diff --git a/jena-db/jena-tdb2/pom.xml b/jena-db/jena-tdb2/pom.xml
 index ea44fc3..d5ef442 100644
 --- a/jena-db/jena-tdb2/pom.xml


=====================================
debian/patches/series
=====================================
@@ -1,4 +1,4 @@
 debian-system-guava.patch
 jena-db.patch
-jena-tdb2.patch
 fuseki2-geosparql.patch
+jena-tdb2-javadoc.patch



View it on GitLab: https://salsa.debian.org/java-team/apache-jena/-/compare/e93d8c7ef44a8fe0fd7b297af6cbe704caaa3d95...c004073714e0ffda1a76cea9c0ddae8bfa87c60a

-- 
View it on GitLab: https://salsa.debian.org/java-team/apache-jena/-/compare/e93d8c7ef44a8fe0fd7b297af6cbe704caaa3d95...c004073714e0ffda1a76cea9c0ddae8bfa87c60a
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/20220207/e2fe4cac/attachment.htm>