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 2020/03/02 10:43:08 UTC

[camel-quarkus] branch master updated: Fix #831 Move Groovy executions under the enforce profile

This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git


The following commit(s) were added to refs/heads/master by this push:
     new 13d3063  Fix #831 Move Groovy executions under the enforce profile
     new f3b78fe  Merge pull request #832 from ppalaga/i831
13d3063 is described below

commit 13d306389cf4deff92836fc856f31277eb4404e2
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Mon Mar 2 10:38:40 2020 +0100

    Fix #831 Move Groovy executions under the enforce profile
---
 extensions/pom.xml | 65 ++++++++++++++++++++++++++++++++++--------------------
 pom.xml            | 37 ++++++++++++++-----------------
 2 files changed, 58 insertions(+), 44 deletions(-)

diff --git a/extensions/pom.xml b/extensions/pom.xml
index b507899..0c8925a 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -126,30 +126,6 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.codehaus.gmaven</groupId>
-                <artifactId>groovy-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>validate-extension-metadata</id>
-                        <inherited>false</inherited>
-                        <goals>
-                            <goal>execute</goal>
-                        </goals>
-                        <phase>verify</phase>
-                        <configuration>
-                            <source>file:///${project.basedir}/../tooling/scripts/validate-extension-metadata.groovy</source>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.yaml</groupId>
-                        <artifactId>snakeyaml</artifactId>
-                        <version>${snakeyaml.version}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-            <plugin>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-maven-plugin</artifactId>
                 <inherited>false</inherited>
@@ -175,4 +151,45 @@
             </plugin>
         </plugins>
     </build>
+
+    <profiles>
+        <profile>
+            <id>enforce</id>
+            <activation>
+                <property>
+                    <name>enforce</name>
+                    <value>!false</value>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.gmaven</groupId>
+                        <artifactId>groovy-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>validate-extension-metadata</id>
+                                <inherited>false</inherited>
+                                <goals>
+                                    <goal>execute</goal>
+                                </goals>
+                                <phase>verify</phase>
+                                <configuration>
+                                    <source>file:///${project.basedir}/../tooling/scripts/validate-extension-metadata.groovy</source>
+                                </configuration>
+                            </execution>
+                        </executions>
+                        <dependencies>
+                            <dependency>
+                                <groupId>org.yaml</groupId>
+                                <artifactId>snakeyaml</artifactId>
+                                <version>${snakeyaml.version}</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+    </profiles>
 </project>
diff --git a/pom.xml b/pom.xml
index daba85f..b7eb6be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -302,26 +302,6 @@
             </plugins>
         </pluginManagement>
 
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.gmaven</groupId>
-                <artifactId>groovy-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>validate-github-workflows</id>
-                        <inherited>false</inherited>
-                        <goals>
-                            <goal>execute</goal>
-                        </goals>
-                        <phase>process-resources</phase>
-                        <configuration>
-                            <source>file:///${project.basedir}/tooling/scripts/validate-github-workflows.groovy</source>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-        </plugins>
     </build>
 
     <profiles>
@@ -357,6 +337,23 @@
                                 </execution>
                             </executions>
                         </plugin>
+                        <plugin>
+                            <groupId>org.codehaus.gmaven</groupId>
+                            <artifactId>groovy-maven-plugin</artifactId>
+                            <executions>
+                                <execution>
+                                    <id>validate-github-workflows</id>
+                                    <inherited>false</inherited>
+                                    <goals>
+                                        <goal>execute</goal>
+                                    </goals>
+                                    <phase>process-resources</phase>
+                                    <configuration>
+                                        <source>file:///${project.basedir}/tooling/scripts/validate-github-workflows.groovy</source>
+                                    </configuration>
+                                </execution>
+                            </executions>
+                        </plugin>
                     </plugins>
                 </pluginManagement>
             </build>