From 869ad977d7f5ef43d40494ebc94294be539b2654 Mon Sep 17 00:00:00 2001 From: Michael Osipov Date: Sun, 9 Jun 2024 20:19:17 +0200 Subject: [PATCH] [MRELEASE-1146] maven-release-plugin tests do not properly check for existence of svn command This closes #218 --- .../prepare/MRELEASE-1053/selector.groovy | 28 +++++++++++++++++++ .../prepare/MRELEASE-128/selector.groovy | 28 +++++++++++++++++++ .../parent-project/selector.groovy | 28 +++++++++++++++++++ .../regular-multi-module/selector.groovy | 28 +++++++++++++++++++ 4 files changed, 112 insertions(+) create mode 100644 maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/selector.groovy create mode 100644 maven-release-plugin/src/it/projects/prepare/MRELEASE-128/selector.groovy create mode 100644 maven-release-plugin/src/it/projects/prepare/flat-multi-module/parent-project/selector.groovy create mode 100644 maven-release-plugin/src/it/projects/prepare/regular-multi-module/selector.groovy diff --git a/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/selector.groovy b/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/selector.groovy new file mode 100644 index 000000000..1705d2416 --- /dev/null +++ b/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/selector.groovy @@ -0,0 +1,28 @@ +/* + * 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. + */ + +try { + def proc = "svn".execute() + proc.consumeProcessOutput() + proc.waitFor() +} catch (IOException e) { + return false +} + +return true diff --git a/maven-release-plugin/src/it/projects/prepare/MRELEASE-128/selector.groovy b/maven-release-plugin/src/it/projects/prepare/MRELEASE-128/selector.groovy new file mode 100644 index 000000000..1705d2416 --- /dev/null +++ b/maven-release-plugin/src/it/projects/prepare/MRELEASE-128/selector.groovy @@ -0,0 +1,28 @@ +/* + * 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. + */ + +try { + def proc = "svn".execute() + proc.consumeProcessOutput() + proc.waitFor() +} catch (IOException e) { + return false +} + +return true diff --git a/maven-release-plugin/src/it/projects/prepare/flat-multi-module/parent-project/selector.groovy b/maven-release-plugin/src/it/projects/prepare/flat-multi-module/parent-project/selector.groovy new file mode 100644 index 000000000..1705d2416 --- /dev/null +++ b/maven-release-plugin/src/it/projects/prepare/flat-multi-module/parent-project/selector.groovy @@ -0,0 +1,28 @@ +/* + * 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. + */ + +try { + def proc = "svn".execute() + proc.consumeProcessOutput() + proc.waitFor() +} catch (IOException e) { + return false +} + +return true diff --git a/maven-release-plugin/src/it/projects/prepare/regular-multi-module/selector.groovy b/maven-release-plugin/src/it/projects/prepare/regular-multi-module/selector.groovy new file mode 100644 index 000000000..1705d2416 --- /dev/null +++ b/maven-release-plugin/src/it/projects/prepare/regular-multi-module/selector.groovy @@ -0,0 +1,28 @@ +/* + * 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. + */ + +try { + def proc = "svn".execute() + proc.consumeProcessOutput() + proc.waitFor() +} catch (IOException e) { + return false +} + +return true