summaryrefslogtreecommitdiffstats
path: root/cds-ui
diff options
context:
space:
mode:
authorTimoney, Dan (dt5972) <dtimoney@att.com>2019-07-17 11:07:44 -0400
committerTimoney, Dan (dt5972) <dtimoney@att.com>2019-07-17 14:50:27 -0400
commitdfe5205bf91864febb2a69d33ede23f3824bb9ed (patch)
tree19a864599803d3613406833dd6810696bd20add8 /cds-ui
parentd5a3cb572ca9d83820e8d93feefb92de992cc044 (diff)
Added npmVersion to install NPM
To install local copy of npm, needed to make 2 changes to frontend-maven-plugin configuration: 1) Add tag <npmVersion>6.4.1</npmVersion> 2) Removed tag <npmDownloadRoot> Confirmed in local build that those changes result in npm being installed in local 'node' directory (which it was not before these changes). Also, changed parent version to 1.3.1-SNAPSHOT - this will be needed to prevent builds from breaking when new SAN certs are installed for ONAP gerrit. Change-Id: I576d8737eccfaa3024a36608edc1102535a55d26 Issue-ID: CCSDK-1491 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
Diffstat (limited to 'cds-ui')
-rw-r--r--cds-ui/client/pom.xml2
-rw-r--r--cds-ui/pom.xml2
-rw-r--r--cds-ui/server/package.json3
-rw-r--r--cds-ui/server/pom.xml2
4 files changed, 4 insertions, 5 deletions
diff --git a/cds-ui/client/pom.xml b/cds-ui/client/pom.xml
index 86504b7ea..ed0087d7d 100644
--- a/cds-ui/client/pom.xml
+++ b/cds-ui/client/pom.xml
@@ -50,8 +50,8 @@ limitations under the License.
<version>1.3</version>
<configuration>
<nodeVersion>v8.12.0</nodeVersion>
+ <npmVersion>6.4.1</npmVersion>
<nodeDownloadRoot>https://nodejs.org/dist/</nodeDownloadRoot>
- <npmDownloadRoot>https://nodejs.org/dist/npm/</npmDownloadRoot>
<installDirectory>./</installDirectory>
</configuration>
<executions>
diff --git a/cds-ui/pom.xml b/cds-ui/pom.xml
index e4c545e27..a22dd4328 100644
--- a/cds-ui/pom.xml
+++ b/cds-ui/pom.xml
@@ -24,7 +24,7 @@ limitations under the License.
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
<relativePath/>
</parent>
diff --git a/cds-ui/server/package.json b/cds-ui/server/package.json
index 627a34eaa..8abadb15b 100644
--- a/cds-ui/server/package.json
+++ b/cds-ui/server/package.json
@@ -86,5 +86,4 @@
"@types/node": "^10.11.2",
"@types/request": "^2.48.1"
}
-
-} \ No newline at end of file
+}
diff --git a/cds-ui/server/pom.xml b/cds-ui/server/pom.xml
index 8d758c710..d0fc42190 100644
--- a/cds-ui/server/pom.xml
+++ b/cds-ui/server/pom.xml
@@ -80,8 +80,8 @@ limitations under the License.
<version>1.3</version>
<configuration>
<nodeVersion>v8.12.0</nodeVersion>
+ <npmVersion>6.4.1</npmVersion>
<nodeDownloadRoot>https://nodejs.org/dist/</nodeDownloadRoot>
- <npmDownloadRoot>https://nodejs.org/dist/npm/</npmDownloadRoot>
<installDirectory>./</installDirectory>
</configuration>
<executions>