You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pp...@apache.org on 2023/06/27 12:58:28 UTC
[camel] branch main updated (5ed6d5dbb8e -> ccac4796479)
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from 5ed6d5dbb8e CAMEL-19485 - camel-debezium - Upgrade to 2.3 - Align Mysql connector java version to 8.0.33, used by Debezium
new 0254ad1d723 Make plugin integration tests runnable against empty local Maven repository with Apache Snapshots repository disabled
new ccac4796479 Show git diff before failing a GHA workflow due to uncommitted changes
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:
.../actions/incremental-build/incremental-build.sh | 2 +-
.github/workflows/pr-build-main.yml | 2 +-
tooling/maven/camel-package-maven-plugin/pom.xml | 3 --
.../src/it/HeaderSupport/pom.xml | 5 +-
.../camel-package-maven-plugin/src/it/settings.xml | 53 ----------------------
tooling/maven/camel-restdsl-openapi-plugin/pom.xml | 26 ++++++++++-
6 files changed, 31 insertions(+), 60 deletions(-)
delete mode 100644 tooling/maven/camel-package-maven-plugin/src/it/settings.xml
[camel] 01/02: Make plugin integration tests runnable against empty local Maven repository with Apache Snapshots repository disabled
Posted by pp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0254ad1d7233216c3d66b2283f9b14583dbfbfba
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Tue Jun 27 13:54:12 2023 +0200
Make plugin integration tests runnable against empty local Maven repository with Apache Snapshots repository disabled
---
tooling/maven/camel-package-maven-plugin/pom.xml | 3 --
.../src/it/HeaderSupport/pom.xml | 5 +-
.../camel-package-maven-plugin/src/it/settings.xml | 53 ----------------------
tooling/maven/camel-restdsl-openapi-plugin/pom.xml | 26 ++++++++++-
4 files changed, 29 insertions(+), 58 deletions(-)
diff --git a/tooling/maven/camel-package-maven-plugin/pom.xml b/tooling/maven/camel-package-maven-plugin/pom.xml
index 7009dfbe106..9ce3108cc27 100644
--- a/tooling/maven/camel-package-maven-plugin/pom.xml
+++ b/tooling/maven/camel-package-maven-plugin/pom.xml
@@ -229,7 +229,6 @@
</pomIncludes>
<postBuildHookScript>verify</postBuildHookScript>
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
- <settingsFile>src/it/settings.xml</settingsFile>
<goals>
<goal>clean</goal>
<goal>verify</goal>
@@ -237,8 +236,6 @@
</configuration>
<executions>
<execution>
- <id>integration-test</id>
- <phase>integration-test</phase>
<goals>
<goal>install</goal>
<goal>integration-test</goal>
diff --git a/tooling/maven/camel-package-maven-plugin/src/it/HeaderSupport/pom.xml b/tooling/maven/camel-package-maven-plugin/src/it/HeaderSupport/pom.xml
index ce1d973480e..2e263eb70b9 100644
--- a/tooling/maven/camel-package-maven-plugin/src/it/HeaderSupport/pom.xml
+++ b/tooling/maven/camel-package-maven-plugin/src/it/HeaderSupport/pom.xml
@@ -33,7 +33,10 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-bom</artifactId>
- <version>@project.version@</version>
+ <!-- Testing against @project.version@ would cause a circular dependency -->
+ <!-- between camel-package-maven-plugin and camel-core. -->
+ <!-- Hence we have to use some recent enough public release here -->
+ <version>4.0.0-M3</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/tooling/maven/camel-package-maven-plugin/src/it/settings.xml b/tooling/maven/camel-package-maven-plugin/src/it/settings.xml
deleted file mode 100644
index c72c23c7d2f..00000000000
--- a/tooling/maven/camel-package-maven-plugin/src/it/settings.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<settings>
- <profiles>
- <profile>
- <id>it-repo</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <repositories>
- <repository>
- <id>local.central</id>
- <url>@localRepositoryUrl@</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>local.central</id>
- <url>@localRepositoryUrl@</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
- </profile>
- </profiles>
-</settings>
diff --git a/tooling/maven/camel-restdsl-openapi-plugin/pom.xml b/tooling/maven/camel-restdsl-openapi-plugin/pom.xml
index 2216a41edb0..5dc0efa3fc9 100644
--- a/tooling/maven/camel-restdsl-openapi-plugin/pom.xml
+++ b/tooling/maven/camel-restdsl-openapi-plugin/pom.xml
@@ -92,13 +92,19 @@
<scope>test</scope>
</dependency>
- <!-- Used in integration tests -->
+ <!-- Required by invoker integration tests -->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -106,6 +112,12 @@
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -113,6 +125,12 @@
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -120,6 +138,12 @@
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
[camel] 02/02: Show git diff before failing a GHA workflow due to uncommitted changes
Posted by pp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ccac4796479c4b67ee3fd9e6be4331788f12f106
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Tue Jun 27 14:24:40 2023 +0200
Show git diff before failing a GHA workflow due to uncommitted changes
---
.github/actions/incremental-build/incremental-build.sh | 2 +-
.github/workflows/pr-build-main.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/actions/incremental-build/incremental-build.sh b/.github/actions/incremental-build/incremental-build.sh
index 0b64fcd62ce..74bbef45e35 100755
--- a/.github/actions/incremental-build/incremental-build.sh
+++ b/.github/actions/incremental-build/incremental-build.sh
@@ -103,7 +103,7 @@ function main() {
$mavenBinary -l $log $MVND_OPTS -DskipTests install -pl "$pl" -am
fi
fi
- [[ -z $(git status --porcelain | grep -v antora.yml) ]] || { echo 'There are uncommitted changes'; git status; exit 1; }
+ [[ -z $(git status --porcelain | grep -v antora.yml) ]] || { echo 'There are uncommitted changes'; git status; echo; echo; git diff; exit 1; }
else
local mustSkipTests
mustSkipTests=$(hasLabel ${prId} "skip-tests")
diff --git a/.github/workflows/pr-build-main.yml b/.github/workflows/pr-build-main.yml
index 045b6584bc2..078eab2a9b8 100644
--- a/.github/workflows/pr-build-main.yml
+++ b/.github/workflows/pr-build-main.yml
@@ -63,7 +63,7 @@ jobs:
- name: Fail if there are uncommitted changes
shell: bash
run: |
- [[ -z $(git status --porcelain) ]] || { echo 'There are uncommitted changes'; git status; exit 1; }
+ [[ -z $(git status --porcelain) ]] || { echo 'There are uncommitted changes'; git status; echo; echo; git diff; exit 1; }
- id: test
name: Quick test execution for affected components
uses: ./.github/actions/quick-test