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 66adfc4 Fix isssue with infinispan-embedded
66adfc4 is described below
commit 66adfc498bc30c4273de0a507b4f827392c454dd
Author: Marat Gubaidullin <[email protected]>
AuthorDate: Mon Oct 31 17:06:15 2022 -0400
Fix isssue with infinispan-embedded
---
.github/workflows/app.yml | 25 ++-----------------------
karavan-app/pom.xml | 10 ++--------
2 files changed, 4 insertions(+), 31 deletions(-)
diff --git a/.github/workflows/app.yml b/.github/workflows/app.yml
index 8a4ea30..46e616b 100644
--- a/.github/workflows/app.yml
+++ b/.github/workflows/app.yml
@@ -12,23 +12,11 @@ env:
jobs:
build:
-
runs-on: ubuntu-latest
-
steps:
- # Checkout infinispan-quarkus
- - name: Checkout infinispan-quarkus repo
- uses: actions/checkout@v3
- with:
- repository: infinispan/infinispan-quarkus
- path: infinispan-quarkus
- ref: 13.0.11.Final
-
# Checkout Karavan
- name: Checkout
uses: actions/checkout@v3
- with:
- path: karavan
# Generate Karavan UI model and API, Kamelets and Components
- name: Set up JDK 11
@@ -45,15 +33,9 @@ jobs:
!~/.m2/repository/org/apache/camel/karavan
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-maven-
-
- # Build infinispan-quarkus
- - name: Build application public
- working-directory: ./infinispan-quarkus
- run: |
- mvn -P-native -DskipIntegrationTests -DskipUnitTests -DskipTests
clean install -pl embedded -am
+ # Generate Karavan
- name: Generate Karavan UI model and API, Kamelets and Components
- working-directory: ./karavan
run: |
mvn clean compile exec:java -f karavan-generator \
-Dexec.mainClass="org.apache.camel.karavan.generator.KaravanGenerator"
@@ -65,12 +47,11 @@ jobs:
node-version: '17'
- name: Karavan Core install
- working-directory: ./karavan/karavan-core
+ working-directory: ./karavan-core
run: npm install
# Build Karavan cloud app with public access
- name: Build application public
- working-directory: ./karavan
run: |
mvn package -f karavan-app -Dquarkus.profile=public -DskipTest \
-Dquarkus.container-image.build=true \
@@ -82,7 +63,6 @@ jobs:
# Build Karavan cloud app with basic authorization
- name: Build application basic auth
- working-directory: ./karavan
run: |
mvn package -f karavan-app -Dquarkus.profile=basic -DskipTest \
-Dquarkus.container-image.build=true \
@@ -94,7 +74,6 @@ jobs:
# Build Karavan cloud app with oidc authorization
- name: Build application oidc
- working-directory: ./karavan
run: |
mvn package -f karavan-app -Dquarkus.profile=oidc -DskipTest \
-Dquarkus.container-image.build=true \
diff --git a/karavan-app/pom.xml b/karavan-app/pom.xml
index efb2b7c..c14eecd 100644
--- a/karavan-app/pom.xml
+++ b/karavan-app/pom.xml
@@ -42,13 +42,6 @@
<type>pom</type>
<scope>import</scope>
</dependency>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-quarkus-bom</artifactId>
- <version>13.0.11.Final</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
</dependencies>
</dependencyManagement>
<dependencies>
@@ -120,7 +113,8 @@
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
- <artifactId>infinispan-quarkus-embedded</artifactId>
+ <artifactId>infinispan-core</artifactId>
+ <version>13.0.11.Final</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
