Fixes integration test setup

ewhauser · Apr 25, 2019 · 2f030b6 · 2f030b6
1 parent 94ac6cf
commit 2f030b6
Showing 1 changed file with 23 additions and 2 deletions.
diff --git a/zipkin-server/pom.xml b/zipkin-server/pom.xml
@@ -36,6 +36,7 @@
     <start-class>zipkin.server.ZipkinServer</start-class>
     <kotlin.version>1.3.30</kotlin.version>
     <maven-invoker-plugin.version>3.2.0</maven-invoker-plugin.version>
+    <proto.generatedSourceDirectory>${project.build.directory}/generated-test-sources/wire</proto.generatedSourceDirectory>
   </properties>
 
   <dependencyManagement>
@@ -386,7 +387,7 @@
               <goal>generate-sources</goal>
             </goals>
             <configuration>
-              <generatedSourceDirectory>${project.build.directory}/generated-test-sources/wire</generatedSourceDirectory>
+              <generatedSourceDirectory>${proto.generatedSourceDirectory}</generatedSourceDirectory>
             </configuration>
           </execution>
         </executions>
@@ -412,12 +413,32 @@
               <sourceDirs>
                 <sourceDir>${project.basedir}/src/test/kotlin</sourceDir>
                 <sourceDir>${project.basedir}/src/test/java</sourceDir>
-                <sourceDir>${project.build.directory}/generated-test-sources/wire</sourceDir>
+                <sourceDir>${proto.generatedSourceDirectory}</sourceDir>
               </sourceDirs>
             </configuration>
           </execution>
         </executions>
       </plugin>
+      <!-- Adds the output directory from proto source generation for the test compiler -->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <version>3.0.0</version>
+        <executions>
+          <execution>
+            <id>add-test-source</id>
+            <phase>generate-test-sources</phase>
+            <goals>
+              <goal>add-test-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>${proto.generatedSourceDirectory}</source>
+              </sources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
         <version>${maven-compiler-plugin.version}</version>