Skip to content

Commit

Permalink
Merge pull request #60 from OpenLiberty/qa
Browse files Browse the repository at this point in the history
Merge qa to master: update version
  • Loading branch information
gkwan-ibm authored May 1, 2020
2 parents fda8d09 + fdc0744 commit 47b9616
Show file tree
Hide file tree
Showing 10 changed files with 10,362 additions and 4,586 deletions.
10 changes: 5 additions & 5 deletions finish/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
<maven.compiler.target>1.8</maven.compiler.target>
<failOnMissingWebXml>false</failOnMissingWebXml>
<!-- Plugin versions -->
<version.liberty-maven-plugin>3.1</version.liberty-maven-plugin>
<version.maven-war-plugin>3.2.2</version.maven-war-plugin>
<version.liberty-maven-plugin>3.2</version.liberty-maven-plugin>
<version.maven-war-plugin>3.2.3</version.maven-war-plugin>
</properties>

<dependencies>
Expand All @@ -27,7 +27,7 @@
<!-- tag::microprofile[] -->
<artifactId>microprofile</artifactId>
<!-- end::microprofile[] -->
<version>3.2</version>
<version>3.3</version>
<type>pom</type>
<scope>provided</scope>
</dependency>
Expand Down Expand Up @@ -64,8 +64,8 @@
<goal>install-node-and-npm</goal>
</goals>
<configuration>
<nodeVersion>v12.16.1</nodeVersion>
<npmVersion>6.13.4</npmVersion>
<nodeVersion>v12.16.2</nodeVersion>
<npmVersion>6.14.4</npmVersion>
</configuration>
</execution>

Expand Down
5 changes: 5 additions & 0 deletions finish/src/main/frontend/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"aot": true,
"outputPath": "../webapp/app",
"index": "src/index.html",
"main": "src/main.ts",
Expand Down Expand Up @@ -50,6 +51,10 @@
"type": "initial",
"maximumWarning": "2mb",
"maximumError": "5mb"
},
{
"type": "anyComponentStyle",
"maximumWarning": "6kb"
}
]
}
Expand Down
Loading

0 comments on commit 47b9616

Please sign in to comment.