You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by lp...@apache.org on 2017/09/05 09:41:16 UTC
[21/50] [abbrv] ambari git commit: AMBARI-21857. Integrate new Log
Search UI with maven (oleewere)
AMBARI-21857. Integrate new Log Search UI with maven (oleewere)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/12c22edb
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/12c22edb
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/12c22edb
Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 12c22edb569cfa1bba59dc2720c6fc25c1ea4b44
Parents: 9f1331a
Author: oleewere <ol...@gmail.com>
Authored: Wed Aug 30 19:57:20 2017 +0200
Committer: oleewere <ol...@gmail.com>
Committed: Thu Aug 31 12:21:01 2017 +0200
----------------------------------------------------------------------
.../ambari-logsearch-web-new/package.json | 1 +
.../ambari-logsearch-web-new/pom.xml | 171 +++++++++++++++++++
2 files changed, 172 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/12c22edb/ambari-logsearch/ambari-logsearch-web-new/package.json
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-web-new/package.json b/ambari-logsearch/ambari-logsearch-web-new/package.json
index b4902a3..96733eb 100644
--- a/ambari-logsearch/ambari-logsearch-web-new/package.json
+++ b/ambari-logsearch/ambari-logsearch-web-new/package.json
@@ -6,6 +6,7 @@
"ng": "ng",
"start": "ng serve",
"build": "ng build",
+ "build-prod": "ng build -prod",
"test": "ng test",
"lint": "ng lint",
"e2e": "ng e2e"
http://git-wip-us.apache.org/repos/asf/ambari/blob/12c22edb/ambari-logsearch/ambari-logsearch-web-new/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-web-new/pom.xml b/ambari-logsearch/ambari-logsearch-web-new/pom.xml
new file mode 100644
index 0000000..28e1754
--- /dev/null
+++ b/ambari-logsearch/ambari-logsearch-web-new/pom.xml
@@ -0,0 +1,171 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>ambari-logsearch</artifactId>
+ <groupId>org.apache.ambari</groupId>
+ <version>2.0.0.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>ambari-logsearch-web-new</artifactId>
+ <name>Ambari LogSearch Web New</name>
+ <version>2.0.0.0-SNAPSHOT</version>
+ <groupId>org.apache.ambari</groupId>
+ <description>Ambari Logsearch Web New</description>
+
+ <properties>
+ <logsearch.npm.config.tmp>/tmp/logsearch_npm_config_tmp</logsearch.npm.config.tmp>
+ <node.version>v6.9.0</node.version>
+ <yarn.version>v0.23.3</yarn.version>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.github.eirslett</groupId>
+ <artifactId>frontend-maven-plugin</artifactId>
+ <version>1.4</version>
+ <configuration>
+ <nodeVersion>${node.version}</nodeVersion>
+ <yarnVersion>${yarn.version}</yarnVersion>
+ <workingDirectory>${project.build.directory}/webapp-build</workingDirectory>
+ <npmInheritsProxyConfigFromMaven>false</npmInheritsProxyConfigFromMaven>
+ <!-- setting npm_config_tmp environment variable is a workaround for
+ https://github.com/Medium/phantomjs/issues/673 -->
+ <environmentVariables>
+ <npm_config_tmp>${logsearch.npm.config.tmp}</npm_config_tmp>
+ </environmentVariables>
+ </configuration>
+ <executions>
+ <execution>
+ <id>install node and yarn</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>install-node-and-yarn</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>yarn install</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>yarn</goal>
+ </goals>
+ <configuration>
+ <arguments>install --ignore-engines --pure-lockfile</arguments>
+ </configuration>
+ </execution>
+ <execution>
+ <id>generate dist</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>yarn</goal>
+ </goals>
+ <configuration>
+ <arguments>build-prod</arguments>
+ </configuration>
+ </execution>
+ <!-- TODO: Use this for testing and make it skippable:
+ <execution>
+ <id>run tests</id>
+ <phase>test</phase>
+ <goals>
+ <goal>yarn</goal>
+ </goals>
+ <configuration>
+ <arguments>test</arguments>
+ </configuration>
+ </execution>
+ -->
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.6</version>
+ <executions>
+ <execution>
+ <id>process-webapp-sources</id>
+ <phase>process-sources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${basedir}/target/webapp-build</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}</directory>
+ <includes>
+ <include>e2e/**</include>
+ <include>src/**</include>
+ <include>.*</include>
+ <include>package.json</include>
+ <include>protactor.conf.js</include>
+ <include>yarn.lock</include>
+ <include>karma.conf.js</include>
+ <include>tsconfig.json</include>
+ <include>tslint.json</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-resources</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${basedir}/target/classes/dist</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/target/webapp-build/dist</directory>
+ <filtering>false</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>README.md</exclude>
+ <exclude>*.editorconfig</exclude>
+ <exclude>src/vendor/**</exclude>
+ <exclude>yarn.lock</exclude>
+ <exclude>node_modules/**</exclude>
+ <exclude>dist/**</exclude>
+ <exclude>**/*.json</exclude>
+ <exclude>**/*.log</exclude>
+ <exclude>**/*.txt</exclude>
+ </excludes>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>test</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>