You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/05/07 19:02:36 UTC
[maven-release] 01/01: [MRELEASE-1089] Reduce the tag format to the project version only
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MRELEASE-1089
in repository https://gitbox.apache.org/repos/asf/maven-release.git
commit 428afaca2398f43e537a0a2970fa913139adf282
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat May 7 21:02:24 2022 +0200
[MRELEASE-1089] Reduce the tag format to the project version only
This closes #122
---
.../src/it/projects/prepare/MRELEASE-128/verify.groovy | 6 +++---
.../prepare/flat-multi-module/parent-project/pom.xml | 5 ++++-
.../it/projects/prepare/regular-multi-module/verify.groovy | 2 +-
.../maven/plugins/release/AbstractScmReleaseMojo.java | 14 +++++++-------
.../src/site/apt/examples/prepare-release.apt.vm | 4 ++--
5 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/maven-release-plugin/src/it/projects/prepare/MRELEASE-128/verify.groovy b/maven-release-plugin/src/it/projects/prepare/MRELEASE-128/verify.groovy
index 8502268e..652ed724 100644
--- a/maven-release-plugin/src/it/projects/prepare/MRELEASE-128/verify.groovy
+++ b/maven-release-plugin/src/it/projects/prepare/MRELEASE-128/verify.groovy
@@ -25,8 +25,8 @@ assert 1 == pomXml.getText().count("<developerConnection>scm:svn:http://\${scm.h
File pomXmlTag = new File( basedir, 'pom.xml.tag' )
assert pomXmlTag.exists()
-assert 1 == pomXmlTag.getText().count("<connection>scm:svn:http://\${scm.host}/svn/\${project.artifactId}/tags/mrelease-128-1.0</connection>")
-assert 1 == pomXmlTag.getText().count("<developerConnection>scm:svn:http://\${scm.host}/svn/\${project.artifactId}/tags/mrelease-128-1.0</developerConnection>")
+assert 1 == pomXmlTag.getText().count("<connection>scm:svn:http://\${scm.host}/svn/\${project.artifactId}/tags/1.0</connection>")
+assert 1 == pomXmlTag.getText().count("<developerConnection>scm:svn:http://\${scm.host}/svn/\${project.artifactId}/tags/1.0</developerConnection>")
File pomXmlNext = new File( basedir, 'pom.xml.next' )
assert pomXmlNext.exists()
@@ -36,4 +36,4 @@ assert 1 == pomXmlNext.getText().count("<developerConnection>scm:svn:http://\${s
File pomXmlReleaseBackup = new File( basedir, 'pom.xml.releaseBackup' )
assert pomXmlReleaseBackup.exists()
assert 1 == pomXmlReleaseBackup.getText().count("<connection>scm:svn:http://\${scm.host}/svn/\${project.artifactId}/trunk/</connection>")
-assert 1 == pomXmlReleaseBackup.getText().count("<developerConnection>scm:svn:http://\${scm.host}/svn/\${project.artifactId}/trunk/</developerConnection>")
\ No newline at end of file
+assert 1 == pomXmlReleaseBackup.getText().count("<developerConnection>scm:svn:http://\${scm.host}/svn/\${project.artifactId}/trunk/</developerConnection>")
diff --git a/maven-release-plugin/src/it/projects/prepare/flat-multi-module/parent-project/pom.xml b/maven-release-plugin/src/it/projects/prepare/flat-multi-module/parent-project/pom.xml
index 8c27df66..b9f8162f 100644
--- a/maven-release-plugin/src/it/projects/prepare/flat-multi-module/parent-project/pom.xml
+++ b/maven-release-plugin/src/it/projects/prepare/flat-multi-module/parent-project/pom.xml
@@ -26,7 +26,7 @@
<name>parent-project</name>
<url>http://maven.apache.org</url>
<scm>
- <connection>scm:svn:file://localhost/${project.file.parentFile.parentFile}/target/svnroot/flat-multi-module/trunk/parent-project</connection>
+ <connection>scm:svn:file://localhost/${project.file.parentFile.parentFile}/target/svnroot/flat-multi-module/trunk/parent-project</connection>
<developerConnection>scm:svn:file://localhost/${project.file.parentFile.parentFile}/target/svnroot/flat-multi-module/trunk/parent-project</developerConnection>
</scm>
@@ -42,6 +42,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>@project.version@</version>
+ <configuration>
+ <tagNameFormat>@{project.artifactId}-@{project.version}</tagNameFormat>
+ </configuration>
</plugin>
</plugins>
</pluginManagement>
diff --git a/maven-release-plugin/src/it/projects/prepare/regular-multi-module/verify.groovy b/maven-release-plugin/src/it/projects/prepare/regular-multi-module/verify.groovy
index a4ae4f75..0e071b63 100644
--- a/maven-release-plugin/src/it/projects/prepare/regular-multi-module/verify.groovy
+++ b/maven-release-plugin/src/it/projects/prepare/regular-multi-module/verify.groovy
@@ -37,7 +37,7 @@ try
String contents = data.toString();
String expected1 = "Full run would tag working copy '" + basedir + "'";
- String expected2 = " with label 'regular-multi-module-project-1.0'";
+ String expected2 = " with label '1.0'";
if( contents.indexOf( expected1 ) != -1 && contents.indexOf( expected2 ) != -1 )
{
diff --git a/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractScmReleaseMojo.java b/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractScmReleaseMojo.java
index fcdda10b..6d4ab7d5 100644
--- a/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractScmReleaseMojo.java
+++ b/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractScmReleaseMojo.java
@@ -70,7 +70,7 @@ public abstract class AbstractScmReleaseMojo
*
* @since 2.2.0
*/
- @Parameter( defaultValue = "@{project.artifactId}-@{project.version}", property = "tagNameFormat" )
+ @Parameter( defaultValue = "@{project.version}", property = "tagNameFormat" )
private String tagNameFormat;
/**
@@ -113,7 +113,7 @@ public abstract class AbstractScmReleaseMojo
private String workItem;
/**
- * Add a new or overwrite the default implementation per provider.
+ * Add a new or overwrite the default implementation per provider.
* The key is the scm prefix and the value is the role hint of the
* {@link org.apache.maven.scm.provider.ScmProvider}.
*
@@ -159,7 +159,7 @@ public abstract class AbstractScmReleaseMojo
descriptor.setPushChanges( pushChanges );
descriptor.setWorkItem( workItem );
-
+
if ( project.getScm() != null )
{
if ( project.getScm().getDeveloperConnection() != null )
@@ -171,24 +171,24 @@ public abstract class AbstractScmReleaseMojo
descriptor.setScmSourceUrl( project.getScm().getConnection() );
}
}
-
+
// As long as Scm.getId() does not exist, read it as a property
descriptor.setScmId( project.getProperties().getProperty( "project.scm.id" ) );
-
+
for ( MavenProject reactorProject : session.getProjects() )
{
if ( reactorProject.getScm() != null )
{
String projectId =
ArtifactUtils.versionlessKey( reactorProject.getGroupId(), reactorProject.getArtifactId() );
-
+
descriptor.addOriginalScmInfo( projectId, buildScm( reactorProject ) );
}
}
return descriptor;
}
-
+
/**
* <p>buildScm.</p>
*
diff --git a/maven-release-plugin/src/site/apt/examples/prepare-release.apt.vm b/maven-release-plugin/src/site/apt/examples/prepare-release.apt.vm
index 11928303..c5680f77 100644
--- a/maven-release-plugin/src/site/apt/examples/prepare-release.apt.vm
+++ b/maven-release-plugin/src/site/apt/examples/prepare-release.apt.vm
@@ -95,7 +95,7 @@ mvn release:prepare-with-pom
* Overriding the default tag name format
- By default, if you do not specify a tag name, a default tag name of <<<artifactId>>>-<<<version>>> will be
+ By default, if you do not specify a tag name, a default tag name of <<<version>>> will be
suggested (and if running non-interactively used).
You can specify the exact tag name to use from the command line by passing the <<<tag>>> property, but if you
@@ -141,4 +141,4 @@ mvn release:prepare-with-pom
[]
- The <<<project.>>> prefix is optional and may be omitted.
\ No newline at end of file
+ The <<<project.>>> prefix is optional and may be omitted.