From 920636fd86b00904f81d0780d7281cb1bd775125 Mon Sep 17 00:00:00 2001
From: sseifert <sseifert@pro-vision.de>
Date: Fri, 14 Feb 2020 11:12:17 +0100
Subject: [PATCH 1/2] #81 add integration test to execute released-version goal

---
 src/it/released-version/invoker.properties    |  2 +
 src/it/released-version/pom.xml               | 64 +++++++++++++++++++
 src/it/released-version/verify.groovy         |  9 +++
 .../mojo/buildhelper/ReleasedVersionMojo.java |  3 +
 4 files changed, 78 insertions(+)
 create mode 100644 src/it/released-version/invoker.properties
 create mode 100644 src/it/released-version/pom.xml
 create mode 100644 src/it/released-version/verify.groovy

diff --git a/src/it/released-version/invoker.properties b/src/it/released-version/invoker.properties
new file mode 100644
index 00000000..2cf67a98
--- /dev/null
+++ b/src/it/released-version/invoker.properties
@@ -0,0 +1,2 @@
+invoker.goals = test
+invoker.buildResult = success
\ No newline at end of file
diff --git a/src/it/released-version/pom.xml b/src/it/released-version/pom.xml
new file mode 100644
index 00000000..22ebae32
--- /dev/null
+++ b/src/it/released-version/pom.xml
@@ -0,0 +1,64 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.codehaus.mojo</groupId>
+  <artifactId>build-helper-maven-plugin-released-version-it</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <name>build-helper-maven-plugin-released-version-it</name>
+
+  <build>
+    <defaultGoal>package</defaultGoal>
+    <plugins>
+      <plugin>
+        <groupId>@project.groupId@</groupId>
+        <artifactId>@project.artifactId@</artifactId>
+        <version>@project.version@</version>
+        <executions>
+          <execution>
+            <id>released-version</id>
+            <goals>
+              <goal>released-version</goal>
+            </goals>
+            <configuration>
+              <propertyPrefix>myReleasedVersion</propertyPrefix>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>mk-target-dir</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <tasks>
+                <mkdir dir="${project.build.directory}" />
+              </tasks>
+            </configuration>
+          </execution>
+          
+          <execution>
+            <id>echo-released-version</id>
+            <phase>test</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <tasks>
+                <echo>myReleasedVersion.version=${myReleasedVersion.version}</echo>
+                <echo>myReleasedVersion.majorVersion=${myReleasedVersion.majorVersion}</echo>
+                <echo>myReleasedVersion.minorVersion=${myReleasedVersion.minorVersion}</echo>
+                <echo>myReleasedVersion.incrementalVersion=${myReleasedVersion.incrementalVersion}</echo>
+              </tasks>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/src/it/released-version/verify.groovy b/src/it/released-version/verify.groovy
new file mode 100644
index 00000000..ddc8d26e
--- /dev/null
+++ b/src/it/released-version/verify.groovy
@@ -0,0 +1,9 @@
+File file = new File( basedir, "build.log" );
+assert file.exists();
+
+String text = file.getText("utf-8");
+
+// its difficult to check the positove case with an existing released version in an IT - so currently we test only the case when no version is detected
+assert text.contains("No released version found.")
+
+return true;
diff --git a/src/main/java/org/codehaus/mojo/buildhelper/ReleasedVersionMojo.java b/src/main/java/org/codehaus/mojo/buildhelper/ReleasedVersionMojo.java
index 9b8cbbf8..726681da 100644
--- a/src/main/java/org/codehaus/mojo/buildhelper/ReleasedVersionMojo.java
+++ b/src/main/java/org/codehaus/mojo/buildhelper/ReleasedVersionMojo.java
@@ -127,6 +127,9 @@ public void execute()
                 defineVersionProperty( "buildNumber", releasedVersion.getBuildNumber() );
                 defineVersionProperty( "qualifier", releasedVersion.getQualifier() );
             }
+            else {
+                getLog().debug("No released version found.");
+            }
 
         }
         catch ( ArtifactMetadataRetrievalException e )

From ccbfb61dd3f49d1b3e7930296fd3fa6a03324ac1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Veiko=20K=C3=A4=C3=A4p?= <veiko.kaap@roguewave.com>
Date: Wed, 16 Oct 2019 10:44:36 +0300
Subject: [PATCH 2/2] Fix issue #81

(https://github.com/mojohaus/build-helper-maven-plugin/issues/81)

(cherry picked from commit 0e55de7f2a05df145d135093201d0a4ded02e0de)
---
 .../java/org/codehaus/mojo/buildhelper/ReleasedVersionMojo.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/codehaus/mojo/buildhelper/ReleasedVersionMojo.java b/src/main/java/org/codehaus/mojo/buildhelper/ReleasedVersionMojo.java
index 726681da..d1cee70c 100644
--- a/src/main/java/org/codehaus/mojo/buildhelper/ReleasedVersionMojo.java
+++ b/src/main/java/org/codehaus/mojo/buildhelper/ReleasedVersionMojo.java
@@ -92,7 +92,7 @@ private void defineVersionProperty( String name, int value )
     public void execute()
     {
         org.apache.maven.artifact.Artifact artifact =
-            artifactFactory.createArtifact( getProject().getGroupId(), getProject().getArtifactId(), "", "", "" );
+            artifactFactory.createArtifact( getProject().getGroupId(), getProject().getArtifactId(), getProject().getVersion(), "", "" );
         try
         {
             ArtifactVersion releasedVersion = null;