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 [4/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/generate-release-poms/pom-with-finalname/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-finalname/pom.xml?rev=1531451&r1=1531450&r2=1531451&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-finalname/pom.xml (original)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-finalname/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>0.0.1-SNAPSHOT</version>
-
- <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>
- <finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName>
- </build>
+<?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>0.0.1-SNAPSHOT</version>
+
+ <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>
+ <finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName>
+ </build>
</project>
\ No newline at end of file
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/generate-release-poms/pom-with-finalname/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: 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=1531451&r1=1531450&r2=1531451&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-entities/expected-pom.xml (original)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-entities/expected-pom.xml Fri Oct 11 22:18:49 2013
@@ -1,31 +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 -->
+<?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 -->
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-entities/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: 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=1531451&r1=1531450&r2=1531451&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-entities/pom.xml (original)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-entities/pom.xml Fri Oct 11 22:18:49 2013
@@ -1,31 +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 -->
+<?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 -->
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-entities/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: 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=1531451&r1=1531450&r2=1531451&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-inherited-scm/expected-pom.xml (original)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-inherited-scm/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>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>
-
+<?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>
+
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-inherited-scm/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: 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=1531451&r1=1531450&r2=1531451&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-inherited-scm/pom.xml (original)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-inherited-scm/pom.xml Fri Oct 11 22:18:49 2013
@@ -1,40 +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>
-
+<?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>
+
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-inherited-scm/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: 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=1531451&r1=1531450&r2=1531451&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-inherited-scm/subproject1/expected-pom.xml (original)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-inherited-scm/subproject1/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>
- <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>
-
+<?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>
+
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-inherited-scm/subproject1/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: 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=1531451&r1=1531450&r2=1531451&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-inherited-scm/subproject1/pom.xml (original)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-inherited-scm/subproject1/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>
- <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>
-
+<?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>
+
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-inherited-scm/subproject1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: 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=1531451&r1=1531450&r2=1531451&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-inherited-scm/subproject1/subsubproject/expected-pom.xml (original)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-inherited-scm/subproject1/subsubproject/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>groupId</groupId>
- <artifactId>subproject1</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>subsubproject</artifactId>
-</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>subproject1</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>subsubproject</artifactId>
+</project>
+
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-inherited-scm/subproject1/subsubproject/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: 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=1531451&r1=1531450&r2=1531451&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-inherited-scm/subproject1/subsubproject/pom.xml (original)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-inherited-scm/subproject1/subsubproject/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>groupId</groupId>
- <artifactId>subproject1</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>subsubproject</artifactId>
-</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>subproject1</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>subsubproject</artifactId>
+</project>
+
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-inherited-scm/subproject1/subsubproject/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-namespace/expected-pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-namespace/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-namespace/expected-pom.xml (original)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-namespace/expected-pom.xml Fri Oct 11 22:18:49 2013
@@ -1,160 +1,160 @@
-<?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>
- <packaging>jar</packaging>
-
- <!-- NOTE: This comment is part of the test -->
- <name>test</name>
- <description>test</description>
- <url>http://www.foo.bar/</url>
-
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
-
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
-
- <repositories>
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
-
- <distributionManagement>
- <!-- Site omitted - each project must provide their own -->
- <repository>
- <id>apache.releases</id>
- <name>Apache Release Distribution Repository</name>
- <url>scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
- </repository>
- <snapshotRepository>
- <id>apache.snapshots</id>
- <name>Apache Development Snapshot Repository</name>
- <url>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
- </snapshotRepository>
- </distributionManagement>
-
- <mailingLists>
- <mailingList>
- <name>Apache Announce List</name>
- <subscribe>announce-subscribe@apache.org</subscribe>
- <unsubscribe>announce-unsubscribe@apache.org</unsubscribe>
- <post>announce@apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/www-announce/</archive>
- </mailingList>
- </mailingLists>
-
- <properties>
- <organization.logo>http://www.apache.org/images/asf_logo_wide.gif</organization.logo>
- <empty0 />
- <empty1 />
- <empty2 />
- </properties>
-
- <profiles>
- <profile>
- <id>run-its</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-invoker-plugin</artifactId>
- <version>1.2</version>
- <configuration>
- <projectsDirectory>src/it</projectsDirectory>
- <pomIncludes>
- <pomInclude>**/pom.xml</pomInclude>
- </pomIncludes>
- <pomExcludes>
- <pomExclude>MWAR-143/war-common/pom.xml</pomExclude>
- <pomExclude>MWAR-143/war-filter-overlay/pom.xml</pomExclude>
- <pomExclude>MWAR-131/mwar131-test/pom.xml</pomExclude>
- <pomExclude>MWAR-131/mwar131-webapp/pom.xml</pomExclude>
- <pomExclude>MWAR-131/mwar131-webapp2/pom.xml</pomExclude>
- <pomExclude>**/META-INF/**/pom.xml</pomExclude>
- </pomExcludes>
- <postBuildHookScript>verify.bsh</postBuildHookScript>
- <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
- <goals>
- <goal>clean</goal>
- <goal>package</goal>
- </goals>
- <settingsFile>src/it/settings.xml</settingsFile>
- <cloneProjectsTo>${project.build.directory}/its</cloneProjectsTo>
- </configuration>
- <executions>
- <execution>
- <id>integration-test</id>
- <goals>
- <goal>install</goal>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <!-- TODO: Remove this plugin execution once MINVOKER-43 is released -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-install-plugin</artifactId>
- <executions>
- <execution>
- <id>it-preparation</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>install-file</goal>
- </goals>
- <configuration>
- <file>${project.build.directory}/${project.build.finalName}.jar</file>
- <groupId>${project.groupId}</groupId>
- <artifactId>${project.artifactId}</artifactId>
- <version>${project.version}</version>
- <packaging>${project.packaging}</packaging>
- <pomFile>${basedir}/pom.xml</pomFile>
- <createChecksum>true</createChecksum>
- <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
- <!-- NOTE: must match identifier of real local repository or metadata lookup during ITs will misbehave -->
- <localRepositoryId>local</localRepositoryId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
-
-<!-- THE END -->
+<?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>
+ <packaging>jar</packaging>
+
+ <!-- NOTE: This comment is part of the test -->
+ <name>test</name>
+ <description>test</description>
+ <url>http://www.foo.bar/</url>
+
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+ <repositories>
+ <repository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ </repositories>
+
+ <distributionManagement>
+ <!-- Site omitted - each project must provide their own -->
+ <repository>
+ <id>apache.releases</id>
+ <name>Apache Release Distribution Repository</name>
+ <url>scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
+ </repository>
+ <snapshotRepository>
+ <id>apache.snapshots</id>
+ <name>Apache Development Snapshot Repository</name>
+ <url>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+ <mailingLists>
+ <mailingList>
+ <name>Apache Announce List</name>
+ <subscribe>announce-subscribe@apache.org</subscribe>
+ <unsubscribe>announce-unsubscribe@apache.org</unsubscribe>
+ <post>announce@apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/www-announce/</archive>
+ </mailingList>
+ </mailingLists>
+
+ <properties>
+ <organization.logo>http://www.apache.org/images/asf_logo_wide.gif</organization.logo>
+ <empty0 />
+ <empty1 />
+ <empty2 />
+ </properties>
+
+ <profiles>
+ <profile>
+ <id>run-its</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-invoker-plugin</artifactId>
+ <version>1.2</version>
+ <configuration>
+ <projectsDirectory>src/it</projectsDirectory>
+ <pomIncludes>
+ <pomInclude>**/pom.xml</pomInclude>
+ </pomIncludes>
+ <pomExcludes>
+ <pomExclude>MWAR-143/war-common/pom.xml</pomExclude>
+ <pomExclude>MWAR-143/war-filter-overlay/pom.xml</pomExclude>
+ <pomExclude>MWAR-131/mwar131-test/pom.xml</pomExclude>
+ <pomExclude>MWAR-131/mwar131-webapp/pom.xml</pomExclude>
+ <pomExclude>MWAR-131/mwar131-webapp2/pom.xml</pomExclude>
+ <pomExclude>**/META-INF/**/pom.xml</pomExclude>
+ </pomExcludes>
+ <postBuildHookScript>verify.bsh</postBuildHookScript>
+ <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+ <goals>
+ <goal>clean</goal>
+ <goal>package</goal>
+ </goals>
+ <settingsFile>src/it/settings.xml</settingsFile>
+ <cloneProjectsTo>${project.build.directory}/its</cloneProjectsTo>
+ </configuration>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <goals>
+ <goal>install</goal>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- TODO: Remove this plugin execution once MINVOKER-43 is released -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>it-preparation</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>install-file</goal>
+ </goals>
+ <configuration>
+ <file>${project.build.directory}/${project.build.finalName}.jar</file>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
+ <version>${project.version}</version>
+ <packaging>${project.packaging}</packaging>
+ <pomFile>${basedir}/pom.xml</pomFile>
+ <createChecksum>true</createChecksum>
+ <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+ <!-- NOTE: must match identifier of real local repository or metadata lookup during ITs will misbehave -->
+ <localRepositoryId>local</localRepositoryId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
+
+<!-- THE END -->
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-namespace/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-namespace/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-namespace/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-namespace/pom.xml (original)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-namespace/pom.xml Fri Oct 11 22:18:49 2013
@@ -1,162 +1,162 @@
-<?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>
- <packaging>jar</packaging>
-
- <!-- NOTE: This comment is part of the test -->
- <name>test</name>
- <description>test</description>
- <url>http://www.foo.bar/</url>
-
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
-
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
-
- <repositories>
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
-
- <distributionManagement>
- <!-- Site omitted - each project must provide their own -->
- <repository>
- <id>apache.releases</id>
- <name>Apache Release Distribution Repository</name>
- <url>scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
- </repository>
- <snapshotRepository>
- <id>apache.snapshots</id>
- <name>Apache Development Snapshot Repository</name>
- <url>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
- </snapshotRepository>
- </distributionManagement>
-
- <mailingLists>
- <mailingList>
- <name>Apache Announce List</name>
- <subscribe>announce-subscribe@apache.org</subscribe>
- <unsubscribe>announce-unsubscribe@apache.org</unsubscribe>
- <post>announce@apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/www-announce/</archive>
- </mailingList>
- </mailingLists>
-
- <properties>
- <organization.logo>http://www.apache.org/images/asf_logo_wide.gif</organization.logo>
- <empty0></empty0>
- <empty1 />
- <empty2/>
- </properties>
-
- <profiles>
- <profile>
- <id>run-its</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-invoker-plugin</artifactId>
- <version>1.2</version>
- <configuration>
- <projectsDirectory>src/it</projectsDirectory>
- <pomIncludes>
- <pomInclude>**/pom.xml</pomInclude>
- </pomIncludes>
- <pomExcludes>
- <pomExclude>MWAR-143/war-common/pom.xml</pomExclude>
- <pomExclude>MWAR-143/war-filter-overlay/pom.xml</pomExclude>
- <pomExclude>MWAR-131/mwar131-test/pom.xml</pomExclude>
- <pomExclude>MWAR-131/mwar131-webapp/pom.xml</pomExclude>
- <pomExclude>MWAR-131/mwar131-webapp2/pom.xml</pomExclude>
- <pomExclude>**/META-INF/**/pom.xml</pomExclude>
- </pomExcludes>
- <postBuildHookScript>verify.bsh</postBuildHookScript>
- <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
- <goals>
- <goal>clean</goal>
- <goal>package</goal>
- </goals>
- <settingsFile>src/it/settings.xml</settingsFile>
- <cloneProjectsTo>${project.build.directory}/its</cloneProjectsTo>
- </configuration>
- <executions>
- <execution>
- <id>integration-test</id>
- <goals>
- <goal>install</goal>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <!-- TODO: Remove this plugin execution once MINVOKER-43 is released -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-install-plugin</artifactId>
- <executions>
- <execution>
- <id>it-preparation</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>install-file</goal>
- </goals>
- <configuration>
- <file>${project.build.directory}/${project.build.finalName}.jar</file>
- <groupId>${project.groupId}</groupId>
- <artifactId>${project.artifactId}</artifactId>
- <version>${project.version}</version>
- <packaging>${project.packaging}</packaging>
- <pomFile>${basedir}/pom.xml</pomFile>
- <createChecksum>true</createChecksum>
- <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
- <!-- NOTE: must match identifier of real local repository or metadata lookup during ITs will misbehave -->
- <localRepositoryId>local</localRepositoryId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
-
-<!-- THE END -->
+<?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>
+ <packaging>jar</packaging>
+
+ <!-- NOTE: This comment is part of the test -->
+ <name>test</name>
+ <description>test</description>
+ <url>http://www.foo.bar/</url>
+
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+ <repositories>
+ <repository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ </repositories>
+
+ <distributionManagement>
+ <!-- Site omitted - each project must provide their own -->
+ <repository>
+ <id>apache.releases</id>
+ <name>Apache Release Distribution Repository</name>
+ <url>scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
+ </repository>
+ <snapshotRepository>
+ <id>apache.snapshots</id>
+ <name>Apache Development Snapshot Repository</name>
+ <url>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+ <mailingLists>
+ <mailingList>
+ <name>Apache Announce List</name>
+ <subscribe>announce-subscribe@apache.org</subscribe>
+ <unsubscribe>announce-unsubscribe@apache.org</unsubscribe>
+ <post>announce@apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/www-announce/</archive>
+ </mailingList>
+ </mailingLists>
+
+ <properties>
+ <organization.logo>http://www.apache.org/images/asf_logo_wide.gif</organization.logo>
+ <empty0></empty0>
+ <empty1 />
+ <empty2/>
+ </properties>
+
+ <profiles>
+ <profile>
+ <id>run-its</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-invoker-plugin</artifactId>
+ <version>1.2</version>
+ <configuration>
+ <projectsDirectory>src/it</projectsDirectory>
+ <pomIncludes>
+ <pomInclude>**/pom.xml</pomInclude>
+ </pomIncludes>
+ <pomExcludes>
+ <pomExclude>MWAR-143/war-common/pom.xml</pomExclude>
+ <pomExclude>MWAR-143/war-filter-overlay/pom.xml</pomExclude>
+ <pomExclude>MWAR-131/mwar131-test/pom.xml</pomExclude>
+ <pomExclude>MWAR-131/mwar131-webapp/pom.xml</pomExclude>
+ <pomExclude>MWAR-131/mwar131-webapp2/pom.xml</pomExclude>
+ <pomExclude>**/META-INF/**/pom.xml</pomExclude>
+ </pomExcludes>
+ <postBuildHookScript>verify.bsh</postBuildHookScript>
+ <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+ <goals>
+ <goal>clean</goal>
+ <goal>package</goal>
+ </goals>
+ <settingsFile>src/it/settings.xml</settingsFile>
+ <cloneProjectsTo>${project.build.directory}/its</cloneProjectsTo>
+ </configuration>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <goals>
+ <goal>install</goal>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- TODO: Remove this plugin execution once MINVOKER-43 is released -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>it-preparation</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>install-file</goal>
+ </goals>
+ <configuration>
+ <file>${project.build.directory}/${project.build.finalName}.jar</file>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
+ <version>${project.version}</version>
+ <packaging>${project.packaging}</packaging>
+ <pomFile>${basedir}/pom.xml</pomFile>
+ <createChecksum>true</createChecksum>
+ <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+ <!-- NOTE: must match identifier of real local repository or metadata lookup during ITs will misbehave -->
+ <localRepositoryId>local</localRepositoryId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
+
+<!-- THE END -->
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-namespace/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-cvs-from-tag/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-cvs-from-tag/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-cvs-from-tag/expected-pom.xml (original)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-cvs-from-tag/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>
- <groupId>groupId</groupId>
- <artifactId>artifactId</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <prerequisites>
- <maven>2.0.4</maven>
- </prerequisites>
-
- <scm>
- <connection>${scm.base}:pserver:anoncvs@localhost:/tmp/scm-repo:module</connection>
- <developerConnection>${scm.base}:ext:${username}@localhost:/tmp/scm-repo:module</developerConnection>
- <url>${baseUrl}/module</url>
- <tag>release-label</tag>
- </scm>
- <properties>
- <scm.base>scm:cvs</scm.base>
- <baseUrl>http://localhost/viewcvs.cgi</baseUrl>
- </properties>
+<?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.base}:pserver:anoncvs@localhost:/tmp/scm-repo:module</connection>
+ <developerConnection>${scm.base}:ext:${username}@localhost:/tmp/scm-repo:module</developerConnection>
+ <url>${baseUrl}/module</url>
+ <tag>release-label</tag>
+ </scm>
+ <properties>
+ <scm.base>scm:cvs</scm.base>
+ <baseUrl>http://localhost/viewcvs.cgi</baseUrl>
+ </properties>
</project>
\ No newline at end of file
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-cvs-from-tag/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-cvs-from-tag/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-cvs-from-tag/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-cvs-from-tag/pom.xml (original)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-cvs-from-tag/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>
- <groupId>groupId</groupId>
- <artifactId>artifactId</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <prerequisites>
- <maven>2.0.4</maven>
- </prerequisites>
-
- <scm>
- <connection>${scm.base}:pserver:anoncvs@localhost:/tmp/scm-repo:module</connection>
- <developerConnection>${scm.base}:ext:${username}@localhost:/tmp/scm-repo:module</developerConnection>
- <url>${baseUrl}/module</url>
- <tag>original-tag</tag>
- </scm>
- <properties>
- <scm.base>scm:cvs</scm.base>
- <baseUrl>http://localhost/viewcvs.cgi</baseUrl>
- </properties>
+<?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.base}:pserver:anoncvs@localhost:/tmp/scm-repo:module</connection>
+ <developerConnection>${scm.base}:ext:${username}@localhost:/tmp/scm-repo:module</developerConnection>
+ <url>${baseUrl}/module</url>
+ <tag>original-tag</tag>
+ </scm>
+ <properties>
+ <scm.base>scm:cvs</scm.base>
+ <baseUrl>http://localhost/viewcvs.cgi</baseUrl>
+ </properties>
</project>
\ No newline at end of file
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-cvs-from-tag/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-cvs/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-cvs/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-cvs/expected-pom.xml (original)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-cvs/expected-pom.xml Fri Oct 11 22:18:49 2013
@@ -1,35 +1,35 @@
-<?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:cvs:pserver:anoncvs@localhost:/tmp/scm-repo:module</connection>
- <developerConnection>scm:cvs:ext:${username}@localhost:/tmp/scm-repo:module</developerConnection>
- <url>http://localhost/viewcvs.cgi/module</url>
- <tag>release-label</tag>
- </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:cvs:pserver:anoncvs@localhost:/tmp/scm-repo:module</connection>
+ <developerConnection>scm:cvs:ext:${username}@localhost:/tmp/scm-repo:module</developerConnection>
+ <url>http://localhost/viewcvs.cgi/module</url>
+ <tag>release-label</tag>
+ </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-cvs/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-cvs/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-cvs/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-cvs/pom.xml (original)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-cvs/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:cvs:pserver:anoncvs@localhost:/tmp/scm-repo:module</connection>
- <developerConnection>scm:cvs:ext:${username}@localhost:/tmp/scm-repo:module</developerConnection>
- <url>http://localhost/viewcvs.cgi/module</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:cvs:pserver:anoncvs@localhost:/tmp/scm-repo:module</connection>
+ <developerConnection>scm:cvs:ext:${username}@localhost:/tmp/scm-repo:module</developerConnection>
+ <url>http://localhost/viewcvs.cgi/module</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-cvs/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-dashes-in-comment/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-dashes-in-comment/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-dashes-in-comment/expected-pom.xml (original)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-dashes-in-comment/expected-pom.xml Fri Oct 11 22:18:49 2013
@@ -1,37 +1,37 @@
-<?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>
-
- <!---
- a multi-line
- comment which will fail when parsed with JDOM 1.0
- -->
-
- <scm>
- <connection>scm:svn:file://localhost/tmp/scm-repo/branches/release-label</connection>
- </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>
+
+ <!---
+ a multi-line
+ comment which will fail when parsed with JDOM 1.0
+ -->
+
+ <scm>
+ <connection>scm:svn:file://localhost/tmp/scm-repo/branches/release-label</connection>
+ </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-dashes-in-comment/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-dashes-in-comment/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-dashes-in-comment/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-dashes-in-comment/pom.xml (original)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-dashes-in-comment/pom.xml Fri Oct 11 22:18:49 2013
@@ -1,37 +1,37 @@
-<?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>
-
- <!---
- a multi-line
- comment which will fail when parsed with JDOM 1.0
- -->
-
- <scm>
- <connection>scm:svn:file://localhost/tmp/scm-repo/trunk</connection>
- </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>
+
+ <!---
+ a multi-line
+ comment which will fail when parsed with JDOM 1.0
+ -->
+
+ <scm>
+ <connection>scm:svn:file://localhost/tmp/scm-repo/trunk</connection>
+ </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-dashes-in-comment/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-empty-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-with-empty-scm/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-empty-scm/expected-pom.xml (original)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-empty-scm/expected-pom.xml Fri Oct 11 22:18:49 2013
@@ -1,32 +1,32 @@
-<?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>
- </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>
+ </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-empty-scm/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-empty-scm/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-empty-scm/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-empty-scm/pom.xml (original)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-empty-scm/pom.xml Fri Oct 11 22:18:49 2013
@@ -1,32 +1,32 @@
-<?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>
- </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>
+ </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-empty-scm/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-scm-expression/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-scm-expression/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-scm-expression/expected-pom.xml (original)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-scm-expression/expected-pom.xml Fri Oct 11 22:18:49 2013
@@ -1,33 +1,33 @@
-<?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:http://localhost/repo/branches/release-label</connection>
- <developerConnection>scm:svn:https://${user.name}@localhost/repo/branches/release-label</developerConnection>
- </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:http://localhost/repo/branches/release-label</connection>
+ <developerConnection>scm:svn:https://${user.name}@localhost/repo/branches/release-label</developerConnection>
+ </scm>
+</project>
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-scm-expression/expected-pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-scm-expression/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-scm-expression/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-scm-expression/pom.xml (original)
+++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-scm-expression/pom.xml Fri Oct 11 22:18:49 2013
@@ -1,33 +1,33 @@
-<?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:http://localhost/repo/trunk</connection>
- <developerConnection>scm:svn:https://${user.name}@localhost/repo/trunk</developerConnection>
- </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:http://localhost/repo/trunk</connection>
+ <developerConnection>scm:svn:https://${user.name}@localhost/repo/trunk</developerConnection>
+ </scm>
+</project>
Propchange: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-scm-expression/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native