Skip to content

Commit 12afe10

Browse files
committed
[MSCMPUB-69] ITs do not properly check for existence of svn/svnadmin/CreateSymbolicLink command/function
1 parent 1b4a3ed commit 12afe10

File tree

8 files changed

+190
-9
lines changed

8 files changed

+190
-9
lines changed

src/it/issue-mscmpub-50/invoker.properties

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,3 @@
1616
# under the License.
1717

1818
invoker.goals = site scm-publish:publish-scm
19-
20-
# Windows doesn't have svn and svnadmin executables
21-
invoker.os.family = !windows
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
20+
import java.nio.file.Files
21+
import java.nio.file.Path
22+
23+
try {
24+
def proc = "svnadmin".execute()
25+
proc.consumeProcessOutput()
26+
proc.waitFor()
27+
28+
def proc2 = "svn".execute()
29+
proc2.consumeProcessOutput()
30+
proc2.waitFor()
31+
32+
def pom = basedir.toPath().resolve("pom.xml")
33+
def linkedPom = basedir.toPath().resolve("linked-pom.xml")
34+
Files.deleteIfExists(linkedPom)
35+
Files.createSymbolicLink(linkedPom, pom)
36+
} catch (IOException e) {
37+
return false
38+
}
39+
40+
return true

src/it/publish-scm-skip/invoker.properties

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,3 @@
1616
# under the License.
1717

1818
invoker.goals = site scm-publish:publish-scm
19-
20-
# Windows doesn't have svn and svnadmin executables
21-
invoker.os.family = !windows
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
20+
import java.nio.file.Files
21+
import java.nio.file.Path
22+
23+
try {
24+
def proc = "svnadmin".execute()
25+
proc.consumeProcessOutput()
26+
proc.waitFor()
27+
28+
def proc2 = "svn".execute()
29+
proc2.consumeProcessOutput()
30+
proc2.waitFor()
31+
32+
def pom = basedir.toPath().resolve("pom.xml")
33+
def linkedPom = basedir.toPath().resolve("linked-pom.xml")
34+
Files.deleteIfExists(linkedPom)
35+
Files.createSymbolicLink(linkedPom, pom)
36+
} catch (IOException e) {
37+
return false
38+
}
39+
40+
return true
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
20+
try {
21+
def proc = "svnadmin".execute()
22+
proc.consumeProcessOutput()
23+
proc.waitFor()
24+
25+
def proc2 = "svn".execute()
26+
proc2.consumeProcessOutput()
27+
proc2.waitFor()
28+
} catch (IOException e) {
29+
return false
30+
}
31+
32+
return true

src/it/publish-scm/invoker.properties

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,3 @@
1616
# under the License.
1717

1818
invoker.goals = site scm-publish:publish-scm
19-
20-
# Windows doesn't have svn and svnadmin executables
21-
invoker.os.family = !windows

src/it/publish-scm/selector.groovy

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
20+
import java.nio.file.Files
21+
import java.nio.file.Path
22+
import java.util.Locale
23+
24+
try {
25+
def proc = "svnadmin".execute()
26+
proc.consumeProcessOutput()
27+
proc.waitFor()
28+
29+
def proc2 = "svn".execute()
30+
proc2.consumeProcessOutput()
31+
proc2.waitFor()
32+
33+
def pom = basedir.toPath().resolve("pom.xml")
34+
def linkedPom = basedir.toPath().resolve("linked-pom.xml")
35+
Files.deleteIfExists(linkedPom)
36+
Files.createSymbolicLink(linkedPom, pom)
37+
} catch (IOException e) {
38+
return false
39+
}
40+
41+
// Because of a bug in Subversion on Windows
42+
if (System.properties['os.name'].toLowerCase(Locale.ROOT).contains('windows')) {
43+
return false
44+
}
45+
46+
return true

src/it/site-deploy/selector.groovy

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
20+
try {
21+
def proc = "svnadmin".execute()
22+
proc.consumeProcessOutput()
23+
proc.waitFor()
24+
25+
def proc2 = "svn".execute()
26+
proc2.consumeProcessOutput()
27+
proc2.waitFor()
28+
} catch (IOException e) {
29+
return false
30+
}
31+
32+
return true

0 commit comments

Comments
 (0)