[Git][java-team/openrefine][master] 3 commits: New upstream version 3.7.7

Markus Koschany (@apo) gitlab at salsa.debian.org
Sun Dec 3 12:06:06 GMT 2023



Markus Koschany pushed to branch master at Debian Java Maintainers / openrefine


Commits:
92a9a07d by Markus Koschany at 2023-12-03T11:50:57+01:00
New upstream version 3.7.7
- - - - -
e225284d by Markus Koschany at 2023-12-03T11:51:07+01:00
Update upstream source from tag 'upstream/3.7.7'

Update to upstream version '3.7.7'
with Debian dir 79e87b289b2af09343083f9b9105de56984de7ab
- - - - -
eccebce3 by Markus Koschany at 2023-12-03T11:51:29+01:00
Update changelog

- - - - -


18 changed files:

- benchmark/pom.xml
- debian/changelog
- extensions/database/pom.xml
- extensions/gdata/pom.xml
- extensions/jython/pom.xml
- extensions/pc-axis/pom.xml
- extensions/phonetic/pom.xml
- extensions/pom.xml
- extensions/wikibase/module/styles/schema-alignment.less
- extensions/wikibase/pom.xml
- main/pom.xml
- main/src/com/google/refine/RefineServlet.java
- main/src/com/google/refine/util/HttpClient.java
- main/tests/server/src/com/google/refine/operations/column/ColumnAdditionByFetchingURLsOperationTests.java
- main/webapp/modules/core/scripts/dialogs/add-column-by-reconciliation.js
- packaging/pom.xml
- pom.xml
- server/pom.xml


Changes:

=====================================
benchmark/pom.xml
=====================================
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>openrefine</artifactId>
     <groupId>org.openrefine</groupId>
-    <version>3.7.6</version>
+    <version>3.7.7</version>
   </parent>
 
   <artifactId>benchmark</artifactId>


=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+openrefine (3.7.7-1) unstable; urgency=medium
+
+  * New upstream version 3.7.7.
+
+ -- Markus Koschany <apo at debian.org>  Sun, 03 Dec 2023 11:51:18 +0100
+
 openrefine (3.7.6-1) unstable; urgency=medium
 
   * New upstream version 3.7.6.


=====================================
extensions/database/pom.xml
=====================================
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.openrefine</groupId>
     <artifactId>extensions</artifactId>
-    <version>3.7.6</version>
+    <version>3.7.7</version>
   </parent>
 
   <build>


=====================================
extensions/gdata/pom.xml
=====================================
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.openrefine</groupId>
     <artifactId>extensions</artifactId>
-    <version>3.7.6</version>
+    <version>3.7.7</version>
   </parent>
 
   <properties>


=====================================
extensions/jython/pom.xml
=====================================
@@ -5,7 +5,7 @@
   <groupId>org.openrefine</groupId>
   <artifactId>jython</artifactId>
   <packaging>jar</packaging>
-  <version>3.7.6</version>
+  <version>3.7.7</version>
 
   <name>OpenRefine - Jython extension</name>
   <description>OpenRefine integration of Python as an expression language</description>
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.openrefine</groupId>
     <artifactId>extensions</artifactId>
-    <version>3.7.6</version>
+    <version>3.7.7</version>
   </parent>
 
   <build>


=====================================
extensions/pc-axis/pom.xml
=====================================
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.openrefine</groupId>
     <artifactId>extensions</artifactId>
-    <version>3.7.6</version>
+    <version>3.7.7</version>
   </parent>
 
   <build>


=====================================
extensions/phonetic/pom.xml
=====================================
@@ -5,7 +5,7 @@
   <groupId>org.openrefine</groupId>
   <artifactId>phonetic</artifactId>
   <packaging>jar</packaging>
-  <version>3.7.6</version>
+  <version>3.7.7</version>
 
   <name>OpenRefine - Phonetic clustering extension</name>
   <description>Adds a few advanced phonetic clustering methods</description>
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.openrefine</groupId>
     <artifactId>extensions</artifactId>
-    <version>3.7.6</version>
+    <version>3.7.7</version>
   </parent>
 
   <build>


=====================================
extensions/pom.xml
=====================================
@@ -5,7 +5,7 @@
   <groupId>org.openrefine</groupId>
   <artifactId>extensions</artifactId>
   <packaging>pom</packaging>
-  <version>3.7.6</version>
+  <version>3.7.7</version>
 
   <name>OpenRefine - extensions</name>
   <description>Extensions add importers, exporters and other sorts of features to OpenRefine</description>
@@ -14,7 +14,7 @@
   <parent>
     <groupId>org.openrefine</groupId>
     <artifactId>openrefine</artifactId>
-    <version>3.7.6</version>
+    <version>3.7.7</version>
   </parent>
 
   <modules>


=====================================
extensions/wikibase/module/styles/schema-alignment.less
=====================================
@@ -60,7 +60,7 @@
   position: sticky;
   top: 0;
   padding-top: 1em;
-  background-color: var(--background-primary);
+  background-color: #fff;
   z-index: 1;
 }
 


=====================================
extensions/wikibase/pom.xml
=====================================
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.openrefine</groupId>
     <artifactId>extensions</artifactId>
-    <version>3.7.6</version>
+    <version>3.7.7</version>
   </parent>
 
   <properties>


=====================================
main/pom.xml
=====================================
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.openrefine</groupId>
     <artifactId>openrefine</artifactId>
