Commit 113feb3a by Jon Maron

ATLAS-116 Build fails when skipping Maven tests (tbeerbower via jmaron)

parent 5b2aa81f
...@@ -293,10 +293,6 @@ ...@@ -293,10 +293,6 @@
<directory>src/main/webapp/WEB-INF</directory> <directory>src/main/webapp/WEB-INF</directory>
<targetPath>WEB-INF</targetPath> <targetPath>WEB-INF</targetPath>
</resource> </resource>
<resource>
<directory>${project.build.directory}/test-classes</directory>
<targetPath>WEB-INF/classes</targetPath>
</resource>
</webResources> </webResources>
<archive> <archive>
<manifest> <manifest>
...@@ -353,6 +349,7 @@ ...@@ -353,6 +349,7 @@
<contextPath>/</contextPath> <contextPath>/</contextPath>
<descriptor>webapp/src/test/webapp/WEB-INF/web.xml</descriptor> <descriptor>webapp/src/test/webapp/WEB-INF/web.xml</descriptor>
<!-- ${project.build.directory}/atlas-webapp-${project.version} --> <!-- ${project.build.directory}/atlas-webapp-${project.version} -->
<extraClasspath>${project.build.directory}/../../webapp/target/test-classes/</extraClasspath>
</webApp> </webApp>
<useTestScope>true</useTestScope> <useTestScope>true</useTestScope>
<systemProperties> <systemProperties>
...@@ -377,6 +374,8 @@ ...@@ -377,6 +374,8 @@
<stopKey>atlas-stop</stopKey> <stopKey>atlas-stop</stopKey>
<stopPort>41001</stopPort> <stopPort>41001</stopPort>
<daemon>${debug.jetty.daemon}</daemon> <daemon>${debug.jetty.daemon}</daemon>
<testClassesDirectory>${project.build.directory}/../../webapp/target/test-classes/</testClassesDirectory>
<useTestClasspath>true</useTestClasspath>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment