You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2022/11/07 08:19:54 UTC
[camel-k-runtime] branch release-1.15.x updated (2af59992 -> f4a85c58)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch release-1.15.x
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
from 2af59992 chore: dependency cleaning
new 09390c98 fix(deps): brought back inheritance to camel deps
new f4a85c58 fix(deps): align camel dependencies
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:
pom.xml | 32 +++++++++++++++++++++++++++++++-
scripts/bump.sh | 1 +
2 files changed, 32 insertions(+), 1 deletion(-)
[camel-k-runtime] 02/02: fix(deps): align camel dependencies
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch release-1.15.x
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit f4a85c58022fb409c77f4d45ed00e603abbe2eea
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Fri Nov 4 12:38:09 2022 +0100
fix(deps): align camel dependencies
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index a8f43834..326f8d51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>camel-dependencies</artifactId>
- <version>3.18.0</version>
+ <version>3.18.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
[camel-k-runtime] 01/02: fix(deps): brought back inheritance to camel deps
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch release-1.15.x
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit 09390c98876790acbe0171ae5befdd5cb61ba3d8
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Fri Nov 4 12:28:39 2022 +0100
fix(deps): brought back inheritance to camel deps
Closes #918
---
pom.xml | 32 +++++++++++++++++++++++++++++++-
scripts/bump.sh | 1 +
2 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index afd6f4b3..a8f43834 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,6 +19,12 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-dependencies</artifactId>
+ <version>3.18.0</version>
+ </parent>
+
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-runtime-project</artifactId>
@@ -130,7 +136,7 @@
<rules>
<requireMavenVersion>
<version>${maven-version}</version>
- </requireMavenVersion>
+ </requireMavenVersion>
</rules>
</configuration>
</execution>
@@ -291,6 +297,30 @@
</plugins>
</pluginManagement>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>${maven-enforcer-plugin-version}</version>
+ <inherited>false</inherited>
+ <executions>
+ <execution>
+ <id>enforce-camel-version</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireProperty>
+ <property>camel-version</property>
+ <regex>${project.parent.version}</regex>
+ <regexMessage>Camel version must be equals to camel-dependency parent pom version (${project.parent.version})!</regexMessage>
+ </requireProperty>
+ </rules>
+ <fail>true</fail>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
diff --git a/scripts/bump.sh b/scripts/bump.sh
index 616125fd..30610c9b 100755
--- a/scripts/bump.sh
+++ b/scripts/bump.sh
@@ -36,6 +36,7 @@ main() {
fi
if [[ ! -z "$CAMEL" ]]; then
+ mvn versions:update-parent "-DparentVersion=[$CAMEL]" -DgenerateBackupPoms=false
mvn versions:set-property -Dproperty="camel-version" -DnewVersion="$CAMEL" -DgenerateBackupPoms=false
echo "Camel version set to $CAMEL"
fi