[Git][java-team/openrefine][master] 20 commits: Update openrefine.poms
Markus Koschany (@apo)
gitlab at salsa.debian.org
Mon Oct 11 20:24:29 BST 2021
Markus Koschany pushed to branch master at Debian Java Maintainers / openrefine
Commits:
629ec549 by Markus Koschany at 2021-10-10T15:13:18+02:00
Update openrefine.poms
- - - - -
3a471a8d by Markus Koschany at 2021-10-10T15:22:29+02:00
Build the sample extension
- - - - -
1cad73ce by Markus Koschany at 2021-10-10T15:31:54+02:00
Test
- - - - -
cda7f959 by Markus Koschany at 2021-10-10T15:33:26+02:00
Build-depend on jython
- - - - -
5ce9d454 by Markus Koschany at 2021-10-10T15:35:50+02:00
Start with enabling the Jython module.
- - - - -
14519258 by Markus Koschany at 2021-10-10T15:43:27+02:00
Enable gdata extension
- - - - -
de6c4632 by Markus Koschany at 2021-10-10T15:46:33+02:00
Build-depend on libjackson2-core-java for gdata extension
- - - - -
830940ea by Markus Koschany at 2021-10-10T15:47:06+02:00
Build-depend on libgoogle-api-client-java for gdata extension
- - - - -
60199320 by Markus Koschany at 2021-10-10T15:47:58+02:00
Ignore test dependency org.mockito mockito-core
- - - - -
edbd77cf by Markus Koschany at 2021-10-11T12:34:53+02:00
Add new Google build-dependencies.
- - - - -
b2768ff1 by Markus Koschany at 2021-10-11T12:51:00+02:00
Don't ignore the extensions' pom file.
- - - - -
7b277fae by Markus Koschany at 2021-10-11T13:12:27+02:00
Add a maven rule for jackson-core artifact
- - - - -
f3c1f09b by Markus Koschany at 2021-10-11T13:36:45+02:00
Add google-http-client-jackson2.patch
- - - - -
1acdc3f0 by Markus Koschany at 2021-10-11T14:18:27+02:00
Build-depend on libgoogle-oauth-client-java
- - - - -
7da58457 by Markus Koschany at 2021-10-11T14:21:02+02:00
Enable pc-axis extension module
- - - - -
1ab2df84 by Markus Koschany at 2021-10-11T14:22:26+02:00
Enable phonetic extension module
- - - - -
0ca122c5 by Markus Koschany at 2021-10-11T14:25:13+02:00
Enable wikidata extension
- - - - -
e9c08e51 by Markus Koschany at 2021-10-11T20:28:43+02:00
Build-depend on libwikidata-toolkit-java
- - - - -
d5c29148 by Markus Koschany at 2021-10-11T20:32:30+02:00
Update maven.rules
- - - - -
d7ef55f1 by Markus Koschany at 2021-10-11T20:37:20+02:00
Add openrefine main test jar to ignoreRules
- - - - -
6 changed files:
- debian/control
- debian/maven.ignoreRules
- debian/maven.rules
- debian/openrefine.poms
- + debian/patches/google-http-client-jackson2.patch
- debian/patches/series
Changes:
=====================================
debian/control
=====================================
@@ -7,6 +7,7 @@ Uploaders:
Build-Depends:
debhelper-compat (= 13),
default-jdk,
+ jython,
libactivation-java,
libapache-jena-java,
libapache-poi-java,
@@ -21,11 +22,17 @@ Build-Depends:
libcommons-text-java,
libcommons-validator-java,
libexec-maven-plugin-java,
+ libgoogle-api-client-java,
+ libgoogle-http-client-java,
+ libgoogle-oauth-client-java,
+ libgoogle-api-services-drive-java,
+ libgoogle-api-services-sheets-java,
libguava-java,
libhttpclient-java,
libhttpclient5-java,
libhttpcore-java,
libhttpmime-java,
+ libjackson2-core-java,
libjackson2-databind-java,
libjaxb-api-java,
libjetty9-java,
@@ -52,6 +59,7 @@ Build-Depends:
libsweble-common-java,
libsweble-wikitext-java,
libtomcat9-java,
+ libwikidata-toolkit-java,
libxtc-rats-java,
maven-debian-helper,
velocity
=====================================
debian/maven.ignoreRules
=====================================
@@ -1,6 +1,5 @@
org.openrefine benchmark jar * * *
-org.openrefine extensions pom * * *
org.openrefine packaging jar * * *
org.apache.maven.plugins maven-surefire-plugin * * * *
org.eluder.coveralls coveralls-maven-plugin * * * *
@@ -11,3 +10,5 @@ org.testng testng * * * *
org.powermock * * * * *
org.openrefine.dependencies jdatapath * * * *
org.openrefine main pom * * *
+org.mockito mockito-core * * * *
+org.openrefine main test-jar * tests *
=====================================
debian/maven.rules
=====================================
@@ -15,9 +15,16 @@ org.mozilla s/rhino-runtime/rhino/ * s/.*/debian/ * *
org.sonatype.aether aether-connector-wagon * s/.*/debian/ * *
org.eclipse.jetty jetty-* * s/.*/9.x/ * *
com.fasterxml.jackson.core jackson-annotations * s/.*/2.x/ * *
+com.fasterxml.jackson.core jackson-core * s/.*/2.x/ * *
s/velocity/org.apache.velocity/ velocity * s/.*/debian/ * *
org.clojure clojure * s/.*/1.10.x/ * *
commons-collections commons-collections jar s/3\..*/3.x/ * *
org.apache.jena jena-tdb2 jar s/.*/debian/ * *
org.apache.jena jena-dboe-storage jar s/.*/debian/ * *
org.apache.jena jena-dboe-base jar s/.*/debian/ * *
+
+# Extensions
+org.python s/jython-standalone/jython/ * s/.*/debian/ * *
+s/org.openrefine.dependencies.wdtk/org.wikidata.wdtk/ wdtk-datamodel * s/.*/debian/ * *
+s/org.openrefine.dependencies.wdtk/org.wikidata.wdtk/ wdtk-util * s/.*/debian/ * *
+s/org.openrefine.dependencies.wdtk/org.wikidata.wdtk/ wdtk-wikibaseapi * s/.*/debian/ * *
=====================================
debian/openrefine.poms
=====================================
@@ -28,6 +28,12 @@
pom.xml
main/pom.xml
server/pom.xml
-extensions/pom.xml --ignore
+extensions/pom.xml
+extensions/database/pom.xml --ignore
+extensions/gdata/pom.xml
+extensions/jython/pom.xml
+extensions/pc-axis/pom.xml
+extensions/phonetic/pom.xml
+extensions/wikidata/pom.xml
packaging/pom.xml --ignore
benchmark/pom.xml --ignore
=====================================
debian/patches/google-http-client-jackson2.patch
=====================================
@@ -0,0 +1,29 @@
+From: Markus Koschany <apo at debian.org>
+Date: Mon, 11 Oct 2021 13:36:19 +0200
+Subject: google-http-client-jackson2
+
+---
+ extensions/gdata/pom.xml | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/extensions/gdata/pom.xml b/extensions/gdata/pom.xml
+index 49dff2c..2ae80d6 100644
+--- a/extensions/gdata/pom.xml
++++ b/extensions/gdata/pom.xml
+@@ -136,6 +136,16 @@
+ <artifactId>google-api-services-sheets</artifactId>
+ <version>v4-rev20200922-1.30.10</version>
+ </dependency>
++ <dependency>
++ <groupId>com.google.http-client</groupId>
++ <artifactId>google-http-client-jackson2</artifactId>
++ <version>1.40.1</version>
++ </dependency>
++ <dependency>
++ <groupId>com.google.oauth-client</groupId>
++ <artifactId>google-oauth-client</artifactId>
++ <version>1.40.1</version>
++ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
=====================================
debian/patches/series
=====================================
@@ -2,3 +2,4 @@ build.patch
jdatapath.patch
openrefine-bin.patch
no-java-files.patch
+google-http-client-jackson2.patch
View it on GitLab: https://salsa.debian.org/java-team/openrefine/-/compare/92486b190889f6f8834448055746d315a33834e4...d7ef55f1ea2240802a09213d3e231bafa65f9805
--
View it on GitLab: https://salsa.debian.org/java-team/openrefine/-/compare/92486b190889f6f8834448055746d315a33834e4...d7ef55f1ea2240802a09213d3e231bafa65f9805
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/20211011/fa581d16/attachment.htm>
More information about the pkg-java-commits
mailing list