[CCSDK/DCAE] Fix dashboard app error

recent version upgrades for spring-web and jackson is causing application to not start

reverting
com.fasterxml.jackson.core : jackson-databind : 2.9.8
org.springframework : spring-web : 4.3.22.RELEASE

Change-Id: If88b8744574b889879d8fafe43ea51598a089310
Signed-off-by: vv770d <vv770d@att.com>
Issue-ID: CCSDK-3233
Signed-off-by: vv770d <vv770d@att.com>
(cherry picked from commit 72bc16df1699d7bf9430430db722059839104bd2)

diff --git a/ccsdk-app-common/pom.xml b/ccsdk-app-common/pom.xml
index d87dbb7..255f29c 100644 (file)
--- a/ccsdk-app-common/pom.xml
+++ b/ccsdk-app-common/pom.xml
@@ -6,19 +6,19 @@
        <parent>
                <groupId>org.onap.ccsdk.dashboard</groupId>
                <artifactId>ccsdk-app-parent</artifactId>
-               <version>1.4.1-SNAPSHOT</version>
+               <version>1.4.2-SNAPSHOT</version>
        </parent>
 
        <groupId>org.onap.ccsdk.dashboard</groupId>
        <artifactId>ccsdk-app-common</artifactId>
-       <version>1.4.1-SNAPSHOT</version>
+       <version>1.4.2-SNAPSHOT</version>
        <packaging>jar</packaging>
        <name>DCAE Dashboard common</name>
        <description>CCSDK Dashboard common Java code</description>
 
        <properties>
                <encoding>UTF-8</encoding>
-               <springframework.version>5.2.7.RELEASE</springframework.version>
+               <springframework.version>4.3.22.RELEASE</springframework.version>
                <hibernate.version>4.3.11.Final</hibernate.version>
                <eelf.version>1.0.0</eelf.version>
                <epsdk.version>2.6.0</epsdk.version>
@@ -27,7 +27,7 @@
                <releaseNexusPath>content/repositories/releases/</releaseNexusPath>
                <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
                <skipTests>false</skipTests>
-               <jackson.version>2.11.0</jackson.version>
+               <jackson.version>2.9.8</jackson.version>
                <sonar.coverage.jacoco.xmlReportPaths> 
                        ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml
        </sonar.coverage.jacoco.xmlReportPaths>

diff --git a/ccsdk-app-os/pom.xml b/ccsdk-app-os/pom.xml
index 9d87486..a995d09 100644 (file)
--- a/ccsdk-app-os/pom.xml
+++ b/ccsdk-app-os/pom.xml
@@ -7,19 +7,19 @@
        <parent>
                <groupId>org.onap.ccsdk.dashboard</groupId>
                <artifactId>ccsdk-app-parent</artifactId>
-               <version>1.4.1-SNAPSHOT</version>
+               <version>1.4.2-SNAPSHOT</version>
        </parent>
 
        <groupId>org.onap.ccsdk.dashboard</groupId>
        <artifactId>ccsdk-app-os</artifactId>
-       <version>1.4.1-SNAPSHOT</version>
+       <version>1.4.2-SNAPSHOT</version>
        <packaging>war</packaging>
        <name>DCAE Dashboard</name>
        <description>CCSDK Dashboard Web Application for external release</description>
 
        <properties>
                <encoding>UTF-8</encoding>
-               <springframework.version>5.2.7.RELEASE</springframework.version>
+               <springframework.version>4.3.22.RELEASE</springframework.version>
                <hibernate.version>4.3.11.Final</hibernate.version>
                <epsdk.version>2.6.0</epsdk.version>
                <ccsdk.version>${project.version}</ccsdk.version>

diff --git a/ccsdk-app-overlay/pom.xml b/ccsdk-app-overlay/pom.xml
index 4a6ec33..ce662cc 100644 (file)
--- a/ccsdk-app-overlay/pom.xml
+++ b/ccsdk-app-overlay/pom.xml
@@ -7,12 +7,12 @@
        <parent>
                <groupId>org.onap.ccsdk.dashboard</groupId>
                <artifactId>ccsdk-app-parent</artifactId>
-               <version>1.4.1-SNAPSHOT</version>
+               <version>1.4.2-SNAPSHOT</version>
        </parent>
 
        <groupId>org.onap.ccsdk.dashboard</groupId>
        <artifactId>ccsdk-app-overlay</artifactId>
-       <version>1.4.1-SNAPSHOT</version>
+       <version>1.4.2-SNAPSHOT</version>
        <packaging>war</packaging>
        <name>DCAE Dashboard overlay</name>
        <description>CCSDK Dashboard web resources</description>

diff --git a/pom.xml b/pom.xml
index 35524f3..b66bb55 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
     <!-- Maven parent project for convenience of building and cleaning -->
     <groupId>org.onap.ccsdk.dashboard</groupId>
     <artifactId>ccsdk-app-parent</artifactId>
-    <version>1.4.1-SNAPSHOT</version>
+    <version>1.4.2-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>ccsdk-dashboard</name>
     

diff --git a/version.properties b/version.properties
index eff345c..77e67b1 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
 
 major=1
 minor=4
-patch=1
+patch=2
 
 base_version=${major}.${minor}.${patch}