From e74906bf5c5bec4469a3301501f447fcbf6fb71d Mon Sep 17 00:00:00 2001
From: Michael Osipov <michaelo@apache.org>
Date: Mon, 8 Apr 2024 11:06:51 +0200
Subject: [PATCH] Try to fix

---
 maven-scm-plugin/pom.xml                       |  2 --
 .../asf/{.svn => dotSvnDir}/all-wcprops        |  0
 .../asf/{.svn => dotSvnDir}/dir-prop-base      |  0
 .../it/scm-781/asf/{.svn => dotSvnDir}/entries |  0
 .../prop-base/pom.xml.svn-base                 |  0
 .../prop-base/site-pom.xml.svn-base            |  0
 .../text-base/pom.xml.svn-base                 |  0
 .../text-base/site-pom.xml.svn-base            |  0
 .../{.svn => dotSvnDir}/dotSvnDir/all-wcprops  |  0
 .../{.svn => dotSvnDir}/dotSvnDir/entries      |  0
 .../maven/{.svn => dotSvnDir}/all-wcprops      |  0
 .../maven/{.svn => dotSvnDir}/dir-prop-base    |  0
 .../scm-781/maven/{.svn => dotSvnDir}/entries  |  0
 .../prop-base/pom.xml.svn-base                 |  0
 .../prop-base/site-pom.xml.svn-base            |  0
 .../text-base/pom.xml.svn-base                 |  0
 .../text-base/site-pom.xml.svn-base            |  0
 maven-scm-plugin/src/it/scm-781/prepare.groovy | 18 ++++++++++++++++--
 18 files changed, 16 insertions(+), 4 deletions(-)
 rename maven-scm-plugin/src/it/scm-781/asf/{.svn => dotSvnDir}/all-wcprops (100%)
 rename maven-scm-plugin/src/it/scm-781/asf/{.svn => dotSvnDir}/dir-prop-base (100%)
 rename maven-scm-plugin/src/it/scm-781/asf/{.svn => dotSvnDir}/entries (100%)
 rename maven-scm-plugin/src/it/scm-781/asf/{.svn => dotSvnDir}/prop-base/pom.xml.svn-base (100%)
 rename maven-scm-plugin/src/it/scm-781/asf/{.svn => dotSvnDir}/prop-base/site-pom.xml.svn-base (100%)
 rename maven-scm-plugin/src/it/scm-781/asf/{.svn => dotSvnDir}/text-base/pom.xml.svn-base (100%)
 rename maven-scm-plugin/src/it/scm-781/asf/{.svn => dotSvnDir}/text-base/site-pom.xml.svn-base (100%)
 rename maven-scm-plugin/src/it/scm-781/{.svn => dotSvnDir}/dotSvnDir/all-wcprops (100%)
 rename maven-scm-plugin/src/it/scm-781/{.svn => dotSvnDir}/dotSvnDir/entries (100%)
 rename maven-scm-plugin/src/it/scm-781/maven/{.svn => dotSvnDir}/all-wcprops (100%)
 rename maven-scm-plugin/src/it/scm-781/maven/{.svn => dotSvnDir}/dir-prop-base (100%)
 rename maven-scm-plugin/src/it/scm-781/maven/{.svn => dotSvnDir}/entries (100%)
 rename maven-scm-plugin/src/it/scm-781/maven/{.svn => dotSvnDir}/prop-base/pom.xml.svn-base (100%)
 rename maven-scm-plugin/src/it/scm-781/maven/{.svn => dotSvnDir}/prop-base/site-pom.xml.svn-base (100%)
 rename maven-scm-plugin/src/it/scm-781/maven/{.svn => dotSvnDir}/text-base/pom.xml.svn-base (100%)
 rename maven-scm-plugin/src/it/scm-781/maven/{.svn => dotSvnDir}/text-base/site-pom.xml.svn-base (100%)

diff --git a/maven-scm-plugin/pom.xml b/maven-scm-plugin/pom.xml
index 4261b6b59..d4fba080b 100644
--- a/maven-scm-plugin/pom.xml
+++ b/maven-scm-plugin/pom.xml
@@ -199,8 +199,6 @@
           <postBuildHookScript>verify</postBuildHookScript>
           <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
           <settingsFile>src/it/settings.xml</settingsFile>
-          <!-- ignore it as it failed for svn local version issue -->
-          <invokerTest>!scm-781</invokerTest>
         </configuration>
         <executions>
           <execution>
