We have run into this issue a couple of time:
Instead of containing a version of the trunk modified for release, the tagged folder contains a copy of the trunk before any modification, and it also contains a 'trunk' subfolder where the correct modified version is.
Therefore, if I have this in my SVN repo before releasing:
- projectName
- trunk (version in pom.xml is 1.0.0-SNAPHOT)
- tags
Normally, I would have the following after releasing version 1.0.0:
- projectName
- trunk (version in pom.xml is 1.1.0-SNAPSHOT)
- tags
- 1.0.0 (version in pom.xml is 1.0.0)
However, very few times, I wound up with:
- projectName
- trunk (version in pom.xml is 1.1.0-SNAPSHOT)
- tags
- 1.0.0 (version in pom.xml is 1.0.0-SNAPSHOT)
- trunk (version in pom.xml is 1.0.0)
- 1.0.0 (version in pom.xml is 1.0.0-SNAPSHOT)
The 'scm' tag in the pom.xml before releasing seems correct, so I don't think if comes from there:
<scm>
<url>http://.../projectName/trunk</url>
<connection>scm:svn:http://.../projectName/trunk</connection>
<developerConnection>scm:svn:http://.../projectName/trunk</developerConnection>
</scm>
My Bamboo plan is composed of the following tasks:
- Source Code Checkout (with Force Clean Build)
- Script (to determine the release version)
- Maven 3.x (Actual release)
My Maven 3.x task has the following goal:
--batch-mode -Dusername=${bamboo.username} -Dpassword=${bamboo.password} -Dtag=${bamboo.version} release:prepare -DreleaseVersion=${bamboo.version} -DdevelopmentVersion=${bamboo.nextVersion}-SNAPSHOT -Dresume=false release:perform
The plugin has no options:
<plugin>
<artifactId>maven-release-plugin</artifactId>
<version>2.4.1</version>
</plugin>
Having checked in the logs, I cannot see anything abnormal to determine the cause.
[LOG] Checking in modified POMs...
[LOG] Executing: /bin/sh -c cd .../build-dir/PROJECT-PLAN-JOB && svn --username user --password '*****' --no-auth-cache --non-interactive commit --file .../temp/PROJECT-PLAN-JOB/maven-scm-386932260.commit --targets .../temp/PROJECT-PLAN-JOB/maven-scm-7155492065832691877-targets
[LOG] Working directory: .../build-dir/PROJECT-PLAN-JOB
[LOG] Tagging release with the label 1.0.0...
[LOG] Executing: /bin/sh -c cd .../build-dir/PROJECT-PLAN-JOB && svn --username user --password '*****' --no-auth-cache --non-interactive copy --file .../temp/PROJECT-PLAN-JOB/maven-scm-80256020.commit --revision 46345 http://.../projectName/trunk http://.../projectName/tags/1.0.0
[LOG] Working directory: .../build-dir/PROJECT-PLAN-JOB
[LOG] Transforming 'projectName'...
[LOG] Not removing release POMs
[LOG] Checking in modified POMs...
[LOG] Executing: /bin/sh -c cd .../build-dir/PROJECT-PLAN-JOB && svn --username user --password '*****' --no-auth-cache --non-interactive commit --file .../temp/PROJECT-PLAN-JOB/maven-scm-1254735614.commit --targets .../temp/PROJECT-PLAN-JOB/maven-scm-2179675177497779390-targets
[LOG] Working directory: .../build-dir/PROJECT-PLAN-JOB
[LOG] Release preparation complete.
[LOG]
[LOG] --- maven-release-plugin:2.4.1:perform (default-cli) @ projectName ---
[LOG] Checking out the project to perform the release ...
[LOG] Executing: /bin/sh -c cd .../build-dir/PROJECT-PLAN-JOB/target && svn --username user --password '*****' --no-auth-cache --non-interactive checkout http://.../projectName/tags/1.0.0 .../build-dir/PROJECT-PLAN-JOB/target/checkout
[LOG] Working directory: .../build-dir/PROJECT-PLAN-JOB/target
[LOG] Invoking perform goals in directory .../build-dir/PROJECT-PLAN-JOB/target/checkout
[LOG] Executing goals 'deploy'...
From what is see in the log, the execution is:
- The version in the pom is modified to remove the -SNAPSHOT (1.0.0)
- This pom is commited in the trunk
- The content of the trunk is copied into the tag 1.0.0
- The version in the pom is modified to next version (1.1.0-SNAPSHOT)
- This pom is commited in the trunk
- The content of the tag 1.0.0 is checked out in the folder /target/checkout/
- The release is done on the /target/checkout/
Any idea why the 1.0.0 tag folder in the SVN repo contains another 'trunk' subfolder there?
