This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 06d44c6de6bd fix(ci): revert module skipping (#20999)
06d44c6de6bd is described below
commit 06d44c6de6bd45646b06d791ba423e2b246a8bda
Author: Pasquale Congiusti <[email protected]>
AuthorDate: Fri Jan 23 13:47:37 2026 +0100
fix(ci): revert module skipping (#20999)
It is no longer needed and it cannot work alone as we have also
autogenerated code which would not be skipped.
Ref CAMEL-22869
---
Jenkinsfile | 3 +-
catalog/camel-allcomponents/pom.xml | 4 +--
.../maven/packaging/PrepareComponentMojo.java | 40 +++++-----------------
3 files changed, 11 insertions(+), 36 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 655aaaf5ceac..1f735db94b1f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -21,9 +21,8 @@ def MAVEN_TEST_PARAMS_UBUNTU = env.MAVEN_TEST_PARAMS ?:
"-Dci.env.name=apache.or
Below parameters are required for camel/core/camel-core module's test cases to
pass on ppc64 and s390x
- xpathExprGrpLimit: limits the number of groups an Xpath expression can
contain
- xpathExprOpLimit: limits the number of operators an Xpath expression can
contain
-- unsupported-arch: won't build modules which are not supported in the given
architecture
*/
-def MAVEN_TEST_PARAMS_ALT_ARCHS = "-Djdk.xml.xpathExprGrpLimit=100
-Djdk.xml.xpathExprOpLimit=2000 -Dunsupported-arch"
+def MAVEN_TEST_PARAMS_ALT_ARCHS = "-Djdk.xml.xpathExprGrpLimit=100
-Djdk.xml.xpathExprOpLimit=2000"
pipeline {
diff --git a/catalog/camel-allcomponents/pom.xml
b/catalog/camel-allcomponents/pom.xml
index d9ec4ccebf98..d6b44a79065b 100644
--- a/catalog/camel-allcomponents/pom.xml
+++ b/catalog/camel-allcomponents/pom.xml
@@ -51,7 +51,7 @@
</repositories>
<dependencies>
- <!-- CODEGEN SUPPORTED ARCHITECTURES DEPENDENCIES START -->
+ <!-- CODEGEN DEPENDENCIES START -->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-activemq</artifactId>
@@ -2267,7 +2267,7 @@
<artifactId>camel-zookeeper-master</artifactId>
<version>${project.version}</version>
</dependency>
- <!-- CODEGEN SUPPORTED ARCHITECTURES DEPENDENCIES END -->
+ <!-- CODEGEN DEPENDENCIES END -->
</dependencies>
</project>
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareComponentMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareComponentMojo.java
index 3573e56a8706..db729130906a 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareComponentMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareComponentMojo.java
@@ -256,8 +256,8 @@ public class PrepareComponentMojo extends
AbstractGeneratorMojo {
Path root = findCamelDirectory(project.getBasedir(),
"catalog/camel-allcomponents").toPath();
Path pomFile = root.resolve("pom.xml");
- final String startDependenciesMarker = "<!-- CODEGEN SUPPORTED
ARCHITECTURES DEPENDENCIES START -->";
- final String endDependenciesMarker = "<!-- CODEGEN SUPPORTED
ARCHITECTURES DEPENDENCIES END -->";
+ final String startDependenciesMarker = "<!-- CODEGEN DEPENDENCIES
START -->";
+ final String endDependenciesMarker = "<!-- CODEGEN DEPENDENCIES END
-->";
if (!Files.isRegularFile(pomFile)) {
throw new MojoExecutionException("Pom file " + pomFile + " does
not exist");
@@ -281,15 +281,9 @@ public class PrepareComponentMojo extends
AbstractGeneratorMojo {
MavenGav gav = new MavenGav(matcher.group(1),
matcher.group(2), "${project.version}", null);
dependencies.add(gav);
}
- if
("true".equals(project.getProperties().getProperty("camel.unsupported.arch"))) {
- // Add this component into the "unsupported architectures"
profile
- getLog().info("IMPORTANT NOTE: adding this component to the
\"unupported architectures\" profile");
- unsupportedArchDependencies
- .add(new MavenGav(project.getGroupId(),
project.getArtifactId(), "${project.version}", null));
- } else {
- // Add this component into the regular list of dependencies
- dependencies.add(new MavenGav(project.getGroupId(),
project.getArtifactId(), "${project.version}", null));
- }
+
+ // Add this component into the regular list of dependencies
+ dependencies.add(new MavenGav(project.getGroupId(),
project.getArtifactId(), "${project.version}", null));
// generate string output of all dependencies
String s = dependencies.stream()
@@ -297,27 +291,9 @@ public class PrepareComponentMojo extends
AbstractGeneratorMojo {
.filter(g -> !g.artifactId.contains("-maven-plugin"))
.map(g -> g.asString(" "))
.collect(Collectors.joining("\n"));
- String updatedPom = before + startDependenciesMarker
- + "\n" + s + "\n"
- + " " + endDependenciesMarker + after;
-
- if (!unsupportedArchDependencies.isEmpty()) {
- final String unsupportedStartDependenciesMarker
- = "<!-- CODEGEN UNSUPPORTED ARCHITECTURES DEPENDENCIES
START -->";
- final String unsupportedEndDependenciesMarker = "<!-- CODEGEN
UNSUPPORTED ARCHITECTURES DEPENDENCIES END -->";
- final String unsupportedBefore = Strings.before(updatedPom,
unsupportedStartDependenciesMarker);
- final String unsupportedAfter = Strings.after(updatedPom,
unsupportedEndDependenciesMarker);
-
- String newUnsupportedContent =
unsupportedArchDependencies.stream()
- // skip maven plugins
- .filter(g -> !g.artifactId.contains("-maven-plugin"))
- .map(g -> g.asString(" "))
- .collect(Collectors.joining("\n"));
-
- updatedPom = unsupportedBefore +
unsupportedStartDependenciesMarker
- + "\n" + newUnsupportedContent + "\n"
- + " " +
unsupportedEndDependenciesMarker + unsupportedAfter;
- }
+ final String updatedPom = before + startDependenciesMarker
+ + "\n" + s + "\n"
+ + " " + endDependenciesMarker +
after;
updateResource(root, "pom.xml", updatedPom);
} catch (IOException e) {
