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

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

commit 9b4e70173eec39f4a36ca496569b143e77e051cb
Author: Peter Palaga <ppal...@redhat.com>
AuthorDate: Tue Apr 28 16:15:53 2020 +0200

    Fix #1156 #1155 Skip unnecessary tasks during release:prepare and
    release:perform
---
 pom.xml                   | 80 +++++++++++++++++++++++++++--------------------
 poms/build-parent/pom.xml | 22 +++++++++++++
 2 files changed, 68 insertions(+), 34 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8fed388..c3c490a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -110,6 +110,7 @@
         <maven-assembly-plugin.version>3.1.1</maven-assembly-plugin.version>
         
<maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
         <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
+        <maven-release-plugin.version>2.5.3</maven-release-plugin.version>
         <!-- NOTE: We pin to this version due to 
https://github.com/apache/camel-quarkus/issues/723 -->
         <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
         <cq-plugin.version>0.2.0</cq-plugin.version>
@@ -237,6 +238,23 @@
 
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-release-plugin</artifactId>
+                    <version>${maven-release-plugin.version}</version>
+                    <configuration>
+                        <!-- release:prepare config -->
+                        <preparationGoals>clean package</preparationGoals>
+                        <waitBeforeTagging>10</waitBeforeTagging>
+                        <!-- release:perform config -->
+                        <useReleaseProfile>true</useReleaseProfile>
+                        <releaseProfiles>apache-release</releaseProfiles>
+                        <goals>deploy</goals>
+                        <!-- Both release:prepare and release:perform config 
-->
+                        <arguments>-DskipTests -Denforce=false 
-Dquarkus.build.skip -Dformatter.skip -Dimpsort.skip</arguments>
+                    </configuration>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
                     <version>${maven-surefire-plugin.version}</version>
                     <configuration>
@@ -426,38 +444,6 @@
 
     <profiles>
         <profile>
-            <id>apache-release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <version>${maven-assembly-plugin.version}</version>
-                        <executions>
-                            <execution>
-                                <id>source-release-assembly</id>
-                                <phase /><!-- fix 
https://github.com/apache/camel-quarkus/issues/844 -->
-                            </execution>
-                            <execution>
-                                <id>camel-quarkus-source-release-assembly</id>
-                                <phase>package</phase>
-                                <inherited>false</inherited>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                                <configuration>
-                                    <descriptors>
-                                        
<descriptor>tooling/descriptors/src.xml</descriptor>
-                                    </descriptors>
-                                    <tarLongFileMode>gnu</tarLongFileMode>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
             <!-- To disable sanity checks while building: add 
'-Denforce=false' to the command line -->
             <id>enforce</id>
             <activation>
@@ -680,14 +666,40 @@
             </build>
         </profile>
         <profile>
-            <id>release</id>
+            <id>apache-release</id>
             <activation>
                 <property>
-                    <name>release</name>
+                    <name>apache-release</name>
                 </property>
             </activation>
             <build>
                 <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <version>${maven-assembly-plugin.version}</version>
+                        <executions>
+                            <execution>
+                                <id>source-release-assembly</id>
+                                <phase /><!-- fix 
https://github.com/apache/camel-quarkus/issues/844 -->
+                            </execution>
+                            <execution>
+                                <id>camel-quarkus-source-release-assembly</id>
+                                <phase>package</phase>
+                                <inherited>false</inherited>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                                <configuration>
+                                    <descriptors>
+                                        
<descriptor>tooling/descriptors/src.xml</descriptor>
+                                    </descriptors>
+                                    <tarLongFileMode>gnu</tarLongFileMode>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+
                     <!-- We want to deploy the artifact to a staging location 
for perusal -->
                     <plugin>
                         <inherited>true</inherited>
diff --git a/poms/build-parent/pom.xml b/poms/build-parent/pom.xml
index 634b3e1..f8ab64d 100644
--- a/poms/build-parent/pom.xml
+++ b/poms/build-parent/pom.xml
@@ -283,5 +283,27 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>apache-release</id>
+            <activation>
+                <property>
+                    <name>apache-release</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.gmaven</groupId>
+                        <artifactId>groovy-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>sanity-checks</id>
+                                <phase /><!-- Speedup the releases by skipping 
the sanity-checks  -->
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 </project>

Reply via email to