Mailing-List: contact commits-help@atlas.incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@atlas.incubator.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: madhan@apache.org
To: commits@atlas.incubator.apache.org
Message-Id: <f71f783692904fa8911b3f30e53c3189@git.apache.org>
Subject: incubator-atlas git commit: ATLAS-1276: fix for webapp test failures
Date: Thu, 10 Nov 2016 21:28:57 +0000 (UTC)
archived-at: Thu, 10 Nov 2016 21:29:02 -0000

Repository: incubator-atlas
Updated Branches:
  refs/heads/master ed3c32c12 -> 46f9f0f8e


ATLAS-1276: fix for webapp test failures


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

Branch: refs/heads/master
Commit: 46f9f0f8e27632213f89c30f92c93cd04ecaef84
Parents: ed3c32c
Author: Ayub Khan <aryanayub786@gmail.com>
Authored: Thu Nov 10 13:27:55 2016 -0800
Committer: Madhan Neethiraj <madhan@apache.org>
Committed: Thu Nov 10 13:28:27 2016 -0800

----------------------------------------------------------------------
 release-log.txt |  3 ++-
 webapp/pom.xml  | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/46f9f0f8/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index e1409a7..6aa1f42 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -9,7 +9,8 @@ ATLAS-1060 Add composite indexes for exact match performance improvements for al
 ATLAS-1127 Modify creation and modification timestamps to Date instead of Long(sumasai)
 
 ALL CHANGES:
-ATLAS-1278 Added API to get typedef header info
+ATLAS-1276 fix for webapp test failures (ayubkhan via mneethiraj)
+ATLAS-1278 Added API to get typedef header info (apoorvnaik via mneethiraj)
 ATLAS-1246 Upgrade versions of dependencies (shwethags)
 ATLAS-1192 Atlas IE support (kevalbhatt)
 ATLAS-1273 Test testOnChangeRefresh in DefaultMetadataServiceTest is failing (ayubkhan via shwethags)

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/46f9f0f8/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/webapp/pom.xml b/webapp/pom.xml
index 6d83cc0..883c52a 100755
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -571,6 +571,28 @@
                 <groupId>net.alchim31.maven</groupId>
                 <artifactId>scala-maven-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/models</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>${basedir}/../addons/models</directory>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>