From 9dc6ccbb2bedd8d01e68ba35bb7f6cd57881a76b Mon Sep 17 00:00:00 2001
From: Maarten Mulders <mthmulders@apache.org>
Date: Wed, 18 Nov 2020 14:43:32 +0100
Subject: [PATCH 1/4] [MPLUGIN-367] Improve @Execute(lifecycle...) docs

---
 .../java/org/apache/maven/plugins/annotations/Execute.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Execute.java b/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Execute.java
index 1cf479bf8..0fe9a661e 100644
--- a/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Execute.java
+++ b/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Execute.java
@@ -51,7 +51,8 @@
     String goal() default "";
 
     /**
-     * lifecycle id to fork.
+     * lifecycle id of the phase to fork. Only valid in combination with {@link #phase()}. If not specified, Maven will
+     * use the lifecycle of the current build.
      * @return the lifecycle id
      */
     String lifecycle() default "";

From 33be78fd0fbb81059b95f8f33a4ed797909500e5 Mon Sep 17 00:00:00 2001
From: Maarten Mulders <mthmulders@apache.org>
Date: Sat, 21 Nov 2020 19:35:47 +0100
Subject: [PATCH 2/4] Improve docs to emphasise the semantics of
 @Execute(lifecycle...)

---
 .../java/org/apache/maven/plugins/annotations/Execute.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Execute.java b/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Execute.java
index 0fe9a661e..34e651a02 100644
--- a/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Execute.java
+++ b/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Execute.java
@@ -51,8 +51,8 @@
     String goal() default "";
 
     /**
-     * lifecycle id of the phase to fork. Only valid in combination with {@link #phase()}. If not specified, Maven will
-     * use the lifecycle of the current build.
+     * lifecycle id of the lifecycle that defines {@link #phase()}. Only valid in combination with {@link #phase()}. If
+     * not specified, Maven will use the lifecycle of the current build.
      * @return the lifecycle id
      */
     String lifecycle() default "";

From 4bd81826d578690903f470c3239930e5a9ae4a79 Mon Sep 17 00:00:00 2001
From: Maarten Mulders <mthmulders@apache.org>
Date: Sat, 21 Nov 2020 19:38:24 +0100
Subject: [PATCH 3/4] Add reference to lifecycle mapping doc

---
 .../main/java/org/apache/maven/plugins/annotations/Execute.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Execute.java b/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Execute.java
index 34e651a02..651c1777b 100644
--- a/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Execute.java
+++ b/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Execute.java
@@ -53,6 +53,8 @@
     /**
      * lifecycle id of the lifecycle that defines {@link #phase()}. Only valid in combination with {@link #phase()}. If
      * not specified, Maven will use the lifecycle of the current build.
+     *
+     * @see <a href="http://maven.apache.org/maven-plugin-api/lifecycle-mappings.html">Lifecycle Mappings</a>
      * @return the lifecycle id
      */
     String lifecycle() default "";

From 13cc0e9056e03347bb2f974dbeb2dfed4b606edf Mon Sep 17 00:00:00 2001
From: Maarten Mulders <mthmulders@apache.org>
Date: Sat, 21 Nov 2020 20:04:23 +0100
Subject: [PATCH 4/4] Of course it should be https

---
 .../main/java/org/apache/maven/plugins/annotations/Execute.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Execute.java b/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Execute.java
index 651c1777b..c4962cfa0 100644
--- a/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Execute.java
+++ b/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Execute.java
@@ -54,7 +54,7 @@
      * lifecycle id of the lifecycle that defines {@link #phase()}. Only valid in combination with {@link #phase()}. If
      * not specified, Maven will use the lifecycle of the current build.
      *
-     * @see <a href="http://maven.apache.org/maven-plugin-api/lifecycle-mappings.html">Lifecycle Mappings</a>
+     * @see <a href="https://maven.apache.org/maven-plugin-api/lifecycle-mappings.html">Lifecycle Mappings</a>
      * @return the lifecycle id
      */
     String lifecycle() default "";