From fbff1afdd39a0d2828508cc89a80a1bd4c20baa9 Mon Sep 17 00:00:00 2001 From: Michael Osipov Date: Tue, 9 Jul 2024 22:09:49 +0200 Subject: [PATCH] Remove outdated invoker conditions --- src/it/projects/MJAVADOC-498_modulepath/invoker.properties | 6 +++--- src/it/projects/MJAVADOC-580_detectLinks/invoker.properties | 5 ++--- src/it/projects/MJAVADOC-610_mrjar/invoker.properties | 6 +++--- src/it/projects/MJAVADOC-704_toolchains/invoker.properties | 5 ++--- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/it/projects/MJAVADOC-498_modulepath/invoker.properties b/src/it/projects/MJAVADOC-498_modulepath/invoker.properties index b70e6b33f..10a36d0ad 100644 --- a/src/it/projects/MJAVADOC-498_modulepath/invoker.properties +++ b/src/it/projects/MJAVADOC-498_modulepath/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,4 +15,4 @@ # specific language governing permissions and limitations # under the License. -invoker.java.version = 1.9+ +invoker.java.version = 9+ diff --git a/src/it/projects/MJAVADOC-580_detectLinks/invoker.properties b/src/it/projects/MJAVADOC-580_detectLinks/invoker.properties index 50090e3eb..0af463246 100644 --- a/src/it/projects/MJAVADOC-580_detectLinks/invoker.properties +++ b/src/it/projects/MJAVADOC-580_detectLinks/invoker.properties @@ -5,14 +5,13 @@ # 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.debug=true invoker.goals=javadoc:javadoc diff --git a/src/it/projects/MJAVADOC-610_mrjar/invoker.properties b/src/it/projects/MJAVADOC-610_mrjar/invoker.properties index 354c26000..a2cc73101 100644 --- a/src/it/projects/MJAVADOC-610_mrjar/invoker.properties +++ b/src/it/projects/MJAVADOC-610_mrjar/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 @@ -18,4 +18,4 @@ invoker.goals = package # disable again for java 11 as again it's a bug fixed in openjdk but reported in oracle jdk # and it seems to be the java vendor we use as a source of trust in ASF build machines and the rest of the team... -invoker.java.version = 1.9+,!11 +invoker.java.version = 9+,!11 diff --git a/src/it/projects/MJAVADOC-704_toolchains/invoker.properties b/src/it/projects/MJAVADOC-704_toolchains/invoker.properties index 2342848e5..940e29663 100644 --- a/src/it/projects/MJAVADOC-704_toolchains/invoker.properties +++ b/src/it/projects/MJAVADOC-704_toolchains/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.toolchain.jdk.version = 11 -invoker.maven.version = 3.3.1 \ No newline at end of file