From 07234f25bee4b80416be229c5e8c4d521df97f8a Mon Sep 17 00:00:00 2001 From: Slawomir Jaranowski Date: Mon, 4 Oct 2021 22:05:39 +0200 Subject: [PATCH] [MINVOKER-290] remove jdk 7 https.protocols configuration --- pom.xml | 2 -- src/it/MINVOKER-191/pom.xml | 4 ---- src/it/MINVOKER-243_install-reactor/pom.xml | 6 ------ src/it/exec-timeout-invoker-level/pom.xml | 4 ---- src/it/exec-timeout-invoker-level/src/it/basic/pom.xml | 6 ------ src/it/exec-timeout-mojo-level/pom.xml | 4 ---- src/it/exec-timeout-mojo-level/src/it/basic/pom.xml | 6 ------ src/it/filtering-extensions/pom.xml | 4 ---- src/it/invocation-debug/pom.xml | 4 ---- src/it/invocation-debug/src/it/minvoker-142/pom.xml | 4 ---- src/it/invocation-emptyproperty/pom.xml | 2 -- src/it/invocation-emptyproperty/src/it/minvoker-118/pom.xml | 4 ---- src/it/invocation-multiple/pom.xml | 2 -- src/it/invocation-offline/pom.xml | 4 ---- src/it/invocation-reactor-indirect/pom.xml | 6 ------ src/it/invocation-spaces/pom.xml | 2 -- src/it/local-repo-default/pom.xml | 4 ---- src/it/local-repo-isolated/pom.xml | 4 ---- src/it/local-repo-path/pom.xml | 4 ---- src/it/pom-filtering-encoding/pom.xml | 4 ---- src/it/pom-filtering/pom.xml | 4 ---- src/it/postbuild-executed-only-once/pom.xml | 2 -- src/it/settings-inherit/pom.xml | 4 ---- src/it/settings-inherit/src/it/project/pom.xml | 4 ---- src/it/settings-merge-multiexecutions/pom.xml | 4 ---- src/it/settings-merge/pom.xml | 4 ---- src/it/settings-merge_jdk9+/pom.xml | 4 ---- src/it/settings-override/pom.xml | 4 ---- src/it/spaces-should-work_non-windows/pom.xml | 4 ---- src/it/special-characters-should-work/pom.xml | 4 ---- src/it/wrongPropertyInterpolation/pom.xml | 4 ---- 31 files changed, 122 deletions(-) diff --git a/pom.xml b/pom.xml index 03b797c2..3ae0baa0 100644 --- a/pom.xml +++ b/pom.xml @@ -375,8 +375,6 @@ under the License. src/it/settings.xml -Djava.io.tmpdir=${project.build.directory} - - ${https.protocols} ${maven.compiler.source} ${maven.compiler.target} diff --git a/src/it/MINVOKER-191/pom.xml b/src/it/MINVOKER-191/pom.xml index c16c506a..6448c7cb 100644 --- a/src/it/MINVOKER-191/pom.xml +++ b/src/it/MINVOKER-191/pom.xml @@ -67,10 +67,6 @@ under the License. @project.version@ true - - - ${https.protocols} - diff --git a/src/it/MINVOKER-243_install-reactor/pom.xml b/src/it/MINVOKER-243_install-reactor/pom.xml index 21881e33..125f22dc 100644 --- a/src/it/MINVOKER-243_install-reactor/pom.xml +++ b/src/it/MINVOKER-243_install-reactor/pom.xml @@ -61,12 +61,6 @@ under the License. org.apache.maven.plugins maven-invoker-plugin @project.version@ - - - - ${https.protocols} - - diff --git a/src/it/exec-timeout-invoker-level/pom.xml b/src/it/exec-timeout-invoker-level/pom.xml index 3bcb75c7..441d9aac 100644 --- a/src/it/exec-timeout-invoker-level/pom.xml +++ b/src/it/exec-timeout-invoker-level/pom.xml @@ -45,10 +45,6 @@ under the License. true ${project.build.directory}/it ${project.build.directory}/local-repo - - - ${https.protocols} - diff --git a/src/it/exec-timeout-invoker-level/src/it/basic/pom.xml b/src/it/exec-timeout-invoker-level/src/it/basic/pom.xml index eba22ebb..9bebf8ba 100644 --- a/src/it/exec-timeout-invoker-level/src/it/basic/pom.xml +++ b/src/it/exec-timeout-invoker-level/src/it/basic/pom.xml @@ -33,12 +33,6 @@ under the License. org.apache.maven.plugins.invoker exec-timeout-invoker-level 1.0-SNAPSHOT - - - - ${https.protocols} - - touch diff --git a/src/it/exec-timeout-mojo-level/pom.xml b/src/it/exec-timeout-mojo-level/pom.xml index 3f02a9a7..e9a1f5e5 100644 --- a/src/it/exec-timeout-mojo-level/pom.xml +++ b/src/it/exec-timeout-mojo-level/pom.xml @@ -46,10 +46,6 @@ under the License. 2 ${project.build.directory}/it ${project.build.directory}/local-repo - - - ${https.protocols} - diff --git a/src/it/exec-timeout-mojo-level/src/it/basic/pom.xml b/src/it/exec-timeout-mojo-level/src/it/basic/pom.xml index eba22ebb..9bebf8ba 100644 --- a/src/it/exec-timeout-mojo-level/src/it/basic/pom.xml +++ b/src/it/exec-timeout-mojo-level/src/it/basic/pom.xml @@ -33,12 +33,6 @@ under the License. org.apache.maven.plugins.invoker exec-timeout-invoker-level 1.0-SNAPSHOT - - - - ${https.protocols} - - touch diff --git a/src/it/filtering-extensions/pom.xml b/src/it/filtering-extensions/pom.xml index 2d72f148..814bdd3d 100644 --- a/src/it/filtering-extensions/pom.xml +++ b/src/it/filtering-extensions/pom.xml @@ -49,10 +49,6 @@ under the License. process-resources - - - ${https.protocols} - diff --git a/src/it/invocation-debug/pom.xml b/src/it/invocation-debug/pom.xml index 1af96da3..6ced9064 100644 --- a/src/it/invocation-debug/pom.xml +++ b/src/it/invocation-debug/pom.xml @@ -47,10 +47,6 @@ under the License. false verify - - - ${https.protocols} - diff --git a/src/it/invocation-debug/src/it/minvoker-142/pom.xml b/src/it/invocation-debug/src/it/minvoker-142/pom.xml index 2cf36a45..38521aab 100644 --- a/src/it/invocation-debug/src/it/minvoker-142/pom.xml +++ b/src/it/invocation-debug/src/it/minvoker-142/pom.xml @@ -42,10 +42,6 @@ under the License. enforce - - - ${https.protocols} - diff --git a/src/it/invocation-emptyproperty/pom.xml b/src/it/invocation-emptyproperty/pom.xml index 3b876efe..23bee19b 100644 --- a/src/it/invocation-emptyproperty/pom.xml +++ b/src/it/invocation-emptyproperty/pom.xml @@ -48,8 +48,6 @@ under the License. value ${example.property} - - ${https.protocols} diff --git a/src/it/invocation-emptyproperty/src/it/minvoker-118/pom.xml b/src/it/invocation-emptyproperty/src/it/minvoker-118/pom.xml index 17fc2413..55a84532 100644 --- a/src/it/invocation-emptyproperty/src/it/minvoker-118/pom.xml +++ b/src/it/invocation-emptyproperty/src/it/minvoker-118/pom.xml @@ -42,10 +42,6 @@ under the License. enforce - - - ${https.protocols} - diff --git a/src/it/invocation-multiple/pom.xml b/src/it/invocation-multiple/pom.xml index 67d1caa2..0ce8813a 100644 --- a/src/it/invocation-multiple/pom.xml +++ b/src/it/invocation-multiple/pom.xml @@ -55,8 +55,6 @@ under the License. ${maven.compiler.source} ${maven.compiler.target} - - ${https.protocols} diff --git a/src/it/invocation-offline/pom.xml b/src/it/invocation-offline/pom.xml index bb9efaf5..eeb61d7e 100644 --- a/src/it/invocation-offline/pom.xml +++ b/src/it/invocation-offline/pom.xml @@ -50,10 +50,6 @@ under the License. validate - - - ${https.protocols} - diff --git a/src/it/invocation-reactor-indirect/pom.xml b/src/it/invocation-reactor-indirect/pom.xml index a7c0f1ab..2c511796 100644 --- a/src/it/invocation-reactor-indirect/pom.xml +++ b/src/it/invocation-reactor-indirect/pom.xml @@ -64,12 +64,6 @@ under the License. org.apache.maven.plugins maven-invoker-plugin @project.version@ - - - - ${https.protocols} - - diff --git a/src/it/invocation-spaces/pom.xml b/src/it/invocation-spaces/pom.xml index 7bfede6b..85dd7f1e 100644 --- a/src/it/invocation-spaces/pom.xml +++ b/src/it/invocation-spaces/pom.xml @@ -52,8 +52,6 @@ under the License. install - - ${https.protocols} value with spaces from cli diff --git a/src/it/local-repo-default/pom.xml b/src/it/local-repo-default/pom.xml index ce1c1cff..b601efb2 100644 --- a/src/it/local-repo-default/pom.xml +++ b/src/it/local-repo-default/pom.xml @@ -51,10 +51,6 @@ under the License. install - - - ${https.protocols} - diff --git a/src/it/local-repo-isolated/pom.xml b/src/it/local-repo-isolated/pom.xml index 06a16ef8..a2e2f8e7 100644 --- a/src/it/local-repo-isolated/pom.xml +++ b/src/it/local-repo-isolated/pom.xml @@ -50,10 +50,6 @@ under the License. install - - - ${https.protocols} - diff --git a/src/it/local-repo-path/pom.xml b/src/it/local-repo-path/pom.xml index 85a77390..b2bab596 100644 --- a/src/it/local-repo-path/pom.xml +++ b/src/it/local-repo-path/pom.xml @@ -56,10 +56,6 @@ under the License. org.apache.maven.plugins:maven-clean-plugin:2.2:clean - - - ${https.protocols} - diff --git a/src/it/pom-filtering-encoding/pom.xml b/src/it/pom-filtering-encoding/pom.xml index 72331d4e..a769935f 100644 --- a/src/it/pom-filtering-encoding/pom.xml +++ b/src/it/pom-filtering-encoding/pom.xml @@ -47,10 +47,6 @@ under the License. ©®ÄÖÜäöüß - - - ${https.protocols} - diff --git a/src/it/pom-filtering/pom.xml b/src/it/pom-filtering/pom.xml index b43fd1d4..c0d5dc21 100644 --- a/src/it/pom-filtering/pom.xml +++ b/src/it/pom-filtering/pom.xml @@ -60,10 +60,6 @@ under the License. FAILED FAILED - - - ${https.protocols} - diff --git a/src/it/postbuild-executed-only-once/pom.xml b/src/it/postbuild-executed-only-once/pom.xml index 0a9faa98..7372b833 100644 --- a/src/it/postbuild-executed-only-once/pom.xml +++ b/src/it/postbuild-executed-only-once/pom.xml @@ -51,8 +51,6 @@ under the License. ${maven.compiler.source} ${maven.compiler.target} - - ${https.protocols} diff --git a/src/it/settings-inherit/pom.xml b/src/it/settings-inherit/pom.xml index 068063d1..d7173221 100644 --- a/src/it/settings-inherit/pom.xml +++ b/src/it/settings-inherit/pom.xml @@ -43,10 +43,6 @@ under the License. ${project.build.directory}/it true true - - - ${https.protocols} - diff --git a/src/it/settings-inherit/src/it/project/pom.xml b/src/it/settings-inherit/src/it/project/pom.xml index a367a642..4d50191f 100644 --- a/src/it/settings-inherit/src/it/project/pom.xml +++ b/src/it/settings-inherit/src/it/project/pom.xml @@ -51,10 +51,6 @@ under the License. true - - - ${https.protocols} - diff --git a/src/it/settings-merge-multiexecutions/pom.xml b/src/it/settings-merge-multiexecutions/pom.xml index fe7c2aec..ff6535cf 100644 --- a/src/it/settings-merge-multiexecutions/pom.xml +++ b/src/it/settings-merge-multiexecutions/pom.xml @@ -37,10 +37,6 @@ under the License. ${project.build.directory}/it src/it/settings.xml true - - - ${https.protocols} - diff --git a/src/it/settings-merge/pom.xml b/src/it/settings-merge/pom.xml index c7b89c6a..7c518059 100644 --- a/src/it/settings-merge/pom.xml +++ b/src/it/settings-merge/pom.xml @@ -45,10 +45,6 @@ under the License. true src/it/settings.xml true - - - ${https.protocols} - diff --git a/src/it/settings-merge_jdk9+/pom.xml b/src/it/settings-merge_jdk9+/pom.xml index c7b89c6a..7c518059 100644 --- a/src/it/settings-merge_jdk9+/pom.xml +++ b/src/it/settings-merge_jdk9+/pom.xml @@ -45,10 +45,6 @@ under the License. true src/it/settings.xml true - - - ${https.protocols} - diff --git a/src/it/settings-override/pom.xml b/src/it/settings-override/pom.xml index c8ec0145..79650f8e 100644 --- a/src/it/settings-override/pom.xml +++ b/src/it/settings-override/pom.xml @@ -43,10 +43,6 @@ under the License. src/it/settings.xml true - - - ${https.protocols} - diff --git a/src/it/spaces-should-work_non-windows/pom.xml b/src/it/spaces-should-work_non-windows/pom.xml index 766fe3dc..75a31c36 100644 --- a/src/it/spaces-should-work_non-windows/pom.xml +++ b/src/it/spaces-should-work_non-windows/pom.xml @@ -47,10 +47,6 @@ under the License. validate verify - - - ${https.protocols} - diff --git a/src/it/special-characters-should-work/pom.xml b/src/it/special-characters-should-work/pom.xml index 5df94f8f..9b498a38 100644 --- a/src/it/special-characters-should-work/pom.xml +++ b/src/it/special-characters-should-work/pom.xml @@ -47,10 +47,6 @@ under the License. false verify - - - ${https.protocols} - diff --git a/src/it/wrongPropertyInterpolation/pom.xml b/src/it/wrongPropertyInterpolation/pom.xml index 9450abd0..03eab80e 100644 --- a/src/it/wrongPropertyInterpolation/pom.xml +++ b/src/it/wrongPropertyInterpolation/pom.xml @@ -44,10 +44,6 @@ under the License. ${project.build.directory}/it verify - - - ${https.protocols} -