From: Dan Timoney Date: Mon, 29 Oct 2018 12:42:45 +0000 (+0000) Subject: Merge "fix typos" X-Git-Tag: 1.5.0~59 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=0d07a3bdb347578b7ff7a63ccd99f402c59bdc25;hp=f88beb40bed6e5d94d8dcf9abc336c524b2a007a;p=sdnc%2Foam.git Merge "fix typos" Former-commit-id: 04cf920de30c68d7803c1daba7a0e02691673ba7 --- diff --git a/SdncReports/SdncReportsApi/pom.xml b/SdncReports/SdncReportsApi/pom.xml index b6cb9483..23fc5121 100644 --- a/SdncReports/SdncReportsApi/pom.xml +++ b/SdncReports/SdncReportsApi/pom.xml @@ -5,12 +5,12 @@ jar SdncReportsApi org.onap.sdnc.oam - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT sdnc-oam :: SdncReports :: SdncReportsApi org.onap.sdnc.oam SdncReports - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT @@ -21,16 +21,13 @@ - - - + ch.vorburger.mariaDB4j mariaDB4j 2.2.3 - + com.google.code.gson @@ -38,10 +35,6 @@ 2.8.2 - - ${project.groupId} SdncReportsDao @@ -102,8 +95,20 @@ org.springframework.boot spring-boot-starter-log4j2 + + + + org.webjars + bootstrap + 3.3.7 + - + + org.webjars + bootstrap-datepicker + 1.0.1 + + @@ -116,9 +121,7 @@ true - + @@ -133,9 +136,7 @@ org.jacoco jacoco-maven-plugin 0.7.5.201505241946 - - + pre-unit-test @@ -149,8 +150,7 @@ surefireArgLine - + post-unit-test test @@ -188,6 +188,5 @@ - diff --git a/SdncReports/SdncReportsApi/src/main/resources/static/style/sdnc-style.css b/SdncReports/SdncReportsApi/src/main/resources/static/style/sdnc-style.css index 361591cf..27b15950 100644 --- a/SdncReports/SdncReportsApi/src/main/resources/static/style/sdnc-style.css +++ b/SdncReports/SdncReportsApi/src/main/resources/static/style/sdnc-style.css @@ -130,7 +130,7 @@ } .heading{ margin-top:30px; - width:100%; + width:99.5%; height:45px; margin-bottom:20px; font-family:Trebuchet MS, Arial, Helvetica, sans-serif; diff --git a/SdncReports/SdncReportsApi/src/main/webapp/WEB-INF/views/index.jsp b/SdncReports/SdncReportsApi/src/main/webapp/WEB-INF/views/index.jsp index f48a1924..3c7be352 100644 --- a/SdncReports/SdncReportsApi/src/main/webapp/WEB-INF/views/index.jsp +++ b/SdncReports/SdncReportsApi/src/main/webapp/WEB-INF/views/index.jsp @@ -26,8 +26,8 @@ - - + + diff --git a/SdncReports/SdncReportsDao/pom.xml b/SdncReports/SdncReportsDao/pom.xml index 2278f600..3a93e39b 100644 --- a/SdncReports/SdncReportsDao/pom.xml +++ b/SdncReports/SdncReportsDao/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.onap.sdnc.oam SdncReportsDao - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT jar sdnc-oam :: SdncReports :: SdncReportsDao @@ -12,7 +12,7 @@ org.onap.sdnc.oam SdncReports - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT diff --git a/SdncReports/pom.xml b/SdncReports/pom.xml index fd74e763..026f9616 100644 --- a/SdncReports/pom.xml +++ b/SdncReports/pom.xml @@ -6,7 +6,7 @@ org.onap.sdnc.oam SdncReports - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT pom sdnc-oam :: SdncReports @@ -14,7 +14,7 @@ org.onap.ccsdk.parent spring-boot-1-starter-parent - 1.1.1 + 1.2.0-SNAPSHOT diff --git a/admportal/pom.xml b/admportal/pom.xml index 1bdc96d8..6c390aac 100644 --- a/admportal/pom.xml +++ b/admportal/pom.xml @@ -6,13 +6,13 @@ org.onap.ccsdk.parent binding-parent - 1.1.1 + 1.2.0-SNAPSHOT org.onap.sdnc.oam admportal - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT pom sdnc-oam :: admportal diff --git a/configbackuprestore/getBackupVnfDetailService/pom.xml b/configbackuprestore/getBackupVnfDetailService/pom.xml index 04055b90..1f00a108 100644 --- a/configbackuprestore/getBackupVnfDetailService/pom.xml +++ b/configbackuprestore/getBackupVnfDetailService/pom.xml @@ -7,11 +7,11 @@ org.onap.sdnc.oam.vnfbackup configbackuprestore - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT org.onap.sdnc.oam.vnfbackup getBackupVnfDetailService - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT sdnc-oam :: vnfbackup :: getBackupVnfDetailService http://maven.apache.org diff --git a/configbackuprestore/pom.xml b/configbackuprestore/pom.xml index 9608a21a..035c616e 100644 --- a/configbackuprestore/pom.xml +++ b/configbackuprestore/pom.xml @@ -7,14 +7,14 @@ org.onap.sdnc.oam.vnfbackup configbackuprestore - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT sdnc-oam :: vnfbackup pom org.onap.ccsdk.parent spring-boot-1-starter-parent - 1.1.1 + 1.2.0-SNAPSHOT diff --git a/configbackuprestore/vnfconfigbackupservice/pom.xml b/configbackuprestore/vnfconfigbackupservice/pom.xml index e96b5a0a..ef9a981e 100644 --- a/configbackuprestore/vnfconfigbackupservice/pom.xml +++ b/configbackuprestore/vnfconfigbackupservice/pom.xml @@ -8,12 +8,12 @@ org.onap.sdnc.oam.vnfbackup configbackuprestore - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT org.onap.sdnc.oam.vnfbackup vnfconfigbackupservice - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT sdnc-oam :: vnfbackup :: vnfconfigbackupservice http://maven.apache.org @@ -22,13 +22,13 @@ org.onap.sdnc.oam.vnfbackup getBackupVnfDetailService - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT org.onap.sdnc.oam.vnfbackup vnfconfigreportsservice - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT @@ -131,11 +131,35 @@ jackson-xml-databind 0.6.2 + + + org.webjars + bootstrap + 3.3.7 + + + + org.webjars + bootstrap-datepicker + 1.0.1 + + + + org.webjars.bower + angular-object-diff + 1.0.1 + + + + org.springframework.boot + spring-boot-maven-plugin + + org.apache.maven.plugins maven-surefire-plugin diff --git a/configbackuprestore/vnfconfigbackupservice/src/main/webapp/WEB-INF/views/index.jsp b/configbackuprestore/vnfconfigbackupservice/src/main/webapp/WEB-INF/views/index.jsp index b6a3e552..95b64141 100644 --- a/configbackuprestore/vnfconfigbackupservice/src/main/webapp/WEB-INF/views/index.jsp +++ b/configbackuprestore/vnfconfigbackupservice/src/main/webapp/WEB-INF/views/index.jsp @@ -26,8 +26,8 @@ - - + + @@ -53,8 +53,8 @@ - - + + diff --git a/configbackuprestore/vnfconfigbackupservice/src/main/webapp/static/views/tabs.html b/configbackuprestore/vnfconfigbackupservice/src/main/webapp/static/views/tabs.html index 178a8180..b8b65c69 100644 --- a/configbackuprestore/vnfconfigbackupservice/src/main/webapp/static/views/tabs.html +++ b/configbackuprestore/vnfconfigbackupservice/src/main/webapp/static/views/tabs.html @@ -10,7 +10,7 @@