Fixing the deploy-snapshot job (#1693)

elastic · Mar 9, 2021 · 1820243 · 1820243
1 parent 88359ba
commit 1820243
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 18 deletions.
diff --git a/integration-tests/application-server-integration-tests/pom.xml b/integration-tests/application-server-integration-tests/pom.xml
@@ -59,6 +59,13 @@
             <version>${project.version}</version>
             <type>war</type>
         </dependency>
+        <dependency>
+            <!-- this dependency is only important in order to make sure the external plugin jar exists -->
+            <groupId>${project.groupId}</groupId>
+            <artifactId>external-plugin</artifactId>
+            <version>${project.version}</version>
+            <type>jar</type>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>apm-agent-core</artifactId>

diff --git a/...n-tests/src/test/java/co/elastic/apm/servlet/AbstractServletContainerIntegrationTest.java b/...n-tests/src/test/java/co/elastic/apm/servlet/AbstractServletContainerIntegrationTest.java
@@ -161,7 +161,6 @@ protected AbstractServletContainerIntegrationTest(GenericContainer<?> servletCon
             .withStartupTimeout(Duration.ofMinutes(5));
         for (TestApp testApp : getTestApps()) {
             testApp.getAdditionalEnvVariables().forEach(servletContainer::withEnv);
-            System.out.println("testApp = " + testApp);
             try {
                 testApp.getAdditionalFilesToBind().forEach((pathToFile, containerPath) -> {
                     checkFilePresent(pathToFile);

diff --git a/...r-integration-tests/src/test/java/co/elastic/apm/servlet/tests/ExternalPluginTestApp.java b/...r-integration-tests/src/test/java/co/elastic/apm/servlet/tests/ExternalPluginTestApp.java
@@ -48,26 +48,11 @@ public ExternalPluginTestApp() {
     @Override
     public Map<String, String> getAdditionalFilesToBind() {
         File externalPluginBuildDir = new File("../external-plugin-test/external-plugin/target/");
-        System.out.println("externalPluginBuildDir = " + externalPluginBuildDir);
-        if (externalPluginBuildDir.exists()) {
-            System.out.println("External plugin dir exists");
-            File[] files = externalPluginBuildDir.listFiles();
-            if (files == null) {
-                System.out.println("No files in the external plugin build dir");
-            } else {
-                System.out.println("Files in external plugin build dir: ");
-                for (File file : files) {
-                    System.out.println("  " + file);
-                }
-            }
-        } else {
-            System.out.println("External plugin dir does not exit");
-        }
-        File pluginJar = Arrays.stream(externalPluginBuildDir.listFiles(file -> file.getName().startsWith("external-plugin-") && file.getName().endsWith(".jar")))
+        File pluginJar = Arrays.stream(externalPluginBuildDir
+            .listFiles(file -> file.getName().startsWith("external-plugin-") && !file.getName().contains("javadoc") && file.getName().endsWith(".jar")))
             .findFirst()
             .orElse(null);
         assert pluginJar != null;
-        System.out.println("pluginJar = " + pluginJar);
         return Map.of(pluginJar.getAbsolutePath(), "/plugins/" + pluginJar.getName());
     }