Merge branch 'develop'

nbbrd · Apr 18, 2018 · e9acc8e · e9acc8e
2 parents c8546ec + 3229676
commit e9acc8e
Show file tree

Hide file tree

Showing 24 changed files with 399 additions and 623 deletions.
diff --git a/nbdemetra-benchmarking/pom.xml b/nbdemetra-benchmarking/pom.xml
@@ -5,7 +5,7 @@
     <groupId>eu.europa.ec.joinup.sat</groupId>
     <artifactId>nbdemetra-benchmarking</artifactId>
     <packaging>nbm</packaging>
-    <version>2.2.0</version>
+    <version>2.2.1</version>
 
     <name>NbDemetra - Benchmarking</name>
     <description>This module provides some experimental methods for temporal disaggregation and multi-variate benchmarking:
@@ -22,7 +22,7 @@
         <maven-jar-plugin.version>2.6</maven-jar-plugin.version>
         <nbm-maven-plugin.version>3.14</nbm-maven-plugin.version>
         <!-- dependencies -->
-        <demetra.version>2.2.0</demetra.version>
+        <demetra.version>2.2.1</demetra.version>
     </properties>
 
     <dependencyManagement>
@@ -114,6 +114,12 @@
             <artifactId>nbdemetra-spreadsheet</artifactId>
             <scope>runtime</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <repositories>

diff --git a/nbdemetra-benchmarking/src/main/java/ec/benchmarking/CholetteDocument2.java b/nbdemetra-benchmarking/src/main/java/ec/benchmarking/CholetteDocument2.java
diff --git a/nbdemetra-benchmarking/src/main/java/ec/benchmarking/DentonDocument2.java b/nbdemetra-benchmarking/src/main/java/ec/benchmarking/DentonDocument2.java