You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2023/10/23 17:55:40 UTC
[camel-quarkus] branch main updated (6ca0fc54f7 -> 500b763fa5)
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
from 6ca0fc54f7 Regen SBOM from commit e4bbd1ac980c0684714567ac703ae424f796bc1a (#5448)
new ed6533d913 Fix package path to XmlSlurper in camel-k-maven-plugin integration tests
new 500b763fa5 Run tests in all tooling sub modules
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/camel-master-cron.yaml | 6 +++---
.github/workflows/ci-build.yaml | 6 +++---
.github/workflows/quarkus-master-cron.yaml | 6 +++---
.../src/it/generate-rest-dsl-from-v2/verify.groovy | 2 +-
.../src/it/generate-rest-dsl-from-v3/verify.groovy | 2 +-
5 files changed, 11 insertions(+), 11 deletions(-)
[camel-quarkus] 01/02: Fix package path to XmlSlurper in camel-k-maven-plugin integration tests
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit ed6533d913340ef5c5b3cf5f645db7fd4093f456
Author: James Netherton <ja...@gmail.com>
AuthorDate: Mon Oct 23 15:08:11 2023 +0100
Fix package path to XmlSlurper in camel-k-maven-plugin integration tests
Fixes #5450
---
.../camel-k-maven-plugin/src/it/generate-rest-dsl-from-v2/verify.groovy | 2 +-
.../camel-k-maven-plugin/src/it/generate-rest-dsl-from-v3/verify.groovy | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tooling/camel-k-maven-plugin/src/it/generate-rest-dsl-from-v2/verify.groovy b/tooling/camel-k-maven-plugin/src/it/generate-rest-dsl-from-v2/verify.groovy
index 9dfe128c1f..38cc8515ab 100644
--- a/tooling/camel-k-maven-plugin/src/it/generate-rest-dsl-from-v2/verify.groovy
+++ b/tooling/camel-k-maven-plugin/src/it/generate-rest-dsl-from-v2/verify.groovy
@@ -17,7 +17,7 @@
new File(basedir, "document.xml").withReader {
- def document = new groovy.util.XmlSlurper().parse(it)
+ def document = new groovy.xml.XmlSlurper().parse(it)
assert document.rest.@path == '/camel/'
assert document.rest.get.size() == 1
diff --git a/tooling/camel-k-maven-plugin/src/it/generate-rest-dsl-from-v3/verify.groovy b/tooling/camel-k-maven-plugin/src/it/generate-rest-dsl-from-v3/verify.groovy
index 6be540e4c8..215a4d8a6d 100644
--- a/tooling/camel-k-maven-plugin/src/it/generate-rest-dsl-from-v3/verify.groovy
+++ b/tooling/camel-k-maven-plugin/src/it/generate-rest-dsl-from-v3/verify.groovy
@@ -16,7 +16,7 @@
*/
new File(basedir, "document.xml").withReader {
- def document = new groovy.util.XmlSlurper().parse(it)
+ def document = new groovy.xml.XmlSlurper().parse(it)
assert document.rest.@path == '/v1'
assert document.rest.get.size() == 2
[camel-quarkus] 02/02: Run tests in all tooling sub modules
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 500b763fa54a23959c124a31e76f4d18df405bd1
Author: James Netherton <ja...@gmail.com>
AuthorDate: Mon Oct 23 15:11:21 2023 +0100
Run tests in all tooling sub modules
---
.github/workflows/camel-master-cron.yaml | 6 +++---
.github/workflows/ci-build.yaml | 6 +++---
.github/workflows/quarkus-master-cron.yaml | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/.github/workflows/camel-master-cron.yaml b/.github/workflows/camel-master-cron.yaml
index 9e54c89deb..097b905f6f 100644
--- a/.github/workflows/camel-master-cron.yaml
+++ b/.github/workflows/camel-master-cron.yaml
@@ -264,10 +264,10 @@ jobs:
../mvnw ${CQ_MAVEN_ARGS} \
-Dformatter.skip -Dimpsort.skip -Denforcer.skip -Dcamel-quarkus.update-extension-doc-page.skip \
test
- - name: cd tooling/perf-regression && mvn verify
+ - name: cd tooling && mvn verify
run: |
- cd tooling/perf-regression
- ../../mvnw ${CQ_MAVEN_ARGS} \
+ cd tooling
+ ../mvnw ${CQ_MAVEN_ARGS} \
-Dformatter.skip -Dimpsort.skip -Denforcer.skip \
verify
- name: cd catalog && mvn test
diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml
index 239873a679..2de58c2e7e 100644
--- a/.github/workflows/ci-build.yaml
+++ b/.github/workflows/ci-build.yaml
@@ -339,10 +339,10 @@ jobs:
../mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} \
-Dformatter.skip -Dimpsort.skip -Denforcer.skip -Dcamel-quarkus.update-extension-doc-page.skip \
test
- - name: cd tooling/perf-regression && mvn verify
+ - name: cd tooling && mvn verify
run: |
- cd tooling/perf-regression
- ../../mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} \
+ cd tooling
+ ../mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} \
-Dformatter.skip -Dimpsort.skip -Denforcer.skip \
verify
- name: cd catalog && mvn test
diff --git a/.github/workflows/quarkus-master-cron.yaml b/.github/workflows/quarkus-master-cron.yaml
index c018a6fb4d..776f4943b2 100644
--- a/.github/workflows/quarkus-master-cron.yaml
+++ b/.github/workflows/quarkus-master-cron.yaml
@@ -265,10 +265,10 @@ jobs:
../mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} \
-Dformatter.skip -Dimpsort.skip -Denforcer.skip -Dcamel-quarkus.update-extension-doc-page.skip \
test
- - name: cd tooling/perf-regression && mvn verify
+ - name: cd tooling && mvn verify
run: |
- cd tooling/perf-regression
- ../../mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} \
+ cd tooling
+ ../mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} \
-Dformatter.skip -Dimpsort.skip -Denforcer.skip \
verify
- name: cd catalog && mvn test