Merge branch 'release-2.2.2'

.gitignore

@@ -11,5 +11,4 @@
 /spreadsheet/*/target/
 /demetra-tck/target/
 /demetra-workspace/target/
-/jdr/target
-/jdr/nbproject/
+/jtss/nbproject/

.travis.yml

@@ -1,26 +1,46 @@
 language: java
 jdk:
   - oraclejdk8
+  - openjdk11
 
-cache:
-  directories:
-    - $HOME/.m2
+env:
+  global:
+    - DEPLOY_JDK=oraclejdk8
+    - DEPLOY_REPO=jdemetra/jdemetra-core
+    - DEPLOY_BIN=jtstoolkit/target/demetra-tstoolkit-*.jar
 
 deploy:
-  # SNAPSHOTS from develop & jdk8
+  # Maven snapshots from develop branch
   - provider: script
     script: mvn deploy -Dmaven.test.skip -s .travis.settings.xml -P deploy-snapshots
     skip_cleanup: true
     on:
       branch: develop
-      jdk: oraclejdk8
-      condition: $TRAVIS_PULL_REQUEST = "false"
-
-  # RELEASES from master & jdk8
+      tags: false
+      repo: "${DEPLOY_REPO}"
+      condition: $TRAVIS_PULL_REQUEST == "false" && $TRAVIS_JDK_VERSION == $DEPLOY_JDK
+
+  # Maven releases from tags
   - provider: script
     script: mvn deploy -Dmaven.test.skip -s .travis.settings.xml -P deploy-releases
     skip_cleanup: true
     on:
-      branch: master
-      jdk: oraclejdk8
-      condition: $TRAVIS_PULL_REQUEST = "false"
+      tags: true
+      repo: "${DEPLOY_REPO}"
+      condition: $TRAVIS_PULL_REQUEST == "false" && $TRAVIS_JDK_VERSION == $DEPLOY_JDK
+
+  # Github releases from tags
+  - provider: releases
+    api_key: "${GITHUB_KEY}"
+    skip_cleanup: true
+    draft: true
+    file_glob: true
+    file: "${DEPLOY_BIN}"
+    on:
+      tags: true
+      repo: "${DEPLOY_REPO}"
+      condition: $TRAVIS_PULL_REQUEST == "false" && $TRAVIS_JDK_VERSION == $DEPLOY_JDK
+
+cache:
+  directories:
+    - $HOME/.m2

commonprovider/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>eu.europa.ec.joinup.sat</groupId>
         <artifactId>demetra-parent</artifactId>
-        <version>2.2.1</version>
+        <version>2.2.2</version>
     </parent>
 
     <artifactId>demetra-common</artifactId>

demetra-tck/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>eu.europa.ec.joinup.sat</groupId>
         <artifactId>demetra-parent</artifactId>
-        <version>2.2.1</version>
+        <version>2.2.2</version>
     </parent>
 
     <artifactId>demetra-tck</artifactId>

demetra-workspace/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>eu.europa.ec.joinup.sat</groupId>
         <artifactId>demetra-parent</artifactId>
-        <version>2.2.1</version>
+        <version>2.2.2</version>
     </parent>
 
     <artifactId>demetra-workspace</artifactId>

demetra-workspace/src/main/java/internal/workspace/file/GenericIndexer.java

@@ -21,6 +21,7 @@
 import internal.workspace.file.xml.XmlGenericWorkspaceItem;
 import internal.io.JaxbUtil;
 import java.io.IOException;
+import java.nio.file.FileSystemException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Map;
@@ -37,7 +38,9 @@ static boolean isValid(Path file) throws IOException {
         try {
             unmarshalIndex(file);
             return true;
-        } catch (JAXBException ex) {
+        } catch (FileSystemException ex) {
+            throw ex;
+        } catch (IOException | JAXBException ex) {
             return false;
         }
     }

demetra-workspace/src/main/java/internal/workspace/file/LegacyIndexer.java

@@ -29,6 +29,7 @@
 import internal.workspace.file.xml.XmlLegacyWorkspaceItem;
 import internal.io.JaxbUtil;
 import java.io.IOException;
+import java.nio.file.FileSystemException;
 import java.nio.file.Path;
 import java.util.Map.Entry;
 import java.util.function.Consumer;
@@ -46,7 +47,9 @@ static boolean isValid(Path file) throws IOException {
         try {
             unmarshalIndex(file);
             return true;
-        } catch (JAXBException ex) {
+        } catch (FileSystemException ex) {
+            throw ex;
+        } catch (IOException | JAXBException ex) {
             return false;
         }
     }

jbench/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>eu.europa.ec.joinup.sat</groupId>
         <artifactId>demetra-parent</artifactId>
-        <version>2.2.1</version>
+        <version>2.2.2</version>
     </parent>
 
     <artifactId>jbench</artifactId>

jdbcprovider/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>eu.europa.ec.joinup.sat</groupId>
         <artifactId>demetra-parent</artifactId>
-        <version>2.2.1</version>
+        <version>2.2.2</version>
     </parent>
 
     <artifactId>demetra-jdbc</artifactId>

jdbcprovider/src/main/java/ec/tss/tsproviders/jdbc/ResultSetFunc.java

@@ -33,6 +33,11 @@
  */
 public abstract class ResultSetFunc<T> implements DbUtil.Func<ResultSet, T, SQLException> {
 
+    @Nonnull
+    public static ResultSetFunc<String> onNull() {
+        return NullResultSetFunc.INSTANCE;
+    }
+
     @Nonnull
     public static ResultSetFunc<String> onGetString(final int columnIndex) {
         return new ResultSetFunc<String>() {
@@ -99,6 +104,16 @@ public static ResultSetFunc<Number> onNumber(@Nonnull ResultSetMetaData metaData
         return result != null ? result : compose(columnIndex, numberParser);
     }
 
+    private static final class NullResultSetFunc extends ResultSetFunc<String> {
+
+        static final ResultSetFunc<String> INSTANCE = new NullResultSetFunc();
+
+        @Override
+        public String apply(ResultSet input) throws SQLException {
+            return null;
+        }
+    }
+
     @Nullable
     private static ResultSetFunc<java.util.Date> dateBySqlType(int columnType, final int columnIndex) {
         switch (columnType) {