Skip to content

Commit

Permalink
- Update to JDemetra+ 2.2.2 dependencies
Browse files Browse the repository at this point in the history 
- Cleaning POM files
- Update of maven dependencies
  • Loading branch information
@maggima @maggimats
maggima authored and maggimats committed Apr 10, 2019
1 parent e12d67f commit f5116ea
Show file tree
Hide file tree
Showing 5 changed files with 219 additions and 246 deletions.
8 changes: 3 additions & 5 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# JDemetra+ Nowcasting plugin

_Current version of the plugin (master branch) needs the version **2.2.0** of JDemetra+ and JDK 8_
_Current version of the plugin (master branch) needs the version **2.2.2** of JDemetra+ and JDK 8_

Release 2.2.1 of the Nowcasting plugin is available [here](https://github.com/nbbrd/jdemetra-nowcasting/releases/tag/v2.2.1).
Release 2.2.2 of the Nowcasting plugin is available [here](https://github.com/nbbrd/jdemetra-nowcasting/releases/tag/v2.2.2).

## Features
- Operationalize the nowcasting process
Expand All @@ -14,6 +14,4 @@ Take a look at the [Wiki](https://github.com/nbbrd/jdemetra-nowcasting/wiki) for
## Installation
In order to install the plugin, this nbm has to be added to the JDemetra+ plugins :

- nbdemetra-dfm-2.2.1.nbm

(nbdemetra-core2-2.2.1.nbm plugin isn't needed anymore)
- nbdemetra-dfm-2.2.2.nbm
78 changes: 63 additions & 15 deletions jtss2/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,34 @@

<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>be.nbb.demetra</groupId>
<artifactId>demetra-seer</artifactId>
<version>2.2.1</version>
</parent>

<groupId>be.nbb.demetra</groupId>
<artifactId>demetra-tss2</artifactId>
<name>Demetra - Tss 2</name>
<version>2.2.2</version>
<url>https://github.com/nbbrd/jdemetra-nowcasting</url>

<organization>
<name>National Bank of Belgium</name>
</organization>

<licenses>
<license>
<name>European Union Public Licence (EUPL)</name>
<url>https://joinup.ec.europa.eu/page/eupl-text-11-12</url>
</license>
</licenses>

<properties>
<!-- build -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>

<!-- dependencies -->
<jdemetra.version>2.2.2</jdemetra.version>
<lombok.version>1.18.6</lombok.version>
</properties>

<dependencyManagement>
<dependencies>
Expand Down Expand Up @@ -39,6 +59,7 @@
<dependency>
<groupId>be.nbb.demetra</groupId>
<artifactId>demetra-tstoolkit2</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
Expand All @@ -55,16 +76,43 @@
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>

<!-- test only -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<reporting>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.4</version>
</plugin>
</plugins>
</reporting>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
</plugin>
</plugins>
</pluginManagement>
</build>

<repositories>
<repository>
<id>netbeans-releases</id>
<url>http://bits.netbeans.org/maven2/</url>
</repository>
<repository>
<id>oss-jfrog-artifactory-releases</id>
<url>https://oss.jfrog.org/artifactory/oss-release-local</url>
</repository>
<repository>
<id>projectlombok.org</id>
<url>https://projectlombok.org/edge-releases</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>

</project>
52 changes: 43 additions & 9 deletions jtstoolkit2/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,35 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>be.nbb.demetra</groupId>
<artifactId>demetra-seer</artifactId>
<version>2.2.1</version>
</parent>


<groupId>be.nbb.demetra</groupId>
<artifactId>demetra-tstoolkit2</artifactId>
<name>Demetra - Tstoolkit 2</name>
<version>2.2.2</version>
<url>https://github.com/nbbrd/jdemetra-nowcasting</url>

<organization>
<name>National Bank of Belgium</name>
</organization>

<licenses>
<license>
<name>European Union Public Licence (EUPL)</name>
<url>https://joinup.ec.europa.eu/page/eupl-text-11-12</url>
</license>
</licenses>

<properties>
<!-- build -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>

<!-- dependencies -->
<jdemetra.version>2.2.2</jdemetra.version>
<lombok.version>1.18.6</lombok.version>
</properties>

<dependencyManagement>
<dependencies>
Expand All @@ -21,14 +41,14 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<dependency>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>demetra-tstoolkit</artifactId>
<version>${jdemetra.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencies>
</dependencyManagement>

<dependencies>
Expand All @@ -45,6 +65,20 @@
<artifactId>jsr305</artifactId>
<scope>provided</scope>
</dependency>

<!-- test only -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<repositories>
<repository>
<id>oss-jfrog-artifactory-releases</id>
<url>https://oss.jfrog.org/artifactory/oss-release-local</url>
</repository>
</repositories>

</project>
114 changes: 104 additions & 10 deletions nbdemetra-dfm/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,78 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>demetra-seer</artifactId>
<groupId>be.nbb.demetra</groupId>
<version>2.2.1</version>
</parent>

<groupId>be.nbb.demetra</groupId>
<artifactId>nbdemetra-dfm</artifactId>
<version>2.2.2</version>
<packaging>nbm</packaging>

<name>NbDemetra - Dynamic Factor Model</name>
<url>https://github.com/nbbrd/jdemetra-nowcasting</url>

<organization>
<name>National Bank of Belgium</name>
</organization>

<licenses>
<license>
<name>European Union Public Licence (EUPL)</name>
<url>https://joinup.ec.europa.eu/page/eupl-text-11-12</url>
</license>
</licenses>

<properties>
<!-- build -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
<nbm-maven-plugin.version>4.1</nbm-maven-plugin.version>

<!-- dependencies -->
<jdemetra.version>2.2.2</jdemetra.version>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>demetra-parent</artifactId>
<version>${jdemetra.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>nbdemetra-parent</artifactId>
<version>${jdemetra.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>demetra-tstoolkit2</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>demetra-tss2</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<!-- compile only -->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>

<!-- compile and runtime -->
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-netbeans-api-annotations-common</artifactId>
Expand Down Expand Up @@ -115,12 +175,50 @@
</exclusions>
</dependency>
</dependencies>

<repositories>
<repository>
<id>netbeans-releases</id>
<url>http://bits.netbeans.org/maven2/</url>
</repository>
<repository>
<id>oss-jfrog-artifactory-releases</id>
<url>https://oss.jfrog.org/artifactory/oss-release-local</url>
</repository>
<repository>
<id>oss-jfrog-artifactory-snapshots</id>
<url>https://oss.jfrog.org/artifactory/oss-snapshot-local</url>
</repository>
</repositories>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
</plugin>
</plugins>
</pluginManagement>

<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>${maven-jar-plugin.version}</version>
<configuration>
<!-- to have the jar plugin pickup the nbm generated manifest -->
<archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>nbm-maven-plugin</artifactId>
<version>${nbm-maven-plugin.version}</version>
<extensions>true</extensions>
<configuration>
<useOSGiDependencies>false</useOSGiDependencies>
Expand All @@ -131,9 +229,5 @@
</configuration>
</plugin>
</plugins>
</build>
<properties>
<netbeans.run.params.ide/>
<netbeans.run.params>${netbeans.run.params.ide}</netbeans.run.params>
</properties>
</build>
</project>
Loading

0 comments on commit f5116ea

Please sign in to comment.