Markus Koschany pushed to branch master at Debian Java Maintainers / openrefine
Commits:
bb324f3b by Markus Koschany at 2023-04-05T19:12:35+02:00
Depend on libjoda-time-java.
Closes: #1022760
Thanks: Robert Jäschke for the report!
- - - - -
d77ba190 by Markus Koschany at 2023-04-05T19:37:45+02:00
Load the refine configuration before parsing the command line options.
Closes: #1033355
Thanks: Robert Jäschke for the report!
- - - - -
59460133 by Markus Koschany at 2023-04-05T20:21:00+02:00
Update changelog
- - - - -
7de582d2 by Markus Koschany at 2023-04-05T21:04:48+02:00
Symlink commons-lang-2.6 into webserver directory to fix another ClassNotFound
exception.
- - - - -
8db62cad by Markus Koschany at 2023-04-05T21:32:31+02:00
Depend on liboro-java.
- - - - -
4 changed files:
- debian/changelog
- debian/control
- debian/patches/openrefine-bin.patch
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+openrefine (3.6.2-2) unstable; urgency=medium
+
+ * Depend on libjoda-time-java and liboro-java.
+ Thanks to Robert Jäschke for the report! (Closes: #1022760)
+ * Load the refine configuration before parsing the command line options.
+ Thanks to Robert Jäschke for the report! (Closes: #1033355)
+ * Symlink commons-lang-2.6 into server directory to fix another
+ ClassNotFound exception.
+
+ -- Markus Koschany <a...@debian.org> Wed, 05 Apr 2023 20:20:17 +0200
+
openrefine (3.6.2-1) unstable; urgency=medium
* New upstream version 3.6.2. (Closes: #1022761)
=====================================
debian/control
=====================================
@@ -81,8 +81,10 @@ Depends:
default-jre | java9-runtime,
libcommons-collections4-java,
libcommons-lang-java,
+ libjoda-time-java,
libjsr305-java,
liblog4j2-java,
+ liboro-java,
procps,
${maven:Depends},
${misc:Depends}
=====================================
debian/patches/openrefine-bin.patch
=====================================
@@ -3,11 +3,11 @@ Date: Wed, 24 Aug 2022 19:59:52 +0200
Subject: openrefine-bin
---
- refine | 14 ++++----------
- 1 file changed, 4 insertions(+), 10 deletions(-)
+ refine | 31 +++++++++++++------------------
+ 1 file changed, 13 insertions(+), 18 deletions(-)
diff --git a/refine b/refine
-index 044670a..10b565f 100755
+index 044670a..3852bf1 100755
--- a/refine
+++ b/refine
@@ -9,7 +9,7 @@
@@ -41,16 +41,40 @@ index 044670a..10b565f 100755
mvn_prepare() {
tools_prepare
-@@ -866,7 +860,7 @@ fi
- # ----- Load configurations -------------------------------------
+@@ -833,6 +827,16 @@ fi
- if [ -z $REFINE_INI_PATH ]; then
-- REFINE_INI_PATH=refine.ini
+ checkJavaMajorVersion
+
++# ----- Load configurations -------------------------------------
++
++if [ -z $REFINE_INI_PATH ]; then
+ REFINE_INI_PATH=/etc/openrefine/refine.ini
++fi
++
++echo "Using ${REFINE_INI_PATH} for configuration"
++load_configs $REFINE_INI_PATH
++
++
+ # ----- Parse the command line args ------------------------------------------
+
+ while [ $# -ne 0 ] ; do
+@@ -863,15 +867,6 @@ if [ -z "$ACTION" ] ; then
+ ACTION="run"
fi
- echo "Using ${REFINE_INI_PATH} for configuration"
-@@ -942,7 +936,7 @@ if [ -z "$REFINE_CLASSES_DIR" ] ; then
+-# ----- Load configurations -------------------------------------
+-
+-if [ -z $REFINE_INI_PATH ]; then
+- REFINE_INI_PATH=refine.ini
+-fi
+-
+-echo "Using ${REFINE_INI_PATH} for configuration"
+-load_configs $REFINE_INI_PATH
+-
+ # ----- Verify and Set Required Environment Variables
-------------------------
+
+ if [ -z "$JAVA_OPTIONS" ] ; then
+@@ -942,7 +937,7 @@ if [ -z "$REFINE_CLASSES_DIR" ] ; then
fi
if [ -z "$REFINE_LIB_DIR" ] ; then
=====================================
debian/rules
=====================================
@@ -4,7 +4,7 @@ LINK_JARS_SERVER := butterfly commons-collections3 commons-io
commons-lang3
LINK_JARS_SERVER += jetty9-servlet jetty9-webapp jetty9-server metaweb-lessen
LINK_JARS_SERVER += jetty9-http jetty9-io jetty9-security jetty9-util
jetty9-xml
LINK_JARS_SERVER += slf4j-api slf4j-log4j12 velocity servlet-api js rhino
log4j-1.2
-LINK_JARS_SERVER += oro
+LINK_JARS_SERVER += oro commons-lang-2.6
LINK_JARS_WEBAPP := ant ant-launcher openrefine-arithcode butterfly clojure
LINK_JARS_WEBAPP += dexx.collection commons-beanutils commons-cli commons-codec
View it on GitLab:
https://salsa.debian.org/java-team/openrefine/-/compare/b32b5f4375e7cd02545716cda159271c9e5f8f24...8db62cad9d893b52ac29c15096e1701bcac02a5a
--
View it on GitLab:
https://salsa.debian.org/java-team/openrefine/-/compare/b32b5f4375e7cd02545716cda159271c9e5f8f24...8db62cad9d893b52ac29c15096e1701bcac02a5a
You're receiving this email because of your account on salsa.debian.org.
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@alioth-lists.debian.net
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