-    <version>3.7.6</version>
+    <version>3.7.7</version>
   </parent>
 
   <properties>


=====================================
main/src/com/google/refine/RefineServlet.java
=====================================
@@ -65,7 +65,7 @@ import edu.mit.simile.butterfly.ButterflyModule;
 
 public class RefineServlet extends Butterfly {
 
-    static private String ASSIGNED_VERSION = "3.7.6";
+    static private String ASSIGNED_VERSION = "3.7.7";
 
     static public String VERSION = "";
     static public String REVISION = "";


=====================================
main/src/com/google/refine/util/HttpClient.java
=====================================
@@ -28,9 +28,6 @@
 package com.google.refine.util;
 
 import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import java.util.List;
@@ -202,20 +199,13 @@ public class HttpClient {
     }
 
     public String getResponse(String urlString, Header[] headers, HttpClientResponseHandler<String> responseHandler) throws IOException {
-        try {
-            // Use of URL constructor below is purely to get additional error checking to mimic
-            // previous behavior for the tests.
-            new URL(urlString).toURI();
-        } catch (IllegalArgumentException | MalformedURLException | URISyntaxException e) {
-            return null;
-        }
 
         HttpGet httpGet = new HttpGet(urlString);
 
         if (headers != null && headers.length > 0) {
             httpGet.setHeaders(headers);
         }
-        httpGet.setConfig(defaultRequestConfig); // FIXME: Redundant? already includes in client builder
+        httpGet.setConfig(defaultRequestConfig); // FIXME: Redundant? already included in client builder
         return httpClient.execute(httpGet, responseHandler);
     }
 


=====================================
main/tests/server/src/com/google/refine/operations/column/ColumnAdditionByFetchingURLsOperationTests.java
=====================================
@@ -50,6 +50,7 @@ import org.testng.annotations.Test;
 
 import com.google.refine.RefineTest;
 import com.google.refine.browsing.EngineConfig;
+import com.google.refine.expr.EvalError;
 import com.google.refine.expr.ExpressionUtils;
 import com.google.refine.model.AbstractOperation;
 import com.google.refine.model.Cell;
@@ -192,7 +193,7 @@ public class ColumnAdditionByFetchingURLsOperationTests extends RefineTest {
             server.enqueue(new MockResponse());
 
             Row row0 = new Row(2);
-            row0.setCell(0, new Cell("auinrestrsc", null)); // malformed -> null
+            row0.setCell(0, new Cell("auinrestrsc", null)); // malformed -> error
             project.rows.add(row0);
             Row row1 = new Row(2);
             row1.setCell(0, new Cell(url.toString(), null)); // fine
@@ -216,8 +217,8 @@ public class ColumnAdditionByFetchingURLsOperationTests extends RefineTest {
 
             int newCol = project.columnModel.getColumnByName("junk").getCellIndex();
             // Inspect rows
-            Assert.assertEquals(project.rows.get(0).getCellValue(newCol), null);
-            Assert.assertTrue(project.rows.get(1).getCellValue(newCol) != null);
+            Assert.assertTrue(project.rows.get(0).getCellValue(newCol) instanceof EvalError);
+            Assert.assertNotNull(project.rows.get(1).getCellValue(newCol));
             Assert.assertTrue(ExpressionUtils.isError(project.rows.get(2).getCellValue(newCol)));
         }
     }


=====================================
main/webapp/modules/core/scripts/dialogs/add-column-by-reconciliation.js
=====================================
@@ -278,6 +278,7 @@ ExtendReconciledDataPreviewDialog.prototype._renderPreview = function(data) {
     $('<a href="javascript:{}"></a>')
     .text($.i18n('core-views/remove-prop'))
     .addClass("action")
+    .css("margin-right", "5px")
     .attr("title", $.i18n('core-views/remove-col'))
     .on('click',function() {
       self._removeProperty(column.id);


=====================================
packaging/pom.xml
=====================================
@@ -10,7 +10,7 @@
   <parent>
     <groupId>org.openrefine</groupId>
     <artifactId>openrefine</artifactId>
-    <version>3.7.6</version>
+    <version>3.7.7</version>
   </parent>
   <properties>
     <rootdir>${basedir}/..</rootdir>


=====================================
pom.xml
=====================================
@@ -5,7 +5,7 @@
   <groupId>org.openrefine</groupId>
   <artifactId>openrefine</artifactId>
   <packaging>pom</packaging>
-  <version>3.7.6</version>
+  <version>3.7.7</version>
 
   <name>OpenRefine</name>
   <description>OpenRefine is a free, open source power tool for working with messy data and improving it</description>


=====================================
server/pom.xml
=====================================
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.openrefine</groupId>
     <artifactId>openrefine</artifactId>
-    <version>3.7.6</version>
+    <version>3.7.7</version>
   </parent>
 
   <properties>



View it on GitLab: https://salsa.debian.org/java-team/openrefine/-/compare/68f4290e5ae1b7e1d12ad108a702b2a7151d19ce...eccebce35f2e0177c172ade0ae6c68d60323c8a0

-- 
View it on GitLab: https://salsa.debian.org/java-team/openrefine/-/compare/68f4290e5ae1b7e1d12ad108a702b2a7151d19ce...eccebce35f2e0177c172ade0ae6c68d60323c8a0
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/20231203/6d14152e/attachment.htm>


More information about the pkg-java-commits mailing list