diff --git a/client/wfprev-war/pom.xml b/client/wfprev-war/pom.xml index e907d54ef..afed57bfc 100644 --- a/client/wfprev-war/pom.xml +++ b/client/wfprev-war/pom.xml @@ -12,7 +12,7 @@ wfprev-war http://maven.apache.org - #{BUILD_NUMBER}# + #{env.BUILD_NUMBER}# UTF-8 $ v18.10.0 @@ -21,185 +21,6 @@ src/main/angular https://bwa.nrs.gov.bc.ca/int/artifactory/api/npm/nrs-virtual-npm/ - - - ci - - false - - - - - com.github.eirslett - frontend-maven-plugin - 1.11.3 - - ${node.version} - ${npm.version} - ${typescript.path} - ${node.path} - - - - install node and npm for ci - initialize - - install-node-and-npm - - - - npm install for ci - initialize - - npm - - - install -no-package-lock --registry=${npm.url} - - - - npm run-script test-and-coverage - test - - npm - - - run-script test-and-coverage - - - - - - - - - package - - true - - - - - maven-war-plugin - 3.3.1 - - false - WEB-INF/web.xml - - - ${basedir}/target/angular - - assets/**/*.* - *.* - - - - src/main/webapp - - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.4.1 - - ${java-target-version} - - - - attach-javadocs - - jar - - - - - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - - attach-sources - - jar - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.1 - - ${java-source-version} - ${java-target-version} - - - - org.apache.maven.plugins - maven-assembly-plugin - 2.5.5 - - - create-distribution - prepare-package - - single - - - src/cd/assemblies - - - - - - com.github.eirslett - frontend-maven-plugin - 1.11.3 - - ${node.version} - ${npm.version} - ${typescript.path} - ${node.path} - - - - install node and npm - initialize - - install-node-and-npm - - - - npm install - initialize - - npm - - - install -no-package-lock --puppeteer_skip_chromium_download=true --registry=${npm.url} - - - - npm run-script mavenbuild - compile - - npm - - - run-script mavenbuild - - - - - - - - @@ -242,9 +63,10 @@ spring-webmvc - - org.springframework - spring-jdbc + + javax.servlet + javax.servlet-api + provided @@ -269,6 +91,7 @@ spring-security-config + org.tuckey urlrewritefilter @@ -302,51 +125,6 @@ apache-log4j-extras - - - com.oracle.weblogic - ojdbc7 - test - - - - - org.eclipse.jetty - jetty-server - test - - - org.eclipse.jetty - jetty-annotations - test - - - org.eclipse.jetty - jetty-webapp - test - - - org.eclipse.jetty - jetty-jndi - test - - - org.eclipse.jetty - jetty-plus - test - - - org.eclipse.jetty - jetty-jsp - test - - - - junit - junit - test - - @@ -357,7 +135,114 @@ - + + maven-war-plugin + + false + WEB-INF/web.xml + + + ${basedir}/target/angular + + assets/**/*.* + *.* + + + + src/main/webapp + + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + attach-javadocs + + jar + + + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + ${java-source-version} + ${java-target-version} + + + + org.apache.maven.plugins + maven-assembly-plugin + + + create-distribution + prepare-package + + single + + + src/cd/assemblies + + + + + + com.github.eirslett + frontend-maven-plugin + + ${node.version} + ${npm.version} + ${typescript.path} + ${node.path} + + + + install node and npm + initialize + + install-node-and-npm + + + + npm install + initialize + + npm + + + install --legacy-peer-deps --no-package-lock --registry=${npm.url} + + + + npm run-script mavenbuild + compile + + npm + + + run-script mavenbuild + + + +