diff --git a/maven-scm-plugin/src/it/scm-781/asf/.svn/all-wcprops b/maven-scm-plugin/src/it/scm-781/asf/dotSvnDir/all-wcprops
similarity index 100%
rename from maven-scm-plugin/src/it/scm-781/asf/.svn/all-wcprops
rename to maven-scm-plugin/src/it/scm-781/asf/dotSvnDir/all-wcprops
diff --git a/maven-scm-plugin/src/it/scm-781/asf/.svn/dir-prop-base b/maven-scm-plugin/src/it/scm-781/asf/dotSvnDir/dir-prop-base
similarity index 100%
rename from maven-scm-plugin/src/it/scm-781/asf/.svn/dir-prop-base
rename to maven-scm-plugin/src/it/scm-781/asf/dotSvnDir/dir-prop-base
diff --git a/maven-scm-plugin/src/it/scm-781/asf/.svn/entries b/maven-scm-plugin/src/it/scm-781/asf/dotSvnDir/entries
similarity index 100%
rename from maven-scm-plugin/src/it/scm-781/asf/.svn/entries
rename to maven-scm-plugin/src/it/scm-781/asf/dotSvnDir/entries
diff --git a/maven-scm-plugin/src/it/scm-781/asf/.svn/prop-base/pom.xml.svn-base b/maven-scm-plugin/src/it/scm-781/asf/dotSvnDir/prop-base/pom.xml.svn-base
similarity index 100%
rename from maven-scm-plugin/src/it/scm-781/asf/.svn/prop-base/pom.xml.svn-base
rename to maven-scm-plugin/src/it/scm-781/asf/dotSvnDir/prop-base/pom.xml.svn-base
diff --git a/maven-scm-plugin/src/it/scm-781/asf/.svn/prop-base/site-pom.xml.svn-base b/maven-scm-plugin/src/it/scm-781/asf/dotSvnDir/prop-base/site-pom.xml.svn-base
similarity index 100%
rename from maven-scm-plugin/src/it/scm-781/asf/.svn/prop-base/site-pom.xml.svn-base
rename to maven-scm-plugin/src/it/scm-781/asf/dotSvnDir/prop-base/site-pom.xml.svn-base
diff --git a/maven-scm-plugin/src/it/scm-781/asf/.svn/text-base/pom.xml.svn-base b/maven-scm-plugin/src/it/scm-781/asf/dotSvnDir/text-base/pom.xml.svn-base
similarity index 100%
rename from maven-scm-plugin/src/it/scm-781/asf/.svn/text-base/pom.xml.svn-base
rename to maven-scm-plugin/src/it/scm-781/asf/dotSvnDir/text-base/pom.xml.svn-base
diff --git a/maven-scm-plugin/src/it/scm-781/asf/.svn/text-base/site-pom.xml.svn-base b/maven-scm-plugin/src/it/scm-781/asf/dotSvnDir/text-base/site-pom.xml.svn-base
similarity index 100%
rename from maven-scm-plugin/src/it/scm-781/asf/.svn/text-base/site-pom.xml.svn-base
rename to maven-scm-plugin/src/it/scm-781/asf/dotSvnDir/text-base/site-pom.xml.svn-base
diff --git a/maven-scm-plugin/src/it/scm-781/.svn/dotSvnDir/all-wcprops b/maven-scm-plugin/src/it/scm-781/dotSvnDir/dotSvnDir/all-wcprops
similarity index 100%
rename from maven-scm-plugin/src/it/scm-781/.svn/dotSvnDir/all-wcprops
rename to maven-scm-plugin/src/it/scm-781/dotSvnDir/dotSvnDir/all-wcprops
diff --git a/maven-scm-plugin/src/it/scm-781/.svn/dotSvnDir/entries b/maven-scm-plugin/src/it/scm-781/dotSvnDir/dotSvnDir/entries
similarity index 100%
rename from maven-scm-plugin/src/it/scm-781/.svn/dotSvnDir/entries
rename to maven-scm-plugin/src/it/scm-781/dotSvnDir/dotSvnDir/entries
diff --git a/maven-scm-plugin/src/it/scm-781/maven/.svn/all-wcprops b/maven-scm-plugin/src/it/scm-781/maven/dotSvnDir/all-wcprops
similarity index 100%
rename from maven-scm-plugin/src/it/scm-781/maven/.svn/all-wcprops
rename to maven-scm-plugin/src/it/scm-781/maven/dotSvnDir/all-wcprops
diff --git a/maven-scm-plugin/src/it/scm-781/maven/.svn/dir-prop-base b/maven-scm-plugin/src/it/scm-781/maven/dotSvnDir/dir-prop-base
similarity index 100%
rename from maven-scm-plugin/src/it/scm-781/maven/.svn/dir-prop-base
rename to maven-scm-plugin/src/it/scm-781/maven/dotSvnDir/dir-prop-base
diff --git a/maven-scm-plugin/src/it/scm-781/maven/.svn/entries b/maven-scm-plugin/src/it/scm-781/maven/dotSvnDir/entries
similarity index 100%
rename from maven-scm-plugin/src/it/scm-781/maven/.svn/entries
rename to maven-scm-plugin/src/it/scm-781/maven/dotSvnDir/entries
diff --git a/maven-scm-plugin/src/it/scm-781/maven/.svn/prop-base/pom.xml.svn-base b/maven-scm-plugin/src/it/scm-781/maven/dotSvnDir/prop-base/pom.xml.svn-base
similarity index 100%
rename from maven-scm-plugin/src/it/scm-781/maven/.svn/prop-base/pom.xml.svn-base
rename to maven-scm-plugin/src/it/scm-781/maven/dotSvnDir/prop-base/pom.xml.svn-base
diff --git a/maven-scm-plugin/src/it/scm-781/maven/.svn/prop-base/site-pom.xml.svn-base b/maven-scm-plugin/src/it/scm-781/maven/dotSvnDir/prop-base/site-pom.xml.svn-base
similarity index 100%
rename from maven-scm-plugin/src/it/scm-781/maven/.svn/prop-base/site-pom.xml.svn-base
rename to maven-scm-plugin/src/it/scm-781/maven/dotSvnDir/prop-base/site-pom.xml.svn-base
diff --git a/maven-scm-plugin/src/it/scm-781/maven/.svn/text-base/pom.xml.svn-base b/maven-scm-plugin/src/it/scm-781/maven/dotSvnDir/text-base/pom.xml.svn-base
similarity index 100%
rename from maven-scm-plugin/src/it/scm-781/maven/.svn/text-base/pom.xml.svn-base
rename to maven-scm-plugin/src/it/scm-781/maven/dotSvnDir/text-base/pom.xml.svn-base
diff --git a/maven-scm-plugin/src/it/scm-781/maven/.svn/text-base/site-pom.xml.svn-base b/maven-scm-plugin/src/it/scm-781/maven/dotSvnDir/text-base/site-pom.xml.svn-base
similarity index 100%
rename from maven-scm-plugin/src/it/scm-781/maven/.svn/text-base/site-pom.xml.svn-base
rename to maven-scm-plugin/src/it/scm-781/maven/dotSvnDir/text-base/site-pom.xml.svn-base
diff --git a/maven-scm-plugin/src/it/scm-781/prepare.groovy b/maven-scm-plugin/src/it/scm-781/prepare.groovy
index b55123af6..fa00c50c5 100644
--- a/maven-scm-plugin/src/it/scm-781/prepare.groovy
+++ b/maven-scm-plugin/src/it/scm-781/prepare.groovy
@@ -21,7 +21,7 @@
 // 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()
@@ -36,7 +36,7 @@ dotSvnDir = new File( basedir, 'maven/dotSvnDir' )
 assert dotSvnDir.exists()
 assert dotSvnDir.isDirectory()
 assert dotSvnDir.renameTo( new File( basedir, 'maven/.svn' ) )
-*/
+
 println "svn --version"
 def proc = "svn --version".execute()
 proc.waitFor()
@@ -50,3 +50,17 @@ proc.waitFor()
 println "return code: ${ proc.exitValue()}"
 println "stderr: ${proc.err.text}"
 println "stdout: ${proc.in.text}"
+
+println "svn upgrade $basedir/asf"
+proc = ["svn", "upgrade", "$basedir/asf"].execute()
+proc.waitFor()
+println "return code: ${ proc.exitValue()}"
+println "stderr: ${proc.err.text}"
+println "stdout: ${proc.in.text}"
+
+println "svn upgrade $basedir/maven"
+proc = ["svn", "upgrade", "$basedir/maven"].execute()
+proc.waitFor()
+println "return code: ${ proc.exitValue()}"
+println "stderr: ${proc.err.text}"
+println "stdout: ${proc.in.text}"