From 71cee33151c85d11b4d4ca2f63b5be72f1c482f3 Mon Sep 17 00:00:00 2001 From: Michael Osipov Date: Tue, 9 Jul 2024 22:27:23 +0200 Subject: [PATCH] Remove outdated invoker conditions --- .../mdep-439-analyze-java8/invoker.properties | 5 +-- .../mdep-571-resolve-java9/invoker.properties | 38 +++++++++---------- .../invoker.properties | 6 +-- .../invoker.properties | 6 +-- .../invoker.properties | 5 +-- .../invoker.properties | 6 +-- .../invoker.properties | 6 +-- 7 files changed, 31 insertions(+), 41 deletions(-) diff --git a/src/it/projects/mdep-439-analyze-java8/invoker.properties b/src/it/projects/mdep-439-analyze-java8/invoker.properties index b81576bc0..35372acc1 100644 --- a/src/it/projects/mdep-439-analyze-java8/invoker.properties +++ b/src/it/projects/mdep-439-analyze-java8/invoker.properties @@ -5,9 +5,9 @@ # 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 @@ -15,5 +15,4 @@ # specific language governing permissions and limitations # under the License. -invoker.java.version = 1.8+ invoker.goals=clean verify diff --git a/src/it/projects/mdep-571-resolve-java9/invoker.properties b/src/it/projects/mdep-571-resolve-java9/invoker.properties index f4bce4e4c..e6c16a727 100644 --- a/src/it/projects/mdep-571-resolve-java9/invoker.properties +++ b/src/it/projects/mdep-571-resolve-java9/invoker.properties @@ -1,19 +1,19 @@ -# 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. - -invoker.java.version = 1.9+ -invoker.goals = ${project.groupId}:${project.artifactId}:${project.version}:resolve +# 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. + +invoker.java.version = 9+ +invoker.goals = ${project.groupId}:${project.artifactId}:${project.version}:resolve diff --git a/src/it/projects/purge-local-repository-bad-dep/invoker.properties b/src/it/projects/purge-local-repository-bad-dep/invoker.properties index 098745b51..6a64fc6e9 100644 --- a/src/it/projects/purge-local-repository-bad-dep/invoker.properties +++ b/src/it/projects/purge-local-repository-bad-dep/invoker.properties @@ -5,9 +5,9 @@ # 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 @@ -16,5 +16,3 @@ # under the License. invoker.goals = ${project.groupId}:${project.artifactId}:${project.version}:purge-local-repository -# [MNG-5366] Does not work in Maven >= 3.0.4 due to the resolveAlways operation not correctly forcing a new download -invoker.maven.version = !3.0.4,!3.0.5,!3.1.0,!3.1.1,!3.2.1,!3.2.2,!3.2.3 diff --git a/src/it/projects/purge-local-repository-bad-pom/invoker.properties b/src/it/projects/purge-local-repository-bad-pom/invoker.properties index 9ea542aa9..6a64fc6e9 100644 --- a/src/it/projects/purge-local-repository-bad-pom/invoker.properties +++ b/src/it/projects/purge-local-repository-bad-pom/invoker.properties @@ -5,9 +5,9 @@ # 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 @@ -16,5 +16,3 @@ # under the License. invoker.goals = ${project.groupId}:${project.artifactId}:${project.version}:purge-local-repository -# [MNG-5366] Only works works with Maven 3.0.x except for 3.0.4 -invoker.maven.version = 3.0.0+, !3.0.4 diff --git a/src/it/projects/purge-local-repository-include/invoker.properties b/src/it/projects/purge-local-repository-include/invoker.properties index 5feb77ebd..8f449f312 100644 --- a/src/it/projects/purge-local-repository-include/invoker.properties +++ b/src/it/projects/purge-local-repository-include/invoker.properties @@ -5,9 +5,9 @@ # 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 @@ -16,4 +16,3 @@ # under the License. invoker.goals = ${project.groupId}:${project.artifactId}:${project.version}:resolve ${project.groupId}:${project.artifactId}:${project.version}:purge-local-repository -invoker.maven.version = 3.1.0+ \ No newline at end of file diff --git a/src/it/projects/purge-local-repository-reresolve/invoker.properties b/src/it/projects/purge-local-repository-reresolve/invoker.properties index 69ba6bff1..8f449f312 100644 --- a/src/it/projects/purge-local-repository-reresolve/invoker.properties +++ b/src/it/projects/purge-local-repository-reresolve/invoker.properties @@ -5,9 +5,9 @@ # 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 @@ -16,5 +16,3 @@ # under the License. invoker.goals = ${project.groupId}:${project.artifactId}:${project.version}:resolve ${project.groupId}:${project.artifactId}:${project.version}:purge-local-repository -# [MNG-5366] Does not work in Maven >= 3.0.4 due to the resolveAlways operation not correctly forcing a new download -invoker.maven.version = !3.0.4,!3.0.5,!3.1.0,!3.1.1,!3.2.1,!3.2.2,!3.2.3 diff --git a/src/it/projects/purge-local-repository-version-range/invoker.properties b/src/it/projects/purge-local-repository-version-range/invoker.properties index 098745b51..6a64fc6e9 100644 --- a/src/it/projects/purge-local-repository-version-range/invoker.properties +++ b/src/it/projects/purge-local-repository-version-range/invoker.properties @@ -5,9 +5,9 @@ # 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 @@ -16,5 +16,3 @@ # under the License. invoker.goals = ${project.groupId}:${project.artifactId}:${project.version}:purge-local-repository -# [MNG-5366] Does not work in Maven >= 3.0.4 due to the resolveAlways operation not correctly forcing a new download -invoker.maven.version = !3.0.4,!3.0.5,!3.1.0,!3.1.1,!3.2.1,!3.2.2,!3.2.3