From 804f40c8724fdbeea19044e67400ebbf82b1c4c3 Mon Sep 17 00:00:00 2001 From: Jasper C Date: Mon, 21 Feb 2022 16:06:39 +0800 Subject: [PATCH 1/2] log string should reflect the default property name --- .gitignore | 1 + src/main/java/org/codehaus/mojo/build/CreateMojo.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 869d6d93..0ee24db1 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ target .classpath .project *.iml +.idea/ diff --git a/src/main/java/org/codehaus/mojo/build/CreateMojo.java b/src/main/java/org/codehaus/mojo/build/CreateMojo.java index fc40ad1d..4a01f9da 100644 --- a/src/main/java/org/codehaus/mojo/build/CreateMojo.java +++ b/src/main/java/org/codehaus/mojo/build/CreateMojo.java @@ -459,7 +459,7 @@ private void buildNumberAndTimeStampForReactorProjects( Date now, String tainted project.getProperties().put( timestampPropertyName, timestamp ); String scmBranch = getScmBranch(); - getLog().info( "Storing buildScmBranch: " + scmBranch ); + getLog().info( "Storing scmBranch: " + scmBranch ); project.getProperties().put( scmBranchPropertyName, scmBranch ); // Add the revision and timestamp properties to each project in the reactor From 696d2cd96f279da9110e2d816fc9302aa45bb876 Mon Sep 17 00:00:00 2001 From: Jasper C Date: Tue, 22 Feb 2022 14:07:03 +0800 Subject: [PATCH 2/2] fixed tests --- README.md | 1 + .../mojo/build/it/BuildNumberMojoTest.java | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 2ac68c5a..0eeac058 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,7 @@ This is the [buildnumber-maven-plugin](http://www.mojohaus.org/buildnumber-maven ## Releasing * Make sure `gpg-agent` is running. +* subversion `svn` is also needed for running tests * Make sure all tests pass `mvn clean verify -Prun-its` * Execute `mvn -B release:prepare release:perform` diff --git a/src/test/java/org/codehaus/mojo/build/it/BuildNumberMojoTest.java b/src/test/java/org/codehaus/mojo/build/it/BuildNumberMojoTest.java index fabd1aea..b070e153 100644 --- a/src/test/java/org/codehaus/mojo/build/it/BuildNumberMojoTest.java +++ b/src/test/java/org/codehaus/mojo/build/it/BuildNumberMojoTest.java @@ -60,7 +60,7 @@ public void basicItTest() FileUtils.copyDirectoryStructure( new File( testDir, "dotSvnDir" ), new File( testDir, ".svn" ) ); result = mavenExec.execute( "clean", "verify" ); result.assertLogText( "Storing buildNumber: 14069" ); - result.assertLogText( "Storing buildScmBranch: trunk" ); + result.assertLogText( "Storing scmBranch: trunk" ); File artifact = new File( testDir, "target/buildnumber-maven-plugin-basic-it-1.0-SNAPSHOT.jar" ); JarFile jarFile = new JarFile( artifact ); @@ -83,7 +83,7 @@ public void basicItGitTest() FileUtils.copyDirectoryStructure( new File( testDir, "dotGitDir" ), new File( testDir, ".git" ) ); result = mavenExec.execute( "clean", "verify" ); result.assertLogText( "Storing buildNumber: 6d36c746e82f00c5913954f9178f40224497b2f3" ); - result.assertLogText( "Storing buildScmBranch: master" ); + result.assertLogText( "Storing scmBranch: master" ); File artifact = new File( testDir, "target/buildnumber-maven-plugin-basic-it-1.0-SNAPSHOT.jar" ); JarFile jarFile = new JarFile( artifact ); @@ -103,7 +103,7 @@ public void basicItClearcaseScmTest() MavenExecutionResult result = mavenExec.execute( "clean", "verify" ); File testDir = result.getBasedir(); result.assertLogText( "Storing buildNumber: foo" ); - result.assertLogText( "Storing buildScmBranch: UNKNOWN_BRANCH" ); + result.assertLogText( "Storing scmBranch: UNKNOWN_BRANCH" ); File artifact = new File( testDir, "target/buildnumber-maven-plugin-basic-it-clearcase-scm-1.0-SNAPSHOT.jar" ); JarFile jarFile = new JarFile( artifact ); @@ -128,7 +128,7 @@ public void basicItNoDevScmTest() FileUtils.copyDirectoryStructure( new File( testDir, "dotSvnDir" ), new File( testDir, ".svn" ) ); result = mavenExec.execute( "clean", "verify" ); result.assertLogText( "Storing buildNumber: 14069" ); - result.assertLogText( "Storing buildScmBranch: trunk" ); + result.assertLogText( "Storing scmBranch: trunk" ); File artifact = new File( testDir, "target/buildnumber-maven-plugin-basic-it-no-devscm-1.0-SNAPSHOT.jar" ); JarFile jarFile = new JarFile( artifact ); @@ -153,7 +153,7 @@ public void basicItSvnJavaTest() FileUtils.copyDirectoryStructure( new File( testDir, "dotSvnDir" ), new File( testDir, ".svn" ) ); result = mavenExec.execute( "clean", "verify" ); result.assertLogText( "Storing buildNumber: 19665" ); - result.assertLogText( "Storing buildScmBranch: trunk" ); + result.assertLogText( "Storing scmBranch: trunk" ); File artifact = new File( testDir, "target/buildnumber-maven-plugin-basic-it-svnjava-1.0-SNAPSHOT.jar" ); JarFile jarFile = new JarFile( artifact ); @@ -235,7 +235,7 @@ public void gitBasicItMBUILDNUM66Test() FileUtils.fileWrite( foo, "hello" ); FileUtils.copyDirectoryStructure( new File( basedir, "dotGitDir" ), new File( basedir, ".git" ) ); result = mavenExec.execute( "verify" ); - result.assertLogText( "Storing buildScmBranch: master" ); + result.assertLogText( "Storing scmBranch: master" ); File testDir = result.getBasedir(); File artifact = new File( testDir, "target/buildnumber-maven-plugin-basic-it-1.0-SNAPSHOT.jar" ); JarFile jarFile = new JarFile( artifact ); @@ -398,4 +398,4 @@ private static boolean isSvn18() return false; } -} \ No newline at end of file +}