Upgraded all libraries, switched to npm, upgraded angular and jdk21
Locusworks Team/portal-webapp/pipeline/head There was a failure building this commit
Locusworks Team/portal-webapp/pipeline/head There was a failure building this commit
This commit is contained in:
iparenteau committed
1 parent
c2f8e20fad
commit
a6df549919
335 files changed
+10923
-12700
No files matched your search
+45
-118
@@ -13,9 +13,7 @@
|
||||
<artifactId>portal_client</artifactId>
|
||||
<name>Portal Web Client</name>
|
||||
<packaging>pom</packaging>
|
||||
<description>The Portal client which houses all the css, html and javascript files for the client. It uses AngularJS 1.x with Angular-Material. Data is sent/received to/from the server via rest requests as json.
|
||||
|
||||
Vendor packages are retrieved via yarn and nodejs. They are compiled and injected into the index.html before the whole application is minimized</description>
|
||||
<description>Angular portal client, built with Angular CLI and npm and packaged into the Spring Boot application.</description>
|
||||
|
||||
<properties>
|
||||
<main.basedir>${project.parent.basedir}</main.basedir>
|
||||
@@ -31,7 +29,7 @@ Vendor packages are retrieved via yarn and nodejs. They are compiled and injecte
|
||||
<plugins>
|
||||
<plugin>
|
||||
<artifactId>maven-clean-plugin</artifactId>
|
||||
<version>2.6.1</version>
|
||||
<version>3.5.0</version>
|
||||
<configuration>
|
||||
<filesets>
|
||||
<fileset>
|
||||
@@ -40,97 +38,60 @@ Vendor packages are retrieved via yarn and nodejs. They are compiled and injecte
|
||||
<include>**/*</include>
|
||||
</includes>
|
||||
</fileset>
|
||||
<fileset>
|
||||
<directory>app/yarn_components</directory>
|
||||
<includes>
|
||||
<include>**/*</include>
|
||||
</includes>
|
||||
</fileset>
|
||||
</filesets>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>com.github.eirslett</groupId>
|
||||
<artifactId>frontend-maven-plugin</artifactId>
|
||||
<version>1.6</version>
|
||||
<version>${frontend-maven-plugin.version}</version>
|
||||
<executions>
|
||||
|
||||
<!--Install Node and yarn -->
|
||||
<execution>
|
||||
<id>install node and yarn</id>
|
||||
<phase>initialize</phase>
|
||||
<goals>
|
||||
<goal>install-node-and-yarn</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<arguments>set strict-ssl false</arguments>
|
||||
<nodeVersion>v8.11.3</nodeVersion>
|
||||
<yarnVersion>v1.7.0</yarnVersion>
|
||||
<!-- Install Node.js and npm -->
|
||||
<execution>
|
||||
<id>install node and npm</id>
|
||||
<phase>initialize</phase>
|
||||
<goals>
|
||||
<goal>install-node-and-npm</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<nodeVersion>${node.version}</nodeVersion>
|
||||
<npmVersion>${npm.version}</npmVersion>
|
||||
</configuration>
|
||||
</execution>
|
||||
|
||||
<!-- Install dependencies from package-lock.json -->
|
||||
<execution>
|
||||
<id>npm install</id>
|
||||
<phase>generate-sources</phase>
|
||||
<goals>
|
||||
<goal>npm</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<arguments>ci</arguments>
|
||||
</configuration>
|
||||
</execution>
|
||||
|
||||
<!--Run yarn install -->
|
||||
<execution>
|
||||
<id>yarn install</id>
|
||||
<phase>generate-sources</phase>
|
||||
<goals>
|
||||
<goal>yarn</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<arguments>install</arguments>
|
||||
</configuration>
|
||||
</execution>
|
||||
|
||||
<execution>
|
||||
<id>webpack build</id>
|
||||
<goals>
|
||||
<goal>webpack</goal>
|
||||
</goals>
|
||||
|
||||
<!-- optional: the default phase is "generate-resources" -->
|
||||
<phase>generate-sources</phase>
|
||||
|
||||
<configuration>
|
||||
<!-- optional: if not specified, it will run webpack's default build
|
||||
(and you can remove this whole <configuration> section.) -->
|
||||
<arguments>-p</arguments>
|
||||
</configuration>
|
||||
</execution>
|
||||
|
||||
<!-- run grunt build -->
|
||||
<execution>
|
||||
<id>grunt build</id>
|
||||
<phase>compile</phase>
|
||||
<goals>
|
||||
<goal>grunt</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<arguments>build</arguments>
|
||||
</configuration>
|
||||
</execution>
|
||||
|
||||
<!-- run grunt tests -->
|
||||
<execution>
|
||||
<id>grunt test</id>
|
||||
<phase>compile</phase>
|
||||
<goals>
|
||||
<goal>grunt</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<arguments>unitTests</arguments>
|
||||
</configuration>
|
||||
</execution>
|
||||
|
||||
<!-- run grunt clean -->
|
||||
<execution>
|
||||
<id>grunt clean</id>
|
||||
<phase>compile</phase>
|
||||
<goals>
|
||||
<goal>grunt</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<arguments>build</arguments>
|
||||
</configuration>
|
||||
<execution>
|
||||
<id>npm build</id>
|
||||
<phase>compile</phase>
|
||||
<goals>
|
||||
<goal>npm</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<arguments>run build</arguments>
|
||||
</configuration>
|
||||
</execution>
|
||||
|
||||
<execution>
|
||||
<id>npm test</id>
|
||||
<phase>test</phase>
|
||||
<goals>
|
||||
<goal>npm</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<arguments>test</arguments>
|
||||
</configuration>
|
||||
</execution>
|
||||
|
||||
</executions>
|
||||
@@ -139,40 +100,6 @@ Vendor packages are retrieved via yarn and nodejs. They are compiled and injecte
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
<!-- Cleans out the dist folder for lighting quick server builds and deploys
|
||||
for development -->
|
||||
<!-- Must serve client via grunt -->
|
||||
<profile>
|
||||
<id>debug</id>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<artifactId>maven-clean-plugin</artifactId>
|
||||
<version>2.6.1</version>
|
||||
<configuration>
|
||||
<phase>clean</phase>
|
||||
<filesets>
|
||||
<fileset>
|
||||
<directory>dist</directory>
|
||||
<includes>
|
||||
<include>**/*</include>
|
||||
</includes>
|
||||
</fileset>
|
||||
</filesets>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>delete-dist</id>
|
||||
<phase>clean</phase>
|
||||
<goals>
|
||||
<goal>clean</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
</profiles>
|
||||
|
||||
</project>
|
||||
Reference in new issue
Block a user