Merge branch 'release-2.2.3'

jdemetra · Jul 7, 2020 · 8d5edfc · 8d5edfc
2 parents ace981f + 10b8613
commit 8d5edfc
Show file tree

Hide file tree

Showing 157 changed files with 1,531 additions and 1,450 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,17 +1,22 @@
+dist: xenial
 language: java
 jdk:
-  - oraclejdk8
+  - openjdk8
   - openjdk11
+  - openjdk-ea
+
+matrix:
+  allow_failures:
+    - jdk: openjdk-ea
 
 env:
   global:
-    - DEPLOY_JDK=oraclejdk8
+    - DEPLOY_JDK=openjdk8
     - DEPLOY_REPO=jdemetra/jdemetra-app
-    - DEPLOY_BIN=nbdemetra-app/target/jdemetra-*-bin.zip
+    - DEPLOY_BIN=nbdemetra-app/target/binaries/*
 
-before_install:
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
+services:
+  - xvfb
 
 deploy:
   # Maven snapshots from develop branch

diff --git a/README.md b/README.md
@@ -1,6 +1,8 @@
 # Econometric software for seasonal adjustment and other time series methods (JDemetra+)
 
 [![Download](https://img.shields.io/github/release/jdemetra/jdemetra-app.svg)](https://github.com/jdemetra/jdemetra-app/releases/latest)
+![GitHub All Releases](https://img.shields.io/github/downloads/jdemetra/jdemetra-app/total)
+![GitHub Releases](https://img.shields.io/github/downloads/jdemetra/jdemetra-app/latest/total)
 
 **JDemetra+ is a new tool for seasonal adjustment (SA)** developed by the National Bank of Belgium (NBB) in cooperation with the Deutsche Bundesbank and Eurostat in accordance with the Guidelines of the European Statistical System (ESS).
 

diff --git a/nbdemetra-anomalydetection/pom.xml b/nbdemetra-anomalydetection/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>nbdemetra-parent</artifactId>
         <groupId>eu.europa.ec.joinup.sat</groupId>
-        <version>2.2.2</version>
+        <version>2.2.3</version>
     </parent>
 
     <artifactId>nbdemetra-anomalydetection</artifactId>
@@ -13,6 +13,13 @@
     <name>NbDemetra - Anomaly Detection</name>
 
     <dependencies>
+        <!-- compile only -->
+        <dependency>
+            <groupId>org.checkerframework</groupId>
+            <artifactId>checker-qual</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
         <!-- NetBeans -->
         <dependency>
             <groupId>org.netbeans.api</groupId>
@@ -94,6 +101,10 @@
             <groupId>org.netbeans.api</groupId>
             <artifactId>org-openide-filesystems-nb</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.netbeans.api</groupId>
+            <artifactId>org-openide-util-ui</artifactId>
+        </dependency>
 
         <!-- Projects -->
         <dependency>
@@ -113,7 +124,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
+                <groupId>org.apache.netbeans.utilities</groupId>
                 <artifactId>nbm-maven-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>

diff --git a/...nomalydetection/src/main/java/ec/nbdemetra/anomalydetection/ui/AnomalyDetectionChart.java b/...nomalydetection/src/main/java/ec/nbdemetra/anomalydetection/ui/AnomalyDetectionChart.java
@@ -45,8 +45,8 @@
 import java.beans.PropertyChangeListener;
 import java.text.NumberFormat;
 import java.util.Arrays;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 import javax.swing.JComponent;
 import javax.swing.JMenu;
 
@@ -171,7 +171,7 @@ public static final class Model {
         private final Ts ts;
         private final OutlierEstimation[] outliers;
 
-        Model(@Nonnull Ts ts, @Nonnull PreprocessingModel model) {
+        Model(@NonNull Ts ts, @NonNull PreprocessingModel model) {
             this.ts = ts;
             TsData data = ts.getTsData();
             this.outliers = new OutlierEstimation[data.getLength()];
@@ -181,12 +181,12 @@ public static final class Model {
             }
         }
 
-        @Nonnull
+        @NonNull
         public Ts getTs() {
             return ts;
         }
 
-        @Nonnull
+        @NonNull
         public OutlierEstimation[] getOutliers() {
             return outliers;
         }

diff --git a/...metra-anomalydetection/src/main/java/ec/nbdemetra/anomalydetection/ui/JTsAnomalyGrid.java b/...metra-anomalydetection/src/main/java/ec/nbdemetra/anomalydetection/ui/JTsAnomalyGrid.java
@@ -38,8 +38,8 @@
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.List;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JTable;
@@ -253,7 +253,7 @@ public TsCollection getTsCollection() {
         return grid.getTsCollection();
     }
 
-    @Nonnull
+    @NonNull
     public ObsIndex getHoveredObs() {
         return grid.getHoveredObs();
     }

diff --git a/nbdemetra-app/pom.xml b/nbdemetra-app/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>eu.europa.ec.joinup.sat</groupId>
         <artifactId>nbdemetra-parent</artifactId>
-        <version>2.2.2</version>
+        <version>2.2.3</version>
     </parent>
 
     <artifactId>nbdemetra-app</artifactId>
@@ -17,6 +17,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <netbeans.run.params.ide/>
         <netbeans.run.params>${netbeans.run.params.ide}</netbeans.run.params>
+        <project.x.binaries>${project.build.directory}/binaries</project.x.binaries>
+        <project.x.zipname>jdemetra-${project.version}-bin</project.x.zipname>
     </properties>
 
     <dependencies>
@@ -34,6 +36,10 @@
                     <groupId>org.netbeans.modules</groupId> 
                     <artifactId>org-netbeans-modules-junitlib</artifactId> 
                 </exclusion> 
+                <exclusion>
+                    <groupId>org.netbeans.api</groupId>
+                    <artifactId>org-netbeans-modules-javahelp</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
@@ -42,13 +48,19 @@
             <groupId>org.netbeans.modules</groupId>
             <artifactId>org-netbeans-modules-dbapi</artifactId>
             <version>${netbeans.version}</version> 
+            <exclusions>
+                <exclusion>
+                    <groupId>org.netbeans.api</groupId>
+                    <artifactId>org-netbeans-modules-javahelp</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.netbeans.modules</groupId>
             <artifactId>org-netbeans-modules-projectapi-nb</artifactId>
             <version>${netbeans.version}</version> 
         </dependency>
-        
+
         <!-- JD+ modules -->
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -94,39 +106,66 @@
 
     <build>
         <plugins>
+            <!-- Generates standalone application -->
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
+                <groupId>org.apache.netbeans.utilities</groupId>
                 <artifactId>nbm-maven-plugin</artifactId>
                 <configuration>
-                    <finalName>jdemetra-${project.version}-bin</finalName>
+                    <finalName>${project.x.zipname}</finalName>
                     <installersFilePrefix>jdemetra-${project.version}-setup</installersFilePrefix>
                     <!--<installerPack200Enable>false</installerPack200Enable>-->
                     <etcConfFile>src/main/resources/nbdemetra.conf</etcConfFile>
                 </configuration>
             </plugin>
+
+            <!-- Generates binaries folder -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>3.0.0</version>
+                <executions>
+                    <execution>
+                        <phase>verify</phase>
+                        <configuration>
+                            <target>
+                                <copy file="${project.build.directory}/${project.x.zipname}.zip" 
+                                      tofile="${project.x.binaries}/${project.x.zipname}.zip"/>
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!-- Generates SHA256 on binaries -->
+            <plugin>
+                <groupId>net.nicoulaj.maven.plugins</groupId>
+                <artifactId>checksum-maven-plugin</artifactId>
+                <version>1.8</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>files</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <algorithms>
+                        <algorithm>SHA-256</algorithm>
+                    </algorithms>
+                    <fileSets>
+                        <fileSet>
+                            <directory>${project.x.binaries}</directory>
+                            <excludes>
+                                <exclude>*.sha256</exclude>
+                            </excludes>
+                        </fileSet>
+                    </fileSets>
+                    <csvSummary>false</csvSummary>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
-
-    <profiles>
-        <profile>
-            <id>deployment</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>nbm-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>extra</id>
-                                <goals>
-                                    <goal>autoupdate</goal>
-                                    <!--<goal>webstart-app</goal>-->
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>
diff --git a/nbdemetra-app/src/main/resources/nbdemetra.conf b/nbdemetra-app/src/main/resources/nbdemetra.conf
@@ -1,10 +1,10 @@
 # ${HOME} will be replaced by user home directory according to platform
-default_userdir="${HOME}/.${APPNAME}/dev"
-default_mac_userdir="${HOME}/Library/Application Support/${APPNAME}/dev"
+default_userdir="${DEFAULT_USERDIR_ROOT}/../.${APPNAME}/dev"
+default_mac_userdir="${DEFAULT_USERDIR_ROOT}/dev"
 
 # options used by the launcher by default, can be overridden by explicit
 # command line switches
-default_options="--branding nbdemetra -J-Xms128m -J-Xmx512m -J-Dapple.laf.useScreenMenuBar=true -J-Dapple.awt.graphics.UseQuartz=true -J-Dsun.java2d.noddraw=true -J-Dsun.java2d.dpiaware=true"
+default_options="--branding nbdemetra -J-Djdk.gtk.version=2.2 -J-Dapple.laf.useScreenMenuBar=true -J-Dapple.awt.graphics.UseQuartz=true -J-Dsun.java2d.noddraw=true -J-Dsun.java2d.dpiaware=true -J-XX:+IgnoreUnrecognizedVMOptions -J-Djna.nosys=false -J-Djna.nounpack=true"
 # for development purposes you may wish to append: -J-Dnetbeans.logger.console=true -J-ea
 
 # default location of JDK/JRE, can be overridden by using --jdkhome <dir> switch

diff --git a/nbdemetra-branding/pom.xml b/nbdemetra-branding/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>eu.europa.ec.joinup.sat</groupId>
         <artifactId>nbdemetra-parent</artifactId>
-        <version>2.2.2</version>
+        <version>2.2.3</version>
     </parent>
 
     <artifactId>nbdemetra-branding</artifactId>
@@ -23,7 +23,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
+                <groupId>org.apache.netbeans.utilities</groupId>
                 <artifactId>nbm-maven-plugin</artifactId>
             </plugin>
         </plugins>

diff --git a/nbdemetra-common/pom.xml b/nbdemetra-common/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>eu.europa.ec.joinup.sat</groupId>
         <artifactId>nbdemetra-parent</artifactId>
-        <version>2.2.2</version>
+        <version>2.2.3</version>
     </parent>
 
     <artifactId>nbdemetra-common</artifactId>
@@ -83,7 +83,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
+                <groupId>org.apache.netbeans.utilities</groupId>
                 <artifactId>nbm-maven-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>