You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ch...@apache.org on 2015/05/09 08:32:35 UTC
[1/2] maven-scm git commit: Change: Added consume
Repository: maven-scm
Updated Branches:
refs/heads/master dd3a18d05 -> 71fcf0ec6
Change: Added consume
Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/b1ab76eb
Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/b1ab76eb
Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/b1ab76eb
Branch: refs/heads/master
Commit: b1ab76eba177ea64e824dc23bca82303497ccb3e
Parents: 4a4f362
Author: ChrisGWarp <Ch...@gmail.com>
Authored: Sat Apr 4 21:33:44 2015 +1100
Committer: ChrisGWarp <Ch...@gmail.com>
Committed: Sat Apr 4 21:33:44 2015 +1100
----------------------------------------------------------------------
.../prepare.groovy | 86 ++++++++++----------
1 file changed, 45 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/b1ab76eb/maven-scm-plugin/src/it/scm-741-validate-scm-url-matches-working-copy/prepare.groovy
----------------------------------------------------------------------
diff --git a/maven-scm-plugin/src/it/scm-741-validate-scm-url-matches-working-copy/prepare.groovy b/maven-scm-plugin/src/it/scm-741-validate-scm-url-matches-working-copy/prepare.groovy
index 40cf6ff..c8abe3e 100644
--- a/maven-scm-plugin/src/it/scm-741-validate-scm-url-matches-working-copy/prepare.groovy
+++ b/maven-scm-plugin/src/it/scm-741-validate-scm-url-matches-working-copy/prepare.groovy
@@ -1,41 +1,45 @@
-/*
- * 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.
- */
-
-// We rename the dotSvnDir in the IT folder to standard .svn naming so that the IT can execute.
-// BUT we actually don't store that special versioning directory as-is to prevent potentially confusing
-// (to say the least) a svn checkout of the maven-scm project.
-//
-File dotSvnDir = new File( basedir, 'dotSvnDir' )
-assert dotSvnDir.exists()
-assert dotSvnDir.isDirectory()
-assert dotSvnDir.renameTo( new File( basedir, '.svn' ) )
-
-println "svn --version"
-def proc = "svn --version".execute()
-proc.waitFor()
-println "return code: ${ proc.exitValue()}"
-println "stderr: ${proc.err.text}"
-println "stdout: ${proc.in.text}"
-
-println "svn upgrade $basedir"
-proc = ["svn", "upgrade", "$basedir"].execute()
-proc.waitFor()
-println "return code: ${ proc.exitValue()}"
-println "stderr: ${proc.err.text}"
-println "stdout: ${proc.in.text}"
+/*
+ * 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.
+ */
+
+// We rename the dotSvnDir in the IT folder to standard .svn naming so that the IT can execute.
+// BUT we actually don't store that special versioning directory as-is to prevent potentially confusing
+// (to say the least) a svn checkout of the maven-scm project.
+//
+
+println "prepare.groovy:"
+File dotSvnDir = new File( basedir, 'dotSvnDir' )
+assert dotSvnDir.exists()
+assert dotSvnDir.isDirectory()
+assert dotSvnDir.renameTo( new File( basedir, '.svn' ) )
+
+println "svn --version"
+def proc = "svn --version".execute()
+proc.consumeProcessOutput()
+proc.waitFor()
+println "return code: ${ proc.exitValue()}"
+println "stderr: ${proc.err.text}"
+println "stdout: ${proc.in.text}"
+
+println "svn upgrade $basedir"
+proc = ["svn", "upgrade", "$basedir"].execute()
+proc.consumeProcessOutput()
+proc.waitFor()
+println "return code: ${ proc.exitValue()}"
+println "stderr: ${proc.err.text}"
+println "stdout: ${proc.in.text}"
[2/2] maven-scm git commit: Resolved merge conflicts over line
endings on merge.
Posted by ch...@apache.org.
Resolved merge conflicts over line endings on merge.
Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/71fcf0ec
Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/71fcf0ec
Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/71fcf0ec
Branch: refs/heads/master
Commit: 71fcf0ec6711ee026e59eb59e57b96d3f1213703
Parents: dd3a18d b1ab76e
Author: Chris Graham <ch...@apache.org>
Authored: Sat May 9 16:23:36 2015 +1000
Committer: Chris Graham <ch...@apache.org>
Committed: Sat May 9 16:23:36 2015 +1000
----------------------------------------------------------------------
----------------------------------------------------------------------