Merge remote-tracking branch 'jenkinsci/master' into JENKINS-58113-re…

…move-maven-internal

Dockerfile

@@ -30,8 +30,6 @@ RUN git clone https://github.com/jenkinsci/plugin-compat-tester &&\
 
 COPY plugins-compat-tester/ /pct/src/plugins-compat-tester/
 COPY plugins-compat-tester-cli/ /pct/src/plugins-compat-tester-cli/
-COPY plugins-compat-tester-gae/ /pct/src/plugins-compat-tester-gae/
-COPY plugins-compat-tester-gae-client/ /pct/src/plugins-compat-tester-gae-client/
 COPY plugins-compat-tester-model/ /pct/src/plugins-compat-tester-model/
 COPY *.xml /pct/src/
 COPY LICENSE.txt /pct/src/LICENSE.txt

plugins-compat-tester-cli/src/main/java/org/jenkins/tools/test/CliOptions.java

@@ -119,11 +119,6 @@ public class CliOptions {
             "These options will be used a la -D")
     private String mavenPropertiesFile;
 
-    @Parameter(names="-gaeSecurityToken", description = "Allows to pass GAE Security token needed to write data")
-    private String gaeSecurityToken;
-    @Parameter(names="-gaeBaseUrl", description = "Allows to pass GAE plugin compat tester base url")
-    private String gaeBaseUrl;
-
     @Parameter(names="-hookPrefixes", description = "Prefixes of the extra hooks' classes")
     private String hookPrefixes;
 
@@ -198,14 +193,6 @@ public String getCacheThresholdStatus() {
         return cacheThresholdStatus;
     }
 
-    public String getGaeSecurityToken() {
-        return gaeSecurityToken;
-    }
-
-    public String getGaeBaseUrl() {
-        return gaeBaseUrl;
-    }
-
     public String getHookPrefixes() {
         return hookPrefixes;
     }

plugins-compat-tester-cli/src/main/java/org/jenkins/tools/test/PluginCompatTesterCli.java

@@ -114,12 +114,6 @@ public static void main(String[] args) throws IOException, PlexusContainerExcept
         if(options.getCacheThresholdStatus() != null){
             config.setCacheThresholStatus(TestStatus.valueOf(options.getCacheThresholdStatus()));
         }
-        if(options.getGaeBaseUrl() != null){
-            config.setGaeBaseUrl(options.getGaeBaseUrl());
-        }
-        if(options.getGaeSecurityToken() != null){
-            config.setGaeSecurityToken(options.getGaeSecurityToken());
-        }
         if(options.getHookPrefixes() != null && !options.getHookPrefixes().isEmpty()){
             config.setHookPrefixes(Arrays.asList(options.getHookPrefixes().split(",")));
         }