From 3ed23ca0e7da477e296693b12abcb8f5e27e537e Mon Sep 17 00:00:00 2001
From: Felix Barnsteiner <felix.barnsteiner@elastic.co>
Date: Tue, 30 Jun 2020 10:45:00 +0200
Subject: [PATCH 1/2] Re-enable non-Scala tests

---
 .../apm/agent/util/VersionUtilsTest.java      | 24 +++++++++++++++++++
 .../latest/testapp/generated/HelloGrpc.java   |  2 +-
 pom.xml                                       |  5 ----
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/apm-agent-core/src/test/java/co/elastic/apm/agent/util/VersionUtilsTest.java b/apm-agent-core/src/test/java/co/elastic/apm/agent/util/VersionUtilsTest.java
index becb0213ce..85a14f849b 100644
--- a/apm-agent-core/src/test/java/co/elastic/apm/agent/util/VersionUtilsTest.java
+++ b/apm-agent-core/src/test/java/co/elastic/apm/agent/util/VersionUtilsTest.java
@@ -1,3 +1,27 @@
+/*-
+ * #%L
+ * Elastic APM Java agent
+ * %%
+ * Copyright (C) 2018 - 2020 Elastic and contributors
+ * %%
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. 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.
+ * #L%
+ */
 package co.elastic.apm.agent.util;
 
 import org.assertj.core.api.Assertions;
diff --git a/apm-agent-plugins/apm-grpc/apm-grpc-test-latest/src/test/java/co/elastic/apm/agent/grpc/latest/testapp/generated/HelloGrpc.java b/apm-agent-plugins/apm-grpc/apm-grpc-test-latest/src/test/java/co/elastic/apm/agent/grpc/latest/testapp/generated/HelloGrpc.java
index 682a0c4b7b..4d134c457c 100644
--- a/apm-agent-plugins/apm-grpc/apm-grpc-test-latest/src/test/java/co/elastic/apm/agent/grpc/latest/testapp/generated/HelloGrpc.java
+++ b/apm-agent-plugins/apm-grpc/apm-grpc-test-latest/src/test/java/co/elastic/apm/agent/grpc/latest/testapp/generated/HelloGrpc.java
@@ -42,7 +42,7 @@
 /**
  */
 @javax.annotation.Generated(
-    value = "by gRPC proto compiler (version 1.30.0)",
+    value = "by gRPC proto compiler (version 1.30.2)",
     comments = "Source: rpc.proto")
 public final class HelloGrpc {
 
diff --git a/pom.xml b/pom.xml
index a038ef00dc..9f07be5209 100644
--- a/pom.xml
+++ b/pom.xml
@@ -439,11 +439,6 @@
                             <version>${version.junit-jupiter}</version>
                         </dependency>
                     </dependencies>
-                    <configuration>
-                        <includes>
-                            <include>**/*Spec.*</include>
-                        </includes>
-                    </configuration>
                 </plugin>
                 <plugin>
                     <artifactId>maven-failsafe-plugin</artifactId>

From a666bcec37f11c8fa39ec3cce30626a2b720218f Mon Sep 17 00:00:00 2001
From: Felix Barnsteiner <felix.barnsteiner@elastic.co>
Date: Tue, 30 Jun 2020 11:24:25 +0200
Subject: [PATCH 2/2] Don't disable Scala tests

---
 apm-agent-plugins/apm-scala-concurrent-plugin/pom.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/apm-agent-plugins/apm-scala-concurrent-plugin/pom.xml b/apm-agent-plugins/apm-scala-concurrent-plugin/pom.xml
index 5868b89d3b..139b23ad0f 100644
--- a/apm-agent-plugins/apm-scala-concurrent-plugin/pom.xml
+++ b/apm-agent-plugins/apm-scala-concurrent-plugin/pom.xml
@@ -50,6 +50,14 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>**/*Spec.*</include>
+                    </includes>
+                </configuration>
+            </plugin>
         </plugins>
     </build>