You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by jm...@apache.org on 2015/08/24 17:30:37 UTC

incubator-atlas git commit: ATLAS-116 Build fails when skipping Maven tests (tbeerbower via jmaron)

Repository: incubator-atlas
Updated Branches:
  refs/heads/master 5b2aa81fa -> 113feb3af


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


Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/113feb3a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/113feb3a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/113feb3a

Branch: refs/heads/master
Commit: 113feb3af4d8b2eed2a8c7b67d4a55b336470119
Parents: 5b2aa81
Author: Jon Maron <jm...@hortonworks.com>
Authored: Mon Aug 24 11:29:35 2015 -0400
Committer: Jon Maron <jm...@hortonworks.com>
Committed: Mon Aug 24 11:29:35 2015 -0400

----------------------------------------------------------------------
 webapp/pom.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/113feb3a/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/webapp/pom.xml b/webapp/pom.xml
index 05721a6..65c7bde 100755
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -293,10 +293,6 @@
                             <directory>src/main/webapp/WEB-INF</directory>
                             <targetPath>WEB-INF</targetPath>
                         </resource>
-                        <resource>
-                            <directory>${project.build.directory}/test-classes</directory>
-                            <targetPath>WEB-INF/classes</targetPath>
-                        </resource>
                     </webResources>
                     <archive>
                         <manifest>
@@ -353,6 +349,7 @@
                         <contextPath>/</contextPath>
                         <descriptor>webapp/src/test/webapp/WEB-INF/web.xml</descriptor>
                         <!-- ${project.build.directory}/atlas-webapp-${project.version} -->
+                        <extraClasspath>${project.build.directory}/../../webapp/target/test-classes/</extraClasspath>
                     </webApp>
                     <useTestScope>true</useTestScope>
                     <systemProperties>
@@ -377,6 +374,8 @@
                     <stopKey>atlas-stop</stopKey>
                     <stopPort>41001</stopPort>
                     <daemon>${debug.jetty.daemon}</daemon>
+                    <testClassesDirectory>${project.build.directory}/../../webapp/target/test-classes/</testClassesDirectory>
+                    <useTestClasspath>true</useTestClasspath>
                 </configuration>
                 <executions>
                     <execution>