Merge pull request #58 from FAIRDataTeam/release/1.7.0

Release 1.7.0

CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.7.0]
+
+### Changed
+
+- Updated to OpenRefine 3.4.1
+
 ## [1.6.0]
 
 ### Changed
@@ -110,11 +116,12 @@ Initial version based on reproducing functionality of deprecated [FAIRifier](htt
 - About dialog with basic information about the extension and its compatibility
 - Report a bug link to create a GitHub issue easily
 
-[Unreleased]: /../../compare/v1.6.0...develop
+[Unreleased]: /../../compare/master...develop
 [1.0.0]: /../../tree/v1.0.0
 [1.1.0]: /../../tree/v1.1.0
 [1.2.0]: /../../tree/v1.2.0
 [1.3.0]: /../../tree/v1.3.0
 [1.4.0]: /../../tree/v1.4.0
 [1.5.0]: /../../tree/v1.5.0
-[1.6.0]: /../../tree/v1.5.0
+[1.6.0]: /../../tree/v1.6.0
+[1.7.0]: /../../tree/v1.7.0

Dockerfile

@@ -2,8 +2,8 @@
 FROM maven:3.6-jdk-8-slim as builder
 
 # You can specify OpenRefine version by: --build-arg OPENREFINE_VERSION=X.Y
-# Possible versions: 3.3 (supported, default), 3.2
-ARG OPENREFINE_VERSION=3.3
+# Possible versions: 3.4.1  (supported, default), 3.3, 3.2
+ARG OPENREFINE_VERSION=3.4.1
 
 WORKDIR /usr/src/app/
 
@@ -16,7 +16,7 @@ RUN mvn clean package
 # Prepare OpenRefine and metadata extension
 RUN curl -sSL https://github.com/OpenRefine/OpenRefine/releases/download/$OPENREFINE_VERSION/openrefine-linux-$OPENREFINE_VERSION.tar.gz | tar xz
 RUN mv openrefine-$OPENREFINE_VERSION openrefine
-RUN tar xzf target/metadata-OpenRefine-3.3.tgz --directory openrefine/webapp/extensions
+RUN tar xzf target/metadata-OpenRefine-3.4.1.tgz --directory openrefine/webapp/extensions
 
 # ===================================================================
 # Main image

pom.xml

@@ -28,7 +28,7 @@
 
     <groupId>solutions.fairdata.openrefine</groupId>
     <artifactId>metadata</artifactId>
-    <version>1.6.0</version>
+    <version>1.7.0</version>
     <packaging>jar</packaging>
 
     <name>OpenRefine - FAIR Metadata extension</name>
@@ -64,7 +64,7 @@
         <maven.compiler.target>1.8</maven.compiler.target>
 
         <!-- Core - local -->
-        <openrefine.version>3.3</openrefine.version>
+        <openrefine.version>3.4.1</openrefine.version>
         <servlet.version>2.5</servlet.version>
         <butterfly.version>1.0.2</butterfly.version>
         <slf4j.version>1.7.18</slf4j.version>

project-repository/org/openrefine/main/3.3/_remote.repositories → project-repository/org/openrefine/main/3.4.1/_remote.repositories

@@ -1,4 +1,4 @@
 #NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice.
-#Sat Feb 08 11:22:29 CET 2020
-main-3.3.pom>=
-main-3.3.jar>=
+#Mon Sep 28 21:29:50 CEST 2020
+main-3.4.1.jar>=
+main-3.4.1.pom>=

project-repository/org/openrefine/main/3.3/main-3.3.pom → project-repository/org/openrefine/main/3.4.1/main-3.4.1.pom

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.openrefine</groupId>
-    <artifactId>main</artifactId>
-    <version>3.3</version>
-    <description>POM was created from install:install-file</description>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.openrefine</groupId>
+  <artifactId>main</artifactId>
+  <version>3.4.1</version>
+  <description>POM was created from install:install-file</description>
 </project>

project-repository/org/openrefine/main/maven-metadata-local.xml

@@ -3,10 +3,10 @@
   <groupId>org.openrefine</groupId>
   <artifactId>main</artifactId>
   <versioning>
-    <release>3.3</release>
+    <release>3.4.1</release>
     <versions>
-      <version>3.3</version>
+      <version>3.4.1</version>
     </versions>
-    <lastUpdated>20200208113600</lastUpdated>
+    <lastUpdated>20200928192950</lastUpdated>
   </versioning>
 </metadata>

src/assembly/module.xml

@@ -1,7 +1,7 @@
 <assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
-    <id>OpenRefine-3.3</id>
+    <id>OpenRefine-3.4.1</id>
     <includeBaseDirectory>true</includeBaseDirectory>
     <baseDirectory>metadata</baseDirectory>
     <formats>

src/main/resources/module/scripts/dialogs/about-dialog.html

@@ -24,6 +24,7 @@
             <dt data-i18n="about-dialog/fdp-versions"></dt>
             <dd>
                 <ul class="versions">
+                    <li class="version"><a href="https://github.com/FAIRDataTeam/FAIRDataPoint/releases/tag/v1.7.0" target="_blank">1.7</a></li>
                     <li class="version"><a href="https://github.com/FAIRDataTeam/FAIRDataPoint/releases/tag/v1.6.0" target="_blank">1.6</a></li>
                     <li class="version"><a href="https://github.com/FAIRDataTeam/FAIRDataPoint/releases/tag/v1.5.0" target="_blank">1.5</a></li>
                     <li class="version"><a href="https://github.com/FAIRDataTeam/FAIRDataPoint/releases/tag/v1.4.0" target="_blank">1.4</a></li>

src/main/resources/project.properties

@@ -1,4 +1,4 @@
 artifactId=${project.artifactId}
 version=${project.version}
 openrefineVersion=${openrefine.version}
-openrefineSupported=3.3 3.2
+openrefineSupported=3.4 3.3 3.2