This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
The following commit(s) were added to refs/heads/main by this push:
new 7ba24e1 Fix quinoa build
7ba24e1 is described below
commit 7ba24e164e8b6a8fca2fd244e2a1b1e6f6c0b977
Author: Marat Gubaidullin <marat.gubaidul...@gmail.com>
AuthorDate: Mon Nov 14 10:43:19 2022 -0500
Fix quinoa build
---
.github/workflows/app.yml | 2 +-
karavan-app/pom.xml | 52 +++++++++++++++++++++++++---
karavan-app/src/main/webui/package-lock.json | 45 ++++++------------------
3 files changed, 58 insertions(+), 41 deletions(-)
diff --git a/.github/workflows/app.yml b/.github/workflows/app.yml
index 28fd363..95a22a2 100644
--- a/.github/workflows/app.yml
+++ b/.github/workflows/app.yml
@@ -53,7 +53,7 @@ jobs:
# Build Karavan cloud app with public access
- name: Build application public
run: |
- mvn package -f karavan-app -Dquarkus.profile=public -DskipTest -X \
+ mvn package -f karavan-app -Dquarkus.profile=public -DskipTest \
-Dquarkus.container-image.build=true \
-Dquarkus.container-image.push=true \
-Dquarkus.container-image.image=ghcr.io/${GITHUB_REPOSITORY}:${{
env.TAG }} \
diff --git a/karavan-app/pom.xml b/karavan-app/pom.xml
index 723d71f..8f35089 100644
--- a/karavan-app/pom.xml
+++ b/karavan-app/pom.xml
@@ -144,11 +144,11 @@
<artifactId>rest-assured</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>io.quarkiverse.quinoa</groupId>
- <artifactId>quarkus-quinoa</artifactId>
- <version>1.2.2</version>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>io.quarkiverse.quinoa</groupId>-->
+<!-- <artifactId>quarkus-quinoa</artifactId>-->
+<!-- <version>1.2.2</version>-->
+<!-- </dependency>-->
</dependencies>
<build>
<resources>
@@ -164,6 +164,48 @@
</resource>
</resources>
<plugins>
+ <plugin>
+ <groupId>com.github.eirslett</groupId>
+ <artifactId>frontend-maven-plugin</artifactId>
+ <version>1.12.1</version>
+ <configuration>
+
<workingDirectory>${project.basedir}/src/main/webui</workingDirectory>
+ <installDirectory>target</installDirectory>
+ </configuration>
+ <executions>
+ <execution>
+ <id>install node and npm</id>
+ <goals>
+ <goal>install-node-and-npm</goal>
+ </goals>
+ <configuration>
+ <nodeVersion>v18.12.1</nodeVersion>
+ <npmVersion>9.1.1</npmVersion>
+ </configuration>
+ </execution>
+ <execution>
+ <id>npm install</id>
+ <goals>
+ <goal>npm</goal>
+ </goals>
+ <configuration>
+ <arguments>install</arguments>
+ </configuration>
+ </execution>
+ <execution>
+ <id>npm run build</id>
+ <goals>
+ <goal>npm</goal>
+ </goals>
+ <configuration>
+ <environmentVariables>
+ <CI>false</CI>
+ </environmentVariables>
+ <arguments>run prod</arguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>${quarkus.platform.group-id}</groupId>
<artifactId>quarkus-maven-plugin</artifactId>
diff --git a/karavan-app/src/main/webui/package-lock.json
b/karavan-app/src/main/webui/package-lock.json
index 7b14c30..6077662 100644
--- a/karavan-app/src/main/webui/package-lock.json
+++ b/karavan-app/src/main/webui/package-lock.json
@@ -39,28 +39,6 @@
"monaco-editor": "0.29.1"
}
},
- "../../../../karavan-core": {
- "version": "3.18.6",
- "license": "Apache-2.0",
- "dependencies": {
- "@types/js-yaml": "^4.0.5",
- "@types/uuid": "^8.3.4",
- "typescript": "^4.5.5",
- "uuid": "8.3.2"
- },
- "devDependencies": {
- "@types/chai": "^4.3.0",
- "@types/dagre": "^0.7.47",
- "@types/localforage": "0.0.34",
- "@types/mocha": "^9.1.0",
- "@types/node": "^17.0.23",
- "chai": "^4.3.4",
- "cross-env": "^7.0.3",
- "fs": "^0.0.1-security",
- "mocha": "^9.2.0",
- "ts-node": "^10.4.0"
- }
- },
"../karavan-core": {
"extraneous": true
},
@@ -10911,8 +10889,15 @@
}
},
"node_modules/karavan-core": {
- "resolved": "../../../../karavan-core",
- "link": true
+ "version": "3.18.6",
+ "resolved": "file:../../../../karavan-core",
+ "license": "Apache-2.0",
+ "dependencies": {
+ "@types/js-yaml": "^4.0.5",
+ "@types/uuid": "^8.3.4",
+ "typescript": "^4.5.5",
+ "uuid": "8.3.2"
+ }
},
"node_modules/keycloak-js": {
"version": "19.0.1",
@@ -24487,20 +24472,10 @@
}
},
"karavan-core": {
- "version": "file:../../../../karavan-core",
+ "version": "3.18.6",
"requires": {
- "@types/chai": "^4.3.0",
- "@types/dagre": "^0.7.47",
"@types/js-yaml": "^4.0.5",
- "@types/localforage": "0.0.34",
- "@types/mocha": "^9.1.0",
- "@types/node": "^17.0.23",
"@types/uuid": "^8.3.4",
- "chai": "^4.3.4",
- "cross-env": "^7.0.3",
- "fs": "^0.0.1-security",
- "mocha": "^9.2.0",
- "ts-node": "^10.4.0",
"typescript": "^4.5.5",
"uuid": "8.3.2"
}
