Skip to content

Commit

Permalink
Revert "Merge staging to prod - Version update (#108)"
Browse files Browse the repository at this point in the history
  • Loading branch information
gkwan-ibm authored Jun 4, 2021
1 parent 16505f9 commit 1fff4db
Show file tree
Hide file tree
Showing 24 changed files with 16,729 additions and 15,478 deletions.
1 change: 0 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ jobs:
uses: github/super-linter@v3
env:
VALIDATE_ALL_CODEBASE: false
VALIDATE_TYPESCRIPT_STANDARD: false
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
LINTER_RULES_PATH: ./tools/pr-checker/linters/
DEFAULT_BRANCH: prod
Expand Down
4 changes: 2 additions & 2 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2019, 2021 IBM Corporation and others.
// Copyright (c) 2019, 2020 IBM Corporation and others.
// Licensed under Creative Commons Attribution-NoDerivatives
// 4.0 International (CC BY-ND 4.0)
// https://creativecommons.org/licenses/by-nd/4.0/
Expand Down Expand Up @@ -107,7 +107,7 @@ the artist JSON is available to you.
Navigate to the `start` directory to begin.

[role='command']
include::{common-includes}/devmode-lmp33-start.adoc[]
include::{common-includes}/devmode-start.adoc[]

You can find your artist JSON at the
http://localhost:9080/artists[http://localhost:9080/artists^] URL.
Expand Down
8 changes: 4 additions & 4 deletions finish/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<!-- tag::microprofile[] -->
<artifactId>microprofile</artifactId>
<!-- end::microprofile[] -->
<version>4.0.1</version>
<version>3.3</version>
<type>pom</type>
<scope>provided</scope>
</dependency>
Expand All @@ -40,19 +40,19 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.3.1</version>
<version>3.2.3</version>
</plugin>
<!-- Enable liberty-maven plugin -->
<plugin>
<groupId>io.openliberty.tools</groupId>
<artifactId>liberty-maven-plugin</artifactId>
<version>3.3.4</version>
<version>3.2.3</version>
</plugin>
<!-- tag::frontend-plugin[] -->
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<version>1.11.3</version>
<version>1.9.1</version>
<configuration>
<!-- tag::working-dir[] -->
<workingDirectory>src/main/frontend</workingDirectory>
Expand Down
10 changes: 4 additions & 6 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 All @@ -26,12 +27,7 @@
"src/styles.css"
],
"scripts": [],
"vendorChunk": true,
"extractLicenses": false,
"buildOptimizer": false,
"sourceMap": true,
"optimization": false,
"namedChunks": true
"es5BrowserSupport": true
},
"configurations": {
"production": {
Expand All @@ -44,7 +40,9 @@
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
Expand Down
File renamed without changes.
Loading

0 comments on commit 1fff4db

Please sign in to comment.