Merge pull request #262 from bcgov/develop

2.1.1
bcgov · Dec 13, 2019 · ee705b4 · ee705b4
2 parents 867450a + ae6bd5c
commit ee705b4
Show file tree

Hide file tree

Showing 9 changed files with 65 additions and 95 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -26,7 +26,7 @@ matrix:
     - |-
       cd /home/travis/build/bcgov/OCWA/microservices/forumApi
       npm ci
-    - npm audit
+      if [ "$TRAVIS_TAG" = "" ]; then npm audit; fi
     before_script:
     - |-
       cd /home/travis/build/bcgov/OCWA/microservices/forumApi
@@ -85,7 +85,7 @@ matrix:
     - |-
       cd /home/travis/build/bcgov/OCWA/microservices/projectApi
       npm ci
-    - npm audit
+      if [ "$TRAVIS_TAG" = "" ]; then npm audit; fi
     before_script:
     - |-
       cd /home/travis/build/bcgov/OCWA/microservices/projectApi
@@ -165,7 +165,7 @@ matrix:
       cp config/test.json.example config/test.json
       cp config/default.json.example config/default.json
       npm ci
-    - npm audit
+      if [ "$TRAVIS_TAG" = "" ]; then npm audit; fi
     - |-
       cd /home/travis/build/bcgov/OCWA/microservices/shared/js
       npm ci
@@ -356,9 +356,10 @@ matrix:
     - |-
       cd /home/travis/build/bcgov/OCWA/frontend
       cp config/test.json.example config/test.json
-    - npm ci
-    - npm audit
-    - npm test
+    - |-
+      npm ci
+      if [ "$TRAVIS_TAG" = "" ]; then npm audit; fi
+      npm test
     - |-
       cd /home/travis/build/bcgov/OCWA/frontend
       helm lint helm/ocwa-frontend
@@ -379,7 +380,7 @@ matrix:
     language: java
     addons:
       apt:
-        packages:    
+        packages:
           - dpkg
           - google-chrome-stable
       hosts:
@@ -432,11 +433,11 @@ matrix:
     script:
     - cd /usr/local/bin/Katalon_Studio
     - |-
-      if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then 
+      if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
         xvfb-run --server-args="-screen 0 1440x900x24" ./katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui_tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/HappyPathSuite" -executionProfile="Travis" -browserType="Chrome (headless)"
       fi
     - |-
-      if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then 
+      if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
         xvfb-run --server-args="-screen 0 1440x900x24" ./katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui_tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/FullFeatureSuite" -executionProfile="Travis" -browserType="Chrome (headless)"
         xvfb-run --server-args="-screen 0 1440x900x24" ./katalon -noSplash -runMode=console -projectPath="/home/travis/build/bcgov/OCWA/ui_tests/OCWA.prj" -retry=0 -testSuitePath="Test Suites/AccessSuite" -executionProfile="Travis" -browserType="Chrome (headless)"
       fi

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ocwa-frontend",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "main": "src/index.js",
   "license": "MIT",
   "scripts": {
@@ -44,15 +44,14 @@
     "jest-websocket-mock": "^2.0.0",
     "mini-css-extract-plugin": "^0.4.4",
     "mock-socket": "^9.0.2",
-    "nodemon": "^1.18.11",
     "node-cache": "5.0.2",
+    "nodemon": "^1.18.11",
     "prettier": "^1.18.2",
     "redux-logger": "^3.0.6",
     "style-loader": "^0.23.0",
     "supertest": "3.4.2",
     "supertest-as-promised": "4.0.2",
     "terser-webpack-plugin": "^1.1.0",
-    "uglifyjs-webpack-plugin": "^2.0.1",
     "webpack": "^4.35.3",
     "webpack-bundle-analyzer": "^3.3.2",
     "webpack-cli": "^3.1.2",

diff --git a/microservices/forumApi/package.json b/microservices/forumApi/package.json
@@ -1,7 +1,7 @@
 {
   "name": "forumApi",
   "author": "Brandon Sharratt",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "private": true,
   "scripts": {
     "start": "node ./bin/www",

diff --git a/microservices/policyApi/setup.py b/microservices/policyApi/setup.py
@@ -29,7 +29,7 @@ def run_tests(self):
     name='policy',
     author='Brandon Sharratt',
     author_email='',
-    version='2.1.0',
+    version='2.1.1',
     description="OCWA Policy API",
     long_description=read('README.md'),
     license='Apache 2.0',

diff --git a/microservices/projectApi/package.json b/microservices/projectApi/package.json
@@ -1,7 +1,7 @@
 {
   "name": "project-api",
   "author": "Jeremy Ho",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "license": "Apache-2.0",
   "private": true,
   "scripts": {

diff --git a/microservices/requestApi/package.json b/microservices/requestApi/package.json
@@ -1,7 +1,7 @@
 {
   "name": "requestApi",
   "author": "Brandon Sharratt",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "private": true,
   "scripts": {
     "start": "node ./bin/www",

diff --git a/microservices/shared/js/package.json b/microservices/shared/js/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ocwa-clients",
   "author": "Jeremy Ho",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "license": "Apache-2.0",
   "private": true,
   "scripts": {

diff --git a/microservices/validateApi/setup.py b/microservices/validateApi/setup.py
@@ -28,7 +28,7 @@ def run_tests(self):
     name='validate',
     author='Brandon Sharratt',
     author_email='',
-    version='2.1.0',
+    version='2.1.1',
     description="OCWA Validate API",
     long_description=read('README.md'),
     license='Apache 2.0',