Skip to content

Commit

Permalink
Try to fix
Browse files Browse the repository at this point in the history
  • Loading branch information
michael-o committed Apr 8, 2024
1 parent 6991a0b commit e74906b
Show file tree
Hide file tree
Showing 18 changed files with 16 additions and 4 deletions.
2 changes: 0 additions & 2 deletions maven-scm-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
18 changes: 16 additions & 2 deletions maven-scm-plugin/src/it/scm-781/prepare.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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()
Expand All @@ -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}"

0 comments on commit e74906b

Please sign in to comment.