You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by de...@apache.org on 2013/10/12 00:18:55 UTC
svn commit: r1531451 [5/15] - in /maven/release/trunk: ./
maven-release-manager/src/main/java/org/apache/maven/shared/release/
maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/
maven-release-manager/src/main/resources/ maven-rele...
Modified: 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
URL: http://svn.apache.org/viewvc/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?rev=1531451&r1=1531450&r2=1531451&view=diff
==============================================================================
--- 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 (original)
+++ 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 Fri Oct 11 22:18:49 2013
@@ -1,34 +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>
- <groupId>groupId</groupId>
- <artifactId>artifactId</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <prerequisites>
- <maven>2.0.4</maven>
- </prerequisites>
-
- <scm>
- <connection>scm:svn:file://localhost/tmp/anon-scm-repo/allprojects/branches/release-label</connection>
- <developerConnection>scm:svn:file://localhost/tmp/scm-repo/allprojects/branches/release-label</developerConnection>
- <url>file://localhost/tmp/viewvc/allprojects/branches/release-label</url>
- </scm>
-</project>
+<?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>
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <prerequisites>
+ <maven>2.0.4</maven>
+ </prerequisites>
+
+ <scm>
+ <connection>scm:svn:file://localhost/tmp/anon-scm-repo/allprojects/branches/release-label</connection>
+ <developerConnection>scm:svn:file://localhost/tmp/scm-repo/allprojects/branches/release-label</developerConnection>
+ <url>file://localhost/tmp/viewvc/allprojects/branches/release-label</url>
+ </scm>
+</project>
Propchange: 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
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-tag-base-and-varying-scm-urls/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-tag-base-and-varying-scm-urls/pom.xml?rev=1531451&r1=1531450&r2=1531451&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-tag-base-and-varying-scm-urls/pom.xml (original)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-tag-base-and-varying-scm-urls/pom.xml Fri Oct 11 22:18:49 2013
@@ -1,34 +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>
- <groupId>groupId</groupId>
- <artifactId>artifactId</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <prerequisites>
- <maven>2.0.4</maven>
- </prerequisites>
-
- <scm>
- <connection>scm:svn:file://localhost/tmp/anon-scm-repo/myproject/trunk</connection>
- <developerConnection>scm:svn:file://localhost/tmp/scm-repo/myproject/trunk</developerConnection>
- <url>file://localhost/tmp/viewvc/myproject/trunk</url>
- </scm>
-</project>
+<?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>
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <prerequisites>
+ <maven>2.0.4</maven>
+ </prerequisites>
+
+ <scm>
+ <connection>scm:svn:file://localhost/tmp/anon-scm-repo/myproject/trunk</connection>
+ <developerConnection>scm:svn:file://localhost/tmp/scm-repo/myproject/trunk</developerConnection>
+ <url>file://localhost/tmp/viewvc/myproject/trunk</url>
+ </scm>
+</project>
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-tag-base-and-varying-scm-urls/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-tag-base/expected-pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-tag-base/expected-pom.xml?rev=1531451&r1=1531450&r2=1531451&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-tag-base/expected-pom.xml (original)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-tag-base/expected-pom.xml Fri Oct 11 22:18:49 2013
@@ -1,34 +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>
- <groupId>groupId</groupId>
- <artifactId>artifactId</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <prerequisites>
- <maven>2.0.4</maven>
- </prerequisites>
-
- <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>
+<?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>
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <prerequisites>
+ <maven>2.0.4</maven>
+ </prerequisites>
+
+ <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>
\ No newline at end of file
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-tag-base/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-tag-base/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-tag-base/pom.xml?rev=1531451&r1=1531450&r2=1531451&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-tag-base/pom.xml (original)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-tag-base/pom.xml Fri Oct 11 22:18:49 2013
@@ -1,34 +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>
- <groupId>groupId</groupId>
- <artifactId>artifactId</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <prerequisites>
- <maven>2.0.4</maven>
- </prerequisites>
-
- <scm>
- <connection>scm:svn:file://localhost/tmp/scm-repo/trunk</connection>
- <developerConnection>scm:svn:file://localhost/tmp/scm-repo/trunk</developerConnection>
- <url>file://localhost/tmp/scm-repo/trunk</url>
- </scm>
+<?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>
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <prerequisites>
+ <maven>2.0.4</maven>
+ </prerequisites>
+
+ <scm>
+ <connection>scm:svn:file://localhost/tmp/scm-repo/trunk</connection>
+ <developerConnection>scm:svn:file://localhost/tmp/scm-repo/trunk</developerConnection>
+ <url>file://localhost/tmp/scm-repo/trunk</url>
+ </scm>
</project>
\ No newline at end of file
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-tag-base/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom/expected-pom-with-schema.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom/expected-pom-with-schema.xml?rev=1531451&r1=1531450&r2=1531451&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom/expected-pom-with-schema.xml (original)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom/expected-pom-with-schema.xml Fri Oct 11 22:18:49 2013
@@ -1,41 +1,41 @@
-<?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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>groupId</groupId>
- <artifactId>artifactId</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <prerequisites>
- <maven>2.0.4</maven>
- </prerequisites>
-
- <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>
-
- <!--
- a multi-line
- comment
- -->
-
- <?processing-instruction attrib="value"?>
-</project>
+<?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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <prerequisites>
+ <maven>2.0.4</maven>
+ </prerequisites>
+
+ <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>
+
+ <!--
+ a multi-line
+ comment
+ -->
+
+ <?processing-instruction attrib="value"?>
+</project>
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom/expected-pom-with-schema.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom/expected-pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom/expected-pom.xml?rev=1531451&r1=1531450&r2=1531451&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom/expected-pom.xml (original)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom/expected-pom.xml Fri Oct 11 22:18:49 2013
@@ -1,41 +1,41 @@
-<?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>
- <groupId>groupId</groupId>
- <artifactId>artifactId</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <prerequisites>
- <maven>2.0.4</maven>
- </prerequisites>
-
- <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>
-
- <!--
- a multi-line
- comment
- -->
-
- <?processing-instruction attrib="value"?>
-</project>
+<?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>
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <prerequisites>
+ <maven>2.0.4</maven>
+ </prerequisites>
+
+ <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>
+
+ <!--
+ a multi-line
+ comment
+ -->
+
+ <?processing-instruction attrib="value"?>
+</project>
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom/pom.xml?rev=1531451&r1=1531450&r2=1531451&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom/pom.xml (original)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom/pom.xml Fri Oct 11 22:18:49 2013
@@ -1,41 +1,41 @@
-<?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>
- <groupId>groupId</groupId>
- <artifactId>artifactId</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <prerequisites>
- <maven>2.0.4</maven>
- </prerequisites>
-
- <scm>
- <connection>scm:svn:file://localhost/tmp/scm-repo/trunk</connection>
- <developerConnection>scm:svn:file://localhost/tmp/scm-repo/trunk</developerConnection>
- <url>file://localhost/tmp/scm-repo/trunk</url>
- </scm>
-
- <!--
- a multi-line
- comment
- -->
-
- <?processing-instruction attrib="value"?>
-</project>
+<?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>
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <prerequisites>
+ <maven>2.0.4</maven>
+ </prerequisites>
+
+ <scm>
+ <connection>scm:svn:file://localhost/tmp/scm-repo/trunk</connection>
+ <developerConnection>scm:svn:file://localhost/tmp/scm-repo/trunk</developerConnection>
+ <url>file://localhost/tmp/scm-repo/trunk</url>
+ </scm>
+
+ <!--
+ a multi-line
+ comment
+ -->
+
+ <?processing-instruction attrib="value"?>
+</project>
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/cdata-around-values/expected-pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/cdata-around-values/expected-pom.xml?rev=1531451&r1=1531450&r2=1531451&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/cdata-around-values/expected-pom.xml (original)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/cdata-around-values/expected-pom.xml Fri Oct 11 22:18:49 2013
@@ -1,58 +1,58 @@
-<?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>
- <groupId><![CDATA[groupId]]></groupId>
- <artifactId><![CDATA[artifactId]]></artifactId>
- <version><![CDATA[1.0-SNAPSHOT]]></version>
- <packaging>pom</packaging>
-
- <scm>
- <connection><![CDATA[scm:svn:file://localhost/tmp/scm-repo/branches/release-label]]></connection>
- <developerConnection><![CDATA[scm:svn:file://localhost/tmp/scm-repo/branches/release-label]]></developerConnection>
- <url><![CDATA[file://localhost/tmp/scm-repo/branches/release-label]]></url>
- </scm>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId><![CDATA[groupId]]></groupId>
- <artifactId><![CDATA[subproject1]]></artifactId>
- <version><![CDATA[2.0-SNAPSHOT]]></version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId><![CDATA[groupId]]></groupId>
- <artifactId><![CDATA[subproject1]]></artifactId>
- <version><![CDATA[2.0-SNAPSHOT]]></version>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <modules>
- <module>subproject1</module>
- <module>subproject2</module>
- </modules>
-</project>
+<?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>
+ <groupId><![CDATA[groupId]]></groupId>
+ <artifactId><![CDATA[artifactId]]></artifactId>
+ <version><![CDATA[1.0-SNAPSHOT]]></version>
+ <packaging>pom</packaging>
+
+ <scm>
+ <connection><![CDATA[scm:svn:file://localhost/tmp/scm-repo/branches/release-label]]></connection>
+ <developerConnection><![CDATA[scm:svn:file://localhost/tmp/scm-repo/branches/release-label]]></developerConnection>
+ <url><![CDATA[file://localhost/tmp/scm-repo/branches/release-label]]></url>
+ </scm>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId><![CDATA[groupId]]></groupId>
+ <artifactId><![CDATA[subproject1]]></artifactId>
+ <version><![CDATA[2.0-SNAPSHOT]]></version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId><![CDATA[groupId]]></groupId>
+ <artifactId><![CDATA[subproject1]]></artifactId>
+ <version><![CDATA[2.0-SNAPSHOT]]></version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <modules>
+ <module>subproject1</module>
+ <module>subproject2</module>
+ </modules>
+</project>
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/cdata-around-values/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/cdata-around-values/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/cdata-around-values/pom.xml?rev=1531451&r1=1531450&r2=1531451&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/cdata-around-values/pom.xml (original)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/cdata-around-values/pom.xml Fri Oct 11 22:18:49 2013
@@ -1,58 +1,58 @@
-<?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>
- <groupId><![CDATA[groupId]]></groupId>
- <artifactId><![CDATA[artifactId]]></artifactId>
- <version><![CDATA[1.0]]>-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <scm>
- <connection><![CDATA[scm:svn:file://localhost/tmp/scm-repo/trunk]]></connection>
- <developerConnection><![CDATA[scm:svn:file://localhost/tmp/scm-repo/trunk]]></developerConnection>
- <url><![CDATA[file://localhost/tmp/scm-repo/trunk]]></url>
- </scm>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId><![CDATA[groupId]]></groupId>
- <artifactId><![CDATA[subproject1]]></artifactId>
- <version><![CDATA[2.0-SNAPSHOT]]></version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId><![CDATA[groupId]]></groupId>
- <artifactId><![CDATA[subproject1]]></artifactId>
- <version><![CDATA[2.0-SNAPSHOT]]></version>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <modules>
- <module>subproject1</module>
- <module>subproject2</module>
- </modules>
-</project>
+<?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>
+ <groupId><![CDATA[groupId]]></groupId>
+ <artifactId><![CDATA[artifactId]]></artifactId>
+ <version><![CDATA[1.0]]>-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <scm>
+ <connection><![CDATA[scm:svn:file://localhost/tmp/scm-repo/trunk]]></connection>
+ <developerConnection><![CDATA[scm:svn:file://localhost/tmp/scm-repo/trunk]]></developerConnection>
+ <url><![CDATA[file://localhost/tmp/scm-repo/trunk]]></url>
+ </scm>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId><![CDATA[groupId]]></groupId>
+ <artifactId><![CDATA[subproject1]]></artifactId>
+ <version><![CDATA[2.0-SNAPSHOT]]></version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId><![CDATA[groupId]]></groupId>
+ <artifactId><![CDATA[subproject1]]></artifactId>
+ <version><![CDATA[2.0-SNAPSHOT]]></version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <modules>
+ <module>subproject1</module>
+ <module>subproject2</module>
+ </modules>
+</project>
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/cdata-around-values/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/cdata-around-values/subproject1/expected-pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/cdata-around-values/subproject1/expected-pom.xml?rev=1531451&r1=1531450&r2=1531451&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/cdata-around-values/subproject1/expected-pom.xml (original)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/cdata-around-values/subproject1/expected-pom.xml Fri Oct 11 22:18:49 2013
@@ -1,29 +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><![CDATA[groupId]]></groupId>
- <artifactId><![CDATA[artifactId]]></artifactId>
- <version><![CDATA[1.0-SNAPSHOT]]></version>
- </parent>
-
- <artifactId><![CDATA[subproject1]]></artifactId>
- <version><![CDATA[2.0-SNAPSHOT]]></version>
-</project>
+<?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><![CDATA[groupId]]></groupId>
+ <artifactId><![CDATA[artifactId]]></artifactId>
+ <version><![CDATA[1.0-SNAPSHOT]]></version>
+ </parent>
+
+ <artifactId><![CDATA[subproject1]]></artifactId>
+ <version><![CDATA[2.0-SNAPSHOT]]></version>
+</project>
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/cdata-around-values/subproject1/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/cdata-around-values/subproject1/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/cdata-around-values/subproject1/pom.xml?rev=1531451&r1=1531450&r2=1531451&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/cdata-around-values/subproject1/pom.xml (original)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/cdata-around-values/subproject1/pom.xml Fri Oct 11 22:18:49 2013
@@ -1,29 +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><![CDATA[groupId]]></groupId>
- <artifactId><![CDATA[artifactId]]></artifactId>
- <version><![CDATA[1.0-SNAPSHOT]]></version>
- </parent>
-
- <artifactId><![CDATA[subproject1]]></artifactId>
- <version><![CDATA[2.0-SNAPSHOT]]></version>
-</project>
+<?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><![CDATA[groupId]]></groupId>
+ <artifactId><![CDATA[artifactId]]></artifactId>
+ <version><![CDATA[1.0-SNAPSHOT]]></version>
+ </parent>
+
+ <artifactId><![CDATA[subproject1]]></artifactId>
+ <version><![CDATA[2.0-SNAPSHOT]]></version>
+</project>
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/cdata-around-values/subproject1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/cdata-around-values/subproject2/expected-pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/cdata-around-values/subproject2/expected-pom.xml?rev=1531451&r1=1531450&r2=1531451&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/cdata-around-values/subproject2/expected-pom.xml (original)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/cdata-around-values/subproject2/expected-pom.xml Fri Oct 11 22:18:49 2013
@@ -1,46 +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><![CDATA[groupId]]></groupId>
- <artifactId><![CDATA[artifactId]]></artifactId>
- <version><![CDATA[1.0-SNAPSHOT]]></version>
- </parent>
-
- <artifactId><![CDATA[subproject2]]></artifactId>
-
- <dependencies>
- <dependency>
- <groupId><![CDATA[groupId]]></groupId>
- <artifactId><![CDATA[subproject1]]></artifactId>
- <version><![CDATA[2.0-SNAPSHOT]]></version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId><![CDATA[groupId]]></groupId>
- <artifactId><![CDATA[subproject1]]></artifactId>
- <version><![CDATA[2.0-SNAPSHOT]]></version>
- </plugin>
- </plugins>
- </build>
-</project>
+<?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><![CDATA[groupId]]></groupId>
+ <artifactId><![CDATA[artifactId]]></artifactId>
+ <version><![CDATA[1.0-SNAPSHOT]]></version>
+ </parent>
+
+ <artifactId><![CDATA[subproject2]]></artifactId>
+
+ <dependencies>
+ <dependency>
+ <groupId><![CDATA[groupId]]></groupId>
+ <artifactId><![CDATA[subproject1]]></artifactId>
+ <version><![CDATA[2.0-SNAPSHOT]]></version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId><![CDATA[groupId]]></groupId>
+ <artifactId><![CDATA[subproject1]]></artifactId>
+ <version><![CDATA[2.0-SNAPSHOT]]></version>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/cdata-around-values/subproject2/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/cdata-around-values/subproject2/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/cdata-around-values/subproject2/pom.xml?rev=1531451&r1=1531450&r2=1531451&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/cdata-around-values/subproject2/pom.xml (original)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/cdata-around-values/subproject2/pom.xml Fri Oct 11 22:18:49 2013
@@ -1,46 +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><![CDATA[groupId]]></groupId>
- <artifactId><![CDATA[artifactId]]></artifactId>
- <version><![CDATA[1.0-SNAPSHOT]]></version>
- </parent>
-
- <artifactId><![CDATA[subproject2]]></artifactId>
-
- <dependencies>
- <dependency>
- <groupId><![CDATA[groupId]]></groupId>
- <artifactId><![CDATA[subproject1]]></artifactId>
- <version><![CDATA[2.0-SNAPSHOT]]></version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId><![CDATA[groupId]]></groupId>
- <artifactId><![CDATA[subproject1]]></artifactId>
- <version><![CDATA[2.0-SNAPSHOT]]></version>
- </plugin>
- </plugins>
- </build>
-</project>
+<?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><![CDATA[groupId]]></groupId>
+ <artifactId><![CDATA[artifactId]]></artifactId>
+ <version><![CDATA[1.0-SNAPSHOT]]></version>
+ </parent>
+
+ <artifactId><![CDATA[subproject2]]></artifactId>
+
+ <dependencies>
+ <dependency>
+ <groupId><![CDATA[groupId]]></groupId>
+ <artifactId><![CDATA[subproject1]]></artifactId>
+ <version><![CDATA[2.0-SNAPSHOT]]></version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId><![CDATA[groupId]]></groupId>
+ <artifactId><![CDATA[subproject1]]></artifactId>
+ <version><![CDATA[2.0-SNAPSHOT]]></version>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/cdata-around-values/subproject2/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/cdata-section/expected-pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/cdata-section/expected-pom.xml?rev=1531451&r1=1531450&r2=1531451&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/cdata-section/expected-pom.xml (original)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/cdata-section/expected-pom.xml Fri Oct 11 22:18:49 2013
@@ -1,67 +1,67 @@
-<?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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>groupId</groupId>
- <artifactId>artifactId</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <prerequisites>
- <maven>2.0.4</maven>
- </prerequisites>
-
- <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>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <configuration>
- <downloadSources>true</downloadSources>
- <additionalBuildcommands>
- <buildcommand>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</buildcommand>
- </additionalBuildcommands>
- <additionalProjectnatures>
- <projectnature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</projectnature>
- </additionalProjectnatures>
- <additionalConfig>
- <file>
- <name>.checkstyle</name>
- <content>
- <![CDATA[<?xml version="1.0" encoding="UTF-8"?>
-<fileset-config file-format-version="1.2.0" simple-config="true">
- <fileset name="all" enabled="true" check-config-name="QifCon" local="false">
- <file-match-pattern match-pattern="." include-pattern="true" />
- </fileset>
-</fileset-config>
-]]>
- </content>
- </file>
- </additionalConfig>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
+<?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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <prerequisites>
+ <maven>2.0.4</maven>
+ </prerequisites>
+
+ <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>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <configuration>
+ <downloadSources>true</downloadSources>
+ <additionalBuildcommands>
+ <buildcommand>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</buildcommand>
+ </additionalBuildcommands>
+ <additionalProjectnatures>
+ <projectnature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</projectnature>
+ </additionalProjectnatures>
+ <additionalConfig>
+ <file>
+ <name>.checkstyle</name>
+ <content>
+ <![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+<fileset-config file-format-version="1.2.0" simple-config="true">
+ <fileset name="all" enabled="true" check-config-name="QifCon" local="false">
+ <file-match-pattern match-pattern="." include-pattern="true" />
+ </fileset>
+</fileset-config>
+]]>
+ </content>
+ </file>
+ </additionalConfig>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/cdata-section/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/cdata-section/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/cdata-section/pom.xml?rev=1531451&r1=1531450&r2=1531451&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/cdata-section/pom.xml (original)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/cdata-section/pom.xml Fri Oct 11 22:18:49 2013
@@ -1,67 +1,67 @@
-<?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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>groupId</groupId>
- <artifactId>artifactId</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <prerequisites>
- <maven>2.0.4</maven>
- </prerequisites>
-
- <scm>
- <connection>scm:svn:file://localhost/tmp/scm-repo/trunk</connection>
- <developerConnection>scm:svn:file://localhost/tmp/scm-repo/trunk</developerConnection>
- <url>file://localhost/tmp/scm-repo/trunk</url>
- </scm>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <configuration>
- <downloadSources>true</downloadSources>
- <additionalBuildcommands>
- <buildcommand>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</buildcommand>
- </additionalBuildcommands>
- <additionalProjectnatures>
- <projectnature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</projectnature>
- </additionalProjectnatures>
- <additionalConfig>
- <file>
- <name>.checkstyle</name>
- <content>
- <![CDATA[<?xml version="1.0" encoding="UTF-8"?>
-<fileset-config file-format-version="1.2.0" simple-config="true">
- <fileset name="all" enabled="true" check-config-name="QifCon" local="false">
- <file-match-pattern match-pattern="." include-pattern="true" />
- </fileset>
-</fileset-config>
-]]>
- </content>
- </file>
- </additionalConfig>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
+<?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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <prerequisites>
+ <maven>2.0.4</maven>
+ </prerequisites>
+
+ <scm>
+ <connection>scm:svn:file://localhost/tmp/scm-repo/trunk</connection>
+ <developerConnection>scm:svn:file://localhost/tmp/scm-repo/trunk</developerConnection>
+ <url>file://localhost/tmp/scm-repo/trunk</url>
+ </scm>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <configuration>
+ <downloadSources>true</downloadSources>
+ <additionalBuildcommands>
+ <buildcommand>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</buildcommand>
+ </additionalBuildcommands>
+ <additionalProjectnatures>
+ <projectnature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</projectnature>
+ </additionalProjectnatures>
+ <additionalConfig>
+ <file>
+ <name>.checkstyle</name>
+ <content>
+ <![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+<fileset-config file-format-version="1.2.0" simple-config="true">
+ <fileset name="all" enabled="true" check-config-name="QifCon" local="false">
+ <file-match-pattern match-pattern="." include-pattern="true" />
+ </fileset>
+</fileset-config>
+]]>
+ </content>
+ </file>
+ </additionalConfig>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/cdata-section/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/comments-around-values/expected-pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/comments-around-values/expected-pom.xml?rev=1531451&r1=1531450&r2=1531451&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/comments-around-values/expected-pom.xml (original)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/comments-around-values/expected-pom.xml Fri Oct 11 22:18:49 2013
@@ -1,59 +1,59 @@
-<!--
- ~ 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>
- <groupId><!-- comment -->groupId<!-- comment --></groupId>
- <artifactId><!-- comment -->artifactId<!-- comment --></artifactId>
- <version>
- <!-- comment -->
- 1.0-SNAPSHOT
- <!-- comment -->
- </version>
- <packaging>pom</packaging>
-
- <scm>
- <connection><!-- comment -->scm:svn:file://localhost/tmp/scm-repo/branches/release-label<!-- comment --></connection>
- <developerConnection><!-- comment -->scm:svn:file://localhost/tmp/scm-repo/branches/release-label<!-- comment --></developerConnection>
- <url><!-- comment -->file://localhost/tmp/scm-repo/branches/release-label<!-- comment --></url>
- </scm>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId><!-- comment -->groupId<!-- comment --></groupId>
- <artifactId><!-- comment -->subproject1<!-- comment --></artifactId>
- <version><!-- comment -->2.0-SNAPSHOT<!-- comment --></version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId><!-- comment -->groupId<!-- comment --></groupId>
- <artifactId><!-- comment -->subproject1<!-- comment --></artifactId>
- <version><!-- comment -->2.0-SNAPSHOT<!-- comment --></version>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <modules>
- <module>subproject1</module>
- </modules>
-</project>
+<!--
+ ~ 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>
+ <groupId><!-- comment -->groupId<!-- comment --></groupId>
+ <artifactId><!-- comment -->artifactId<!-- comment --></artifactId>
+ <version>
+ <!-- comment -->
+ 1.0-SNAPSHOT
+ <!-- comment -->
+ </version>
+ <packaging>pom</packaging>
+
+ <scm>
+ <connection><!-- comment -->scm:svn:file://localhost/tmp/scm-repo/branches/release-label<!-- comment --></connection>
+ <developerConnection><!-- comment -->scm:svn:file://localhost/tmp/scm-repo/branches/release-label<!-- comment --></developerConnection>
+ <url><!-- comment -->file://localhost/tmp/scm-repo/branches/release-label<!-- comment --></url>
+ </scm>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId><!-- comment -->groupId<!-- comment --></groupId>
+ <artifactId><!-- comment -->subproject1<!-- comment --></artifactId>
+ <version><!-- comment -->2.0-SNAPSHOT<!-- comment --></version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId><!-- comment -->groupId<!-- comment --></groupId>
+ <artifactId><!-- comment -->subproject1<!-- comment --></artifactId>
+ <version><!-- comment -->2.0-SNAPSHOT<!-- comment --></version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <modules>
+ <module>subproject1</module>
+ </modules>
+</project>
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/comments-around-values/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/comments-around-values/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/comments-around-values/pom.xml?rev=1531451&r1=1531450&r2=1531451&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/comments-around-values/pom.xml (original)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/comments-around-values/pom.xml Fri Oct 11 22:18:49 2013
@@ -1,59 +1,59 @@
-<!--
- ~ 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>
- <groupId><!-- comment -->groupId<!-- comment --></groupId>
- <artifactId><!-- comment -->artifactId<!-- comment --></artifactId>
- <version>
- <!-- comment -->
- 1.0-SNAPSHOT
- <!-- comment -->
- </version>
- <packaging>pom</packaging>
-
- <scm>
- <connection><!-- comment -->scm:svn:file://localhost/tmp/scm-repo/trunk<!-- comment --></connection>
- <developerConnection><!-- comment -->scm:svn:file://localhost/tmp/scm-repo/trunk<!-- comment --></developerConnection>
- <url><!-- comment -->file://localhost/tmp/scm-repo/trunk<!-- comment --></url>
- </scm>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId><!-- comment -->groupId<!-- comment --></groupId>
- <artifactId><!-- comment -->subproject1<!-- comment --></artifactId>
- <version><!-- comment -->2.0-SNAPSHOT<!-- comment --></version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId><!-- comment -->groupId<!-- comment --></groupId>
- <artifactId><!-- comment -->subproject1<!-- comment --></artifactId>
- <version><!-- comment -->2.0-SNAPSHOT<!-- comment --></version>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <modules>
- <module>subproject1</module>
- </modules>
-</project>
+<!--
+ ~ 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>
+ <groupId><!-- comment -->groupId<!-- comment --></groupId>
+ <artifactId><!-- comment -->artifactId<!-- comment --></artifactId>
+ <version>
+ <!-- comment -->
+ 1.0-SNAPSHOT
+ <!-- comment -->
+ </version>
+ <packaging>pom</packaging>
+
+ <scm>
+ <connection><!-- comment -->scm:svn:file://localhost/tmp/scm-repo/trunk<!-- comment --></connection>
+ <developerConnection><!-- comment -->scm:svn:file://localhost/tmp/scm-repo/trunk<!-- comment --></developerConnection>
+ <url><!-- comment -->file://localhost/tmp/scm-repo/trunk<!-- comment --></url>
+ </scm>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId><!-- comment -->groupId<!-- comment --></groupId>
+ <artifactId><!-- comment -->subproject1<!-- comment --></artifactId>
+ <version><!-- comment -->2.0-SNAPSHOT<!-- comment --></version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId><!-- comment -->groupId<!-- comment --></groupId>
+ <artifactId><!-- comment -->subproject1<!-- comment --></artifactId>
+ <version><!-- comment -->2.0-SNAPSHOT<!-- comment --></version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <modules>
+ <module>subproject1</module>
+ </modules>
+</project>
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/comments-around-values/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/comments-around-values/subproject1/expected-pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/comments-around-values/subproject1/expected-pom.xml?rev=1531451&r1=1531450&r2=1531451&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/comments-around-values/subproject1/expected-pom.xml (original)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/comments-around-values/subproject1/expected-pom.xml Fri Oct 11 22:18:49 2013
@@ -1,27 +1,27 @@
-<!--
- ~ 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><!-- comment -->groupId<!-- comment --></groupId>
- <artifactId><!-- comment -->artifactId<!-- comment --></artifactId>
- <version><!-- comment -->1.0-SNAPSHOT<!-- comment --></version>
- </parent>
-
- <artifactId><!-- comment -->subproject1<!-- comment --></artifactId>
- <version> <!-- comment --> 2.0-SNAPSHOT <!-- comment --> </version>
-</project>
+<!--
+ ~ 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><!-- comment -->groupId<!-- comment --></groupId>
+ <artifactId><!-- comment -->artifactId<!-- comment --></artifactId>
+ <version><!-- comment -->1.0-SNAPSHOT<!-- comment --></version>
+ </parent>
+
+ <artifactId><!-- comment -->subproject1<!-- comment --></artifactId>
+ <version> <!-- comment --> 2.0-SNAPSHOT <!-- comment --> </version>
+</project>
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/comments-around-values/subproject1/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/comments-around-values/subproject1/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/comments-around-values/subproject1/pom.xml?rev=1531451&r1=1531450&r2=1531451&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/comments-around-values/subproject1/pom.xml (original)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/comments-around-values/subproject1/pom.xml Fri Oct 11 22:18:49 2013
@@ -1,27 +1,27 @@
-<!--
- ~ 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><!-- comment -->groupId<!-- comment --></groupId>
- <artifactId><!-- comment -->artifactId<!-- comment --></artifactId>
- <version><!-- comment -->1.0-SNAPSHOT<!-- comment --></version>
- </parent>
-
- <artifactId><!-- comment -->subproject1<!-- comment --></artifactId>
- <version> <!-- comment --> 2.0-SNAPSHOT <!-- comment --> </version>
-</project>
+<!--
+ ~ 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><!-- comment -->groupId<!-- comment --></groupId>
+ <artifactId><!-- comment -->artifactId<!-- comment --></artifactId>
+ <version><!-- comment -->1.0-SNAPSHOT<!-- comment --></version>
+ </parent>
+
+ <artifactId><!-- comment -->subproject1<!-- comment --></artifactId>
+ <version> <!-- comment --> 2.0-SNAPSHOT <!-- comment --> </version>
+</project>
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/comments-around-values/subproject1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/imported-dependency-management-in-reactor/expected-pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/imported-dependency-management-in-reactor/expected-pom.xml?rev=1531451&r1=1531450&r2=1531451&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/imported-dependency-management-in-reactor/expected-pom.xml (original)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/imported-dependency-management-in-reactor/expected-pom.xml Fri Oct 11 22:18:49 2013
@@ -1,30 +1,30 @@
-<?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>
- <groupId>groupId</groupId>
- <artifactId>artifactId</artifactId>
- <version>1.0-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <modules>
- <module>subproject1</module>
- <module>subproject2</module>
- </modules>
-</project>
+<?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>
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>subproject1</module>
+ <module>subproject2</module>
+ </modules>
+</project>
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/imported-dependency-management-in-reactor/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/imported-dependency-management-in-reactor/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/imported-dependency-management-in-reactor/pom.xml?rev=1531451&r1=1531450&r2=1531451&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/imported-dependency-management-in-reactor/pom.xml (original)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/imported-dependency-management-in-reactor/pom.xml Fri Oct 11 22:18:49 2013
@@ -1,30 +1,30 @@
-<?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>
- <groupId>groupId</groupId>
- <artifactId>artifactId</artifactId>
- <version>1.0-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <modules>
- <module>subproject1</module>
- <module>subproject2</module>
- </modules>
-</project>
+<?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>
+ <groupId>groupId</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>subproject1</module>
+ <module>subproject2</module>
+ </modules>
+</project>
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/imported-dependency-management-in-reactor/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/imported-dependency-management-in-reactor/subproject1/expected-pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/imported-dependency-management-in-reactor/subproject1/expected-pom.xml?rev=1531451&r1=1531450&r2=1531451&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/imported-dependency-management-in-reactor/subproject1/expected-pom.xml (original)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/imported-dependency-management-in-reactor/subproject1/expected-pom.xml Fri Oct 11 22:18:49 2013
@@ -1,39 +1,39 @@
-<?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>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>external</groupId>
- <artifactId>artifactId</artifactId>
- <version>1.0</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
-</project>
+<?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>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>external</groupId>
+ <artifactId>artifactId</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+</project>
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/imported-dependency-management-in-reactor/subproject1/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native