Fixes Maven integration tests. (#272)

GoogleContainerTools · May 15, 2018 · 8374134 · 8374134
1 parent 50ad775
commit 8374134
Showing 1 changed file with 38 additions and 13 deletions.
diff --git a/jib-maven-plugin/pom.xml b/jib-maven-plugin/pom.xml
@@ -127,7 +127,10 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-failsafe-plugin</artifactId>
-            <version>2.20.1</version>
+            <version>2.21.0</version>
+            <configuration>
+              <classesDirectory>${project.build.directory}/classes</classesDirectory>
+            </configuration>
             <executions>
               <execution>
                 <id>integration-tests</id>
@@ -138,6 +141,39 @@
               </execution>
             </executions>
           </plugin>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>build-helper-maven-plugin</artifactId>
+            <version>3.0.0</version>
+            <executions>
+              <execution>
+                <id>add-jib-core-integration-test-sources</id>
+                <phase>generate-test-sources</phase>
+                <goals>
+                  <goal>add-test-source</goal>
+                </goals>
+                <configuration>
+                  <sources>
+                    <source>${basedir}/../jib-core/src/integration-test/java</source>
+                  </sources>
+                </configuration>
+              </execution>
+              <execution>
+                <id>add-jib-core-integration-test-resources</id>
+                <phase>generate-test-sources</phase>
+                <goals>
+                  <goal>add-test-resource</goal>
+                </goals>
+                <configuration>
+                  <resources>
+                    <resource>
+                      <directory>${basedir}/../jib-core/src/integration-test/resources</directory>
+                    </resource>
+                  </resources>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
         </plugins>
       </build>
     </profile>
@@ -238,18 +274,6 @@
               </resources>
             </configuration>
           </execution>
-          <execution>
-            <id>add-jib-core-integration-test-sources</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>add-test-source</goal>
-            </goals>
-            <configuration>
-              <sources>
-                <source>${basedir}/../jib-core/src/integration-test/java</source>
-              </sources>
-            </configuration>
-          </execution>
         </executions>
       </plugin>
 
@@ -311,6 +335,7 @@
         <configuration>
           <excludes>
             <exclude>**/*IntegrationTest.java</exclude>
+            <exclude>**/*IT.java</exclude>
           </excludes>
         </configuration>
       </plugin>