You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2012/09/28 17:07:22 UTC
svn commit: r1391497 [1/6] - in
/maven/release/trunk/maven-release-manager/src:
main/java/org/apache/maven/shared/release/phase/
test/java/org/apache/maven/shared/release/phase/
test/resources/projects/rewrite-for-branch/ test/resources/projects/rewrit...
Author: rfscholte
Date: Fri Sep 28 15:07:12 2012
New Revision: 1391497
URL: http://svn.apache.org/viewvc?rev=1391497&view=rev
Log:
Fix MRELEASE-795: Wrong level when using release:branch
Added:
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhaseTest.java
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-entities/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-entities/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-entities/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-inherited-scm/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-inherited-scm/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-inherited-scm/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-inherited-scm/subproject1/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-inherited-scm/subproject1/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-inherited-scm/subproject1/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-inherited-scm/subproject1/subsubproject/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-inherited-scm/subproject1/subsubproject/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-inherited-scm/subproject1/subsubproject/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-namespace/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-namespace/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-namespace/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-cvs/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-cvs-from-tag/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-cvs-from-tag/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-cvs-from-tag/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-cvs/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-cvs/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-dashes-in-comment/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-dashes-in-comment/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-dashes-in-comment/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-empty-scm/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-empty-scm/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-empty-scm/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-encoding/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-encoding/expected-pom.xml (with props)
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-encoding/pom.xml (with props)
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-scm-expression/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-scm-expression/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-scm-expression/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-tag-base/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-tag-base-and-varying-scm-urls/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-tag-base-and-varying-scm-urls/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-tag-base-and-varying-scm-urls/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-tag-base/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-tag-base/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom/expected-pom-with-schema.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/cdata-around-values/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/cdata-around-values/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/cdata-around-values/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/cdata-around-values/subproject1/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/cdata-around-values/subproject1/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/cdata-around-values/subproject1/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/cdata-around-values/subproject2/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/cdata-around-values/subproject2/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/cdata-around-values/subproject2/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/cdata-section/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/cdata-section/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/cdata-section/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/comments-around-values/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/comments-around-values/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/comments-around-values/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/comments-around-values/subproject1/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/comments-around-values/subproject1/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/comments-around-values/subproject1/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/imported-dependency-management-in-reactor/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/imported-dependency-management-in-reactor/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/imported-dependency-management-in-reactor/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/imported-dependency-management-in-reactor/subproject1/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/imported-dependency-management-in-reactor/subproject1/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/imported-dependency-management-in-reactor/subproject1/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/imported-dependency-management-in-reactor/subproject2/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/imported-dependency-management-in-reactor/subproject2/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/imported-dependency-management-in-reactor/subproject2/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-differing-snapshot-dependencies/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-differing-snapshot-dependencies/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-differing-snapshot-dependencies/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-differing-snapshot-dependencies/subproject1/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-differing-snapshot-dependencies/subproject1/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-differing-snapshot-dependencies/subproject1/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-differing-snapshot-dependencies/subproject2/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-differing-snapshot-dependencies/subproject2/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-differing-snapshot-dependencies/subproject2/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-differing-snapshot-extension/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-differing-snapshot-extension/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-differing-snapshot-extension/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-differing-snapshot-extension/subproject1/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-differing-snapshot-extension/subproject1/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-differing-snapshot-extension/subproject1/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-differing-snapshot-extension/subproject2/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-differing-snapshot-extension/subproject2/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-differing-snapshot-extension/subproject2/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-differing-snapshot-plugins/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-differing-snapshot-plugins/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-differing-snapshot-plugins/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-differing-snapshot-plugins/subproject1/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-differing-snapshot-plugins/subproject1/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-differing-snapshot-plugins/subproject1/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-differing-snapshot-plugins/subproject2/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-differing-snapshot-plugins/subproject2/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-differing-snapshot-plugins/subproject2/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-differing-snapshot-report-plugins/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-differing-snapshot-report-plugins/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-differing-snapshot-report-plugins/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-differing-snapshot-report-plugins/subproject1/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-differing-snapshot-report-plugins/subproject1/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-differing-snapshot-report-plugins/subproject1/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-differing-snapshot-report-plugins/subproject2/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-differing-snapshot-report-plugins/subproject2/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-differing-snapshot-report-plugins/subproject2/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-managed-snapshot-dependency/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-managed-snapshot-dependency/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-managed-snapshot-dependency/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-managed-snapshot-dependency/subproject1/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-managed-snapshot-dependency/subproject1/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-managed-snapshot-dependency/subproject1/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-managed-snapshot-dependency/subproject2/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-managed-snapshot-dependency/subproject2/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-managed-snapshot-dependency/subproject2/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-managed-snapshot-dependency/subproject3/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-managed-snapshot-dependency/subproject3/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-managed-snapshot-dependency/subproject3/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-managed-snapshot-plugin/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-managed-snapshot-plugin/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-managed-snapshot-plugin/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-managed-snapshot-plugin/subproject1/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-managed-snapshot-plugin/subproject1/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-managed-snapshot-plugin/subproject1/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-managed-snapshot-plugin/subproject2/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-managed-snapshot-plugin/subproject2/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-managed-snapshot-plugin/subproject2/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-managed-snapshot-plugin/subproject3/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-managed-snapshot-plugin/subproject3/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-managed-snapshot-plugin/subproject3/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-dependencies/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-dependencies/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-dependencies/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-dependencies/subproject1/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-dependencies/subproject1/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-dependencies/subproject1/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-dependencies/subproject2/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-dependencies/subproject2/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-dependencies/subproject2/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-dependencies/subproject3/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-dependencies/subproject3/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-dependencies/subproject3/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-dependencies/subproject4/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-dependencies/subproject4/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-dependencies/subproject4/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-dependencies/subproject4/subsubproject/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-dependencies/subproject4/subsubproject/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-dependencies/subproject4/subsubproject/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-extension/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-extension/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-extension/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-extension/subproject1/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-extension/subproject1/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-extension/subproject1/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-extension/subproject2/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-extension/subproject2/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-extension/subproject2/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-extension/subproject3/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-extension/subproject3/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-extension/subproject3/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-plugin-deps/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-plugin-deps/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-plugin-deps/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-plugin-deps/subproject1/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-plugin-deps/subproject1/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-plugin-deps/subproject1/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-plugin-deps/subproject2/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-plugin-deps/subproject2/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-plugin-deps/subproject2/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-plugin-deps/subproject3/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-plugin-deps/subproject3/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-plugin-deps/subproject3/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-plugins/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-plugins/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-plugins/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-plugins/subproject1/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-plugins/subproject1/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-plugins/subproject1/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-plugins/subproject2/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-plugins/subproject2/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-plugins/subproject2/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-plugins/subproject3/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-plugins/subproject3/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-plugins/subproject3/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-plugins/subproject4/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-plugins/subproject4/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-plugins/subproject4/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-profile/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-profile/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-profile/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-profile/subproject1/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-profile/subproject1/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-profile/subproject1/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-profile/subproject2/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-profile/subproject2/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-profile/subproject2/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-profile/subproject3/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-profile/subproject3/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-profile/subproject3/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-report-plugins/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-report-plugins/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-report-plugins/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-report-plugins/subproject1/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-report-plugins/subproject1/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-report-plugins/subproject1/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-report-plugins/subproject2/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-report-plugins/subproject2/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-report-plugins/subproject2/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-report-plugins/subproject3/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-report-plugins/subproject3/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-report-plugins/subproject3/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-report-plugins/subproject4/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-report-plugins/subproject4/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/internal-snapshot-report-plugins/subproject4/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/interpolated-versions/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/interpolated-versions/expected-pom-different-version.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/interpolated-versions/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/interpolated-versions/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/interpolated-versions/subproject1/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/interpolated-versions/subproject1/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/interpolated-versions/subproject1/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/interpolated-versions/subproject2/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/interpolated-versions/subproject2/expected-pom-different-version.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/interpolated-versions/subproject2/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/interpolated-versions/subproject2/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/interpolated-versions/subproject3/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/interpolated-versions/subproject3/expected-pom-different-version.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/interpolated-versions/subproject3/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/interpolated-versions/subproject3/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/modules-with-different-versions/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/modules-with-different-versions/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/modules-with-different-versions/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/modules-with-different-versions/subproject1/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/modules-with-different-versions/subproject1/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/modules-with-different-versions/subproject1/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/modules-with-different-versions/subproject2/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/modules-with-different-versions/subproject2/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/modules-with-different-versions/subproject2/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/multimodule-with-deep-subprojects/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/multimodule-with-deep-subprojects/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/multimodule-with-deep-subprojects/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/multimodule-with-deep-subprojects/sub/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/multimodule-with-deep-subprojects/sub/subproject2/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/multimodule-with-deep-subprojects/sub/subproject2/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/multimodule-with-deep-subprojects/sub/subproject2/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/multimodule-with-deep-subprojects/subproject1/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/multimodule-with-deep-subprojects/subproject1/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/multimodule-with-deep-subprojects/subproject1/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-inherited-version/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-inherited-version/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-inherited-version/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-inherited-version/subproject1/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-inherited-version/subproject1/expected-pom-version-changed.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-inherited-version/subproject1/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-inherited-version/subproject1/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-namespace/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-namespace/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-namespace/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-namespace/subproject1/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-namespace/subproject1/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-namespace/subproject1/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-namespace/subproject2/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-namespace/subproject2/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-namespace/subproject2/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-overridden-scm/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-overridden-scm/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-overridden-scm/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-overridden-scm/subproject1/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-overridden-scm/subproject1/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-overridden-scm/subproject1/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-overridden-scm/subproject1/subsubproject/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-overridden-scm/subproject1/subsubproject/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-overridden-scm/subproject1/subsubproject/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-parent/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-parent-and-properties/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-parent-and-properties/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-parent-and-properties/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-parent-and-properties/subproject1/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-parent-and-properties/subproject1/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-parent-and-properties/subproject1/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-parent-and-properties/subproject2/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-parent-and-properties/subproject2/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-parent-and-properties/subproject2/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-parent-flat/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-parent-flat/root-project/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-parent-flat/root-project/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-parent-flat/root-project/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-parent-flat/subproject1/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-parent-flat/subproject1/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-parent-flat/subproject1/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-parent/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-parent/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-parent/subproject1/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-parent/subproject1/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-parent/subproject1/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-property-dependency-coordinate/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-property-dependency-coordinate/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-property-dependency-coordinate/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-property-dependency-coordinate/subproject1-3.4/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-property-dependency-coordinate/subproject1-3.4/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-property-dependency-coordinate/subproject1-3.4/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-property-dependency-coordinate/subproject2/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-property-dependency-coordinate/subproject2/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-property-dependency-coordinate/subproject2/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-released-parent/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-released-parent/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-released-parent/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-released-parent/subproject1/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-released-parent/subproject1/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-released-parent/subproject1/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-scm-of-parent-ending-with-a-slash/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-scm-of-parent-ending-with-a-slash/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-scm-of-parent-ending-with-a-slash/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-scm-of-parent-ending-with-a-slash/subproject1/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-scm-of-parent-ending-with-a-slash/subproject1/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-with-scm-of-parent-ending-with-a-slash/subproject1/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-without-extension-version/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-without-extension-version/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/pom-without-extension-version/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/whitespace-around-values/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/whitespace-around-values/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/whitespace-around-values/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/whitespace-around-values/subproject1/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/whitespace-around-values/subproject1/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/whitespace-around-values/subproject1/pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/whitespace-around-values/subproject2/
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/whitespace-around-values/subproject2/expected-pom.xml
maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/whitespace-around-values/subproject2/pom.xml
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhase.java
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhase.java?rev=1391497&r1=1391496&r2=1391497&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhase.java Fri Sep 28 15:07:12 2012
@@ -32,6 +32,7 @@ import org.apache.maven.shared.release.R
import org.apache.maven.shared.release.config.ReleaseDescriptor;
import org.apache.maven.shared.release.scm.ScmTranslator;
import org.apache.maven.shared.release.util.ReleaseUtil;
+import org.codehaus.plexus.util.StringUtils;
import org.jdom.Element;
import org.jdom.Namespace;
@@ -115,7 +116,12 @@ public class RewritePomsForBranchPhase
boolean result = false;
if ( translator != null )
{
- Scm scm = project.getScm();
+ Scm scm = project.getOriginalModel().getScm();
+ if ( scm == null )
+ {
+ scm = project.getScm();
+ }
+
String branchName = releaseDescriptor.getScmReleaseLabel();
String branchBase = releaseDescriptor.getScmBranchBase();
@@ -141,8 +147,19 @@ public class RewritePomsForBranchPhase
subDirectoryBranch = "/" + subDirectoryBranch;
}
+ String scmConnectionBranch = branchBase;
+ if ( scmConnectionBranch != null )
+ {
+ String trunkUrl = scm.getDeveloperConnection();
+ if ( trunkUrl == null )
+ {
+ trunkUrl = scm.getConnection();
+ }
+ scmConnectionBranch = this.translateUrlPath( trunkUrl, branchBase, scm.getConnection() );
+ }
+
String value =
- translator.translateBranchUrl( scm.getConnection(), branchName + subDirectoryBranch, branchBase );
+ translator.translateBranchUrl( scm.getConnection(), branchName + subDirectoryBranch, scmConnectionBranch );
if ( !value.equals( scm.getConnection() ) )
{
rewriteElement( "connection", value, scmRoot, namespace );
@@ -179,10 +196,21 @@ public class RewritePomsForBranchPhase
{
subDirectoryBranch = "/" + subDirectoryBranch;
}
+
+ String tagScmUrl = branchBase;
+ if ( tagScmUrl != null )
+ {
+ String trunkUrl = scm.getDeveloperConnection();
+ if ( trunkUrl == null )
+ {
+ trunkUrl = scm.getConnection();
+ }
+ tagScmUrl = this.translateUrlPath( trunkUrl, branchBase, scm.getUrl() );
+ }
// use original branch base without protocol
String value = translator.translateBranchUrl( scm.getUrl(), branchName + subDirectoryBranch,
- releaseDescriptor.getScmBranchBase() );
+ tagScmUrl );
if ( !value.equals( scm.getUrl() ) )
{
rewriteElement( "url", value, scmRoot, namespace );
@@ -237,4 +265,46 @@ public class RewritePomsForBranchPhase
return null;
}
}
+
+ /**
+ * Determines the relative path from trunk to tag, and adds this relative path
+ * to the url.
+ *
+ * @param trunkPath - The trunk url
+ * @param tagPath - The tag base
+ * @param urlPath - scm.url or scm.connection
+ * @return The url path for the tag.
+ */
+ private String translateUrlPath( String trunkPath, String tagPath, String urlPath )
+ {
+ trunkPath = trunkPath.trim();
+ tagPath = tagPath.trim();
+ //Strip the slash at the end if one is present
+ if ( trunkPath.endsWith( "/" ) )
+ {
+ trunkPath = trunkPath.substring( 0, trunkPath.length() - 1 );
+ }
+ if ( tagPath.endsWith( "/" ) )
+ {
+ tagPath = tagPath.substring( 0, tagPath.length() - 1 );
+ }
+ char[] tagPathChars = trunkPath.toCharArray();
+ char[] trunkPathChars = tagPath.toCharArray();
+ // Find the common path between trunk and tags
+ int i = 0;
+ while ( ( i < tagPathChars.length ) && ( i < trunkPathChars.length ) && tagPathChars[i] == trunkPathChars[i] )
+ {
+ ++i;
+ }
+ // If there is nothing common between trunk and tags, or the relative
+ // path does not exist in the url, then just return the tag.
+ if ( i == 0 || urlPath.indexOf( trunkPath.substring( i ) ) < 0 )
+ {
+ return tagPath;
+ }
+ else
+ {
+ return StringUtils.replace( urlPath, trunkPath.substring( i ), tagPath.substring( i ) );
+ }
+ }
}
Added: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhaseTest.java?rev=1391497&view=auto
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhaseTest.java (added)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhaseTest.java Fri Sep 28 15:07:12 2012
@@ -0,0 +1,430 @@
+package org.apache.maven.shared.release.phase;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.shared.release.config.ReleaseDescriptor;
+import org.apache.maven.shared.release.env.DefaultReleaseEnvironment;
+import org.apache.maven.shared.release.util.ReleaseUtil;
+
+/**
+ * Test the SCM modification check phase.
+ *
+ * @author <a href="mailto:brett@apache.org">Brett Porter</a>
+ */
+public class RewritePomsForBranchPhaseTest
+ extends AbstractEditModeRewritingReleasePhaseTestCase
+{
+ private static final String NEXT_VERSION = "1.0-SNAPSHOT";
+
+ private static final String ALTERNATIVE_NEXT_VERSION = "2.0-SNAPSHOT";
+
+ protected void setUp()
+ throws Exception
+ {
+ super.setUp();
+
+ phase = (ReleasePhase) lookup( ReleasePhase.ROLE, "rewrite-poms-for-branch" );
+ }
+
+ protected List<MavenProject> prepareReactorProjects( String path, boolean copyFiles )
+ throws Exception
+ {
+ return createReactorProjects( "rewrite-for-branch/", path );
+ }
+
+ protected String readTestProjectFile( String fileName )
+ throws IOException
+ {
+ return ReleaseUtil.readXmlFile( getTestFile( "target/test-classes/projects/rewrite-for-branch/" + fileName ) );
+ }
+
+ public void testSimulateRewrite()
+ throws Exception
+ {
+ List<MavenProject> reactorProjects = createReactorProjectsFromBasicPom();
+ ReleaseDescriptor config = createDescriptorFromBasicPom( reactorProjects );
+ config.mapReleaseVersion( "groupId:artifactId", NEXT_VERSION );
+
+ String expected = readTestProjectFile( "basic-pom/pom.xml" );
+
+ phase.simulate( config, new DefaultReleaseEnvironment(), reactorProjects );
+
+ String actual = readTestProjectFile( "basic-pom/pom.xml" );
+ assertEquals( "Check the original POM untouched", expected, actual );
+
+ expected = readTestProjectFile( "basic-pom/expected-pom.xml" );
+ actual = readTestProjectFile( "basic-pom/pom.xml.branch" );
+ assertEquals( "Check the transformed POM", expected, actual );
+ }
+
+ public void testRewriteWithDashedComments()
+ throws Exception
+ {
+ List<MavenProject> reactorProjects = createReactorProjects("basic-pom-with-dashes-in-comment");
+ ReleaseDescriptor config = createDescriptorFromBasicPom( reactorProjects );
+ config.mapReleaseVersion( "groupId:artifactId", NEXT_VERSION );
+
+ String expected = readTestProjectFile( "basic-pom-with-dashes-in-comment/pom.xml" );
+
+ phase.simulate( config, new DefaultReleaseEnvironment(), reactorProjects );
+
+ String actual = readTestProjectFile( "basic-pom-with-dashes-in-comment/pom.xml" );
+ assertEquals( "Check the original POM is untouched", expected, actual );
+
+ expected = readTestProjectFile( "basic-pom-with-dashes-in-comment/expected-pom.xml" );
+ actual = readTestProjectFile( "basic-pom-with-dashes-in-comment/pom.xml.branch" );
+ assertEquals( "Check the transformed POM", expected, actual );
+ }
+
+ public void testClean()
+ throws Exception
+ {
+ List<MavenProject> reactorProjects = createReactorProjectsFromBasicPom();
+ ReleaseDescriptor config = createDescriptorFromBasicPom( reactorProjects );
+ config.mapReleaseVersion( "groupId:artifactId", NEXT_VERSION );
+
+ File testFile = getTestFile( "target/test-classes/projects/rewrite-for-branch/basic-pom/pom.xml.branch" );
+ testFile.delete();
+ assertFalse( testFile.exists() );
+
+ phase.simulate( config, new DefaultReleaseEnvironment(), reactorProjects );
+
+ assertTrue( testFile.exists() );
+
+ phase.clean( reactorProjects );
+
+ assertFalse( testFile.exists() );
+ }
+
+ public void testCleanNotExists()
+ throws Exception
+ {
+ List<MavenProject> reactorProjects = createReactorProjectsFromBasicPom();
+ ReleaseDescriptor config = createDescriptorFromBasicPom( reactorProjects );
+ config.mapReleaseVersion( "groupId:artifactId", NEXT_VERSION );
+
+ File testFile = getTestFile( "target/test-classes/projects/rewrite-for-branch/basic-pom/pom.xml.branch" );
+ testFile.delete();
+ assertFalse( testFile.exists() );
+
+ phase.clean( reactorProjects );
+
+ assertFalse( testFile.exists() );
+ }
+
+ //MRELEASE-116
+ public void testScmOverridden()
+ throws Exception
+ {
+ List<MavenProject> reactorProjects = createReactorProjects( "pom-with-overridden-scm" );
+ ReleaseDescriptor config = createConfigurationForWithParentNextVersion( reactorProjects );
+ config.mapReleaseVersion( "groupId:subsubproject", NEXT_VERSION );
+
+ phase.execute( config, new DefaultReleaseEnvironment(), reactorProjects );
+
+ assertTrue( comparePomFiles( reactorProjects ) );
+ }
+
+ protected void mapAlternateNextVersion( ReleaseDescriptor config, String projectId )
+ {
+ config.mapReleaseVersion( projectId, ALTERNATIVE_NEXT_VERSION );
+ }
+
+ protected void mapNextVersion( ReleaseDescriptor config, String projectId )
+ {
+ config.mapReleaseVersion( projectId, NEXT_VERSION );
+ }
+
+ protected ReleaseDescriptor createConfigurationForPomWithParentAlternateNextVersion( List<MavenProject> reactorProjects )
+ throws Exception
+ {
+ ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
+
+ config.mapReleaseVersion( "groupId:artifactId", NEXT_VERSION );
+ config.mapReleaseVersion( "groupId:subproject1", ALTERNATIVE_NEXT_VERSION );
+ return config;
+ }
+
+ protected ReleaseDescriptor createConfigurationForWithParentNextVersion( List<MavenProject> reactorProjects )
+ throws Exception
+ {
+ ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
+
+ config.mapReleaseVersion( "groupId:artifactId", NEXT_VERSION );
+ config.mapReleaseVersion( "groupId:subproject1", NEXT_VERSION );
+ return config;
+ }
+
+ protected void unmapNextVersion( ReleaseDescriptor config, String projectId )
+ {
+ // nothing to do
+ }
+
+ public void testRewriteBasicPomWithCvs()
+ throws Exception
+ {
+
+ List<MavenProject> reactorProjects = createReactorProjects( "basic-pom-with-cvs" );
+ ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
+ mapNextVersion( config, "groupId:artifactId" );
+
+ phase.execute( config, new DefaultReleaseEnvironment(), reactorProjects );
+
+ assertTrue( comparePomFiles( reactorProjects ) );
+ }
+
+ public void testRewriteBasicPomWithScmExpression()
+ throws Exception
+ {
+
+ List<MavenProject> reactorProjects = createReactorProjects( "basic-pom-with-scm-expression" );
+ ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
+ mapNextVersion( config, "groupId:artifactId" );
+
+ phase.execute( config, new DefaultReleaseEnvironment(), reactorProjects );
+
+ assertTrue( comparePomFiles( reactorProjects ) );
+ }
+
+ public void testRewriteBasicPomWithTagBase()
+ throws Exception
+ {
+
+ List<MavenProject> reactorProjects = createReactorProjects( "basic-pom-with-tag-base" );
+ ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
+ config.setScmBranchBase( "file://localhost/tmp/scm-repo/branches" );
+ mapNextVersion( config, "groupId:artifactId" );
+
+ phase.execute( config, new DefaultReleaseEnvironment(), reactorProjects );
+
+ assertTrue( comparePomFiles( reactorProjects ) );
+ }
+
+ public void testRewriteBasicPomWithTagBaseAndVaryingScmUrls()
+ throws Exception
+ {
+ List<MavenProject> reactorProjects = createReactorProjects( "basic-pom-with-tag-base-and-varying-scm-urls" );
+ ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
+ config.setScmBranchBase( "file://localhost/tmp/scm-repo/allprojects/branches" );
+ mapNextVersion( config, "groupId:artifactId" );
+
+ phase.execute( config, new DefaultReleaseEnvironment(), reactorProjects );
+
+ assertTrue( comparePomFiles( reactorProjects ) );
+ }
+
+ public void testRewriteBasicPomWithCvsFromTag()
+ throws Exception
+ {
+ List<MavenProject> reactorProjects = createReactorProjects( "basic-pom-with-cvs-from-tag" );
+ ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
+ mapNextVersion( config, "groupId:artifactId" );
+
+ phase.execute( config, new DefaultReleaseEnvironment(), reactorProjects );
+
+ assertTrue( comparePomFiles( reactorProjects ) );
+ }
+
+ public void testRewriteBasicPomWithEmptyScm()
+ throws Exception
+ {
+ List<MavenProject> reactorProjects = createReactorProjects( "basic-pom-with-empty-scm" );
+ ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
+ mapNextVersion( config, "groupId:artifactId" );
+
+ phase.execute( config, new DefaultReleaseEnvironment(), reactorProjects );
+
+ assertTrue( comparePomFiles( reactorProjects ) );
+ }
+
+ public void testRewriteInterpolatedVersions()
+ throws Exception
+ {
+ List<MavenProject> reactorProjects = createReactorProjects( "interpolated-versions" );
+ ReleaseDescriptor config = createMappedConfiguration( reactorProjects );
+
+ phase.execute( config, new DefaultReleaseEnvironment(), reactorProjects );
+
+ assertTrue( comparePomFiles( reactorProjects ) );
+ }
+
+ public void testRewriteInterpolatedVersionsDifferentVersion()
+ throws Exception
+ {
+ List<MavenProject> reactorProjects = createReactorProjects( "interpolated-versions" );
+ ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
+
+ config.mapReleaseVersion( "groupId:artifactId", NEXT_VERSION );
+ config.mapReleaseVersion( "groupId:subproject1", ALTERNATIVE_NEXT_VERSION );
+ config.mapReleaseVersion( "groupId:subproject2", NEXT_VERSION );
+ config.mapReleaseVersion( "groupId:subproject3", NEXT_VERSION );
+
+ phase.execute( config, new DefaultReleaseEnvironment(), reactorProjects );
+
+ for ( Iterator<MavenProject> i = reactorProjects.iterator(); i.hasNext(); )
+ {
+ MavenProject project = i.next();
+
+ // skip subproject1 - we don't need to worry about its version mapping change, it has no deps of any kind
+ if ( !"groupId".equals( project.getGroupId() ) || !"subproject1".equals( project.getArtifactId() ) )
+ {
+ comparePomFiles( project, "-different-version", true );
+ }
+ }
+ }
+
+ public void testRewriteBasicPomWithInheritedScm()
+ throws Exception
+ {
+ List<MavenProject> reactorProjects = createReactorProjects( "basic-pom-inherited-scm" );
+ ReleaseDescriptor config = createConfigurationForWithParentNextVersion( reactorProjects );
+ config.mapReleaseVersion( "groupId:subsubproject", NEXT_VERSION );
+
+ phase.execute( config, new DefaultReleaseEnvironment(), reactorProjects );
+
+ assertTrue( comparePomFiles( reactorProjects ) );
+ }
+
+ public void testRewritePomWithParentAndProperties()
+ throws Exception
+ {
+ List<MavenProject> reactorProjects = createReactorProjects( "pom-with-parent-and-properties" );
+
+ ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
+ config.mapReleaseVersion( "groupId:artifactId", NEXT_VERSION );
+ config.mapReleaseVersion( "groupId:subproject1", ALTERNATIVE_NEXT_VERSION );
+ config.mapReleaseVersion( "groupId:subproject2", ALTERNATIVE_NEXT_VERSION );
+
+ phase.execute( config, new DefaultReleaseEnvironment(), reactorProjects );
+
+ assertTrue( comparePomFiles( reactorProjects ) );
+ }
+
+ // MRELEASE-311
+ public void testRewritePomWithDependencyPropertyCoordinate()
+ throws Exception
+ {
+ List<MavenProject> reactorProjects = createReactorProjects( "pom-with-property-dependency-coordinate" );
+
+ ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
+ config.mapReleaseVersion( "groupId:artifactId", NEXT_VERSION );
+ config.mapReleaseVersion( "groupId:subproject1-3.4", ALTERNATIVE_NEXT_VERSION );
+ config.mapReleaseVersion( "groupId:subproject2", ALTERNATIVE_NEXT_VERSION );
+
+ phase.execute( config, new DefaultReleaseEnvironment(), reactorProjects );
+
+ assertTrue( comparePomFiles( reactorProjects ) );
+ }
+
+ // MRELEASE-305
+ public void testRewritePomWithScmOfParentEndingWithASlash()
+ throws Exception
+ {
+ List<MavenProject> reactorProjects = createReactorProjects( "pom-with-scm-of-parent-ending-with-a-slash" );
+
+ ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
+ config.mapReleaseVersion( "groupId:artifactId", NEXT_VERSION );
+ config.mapReleaseVersion( "groupId:subproject1", ALTERNATIVE_NEXT_VERSION );
+
+ phase.execute( config, new DefaultReleaseEnvironment(), reactorProjects );
+
+ assertTrue( comparePomFiles( reactorProjects ) );
+ }
+
+ public void testRewritePomWithDeepSubprojects()
+ throws Exception
+ {
+ List<MavenProject> reactorProjects = createReactorProjects( "multimodule-with-deep-subprojects" );
+
+ ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
+ config.mapReleaseVersion( "groupId:artifactId", NEXT_VERSION );
+ config.mapReleaseVersion( "groupId:subproject1", ALTERNATIVE_NEXT_VERSION );
+ config.mapReleaseVersion( "groupId:subproject2", ALTERNATIVE_NEXT_VERSION );
+
+ phase.execute( config, new DefaultReleaseEnvironment(), reactorProjects );
+
+ assertTrue( comparePomFiles( reactorProjects ) );
+ }
+
+ public void testRewritePomForFlatMultiModule()
+ throws Exception
+ {
+ List<MavenProject> reactorProjects = createReactorProjects( "rewrite-for-branch/pom-with-parent-flat", "/root-project" );
+ ReleaseDescriptor config = createConfigurationForPomWithParentAlternateNextVersion( reactorProjects );
+
+ phase.execute( config, new DefaultReleaseEnvironment(), reactorProjects );
+
+ assertTrue( comparePomFiles( reactorProjects ) );
+ }
+
+ // MRELEASE-383
+ public void testRewritePomWithCDATASectionOnWindows()
+ throws Exception
+ {
+ List<MavenProject> reactorProjects = createReactorProjects( "cdata-section" );
+ ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
+ mapNextVersion( config, "groupId:artifactId" );
+
+ AbstractRewritePomsPhase phase = (AbstractRewritePomsPhase) this.phase;
+ phase.setLs( "\r\n" );
+ phase.execute( config, new DefaultReleaseEnvironment(), reactorProjects );
+
+ // compare POMS without line ending normalization
+ assertTrue( comparePomFiles( reactorProjects, false ) );
+ }
+
+ protected ReleaseDescriptor createDescriptorFromProjects( List<MavenProject> reactorProjects )
+ {
+ ReleaseDescriptor descriptor = super.createDescriptorFromProjects( reactorProjects );
+ descriptor.setScmReleaseLabel( "release-label" );
+ return descriptor;
+ }
+
+ // MRELEASE-454
+ public void testRewritePomWithImportedDependencyManagementInReactor()
+ throws Exception
+ {
+ List<MavenProject> reactorProjects = createReactorProjects( "imported-dependency-management-in-reactor" );
+ ReleaseDescriptor config = createMappedConfiguration( reactorProjects );
+
+ phase.execute( config, new DefaultReleaseEnvironment(), reactorProjects );
+
+ assertTrue( comparePomFiles( reactorProjects ) );
+ }
+
+ public void testRewritePomWithDifferentVersionsAcrossModules()
+ throws Exception
+ {
+ List<MavenProject> reactorProjects = createReactorProjects( "modules-with-different-versions" );
+ ReleaseDescriptor config = createMappedConfiguration( reactorProjects );
+ config.mapReleaseVersion( "groupId:subproject2", ALTERNATIVE_NEXT_VERSION );
+
+ phase.execute( config, new DefaultReleaseEnvironment(), reactorProjects );
+
+ assertTrue( comparePomFiles( reactorProjects ) );
+ }
+
+}
Added: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-entities/expected-pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-entities/expected-pom.xml?rev=1391497&view=auto
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-entities/expected-pom.xml (added)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-entities/expected-pom.xml Fri Sep 28 15:07:12 2012
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Copyright 2005-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<!DOCTYPE project [
+<!ENTITY foo "bar" >
+]>
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>< & Non-ASCIIs: à İ É Ï Ã Ð¯ × Ø°</name>
+</project>
+
+<!-- THE END -->
Added: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-entities/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-entities/pom.xml?rev=1391497&view=auto
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-entities/pom.xml (added)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-entities/pom.xml Fri Sep 28 15:07:12 2012
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Copyright 2005-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<!DOCTYPE project [
+<!ENTITY foo "bar" >
+]>
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>< & Non-ASCIIs: ß İ ə σ ß Я א ذ</name>
+</project>
+
+<!-- THE END -->
Added: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-inherited-scm/expected-pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-inherited-scm/expected-pom.xml?rev=1391497&view=auto
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-inherited-scm/expected-pom.xml (added)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-inherited-scm/expected-pom.xml Fri Sep 28 15:07:12 2012
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Copyright 2005-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>external</groupId>
+ <artifactId>parent-artifactId</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <prerequisites>
+ <maven>2.0.4</maven>
+ </prerequisites>
+
+ <modules>
+ <module>subproject1</module>
+ </modules>
+
+ <scm>
+ <connection>scm:svn:file://localhost/tmp/scm-repo/branches/release-label</connection>
+ <developerConnection>scm:svn:file://localhost/tmp/scm-repo/branches/release-label</developerConnection>
+ <url>file://localhost/tmp/scm-repo/branches/release-label</url>
+ </scm>
+</project>
+
Added: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-inherited-scm/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-inherited-scm/pom.xml?rev=1391497&view=auto
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-inherited-scm/pom.xml (added)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-inherited-scm/pom.xml Fri Sep 28 15:07:12 2012
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Copyright 2005-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>external</groupId>
+ <artifactId>parent-artifactId</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <prerequisites>
+ <maven>2.0.4</maven>
+ </prerequisites>
+
+ <modules>
+ <module>subproject1</module>
+ </modules>
+</project>
+
Added: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-inherited-scm/subproject1/expected-pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-inherited-scm/subproject1/expected-pom.xml?rev=1391497&view=auto
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-inherited-scm/subproject1/expected-pom.xml (added)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-inherited-scm/subproject1/expected-pom.xml Fri Sep 28 15:07:12 2012
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Copyright 2005-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>subproject1</artifactId>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>subsubproject</module>
+ </modules>
+</project>
+
Added: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-inherited-scm/subproject1/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-inherited-scm/subproject1/pom.xml?rev=1391497&view=auto
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-inherited-scm/subproject1/pom.xml (added)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-inherited-scm/subproject1/pom.xml Fri Sep 28 15:07:12 2012
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Copyright 2005-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>subproject1</artifactId>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>subsubproject</module>
+ </modules>
+</project>
+
Added: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-inherited-scm/subproject1/subsubproject/expected-pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-inherited-scm/subproject1/subsubproject/expected-pom.xml?rev=1391497&view=auto
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-inherited-scm/subproject1/subsubproject/expected-pom.xml (added)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-inherited-scm/subproject1/subsubproject/expected-pom.xml Fri Sep 28 15:07:12 2012
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Copyright 2005-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>groupId</groupId>
+ <artifactId>subproject1</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>subsubproject</artifactId>
+</project>
+
Added: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-inherited-scm/subproject1/subsubproject/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-inherited-scm/subproject1/subsubproject/pom.xml?rev=1391497&view=auto
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-inherited-scm/subproject1/subsubproject/pom.xml (added)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-inherited-scm/subproject1/subsubproject/pom.xml Fri Sep 28 15:07:12 2012
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Copyright 2005-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>groupId</groupId>
+ <artifactId>subproject1</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>subsubproject</artifactId>
+</project>
+