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 [13/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-rel...
Modified: maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-459/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-459/pom.xml?rev=1531451&r1=1531450&r2=1531451&view=diff
==============================================================================
--- maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-459/pom.xml (original)
+++ maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-459/pom.xml Fri Oct 11 22:18:49 2013
@@ -1,71 +1,71 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-<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>org.apache.maven.plugin.release.its</groupId>
- <artifactId>mrelease-759</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <scm>
- <connection>scm:dummy|nul</connection>
- <developerConnection>scm:dummy|nul</developerConnection>
- </scm>
-
- <distributionManagement>
- <snapshotRepository>
- <id>dummy</id>
- <url>dummy:nul</url>
- </snapshotRepository>
- </distributionManagement>
-
- <build>
- <extensions>
- <extension>
- <groupId>org.apache.maven.its.release</groupId>
- <artifactId>wagon-provider-dummy</artifactId>
- <version>1.0</version>
- </extension>
- </extensions>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>@project.version@</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.its.release</groupId>
- <artifactId>maven-scm-provider-dummy</artifactId>
- <version>1.0</version>
- </dependency>
- </dependencies>
- <configuration>
- <releaseProfiles>custom-release</releaseProfiles>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>custom-release</id>
- </profile>
- </profiles>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<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>org.apache.maven.plugin.release.its</groupId>
+ <artifactId>mrelease-759</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <scm>
+ <connection>scm:dummy|nul</connection>
+ <developerConnection>scm:dummy|nul</developerConnection>
+ </scm>
+
+ <distributionManagement>
+ <snapshotRepository>
+ <id>dummy</id>
+ <url>dummy:nul</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+ <build>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.its.release</groupId>
+ <artifactId>wagon-provider-dummy</artifactId>
+ <version>1.0</version>
+ </extension>
+ </extensions>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>@project.version@</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.release</groupId>
+ <artifactId>maven-scm-provider-dummy</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <releaseProfiles>custom-release</releaseProfiles>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>custom-release</id>
+ </profile>
+ </profiles>
</project>
\ No newline at end of file
Propchange: maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-459/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-459/verify.groovy
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-459/verify.groovy?rev=1531451&r1=1531450&r2=1531451&view=diff
==============================================================================
--- maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-459/verify.groovy (original)
+++ maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-459/verify.groovy Fri Oct 11 22:18:49 2013
@@ -1,32 +1,32 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-File buildLog = new File( basedir, 'build.log' )
-assert buildLog.exists()
-
-def addArgsExpr = /\Q[DEBUG] Additional arguments: -P\E(.+)\Q-DperformRelease=true -f pom.xml\E/
-def matcher = ( buildLog.getText() =~ addArgsExpr )
-
-// M2: [DEBUG] Additional arguments: -P custom-release -DperformRelease=true -f pom.xml
-// M3: [DEBUG] Additional arguments: -P it-repo,it-repo,custom-release -DperformRelease=true -f pom.xml
-
-assert matcher.find()
-assert matcher.getCount() == 1
-
-assert matcher[0][1].contains( "custom-release" )
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+File buildLog = new File( basedir, 'build.log' )
+assert buildLog.exists()
+
+def addArgsExpr = /\Q[DEBUG] Additional arguments: -P\E(.+)\Q-DperformRelease=true -f pom.xml\E/
+def matcher = ( buildLog.getText() =~ addArgsExpr )
+
+// M2: [DEBUG] Additional arguments: -P custom-release -DperformRelease=true -f pom.xml
+// M3: [DEBUG] Additional arguments: -P it-repo,it-repo,custom-release -DperformRelease=true -f pom.xml
+
+assert matcher.find()
+assert matcher.getCount() == 1
+
+assert matcher[0][1].contains( "custom-release" )
Propchange: maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-459/verify.groovy
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-592/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-592/pom.xml?rev=1531451&r1=1531450&r2=1531451&view=diff
==============================================================================
--- maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-592/pom.xml (original)
+++ maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-592/pom.xml Fri Oct 11 22:18:49 2013
@@ -1,116 +1,116 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- ~ Licensed to the Apache Software Foundation (ASF) under one ~ or more
- contributor license agreements. See the NOTICE file ~ distributed with this
- work for additional information ~ regarding copyright ownership. The ASF
- licenses this file ~ to you under the Apache License, Version 2.0 (the ~
- "License"); you may not use this file except in compliance ~ with the License.
- You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0
- ~ ~ Unless required by applicable law or agreed to in writing, ~ software
- distributed under the License is distributed on an ~ "AS IS" BASIS, WITHOUT
- WARRANTIES OR CONDITIONS OF ANY ~ KIND, either express or implied. See the
- License for the ~ specific language governing permissions and limitations
- ~ under the License. -->
-<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>org.apache.maven.plugin.release.its</groupId>
- <artifactId>mrelease-592</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <scm>
- <connection>scm:dummy|nul</connection>
- <developerConnection>scm:dummy|nul</developerConnection>
- </scm>
-
- <distributionManagement>
- <snapshotRepository>
- <id>dummy</id>
- <url>dummy:nul</url>
- </snapshotRepository>
- </distributionManagement>
-
- <build>
- <extensions>
- <extension>
- <groupId>org.apache.maven.its.release</groupId>
- <artifactId>wagon-provider-dummy</artifactId>
- <version>1.0</version>
- </extension>
- </extensions>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>@project.version@</version>
- <configuration>
- <preparationGoals>clean</preparationGoals>
- <releaseProfiles>release,!integration-tests</releaseProfiles>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.its.release</groupId>
- <artifactId>maven-scm-provider-dummy</artifactId>
- <version>1.0</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>release</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.1.1</version>
- <executions>
- <execution>
- <id>enforce</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <AlwaysPass />
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>integration-tests</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.1.1</version>
- <executions>
- <execution>
- <id>enforce</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <AlwaysFail />
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- ~ Licensed to the Apache Software Foundation (ASF) under one ~ or more
+ contributor license agreements. See the NOTICE file ~ distributed with this
+ work for additional information ~ regarding copyright ownership. The ASF
+ licenses this file ~ to you under the Apache License, Version 2.0 (the ~
+ "License"); you may not use this file except in compliance ~ with the License.
+ You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~ ~ Unless required by applicable law or agreed to in writing, ~ software
+ distributed under the License is distributed on an ~ "AS IS" BASIS, WITHOUT
+ WARRANTIES OR CONDITIONS OF ANY ~ KIND, either express or implied. See the
+ License for the ~ specific language governing permissions and limitations
+ ~ under the License. -->
+<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>org.apache.maven.plugin.release.its</groupId>
+ <artifactId>mrelease-592</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <scm>
+ <connection>scm:dummy|nul</connection>
+ <developerConnection>scm:dummy|nul</developerConnection>
+ </scm>
+
+ <distributionManagement>
+ <snapshotRepository>
+ <id>dummy</id>
+ <url>dummy:nul</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+ <build>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.its.release</groupId>
+ <artifactId>wagon-provider-dummy</artifactId>
+ <version>1.0</version>
+ </extension>
+ </extensions>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>@project.version@</version>
+ <configuration>
+ <preparationGoals>clean</preparationGoals>
+ <releaseProfiles>release,!integration-tests</releaseProfiles>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.release</groupId>
+ <artifactId>maven-scm-provider-dummy</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.1.1</version>
+ <executions>
+ <execution>
+ <id>enforce</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <AlwaysPass />
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>integration-tests</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.1.1</version>
+ <executions>
+ <execution>
+ <id>enforce</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <AlwaysFail />
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
\ No newline at end of file
Propchange: maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-592/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-736/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-736/pom.xml?rev=1531451&r1=1531450&r2=1531451&view=diff
==============================================================================
--- maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-736/pom.xml (original)
+++ maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-736/pom.xml Fri Oct 11 22:18:49 2013
@@ -1,62 +1,62 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-<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>org.apache.maven.plugin.release.its</groupId>
- <artifactId>mrelease-736</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <scm>
- <connection>scm:dummy|nul</connection>
- <developerConnection>scm:dummy|nul</developerConnection>
- </scm>
-
- <distributionManagement>
- <snapshotRepository>
- <id>dummy</id>
- <url>dummy:nul</url>
- </snapshotRepository>
- </distributionManagement>
-
- <build>
- <extensions>
- <extension>
- <groupId>org.apache.maven.its.release</groupId>
- <artifactId>wagon-provider-dummy</artifactId>
- <version>1.0</version>
- </extension>
- </extensions>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>@project.version@</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.its.release</groupId>
- <artifactId>maven-scm-provider-dummy</artifactId>
- <version>1.0</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<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>org.apache.maven.plugin.release.its</groupId>
+ <artifactId>mrelease-736</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <scm>
+ <connection>scm:dummy|nul</connection>
+ <developerConnection>scm:dummy|nul</developerConnection>
+ </scm>
+
+ <distributionManagement>
+ <snapshotRepository>
+ <id>dummy</id>
+ <url>dummy:nul</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+ <build>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.its.release</groupId>
+ <artifactId>wagon-provider-dummy</artifactId>
+ <version>1.0</version>
+ </extension>
+ </extensions>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>@project.version@</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.release</groupId>
+ <artifactId>maven-scm-provider-dummy</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
Propchange: maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-736/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-736/test.properties
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-736/test.properties?rev=1531451&r1=1531450&r2=1531451&view=diff
==============================================================================
--- maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-736/test.properties (original)
+++ maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-736/test.properties Fri Oct 11 22:18:49 2013
@@ -1,18 +1,18 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
dryRun=true
\ No newline at end of file
Propchange: maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-736/test.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-818/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-818/pom.xml?rev=1531451&r1=1531450&r2=1531451&view=diff
==============================================================================
--- maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-818/pom.xml (original)
+++ maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-818/pom.xml Fri Oct 11 22:18:49 2013
@@ -1,65 +1,65 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-<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>org.apache.maven.plugin.release.its</groupId>
- <artifactId>mrelease-818</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <scm>
- <connection>scm:dummy|nul</connection>
- <developerConnection>scm:dummy|nul</developerConnection>
- </scm>
-
- <distributionManagement>
- <snapshotRepository>
- <id>dummy</id>
- <url>dummy:nul</url>
- </snapshotRepository>
- </distributionManagement>
-
- <build>
- <extensions>
- <extension>
- <groupId>org.apache.maven.its.release</groupId>
- <artifactId>wagon-provider-dummy</artifactId>
- <version>1.0</version>
- </extension>
- </extensions>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>@project.version@</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.its.release</groupId>
- <artifactId>maven-scm-provider-dummy</artifactId>
- <version>1.0</version>
- </dependency>
- </dependencies>
- <configuration>
- <localCheckout>true</localCheckout>
- </configuration>
- </plugin>
- </plugins>
- </build>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<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>org.apache.maven.plugin.release.its</groupId>
+ <artifactId>mrelease-818</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <scm>
+ <connection>scm:dummy|nul</connection>
+ <developerConnection>scm:dummy|nul</developerConnection>
+ </scm>
+
+ <distributionManagement>
+ <snapshotRepository>
+ <id>dummy</id>
+ <url>dummy:nul</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+ <build>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.its.release</groupId>
+ <artifactId>wagon-provider-dummy</artifactId>
+ <version>1.0</version>
+ </extension>
+ </extensions>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>@project.version@</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.release</groupId>
+ <artifactId>maven-scm-provider-dummy</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <localCheckout>true</localCheckout>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
Propchange: maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-818/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-818/verify.groovy
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-818/verify.groovy?rev=1531451&r1=1531450&r2=1531451&view=diff
==============================================================================
--- maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-818/verify.groovy (original)
+++ maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-818/verify.groovy Fri Oct 11 22:18:49 2013
@@ -1,27 +1,27 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-File buildLog = new File( basedir, 'build.log' )
-assert buildLog.exists()
-
-def localCheckoutExpr = /\Q[INFO] This would be a LOCAL check out to perform the release ...\E/
-def matcher = ( buildLog.getText() =~ localCheckoutExpr )
-
-assert matcher.find()
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+File buildLog = new File( basedir, 'build.log' )
+assert buildLog.exists()
+
+def localCheckoutExpr = /\Q[INFO] This would be a LOCAL check out to perform the release ...\E/
+def matcher = ( buildLog.getText() =~ localCheckoutExpr )
+
+assert matcher.find()
assert matcher.getCount() == 1
\ No newline at end of file
Propchange: maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-818/verify.groovy
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-832/invoker.properties
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-832/invoker.properties?rev=1531451&r1=1531450&r2=1531451&view=diff
==============================================================================
--- maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-832/invoker.properties (original)
+++ maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-832/invoker.properties Fri Oct 11 22:18:49 2013
@@ -1,18 +1,18 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
invoker.goals = release:clean release:perform
\ No newline at end of file
Propchange: maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-832/invoker.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-832/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-832/pom.xml?rev=1531451&r1=1531450&r2=1531451&view=diff
==============================================================================
--- maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-832/pom.xml (original)
+++ maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-832/pom.xml Fri Oct 11 22:18:49 2013
@@ -1,48 +1,48 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-<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>org.apache.maven.plugin.release.its</groupId>
- <artifactId>mrelease-832</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>@project.version@</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.its.release</groupId>
- <artifactId>maven-scm-provider-dummy</artifactId>
- <version>1.0</version>
- </dependency>
- </dependencies>
- <configuration>
- <connectionUrl>scm:dummy|nul</connectionUrl>
- <username>perform_username</username>
- <password>perform_password</password>
- </configuration>
- </plugin>
- </plugins>
- </build>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<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>org.apache.maven.plugin.release.its</groupId>
+ <artifactId>mrelease-832</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>@project.version@</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.release</groupId>
+ <artifactId>maven-scm-provider-dummy</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <connectionUrl>scm:dummy|nul</connectionUrl>
+ <username>perform_username</username>
+ <password>perform_password</password>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
Propchange: maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-832/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-832/verify.groovy
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-832/verify.groovy?rev=1531451&r1=1531450&r2=1531451&view=diff
==============================================================================
--- maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-832/verify.groovy (original)
+++ maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-832/verify.groovy Fri Oct 11 22:18:49 2013
@@ -1,25 +1,25 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-File buildLog = new File( basedir, 'build.log' )
-assert buildLog.exists()
-
-assert buildLog.text.contains( "[DEBUG] (f) username = perform_username" )
-assert buildLog.text.contains( "[DEBUG] (f) password = perform_password" )
-
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+File buildLog = new File( basedir, 'build.log' )
+assert buildLog.exists()
+
+assert buildLog.text.contains( "[DEBUG] (f) username = perform_username" )
+assert buildLog.text.contains( "[DEBUG] (f) password = perform_password" )
+
Propchange: maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-832/verify.groovy
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/release/trunk/maven-release-plugin/src/it/projects/prepare-with-pom/MRELEASE-808/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/it/projects/prepare-with-pom/MRELEASE-808/pom.xml?rev=1531451&r1=1531450&r2=1531451&view=diff
==============================================================================
--- maven/release/trunk/maven-release-plugin/src/it/projects/prepare-with-pom/MRELEASE-808/pom.xml (original)
+++ maven/release/trunk/maven-release-plugin/src/it/projects/prepare-with-pom/MRELEASE-808/pom.xml Fri Oct 11 22:18:49 2013
@@ -1,63 +1,63 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- ~ Licensed to the Apache Software Foundation (ASF) under one ~ or more
- contributor license agreements. See the NOTICE file ~ distributed with this
- work for additional information ~ regarding copyright ownership. The ASF
- licenses this file ~ to you under the Apache License, Version 2.0 (the ~
- "License"); you may not use this file except in compliance ~ with the License.
- You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0
- ~ ~ Unless required by applicable law or agreed to in writing, ~ software
- distributed under the License is distributed on an ~ "AS IS" BASIS, WITHOUT
- WARRANTIES OR CONDITIONS OF ANY ~ KIND, either express or implied. See the
- License for the ~ specific language governing permissions and limitations
- ~ under the License. -->
-<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>org.apache.maven.plugin.release.its</groupId>
- <artifactId>mrelease-808</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <scm>
- <connection>scm:dummy|nul</connection>
- <developerConnection>scm:dummy|nul</developerConnection>
- <url>http://${scm.host}/viewvc/${project.artifactId}/trunk/</url>
- </scm>
-
- <properties>
- <scm.host>localhost:8080</scm.host>
- </properties>
-
- <distributionManagement>
- <snapshotRepository>
- <id>dummy</id>
- <url>dummy:nul</url>
- </snapshotRepository>
- </distributionManagement>
-
- <build>
- <finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName>
- <extensions>
- <extension>
- <groupId>org.apache.maven.its.release</groupId>
- <artifactId>wagon-provider-dummy</artifactId>
- <version>1.0</version>
- </extension>
- </extensions>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>@project.version@</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.its.release</groupId>
- <artifactId>maven-scm-provider-dummy</artifactId>
- <version>1.0</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- ~ Licensed to the Apache Software Foundation (ASF) under one ~ or more
+ contributor license agreements. See the NOTICE file ~ distributed with this
+ work for additional information ~ regarding copyright ownership. The ASF
+ licenses this file ~ to you under the Apache License, Version 2.0 (the ~
+ "License"); you may not use this file except in compliance ~ with the License.
+ You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~ ~ Unless required by applicable law or agreed to in writing, ~ software
+ distributed under the License is distributed on an ~ "AS IS" BASIS, WITHOUT
+ WARRANTIES OR CONDITIONS OF ANY ~ KIND, either express or implied. See the
+ License for the ~ specific language governing permissions and limitations
+ ~ under the License. -->
+<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>org.apache.maven.plugin.release.its</groupId>
+ <artifactId>mrelease-808</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <scm>
+ <connection>scm:dummy|nul</connection>
+ <developerConnection>scm:dummy|nul</developerConnection>
+ <url>http://${scm.host}/viewvc/${project.artifactId}/trunk/</url>
+ </scm>
+
+ <properties>
+ <scm.host>localhost:8080</scm.host>
+ </properties>
+
+ <distributionManagement>
+ <snapshotRepository>
+ <id>dummy</id>
+ <url>dummy:nul</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+ <build>
+ <finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.its.release</groupId>
+ <artifactId>wagon-provider-dummy</artifactId>
+ <version>1.0</version>
+ </extension>
+ </extensions>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>@project.version@</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.release</groupId>
+ <artifactId>maven-scm-provider-dummy</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
\ No newline at end of file
Propchange: maven/release/trunk/maven-release-plugin/src/it/projects/prepare-with-pom/MRELEASE-808/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/release/trunk/maven-release-plugin/src/it/projects/prepare-with-pom/MRELEASE-808/verify.groovy
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/it/projects/prepare-with-pom/MRELEASE-808/verify.groovy?rev=1531451&r1=1531450&r2=1531451&view=diff
==============================================================================
--- maven/release/trunk/maven-release-plugin/src/it/projects/prepare-with-pom/MRELEASE-808/verify.groovy (original)
+++ maven/release/trunk/maven-release-plugin/src/it/projects/prepare-with-pom/MRELEASE-808/verify.groovy Fri Oct 11 22:18:49 2013
@@ -1,24 +1,24 @@
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-File releasePom = new File( basedir, 'release-pom.xml' )
-assert releasePom.exists()
-
-assert 1 == releasePom.getText().count("<finalName>org.apache.maven.plugin.release.its.mrelease-808-1.0</finalName>")
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+File releasePom = new File( basedir, 'release-pom.xml' )
+assert releasePom.exists()
+
+assert 1 == releasePom.getText().count("<finalName>org.apache.maven.plugin.release.its.mrelease-808-1.0</finalName>")
Propchange: maven/release/trunk/maven-release-plugin/src/it/projects/prepare-with-pom/MRELEASE-808/verify.groovy
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/release/trunk/maven-release-plugin/src/it/projects/prepare-with-pom/finalname-basic/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/it/projects/prepare-with-pom/finalname-basic/pom.xml?rev=1531451&r1=1531450&r2=1531451&view=diff
==============================================================================
--- maven/release/trunk/maven-release-plugin/src/it/projects/prepare-with-pom/finalname-basic/pom.xml (original)
+++ maven/release/trunk/maven-release-plugin/src/it/projects/prepare-with-pom/finalname-basic/pom.xml Fri Oct 11 22:18:49 2013
@@ -1,62 +1,62 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- ~ Licensed to the Apache Software Foundation (ASF) under one ~ or more
- contributor license agreements. See the NOTICE file ~ distributed with this
- work for additional information ~ regarding copyright ownership. The ASF
- licenses this file ~ to you under the Apache License, Version 2.0 (the ~
- "License"); you may not use this file except in compliance ~ with the License.
- You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0
- ~ ~ Unless required by applicable law or agreed to in writing, ~ software
- distributed under the License is distributed on an ~ "AS IS" BASIS, WITHOUT
- WARRANTIES OR CONDITIONS OF ANY ~ KIND, either express or implied. See the
- License for the ~ specific language governing permissions and limitations
- ~ under the License. -->
-<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>org.apache.maven.plugin.release.its</groupId>
- <artifactId>finalname-basic</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <scm>
- <connection>scm:dummy|nul</connection>
- <developerConnection>scm:dummy|nul</developerConnection>
- <url>http://${scm.host}/viewvc/${project.artifactId}/trunk/</url>
- </scm>
-
- <properties>
- <scm.host>localhost:8080</scm.host>
- </properties>
-
- <distributionManagement>
- <snapshotRepository>
- <id>dummy</id>
- <url>dummy:nul</url>
- </snapshotRepository>
- </distributionManagement>
-
- <build>
- <extensions>
- <extension>
- <groupId>org.apache.maven.its.release</groupId>
- <artifactId>wagon-provider-dummy</artifactId>
- <version>1.0</version>
- </extension>
- </extensions>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>@project.version@</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.its.release</groupId>
- <artifactId>maven-scm-provider-dummy</artifactId>
- <version>1.0</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- ~ Licensed to the Apache Software Foundation (ASF) under one ~ or more
+ contributor license agreements. See the NOTICE file ~ distributed with this
+ work for additional information ~ regarding copyright ownership. The ASF
+ licenses this file ~ to you under the Apache License, Version 2.0 (the ~
+ "License"); you may not use this file except in compliance ~ with the License.
+ You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~ ~ Unless required by applicable law or agreed to in writing, ~ software
+ distributed under the License is distributed on an ~ "AS IS" BASIS, WITHOUT
+ WARRANTIES OR CONDITIONS OF ANY ~ KIND, either express or implied. See the
+ License for the ~ specific language governing permissions and limitations
+ ~ under the License. -->
+<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>org.apache.maven.plugin.release.its</groupId>
+ <artifactId>finalname-basic</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <scm>
+ <connection>scm:dummy|nul</connection>
+ <developerConnection>scm:dummy|nul</developerConnection>
+ <url>http://${scm.host}/viewvc/${project.artifactId}/trunk/</url>
+ </scm>
+
+ <properties>
+ <scm.host>localhost:8080</scm.host>
+ </properties>
+
+ <distributionManagement>
+ <snapshotRepository>
+ <id>dummy</id>
+ <url>dummy:nul</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+ <build>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.its.release</groupId>
+ <artifactId>wagon-provider-dummy</artifactId>
+ <version>1.0</version>
+ </extension>
+ </extensions>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>@project.version@</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.release</groupId>
+ <artifactId>maven-scm-provider-dummy</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
\ No newline at end of file
Propchange: maven/release/trunk/maven-release-plugin/src/it/projects/prepare-with-pom/finalname-basic/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/release/trunk/maven-release-plugin/src/it/projects/prepare-with-pom/finalname-basic/verify.groovy
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/it/projects/prepare-with-pom/finalname-basic/verify.groovy?rev=1531451&r1=1531450&r2=1531451&view=diff
==============================================================================
--- maven/release/trunk/maven-release-plugin/src/it/projects/prepare-with-pom/finalname-basic/verify.groovy (original)
+++ maven/release/trunk/maven-release-plugin/src/it/projects/prepare-with-pom/finalname-basic/verify.groovy Fri Oct 11 22:18:49 2013
@@ -1,24 +1,24 @@
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-File releasePom = new File( basedir, 'release-pom.xml' )
-assert releasePom.exists()
-
-assert 1 == releasePom.getText().count("<finalName>finalname-basic-1.0</finalName>")
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+File releasePom = new File( basedir, 'release-pom.xml' )
+assert releasePom.exists()
+
+assert 1 == releasePom.getText().count("<finalName>finalname-basic-1.0</finalName>")
Propchange: maven/release/trunk/maven-release-plugin/src/it/projects/prepare-with-pom/finalname-basic/verify.groovy
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/release/trunk/maven-release-plugin/src/it/projects/prepare-with-pom/finalname-multimodule/module/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/it/projects/prepare-with-pom/finalname-multimodule/module/pom.xml?rev=1531451&r1=1531450&r2=1531451&view=diff
==============================================================================
--- maven/release/trunk/maven-release-plugin/src/it/projects/prepare-with-pom/finalname-multimodule/module/pom.xml (original)
+++ maven/release/trunk/maven-release-plugin/src/it/projects/prepare-with-pom/finalname-multimodule/module/pom.xml Fri Oct 11 22:18:49 2013
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- ~ Licensed to the Apache Software Foundation (ASF) under one ~ or more
- contributor license agreements. See the NOTICE file ~ distributed with this
- work for additional information ~ regarding copyright ownership. The ASF
- licenses this file ~ to you under the Apache License, Version 2.0 (the ~
- "License"); you may not use this file except in compliance ~ with the License.
- You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0
- ~ ~ Unless required by applicable law or agreed to in writing, ~ software
- distributed under the License is distributed on an ~ "AS IS" BASIS, WITHOUT
- WARRANTIES OR CONDITIONS OF ANY ~ KIND, either express or implied. See the
- License for the ~ specific language governing permissions and limitations
- ~ under the License. -->
-<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>
-
- <parent>
- <groupId>org.apache.maven.plugin.release.its</groupId>
- <artifactId>finalname-multimodule</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>module</artifactId>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- ~ Licensed to the Apache Software Foundation (ASF) under one ~ or more
+ contributor license agreements. See the NOTICE file ~ distributed with this
+ work for additional information ~ regarding copyright ownership. The ASF
+ licenses this file ~ to you under the Apache License, Version 2.0 (the ~
+ "License"); you may not use this file except in compliance ~ with the License.
+ You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~ ~ Unless required by applicable law or agreed to in writing, ~ software
+ distributed under the License is distributed on an ~ "AS IS" BASIS, WITHOUT
+ WARRANTIES OR CONDITIONS OF ANY ~ KIND, either express or implied. See the
+ License for the ~ specific language governing permissions and limitations
+ ~ under the License. -->
+<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>
+
+ <parent>
+ <groupId>org.apache.maven.plugin.release.its</groupId>
+ <artifactId>finalname-multimodule</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>module</artifactId>
+
</project>
\ No newline at end of file
Propchange: maven/release/trunk/maven-release-plugin/src/it/projects/prepare-with-pom/finalname-multimodule/module/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/release/trunk/maven-release-plugin/src/it/projects/prepare-with-pom/finalname-multimodule/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/it/projects/prepare-with-pom/finalname-multimodule/pom.xml?rev=1531451&r1=1531450&r2=1531451&view=diff
==============================================================================
--- maven/release/trunk/maven-release-plugin/src/it/projects/prepare-with-pom/finalname-multimodule/pom.xml (original)
+++ maven/release/trunk/maven-release-plugin/src/it/projects/prepare-with-pom/finalname-multimodule/pom.xml Fri Oct 11 22:18:49 2013
@@ -1,63 +1,63 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- ~ Licensed to the Apache Software Foundation (ASF) under one ~ or more
- contributor license agreements. See the NOTICE file ~ distributed with this
- work for additional information ~ regarding copyright ownership. The ASF
- licenses this file ~ to you under the Apache License, Version 2.0 (the ~
- "License"); you may not use this file except in compliance ~ with the License.
- You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0
- ~ ~ Unless required by applicable law or agreed to in writing, ~ software
- distributed under the License is distributed on an ~ "AS IS" BASIS, WITHOUT
- WARRANTIES OR CONDITIONS OF ANY ~ KIND, either express or implied. See the
- License for the ~ specific language governing permissions and limitations
- ~ under the License. -->
-<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>org.apache.maven.plugin.release.its</groupId>
- <artifactId>finalname-multimodule</artifactId>
- <version>1.0-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <scm>
- <connection>scm:dummy|nul</connection>
- <developerConnection>scm:dummy|nul</developerConnection>
- </scm>
-
- <distributionManagement>
- <snapshotRepository>
- <id>dummy</id>
- <url>dummy:nul</url>
- </snapshotRepository>
- </distributionManagement>
-
- <build>
- <finalName>FinalName</finalName>
- <extensions>
- <extension>
- <groupId>org.apache.maven.its.release</groupId>
- <artifactId>wagon-provider-dummy</artifactId>
- <version>1.0</version>
- </extension>
- </extensions>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>@project.version@</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.its.release</groupId>
- <artifactId>maven-scm-provider-dummy</artifactId>
- <version>1.0</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
-
- <modules>
- <module>module</module>
- </modules>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- ~ Licensed to the Apache Software Foundation (ASF) under one ~ or more
+ contributor license agreements. See the NOTICE file ~ distributed with this
+ work for additional information ~ regarding copyright ownership. The ASF
+ licenses this file ~ to you under the Apache License, Version 2.0 (the ~
+ "License"); you may not use this file except in compliance ~ with the License.
+ You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~ ~ Unless required by applicable law or agreed to in writing, ~ software
+ distributed under the License is distributed on an ~ "AS IS" BASIS, WITHOUT
+ WARRANTIES OR CONDITIONS OF ANY ~ KIND, either express or implied. See the
+ License for the ~ specific language governing permissions and limitations
+ ~ under the License. -->
+<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>org.apache.maven.plugin.release.its</groupId>
+ <artifactId>finalname-multimodule</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <scm>
+ <connection>scm:dummy|nul</connection>
+ <developerConnection>scm:dummy|nul</developerConnection>
+ </scm>
+
+ <distributionManagement>
+ <snapshotRepository>
+ <id>dummy</id>
+ <url>dummy:nul</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+ <build>
+ <finalName>FinalName</finalName>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.its.release</groupId>
+ <artifactId>wagon-provider-dummy</artifactId>
+ <version>1.0</version>
+ </extension>
+ </extensions>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>@project.version@</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.release</groupId>
+ <artifactId>maven-scm-provider-dummy</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+
+ <modules>
+ <module>module</module>
+ </modules>
+
</project>
\ No newline at end of file
Propchange: maven/release/trunk/maven-release-plugin/src/it/projects/prepare-with-pom/finalname-multimodule/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/release/trunk/maven-release-plugin/src/it/projects/prepare-with-pom/finalname-multimodule/verify.groovy
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/it/projects/prepare-with-pom/finalname-multimodule/verify.groovy?rev=1531451&r1=1531450&r2=1531451&view=diff
==============================================================================
--- maven/release/trunk/maven-release-plugin/src/it/projects/prepare-with-pom/finalname-multimodule/verify.groovy (original)
+++ maven/release/trunk/maven-release-plugin/src/it/projects/prepare-with-pom/finalname-multimodule/verify.groovy Fri Oct 11 22:18:49 2013
@@ -1,24 +1,24 @@
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-File moduleReleasePom = new File( basedir, 'module/release-pom.xml' )
-assert moduleReleasePom.exists()
-
-assert 1 == moduleReleasePom.getText().count("<finalName>FinalName</finalName>")
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+File moduleReleasePom = new File( basedir, 'module/release-pom.xml' )
+assert moduleReleasePom.exists()
+
+assert 1 == moduleReleasePom.getText().count("<finalName>FinalName</finalName>")
Propchange: maven/release/trunk/maven-release-plugin/src/it/projects/prepare-with-pom/finalname-multimodule/verify.groovy
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-128/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-128/pom.xml?rev=1531451&r1=1531450&r2=1531451&view=diff
==============================================================================
--- maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-128/pom.xml (original)
+++ maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-128/pom.xml Fri Oct 11 22:18:49 2013
@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-<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>org.apache.maven.plugin.release.its</groupId>
- <artifactId>mrelease-128</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <description>
- SCM properties being replaced during release:perform
- </description>
-
- <scm>
- <connection>scm:svn:http://${scm.host}/svn/${project.artifactId}/trunk/</connection>
- <developerConnection>scm:svn:http://${scm.host}/svn/${project.artifactId}/trunk/</developerConnection>
- <url>http://${scm.host}/viewvc/${project.artifactId}/trunk/</url>
- </scm>
-
- <properties>
- <scm.host>scmhost.apache.org</scm.host>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>@project.version@</version>
- </plugin>
- </plugins>
- </build>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<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>org.apache.maven.plugin.release.its</groupId>
+ <artifactId>mrelease-128</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <description>
+ SCM properties being replaced during release:perform
+ </description>
+
+ <scm>
+ <connection>scm:svn:http://${scm.host}/svn/${project.artifactId}/trunk/</connection>
+ <developerConnection>scm:svn:http://${scm.host}/svn/${project.artifactId}/trunk/</developerConnection>
+ <url>http://${scm.host}/viewvc/${project.artifactId}/trunk/</url>
+ </scm>
+
+ <properties>
+ <scm.host>scmhost.apache.org</scm.host>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>@project.version@</version>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
Propchange: maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-128/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-128/verify.groovy
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-128/verify.groovy?rev=1531451&r1=1531450&r2=1531451&view=diff
==============================================================================
--- maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-128/verify.groovy (original)
+++ maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-128/verify.groovy Fri Oct 11 22:18:49 2013
@@ -1,39 +1,39 @@
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-File pomXml = new File( basedir, 'pom.xml' )
-assert pomXml.exists()
-assert 1 == pomXml.getText().count("<connection>scm:svn:http://\${scm.host}/svn/\${project.artifactId}/trunk/</connection>")
-assert 1 == pomXml.getText().count("<developerConnection>scm:svn:http://\${scm.host}/svn/\${project.artifactId}/trunk/</developerConnection>")
-
-File pomXmlTag = new File( basedir, 'pom.xml.tag' )
-assert pomXmlTag.exists()
-assert 1 == pomXmlTag.getText().count("<connection>scm:svn:http://\${scm.host}/svn/\${project.artifactId}/tags/mrelease-128-1.0</connection>")
-assert 1 == pomXmlTag.getText().count("<developerConnection>scm:svn:http://\${scm.host}/svn/\${project.artifactId}/tags/mrelease-128-1.0</developerConnection>")
-
-File pomXmlNext = new File( basedir, 'pom.xml.next' )
-assert pomXmlNext.exists()
-assert 1 == pomXmlNext.getText().count("<connection>scm:svn:http://\${scm.host}/svn/\${project.artifactId}/trunk/</connection>")
-assert 1 == pomXmlNext.getText().count("<developerConnection>scm:svn:http://\${scm.host}/svn/\${project.artifactId}/trunk/</developerConnection>")
-
-File pomXmlReleaseBackup = new File( basedir, 'pom.xml.releaseBackup' )
-assert pomXmlReleaseBackup.exists()
-assert 1 == pomXmlReleaseBackup.getText().count("<connection>scm:svn:http://\${scm.host}/svn/\${project.artifactId}/trunk/</connection>")
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+File pomXml = new File( basedir, 'pom.xml' )
+assert pomXml.exists()
+assert 1 == pomXml.getText().count("<connection>scm:svn:http://\${scm.host}/svn/\${project.artifactId}/trunk/</connection>")
+assert 1 == pomXml.getText().count("<developerConnection>scm:svn:http://\${scm.host}/svn/\${project.artifactId}/trunk/</developerConnection>")
+
+File pomXmlTag = new File( basedir, 'pom.xml.tag' )
+assert pomXmlTag.exists()
+assert 1 == pomXmlTag.getText().count("<connection>scm:svn:http://\${scm.host}/svn/\${project.artifactId}/tags/mrelease-128-1.0</connection>")
+assert 1 == pomXmlTag.getText().count("<developerConnection>scm:svn:http://\${scm.host}/svn/\${project.artifactId}/tags/mrelease-128-1.0</developerConnection>")
+
+File pomXmlNext = new File( basedir, 'pom.xml.next' )
+assert pomXmlNext.exists()
+assert 1 == pomXmlNext.getText().count("<connection>scm:svn:http://\${scm.host}/svn/\${project.artifactId}/trunk/</connection>")
+assert 1 == pomXmlNext.getText().count("<developerConnection>scm:svn:http://\${scm.host}/svn/\${project.artifactId}/trunk/</developerConnection>")
+
+File pomXmlReleaseBackup = new File( basedir, 'pom.xml.releaseBackup' )
+assert pomXmlReleaseBackup.exists()
+assert 1 == pomXmlReleaseBackup.getText().count("<connection>scm:svn:http://\${scm.host}/svn/\${project.artifactId}/trunk/</connection>")
assert 1 == pomXmlReleaseBackup.getText().count("<developerConnection>scm:svn:http://\${scm.host}/svn/\${project.artifactId}/trunk/</developerConnection>")
\ No newline at end of file
Propchange: maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-128/verify.groovy
------------------------------------------------------------------------------
svn:eol-style = native