[Git][java-team/openrefine-butterfly][master] 4 commits: New upstream version 1.2.5

[Markus Koschany (@apo)]

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


Commits:
287c2998 by Markus Koschany at 2023-09-13T16:27:57+02:00
New upstream version 1.2.5
- - - - -
72baf953 by Markus Koschany at 2023-09-13T16:27:58+02:00
Update upstream source from tag 'upstream/1.2.5'

Update to upstream version '1.2.5'
with Debian dir ae7604b6891428ed2d477279bc67cbe2845169d7
- - - - -
a056f85f by Markus Koschany at 2023-09-13T16:29:05+02:00
Refresh the patch

- - - - -
93cdc443 by Markus Koschany at 2023-09-13T16:34:44+02:00
Update changelog

- - - - -


5 changed files:

- debian/changelog
- debian/patches/getAllowRendering.patch
- main/pom.xml
- main/src/edu/mit/simile/butterfly/ButterflyModuleImpl.java
- pom.xml


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+openrefine-butterfly (1.2.5-1) unstable; urgency=medium
+
+  * New upstream version 1.2.5.
+
+ -- Markus Koschany <apo at debian.org>  Wed, 13 Sep 2023 16:29:13 +0200
+
 openrefine-butterfly (1.2.4-1) unstable; urgency=medium
 
   * New upstream version 1.2.4.


=====================================
debian/patches/getAllowRendering.patch
=====================================
@@ -9,8 +9,6 @@ This method is gone. Needs to be fixed upstream.
  main/src/edu/mit/simile/butterfly/velocity/Super.java | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
-diff --git a/main/src/edu/mit/simile/butterfly/velocity/Super.java b/main/src/edu/mit/simile/butterfly/velocity/Super.java
-index 3c1d6f6..823b688 100644
 --- a/main/src/edu/mit/simile/butterfly/velocity/Super.java
 +++ b/main/src/edu/mit/simile/butterfly/velocity/Super.java
 @@ -39,9 +39,9 @@ public class Super extends InputBase {


=====================================
main/pom.xml
=====================================
@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.openrefine.dependencies</groupId>
     <artifactId>butterfly-container</artifactId>
-    <version>1.2.4</version>
+    <version>1.2.5</version>
   </parent>
   
   <groupId>org.openrefine.dependencies</groupId>
   <artifactId>butterfly</artifactId>
-  <version>1.2.4</version>
+  <version>1.2.5</version>
 
   <name>SIMILE Butterfly Engine</name>
   <url>https://github.com/OpenRefine/simile-butterfly/</url>
@@ -51,7 +51,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.22.2</version>
+        <version>3.0.0</version>
         <configuration>
           <suiteXmlFiles>
             <suiteXmlFile>tests/conf/tests.xml</suiteXmlFile>
@@ -117,7 +117,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>5.0.0</version>
+      <version>5.2.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>


=====================================
main/src/edu/mit/simile/butterfly/ButterflyModuleImpl.java
=====================================
@@ -342,7 +342,7 @@ public class ButterflyModuleImpl implements ButterflyModule {
     
     // ------------------------------------------------------------------------------------------------
     
-    protected Pattern images_pattern = Pattern.compile("^/?.*\\.(jpg|gif|png|svg)$");
+    protected Pattern images_pattern = Pattern.compile("^/?.*\\.(jpg|gif|png)$");
     protected Pattern mod_inf_pattern = Pattern.compile("^.*/MOD-INF/.*$");
 
     protected String encoding = "UTF-8";
@@ -458,6 +458,10 @@ public class ButterflyModuleImpl implements ButterflyModule {
         if (path.endsWith(".xml")) {
             return sendText(request, response, path, encoding, "application/xml",false);
         }
+
+        if (path.endsWith(".svg"))  {
+            return sendText(request, response, path, encoding, "image/svg+xml",false);
+        }
                 
         m = mod_inf_pattern.matcher(path);
         if (m.matches()) {


=====================================
pom.xml
=====================================
@@ -12,7 +12,7 @@
 
   <groupId>org.openrefine.dependencies</groupId>
   <artifactId>butterfly-container</artifactId>
-  <version>1.2.4</version>
+  <version>1.2.5</version>
   <packaging>pom</packaging>
 
   <name>SIMILE Butterfly</name>
@@ -78,7 +78,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.10.1</version>
+        <version>3.11.0</version>
         <configuration>
           <source>1.8</source>
           <target>1.8</target>



View it on GitLab: https://salsa.debian.org/java-team/openrefine-butterfly/-/compare/5bf7bf309176665f4eb48d8f6b98c19fa40c973b...93cdc4431050a2310ba6af447cf536336c30d622

-- 
View it on GitLab: https://salsa.debian.org/java-team/openrefine-butterfly/-/compare/5bf7bf309176665f4eb48d8f6b98c19fa40c973b...93cdc4431050a2310ba6af447cf536336c30d622
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/20230913/2aa77363/attachment.htm>