You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by sh...@apache.org on 2016/01/29 07:26:21 UTC
incubator-atlas git commit: ATLAS-199 webapp build fails (grunt +
tests) (sanjayp via shwethags)
Repository: incubator-atlas
Updated Branches:
refs/heads/master 8c4a7faef -> 6c06fd0a7
ATLAS-199 webapp build fails (grunt + tests) (sanjayp via shwethags)
Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/6c06fd0a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/6c06fd0a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/6c06fd0a
Branch: refs/heads/master
Commit: 6c06fd0a72e94d9575ea14c9e4bf662f00592590
Parents: 8c4a7fa
Author: Shwetha GS <ss...@hortonworks.com>
Authored: Fri Jan 29 11:56:14 2016 +0530
Committer: Shwetha GS <ss...@hortonworks.com>
Committed: Fri Jan 29 11:56:14 2016 +0530
----------------------------------------------------------------------
dashboard/pom.xml | 228 +++++++++++++++++--------------------------------
release-log.txt | 1 +
2 files changed, 81 insertions(+), 148 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/6c06fd0a/dashboard/pom.xml
----------------------------------------------------------------------
diff --git a/dashboard/pom.xml b/dashboard/pom.xml
index 58dc55f..dea74b4 100644
--- a/dashboard/pom.xml
+++ b/dashboard/pom.xml
@@ -42,6 +42,7 @@
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<configuration>
+ <phase>validate</phase>
<workingDirectory>${project.build.directory}</workingDirectory>
</configuration>
</plugin>
@@ -60,154 +61,85 @@
</webResources>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.7</version>
+ <executions>
+ <execution>
+ <id>copy-resources</id>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <phase>validate</phase>
+ <configuration>
+ <outputDirectory>${basedir}/target/</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}</directory>
+ <includes>
+ <include>package.json</include>
+ <include>.bowerrc</include>
+ <include>bower.json</include>
+ <include>gruntfile.js</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>com.github.eirslett</groupId>
+ <artifactId>frontend-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>install node and npm</id>
+ <goals>
+ <goal>install-node-and-npm</goal>
+ </goals>
+ <configuration>
+ <nodeVersion>${node.version}</nodeVersion>
+ <npmVersion>1.4.3</npmVersion>
+ </configuration>
+ </execution>
+ <execution>
+ <id>npm install</id>
+ <goals>
+ <goal>npm</goal>
+ </goals>
+ <configuration>
+ <arguments>install</arguments>
+ </configuration>
+ </execution>
+ <execution>
+ <id>install bower</id>
+ <goals>
+ <goal>grunt</goal>
+ </goals>
+ <configuration>
+ <arguments>bower</arguments>
+ </configuration>
+ </execution>
+ <execution>
+ <id>npm remaining</id>
+ <goals>
+ <goal>npm</goal>
+ </goals>
+ <configuration>
+ <arguments>install --ignore-scripts</arguments>
+ </configuration>
+ </execution>
+ <execution>
+ <id>grunt dist</id>
+ <goals>
+ <goal>grunt</goal>
+ </goals>
+ <configuration>
+ <arguments>build</arguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>install-node</id>
- <activation>
- <file>
- <missing>${project.build.directory}/node</missing>
- </file>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>com.github.eirslett</groupId>
- <artifactId>frontend-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>install node and npm</id>
- <goals>
- <goal>install-node-and-npm</goal>
- </goals>
- <configuration>
- <nodeVersion>${node.version}</nodeVersion>
- <npmVersion>1.4.3</npmVersion>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.7</version>
- <executions>
- <execution>
- <id>copy-resources</id>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <phase>validate</phase>
- <configuration>
- <outputDirectory>${basedir}/target/</outputDirectory>
- <resources>
- <resource>
- <directory>${basedir}</directory>
- <includes>
- <include>package.json</include>
- <include>.bowerrc</include>
- <include>bower.json</include>
- <include>gruntfile.js</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>install-node_modules</id>
- <activation>
- <file>
- <missing>${project.build.directory}/node_modules</missing>
- </file>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>com.github.eirslett</groupId>
- <artifactId>frontend-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>npm install</id>
- <goals>
- <goal>npm</goal>
- </goals>
- <configuration>
- <arguments>install</arguments>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>bower-install</id>
- <activation>
- <file>
- <missing>${project.build.directory}/dist/lib</missing>
- </file>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>com.github.eirslett</groupId>
- <artifactId>frontend-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>install bower</id>
- <goals>
- <goal>grunt</goal>
- </goals>
- <configuration>
- <arguments>bower</arguments>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>grunt-task</id>
- <activation>
- <property>
- <name>!disableGrunt</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>com.github.eirslett</groupId>
- <artifactId>frontend-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>npm remaining</id>
- <goals>
- <goal>npm</goal>
- </goals>
- <configuration>
- <arguments>install --ignore-scripts</arguments>
- </configuration>
- </execution>
- <execution>
- <id>grunt dist</id>
- <goals>
- <goal>grunt</goal>
- </goals>
- <configuration>
- <arguments>build</arguments>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/6c06fd0a/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index da1f744..0fa222f 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -7,6 +7,7 @@ ATLAS-409 Atlas will not import avro tables with schema read from a file (dosset
ATLAS-379 Create sqoop and falcon metadata addons (venkatnrangan,bvellanki,sowmyaramesh via shwethags)
ALL CHANGES:
+ATLAS-199 webapp build fails (grunt + tests) (sanjayp via shwethags)
ATLAS-415 Hive import fails when importing a table that is already imported without StorageDescriptor information (yhemanth via shwethags)
ATLAS-450 quick_start fails on cygwin (dkantor via shwethags)
ATLAS-451 Doc: Fix few broken links due to Wiki words in Atlas documentation (ssainath via shwethags)