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-quarkus.git
commit 7001b6c25dc523f9299826b4b72f7e22d4375e6d
Author: Peter Palaga <ppal...@redhat.com>
AuthorDate: Thu Aug 1 18:37:40 2024 +0200
Move all enforcer invocations to the full profile
---
extensions/grpc/pom.xml | 105 +++++++++++++++++++----------------
extensions/salesforce/pom.xml | 105 +++++++++++++++++++----------------
integration-tests/grpc/pom.xml | 99 +++++++++++++++++++--------------
integration-tests/salesforce/pom.xml | 104 ++++++++++++++++++----------------
4 files changed, 228 insertions(+), 185 deletions(-)
diff --git a/extensions/grpc/pom.xml b/extensions/grpc/pom.xml
index 2fd05e6a43..a2017f0bdc 100644
--- a/extensions/grpc/pom.xml
+++ b/extensions/grpc/pom.xml
@@ -36,51 +36,62 @@
<module>runtime</module>
</modules>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-enforcer-rules</artifactId>
- <version>${quarkus.version}</version>
- </dependency>
- <dependency>
- <groupId>org.l2x6.cq</groupId>
-
<artifactId>cq-filtered-external-enforcer-rules</artifactId>
- <version>${cq-plugin.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>camel-quarkus-enforcer-rules</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <dependencyConvergence />
- <filteredExternalRules>
-
<location>classpath:enforcer-rules/quarkus-require-maven-version.xml</location>
- </filteredExternalRules>
- <filteredExternalRules>
-
<location>classpath:enforcer-rules/quarkus-banned-dependencies.xml</location>
-
<xsltLocation>${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/quarkus-banned-dependencies.xsl</xsltLocation>
- </filteredExternalRules>
- <filteredExternalRules>
-
<location>${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned-dependencies.xml</location>
-
<xsltLocation>${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/allow-findbugs.xsl</xsltLocation>
- </filteredExternalRules>
- <filteredExternalRules>
-
<location>${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned-dependencies-spring.xml</location>
- </filteredExternalRules>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <profiles>
+ <profile>
+ <!-- Pass '-Dquickly' to skip enforcer and some further sanity
checks -->
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-enforcer-rules</artifactId>
+ <version>${quarkus.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.l2x6.cq</groupId>
+
<artifactId>cq-filtered-external-enforcer-rules</artifactId>
+ <version>${cq-plugin.version}</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>camel-quarkus-enforcer-rules</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <dependencyConvergence />
+ <filteredExternalRules>
+
<location>classpath:enforcer-rules/quarkus-require-maven-version.xml</location>
+ </filteredExternalRules>
+ <filteredExternalRules>
+
<location>classpath:enforcer-rules/quarkus-banned-dependencies.xml</location>
+
<xsltLocation>${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/quarkus-banned-dependencies.xsl</xsltLocation>
+ </filteredExternalRules>
+ <filteredExternalRules>
+
<location>${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned-dependencies.xml</location>
+
<xsltLocation>${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/allow-findbugs.xsl</xsltLocation>
+ </filteredExternalRules>
+ <filteredExternalRules>
+
<location>${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned-dependencies-spring.xml</location>
+ </filteredExternalRules>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/extensions/salesforce/pom.xml b/extensions/salesforce/pom.xml
index 17c851fc11..359c74d5c8 100644
--- a/extensions/salesforce/pom.xml
+++ b/extensions/salesforce/pom.xml
@@ -36,51 +36,62 @@
<module>runtime</module>
</modules>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-enforcer-rules</artifactId>
- <version>${quarkus.version}</version>
- </dependency>
- <dependency>
- <groupId>org.l2x6.cq</groupId>
-
<artifactId>cq-filtered-external-enforcer-rules</artifactId>
- <version>${cq-plugin.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>camel-quarkus-enforcer-rules</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <dependencyConvergence />
- <filteredExternalRules>
-
<location>classpath:enforcer-rules/quarkus-require-maven-version.xml</location>
- </filteredExternalRules>
- <filteredExternalRules>
-
<location>classpath:enforcer-rules/quarkus-banned-dependencies.xml</location>
-
<xsltLocation>${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/quarkus-banned-dependencies.xsl</xsltLocation>
- </filteredExternalRules>
- <filteredExternalRules>
-
<location>${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned-dependencies.xml</location>
-
<xsltLocation>${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/allow-findbugs.xsl</xsltLocation>
- </filteredExternalRules>
- <filteredExternalRules>
-
<location>${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned-dependencies-spring.xml</location>
- </filteredExternalRules>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <profiles>
+ <profile>
+ <!-- Pass '-Dquickly' to skip enforcer and some further sanity
checks -->
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-enforcer-rules</artifactId>
+ <version>${quarkus.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.l2x6.cq</groupId>
+
<artifactId>cq-filtered-external-enforcer-rules</artifactId>
+ <version>${cq-plugin.version}</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>camel-quarkus-enforcer-rules</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <dependencyConvergence />
+ <filteredExternalRules>
+
<location>classpath:enforcer-rules/quarkus-require-maven-version.xml</location>
+ </filteredExternalRules>
+ <filteredExternalRules>
+
<location>classpath:enforcer-rules/quarkus-banned-dependencies.xml</location>
+
<xsltLocation>${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/quarkus-banned-dependencies.xsl</xsltLocation>
+ </filteredExternalRules>
+ <filteredExternalRules>
+
<location>${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned-dependencies.xml</location>
+
<xsltLocation>${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/allow-findbugs.xsl</xsltLocation>
+ </filteredExternalRules>
+ <filteredExternalRules>
+
<location>${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned-dependencies-spring.xml</location>
+ </filteredExternalRules>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/integration-tests/grpc/pom.xml b/integration-tests/grpc/pom.xml
index 5e4ba36758..3bb8b8721d 100644
--- a/integration-tests/grpc/pom.xml
+++ b/integration-tests/grpc/pom.xml
@@ -90,49 +90,6 @@
<build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-enforcer-rules</artifactId>
- <version>${quarkus.version}</version>
- </dependency>
- <dependency>
- <groupId>org.l2x6.cq</groupId>
-
<artifactId>cq-filtered-external-enforcer-rules</artifactId>
- <version>${cq-plugin.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>camel-quarkus-enforcer-rules</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <dependencyConvergence />
- <filteredExternalRules>
-
<location>classpath:enforcer-rules/quarkus-require-maven-version.xml</location>
- </filteredExternalRules>
- <filteredExternalRules>
-
<location>classpath:enforcer-rules/quarkus-banned-dependencies.xml</location>
-
<xsltLocation>${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/quarkus-banned-dependencies.xsl</xsltLocation>
- </filteredExternalRules>
- <filteredExternalRules>
-
<location>${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned-dependencies.xml</location>
-
<xsltLocation>${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/allow-findbugs.xsl</xsltLocation>
- </filteredExternalRules>
- <filteredExternalRules>
-
<location>${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned-dependencies-spring.xml</location>
- </filteredExternalRules>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>${quarkus.platform.group-id}</groupId>
<artifactId>quarkus-maven-plugin</artifactId>
@@ -152,6 +109,62 @@
</build>
<profiles>
+ <profile>
+ <!-- Pass '-Dquickly' to skip enforcer and some further sanity
checks -->
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-enforcer-rules</artifactId>
+ <version>${quarkus.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.l2x6.cq</groupId>
+
<artifactId>cq-filtered-external-enforcer-rules</artifactId>
+ <version>${cq-plugin.version}</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>camel-quarkus-enforcer-rules</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <dependencyConvergence />
+ <filteredExternalRules>
+
<location>classpath:enforcer-rules/quarkus-require-maven-version.xml</location>
+ </filteredExternalRules>
+ <filteredExternalRules>
+
<location>classpath:enforcer-rules/quarkus-banned-dependencies.xml</location>
+
<xsltLocation>${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/quarkus-banned-dependencies.xsl</xsltLocation>
+ </filteredExternalRules>
+ <filteredExternalRules>
+
<location>${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned-dependencies.xml</location>
+
<xsltLocation>${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/allow-findbugs.xsl</xsltLocation>
+ </filteredExternalRules>
+ <filteredExternalRules>
+
<location>${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned-dependencies-spring.xml</location>
+ </filteredExternalRules>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
<profile>
<id>native</id>
<activation>
diff --git a/integration-tests/salesforce/pom.xml
b/integration-tests/salesforce/pom.xml
index b67a4ded6c..f73eaf9e79 100644
--- a/integration-tests/salesforce/pom.xml
+++ b/integration-tests/salesforce/pom.xml
@@ -77,55 +77,63 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-enforcer-rules</artifactId>
- <version>${quarkus.version}</version>
- </dependency>
- <dependency>
- <groupId>org.l2x6.cq</groupId>
-
<artifactId>cq-filtered-external-enforcer-rules</artifactId>
- <version>${cq-plugin.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>camel-quarkus-enforcer-rules</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <dependencyConvergence />
- <filteredExternalRules>
-
<location>classpath:enforcer-rules/quarkus-require-maven-version.xml</location>
- </filteredExternalRules>
- <filteredExternalRules>
-
<location>classpath:enforcer-rules/quarkus-banned-dependencies.xml</location>
-
<xsltLocation>${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/quarkus-banned-dependencies.xsl</xsltLocation>
- </filteredExternalRules>
- <filteredExternalRules>
-
<location>${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned-dependencies.xml</location>
-
<xsltLocation>${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/allow-findbugs.xsl</xsltLocation>
- </filteredExternalRules>
- <filteredExternalRules>
-
<location>${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned-dependencies-spring.xml</location>
- </filteredExternalRules>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
<profiles>
+ <profile>
+ <!-- Pass '-Dquickly' to skip enforcer and some further sanity
checks -->
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-enforcer-rules</artifactId>
+ <version>${quarkus.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.l2x6.cq</groupId>
+
<artifactId>cq-filtered-external-enforcer-rules</artifactId>
+ <version>${cq-plugin.version}</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>camel-quarkus-enforcer-rules</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <dependencyConvergence />
+ <filteredExternalRules>
+
<location>classpath:enforcer-rules/quarkus-require-maven-version.xml</location>
+ </filteredExternalRules>
+ <filteredExternalRules>
+
<location>classpath:enforcer-rules/quarkus-banned-dependencies.xml</location>
+
<xsltLocation>${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/quarkus-banned-dependencies.xsl</xsltLocation>
+ </filteredExternalRules>
+ <filteredExternalRules>
+
<location>${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned-dependencies.xml</location>
+
<xsltLocation>${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/allow-findbugs.xsl</xsltLocation>
+ </filteredExternalRules>
+ <filteredExternalRules>
+
<location>${maven.multiModuleProjectDirectory}/tooling/enforcer-rules/camel-quarkus-banned-dependencies-spring.xml</location>
+ </filteredExternalRules>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
<profile>
<id>native</id>
<activation>
