summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNaresh Bhat <naresh.bhat@linaro.org>2018-04-23 15:05:32 +0530
committerNaresh Bhat <naresh.bhat@linaro.org>2018-06-06 19:28:50 +0530
commitd90584bb654f1d99297c230d465be2ba17d3140d (patch)
tree6ab638bcbc8222373afcf9d4c96b274af84eece1
parent27e00dde15b0d4e1c3701158521268623ff1be0d (diff)
ambari: Fix needarch build issues v2.5.2
Aambari build fixes on aarch64 for v2.5.2, Which includes following version packages - NpmVersion 2.14.12 - NodeVersion v4.2.6 - PhantomJsVersion 2.1.1 - Replace all hardcoded needarch x86_64 with aarch64 in needarch. - Don't allow package karma-phantomjs-launcher to launch 0.1 which try to launch 1.9.8 phantomjs hence Ambari Admin View is failing. - Dependency SNAPSHOT is not available but 1.1.0 is available - https://community.hortonworks.com/questions/93448/compile-ambari-metrics-storm-sink-error.html hence the change is updated. Signed-off-by: Naresh Bhat <naresh.bhat@linaro.org>
-rw-r--r--ambari-admin/pom.xml4
-rw-r--r--ambari-admin/src/main/resources/ui/admin-web/package.json3
-rw-r--r--ambari-agent/pom.xml2
-rw-r--r--ambari-client/python-client/pom.xml2
-rw-r--r--ambari-metrics/ambari-metrics-assembly/pom.xml6
-rw-r--r--ambari-metrics/ambari-metrics-storm-sink/pom.xml2
-rw-r--r--ambari-server/pom.xml2
-rw-r--r--ambari-shell/ambari-python-shell/pom.xml2
-rw-r--r--ambari-web/config.coffee4
-rw-r--r--ambari-web/package.json2
10 files changed, 12 insertions, 17 deletions
diff --git a/ambari-admin/pom.xml b/ambari-admin/pom.xml
index 8fc94b864c..76248020fb 100644
--- a/ambari-admin/pom.xml
+++ b/ambari-admin/pom.xml
@@ -63,8 +63,8 @@
<artifactId>frontend-maven-plugin</artifactId>
<version>1.3</version>
<configuration>
- <nodeVersion>v4.5.0</nodeVersion>
- <npmVersion>2.15.0</npmVersion>
+ <nodeVersion>v4.2.6</nodeVersion>
+ <npmVersion>2.14.12</npmVersion>
<workingDirectory>src/main/resources/ui/admin-web/</workingDirectory>
<npmInheritsProxyConfigFromMaven>false</npmInheritsProxyConfigFromMaven>
</configuration>
diff --git a/ambari-admin/src/main/resources/ui/admin-web/package.json b/ambari-admin/src/main/resources/ui/admin-web/package.json
index efcd9d4be6..1804ab1e30 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/package.json
+++ b/ambari-admin/src/main/resources/ui/admin-web/package.json
@@ -23,8 +23,7 @@
"karma-chrome-launcher": "0.1.4",
"karma-jasmine": "0.1.5",
"karma-ng-html2js-preprocessor": "^0.1.0",
- "karma-phantomjs-launcher": "0.1",
- "phantomjs": "1.9.20",
+ "phantomjs": "2.1.1",
"protractor": "1.0.0"
},
"scripts": {
diff --git a/ambari-agent/pom.xml b/ambari-agent/pom.xml
index fdef897807..98ee92b726 100644
--- a/ambari-agent/pom.xml
+++ b/ambari-agent/pom.xml
@@ -257,7 +257,7 @@
<fileEncoding>utf-8</fileEncoding>
</posttransScriptlet>
- <needarch>x86_64</needarch>
+ <needarch>aarch64</needarch>
<autoRequires>false</autoRequires>
<mappings>
<mapping>
diff --git a/ambari-client/python-client/pom.xml b/ambari-client/python-client/pom.xml
index 990d8adae7..60736a1057 100644
--- a/ambari-client/python-client/pom.xml
+++ b/ambari-client/python-client/pom.xml
@@ -133,7 +133,7 @@
<require>zlib</require>
<require>${python.ver}</require>
</requires>
- <needarch>x86_64</needarch>
+ <needarch>aarch64</needarch>
<autoRequires>false</autoRequires>
<mappings>
<mapping>
diff --git a/ambari-metrics/ambari-metrics-assembly/pom.xml b/ambari-metrics/ambari-metrics-assembly/pom.xml
index 42f61b5245..19172829bb 100644
--- a/ambari-metrics/ambari-metrics-assembly/pom.xml
+++ b/ambari-metrics/ambari-metrics-assembly/pom.xml
@@ -199,7 +199,7 @@
<version>2.0.1</version>
<configuration>
<group>Development</group>
- <needarch>x86_64</needarch>
+ <needarch>aarch64</needarch>
<copyright>2012, Apache Software Foundation</copyright>
<version>${package-version}</version>
<release>${package-release}</release>
@@ -457,7 +457,7 @@
<configuration>
<name>ambari-metrics-grafana</name>
<group>Development</group>
- <needarch>x86_64</needarch>
+ <needarch>aarch64</needarch>
<autoRequires>false</autoRequires>
<mappings>
<mapping>
@@ -537,7 +537,7 @@
<configuration>
<name>ambari-metrics-monitor</name>
<group>Development</group>
- <needarch>x86_64</needarch>
+ <needarch>aarch64</needarch>
<autoRequires>false</autoRequires>
<requires>
<require>${python.ver}</require>
diff --git a/ambari-metrics/ambari-metrics-storm-sink/pom.xml b/ambari-metrics/ambari-metrics-storm-sink/pom.xml
index 779ee1c6de..5f17bc14a4 100644
--- a/ambari-metrics/ambari-metrics-storm-sink/pom.xml
+++ b/ambari-metrics/ambari-metrics-storm-sink/pom.xml
@@ -31,7 +31,7 @@ limitations under the License.
<packaging>jar</packaging>
<properties>
- <storm.version>1.1.0-SNAPSHOT</storm.version>
+ <storm.version>1.1.0</storm.version>
</properties>
<build>
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index 2b933009c3..9e3c9169b6 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -429,7 +429,7 @@
<scriptFile>src/main/package/rpm/posttrans_server.sh</scriptFile>
<fileEncoding>utf-8</fileEncoding>
</posttransScriptlet>
- <needarch>x86_64</needarch>
+ <needarch>aarch64</needarch>
<mappings>
<mapping>
<directory>/etc</directory>
diff --git a/ambari-shell/ambari-python-shell/pom.xml b/ambari-shell/ambari-python-shell/pom.xml
index 0c4baf6a36..6b10d8bba1 100644
--- a/ambari-shell/ambari-python-shell/pom.xml
+++ b/ambari-shell/ambari-python-shell/pom.xml
@@ -115,7 +115,7 @@
<require>zlib</require>
<require>${python.ver}</require>
</requires>
- <needarch>x86_64</needarch>
+ <needarch>aarch64</needarch>
<autoRequires>false</autoRequires>
<mappings>
<mapping>
diff --git a/ambari-web/config.coffee b/ambari-web/config.coffee
index 2b2b78bf5e..bcc67cbdbc 100644
--- a/ambari-web/config.coffee
+++ b/ambari-web/config.coffee
@@ -99,10 +99,6 @@ exports.config =
precompile: true
defaultExtension: 'hbs'
joinTo: 'javascripts/app.js' : /^app/
- paths:
- jquery: 'vendor/scripts/jquery-1.7.2.min.js'
- handlebars: 'vendor/scripts/handlebars-1.0.0.beta.6.js'
- ember: 'vendor/scripts/ember-latest.js'
server:
port: 3333
diff --git a/ambari-web/package.json b/ambari-web/package.json
index 92ac968cf5..4dd8dca493 100644
--- a/ambari-web/package.json
+++ b/ambari-web/package.json
@@ -13,7 +13,7 @@
"css-brunch": ">= 1.0 < 1.5",
"uglify-js-brunch": ">= 1.0 < 1.5",
"clean-css-brunch": ">= 1.0 < 1.5",
- "ember-precompile-brunch": "^0.1.1",
+ "ember-handlebars-brunch":"git://github.com/icholy/ember-handlebars-brunch.git#540127137296a09601cbd215dcf4da4d27bcfb9e",
"ember-radio-button": "0.1.2",
"less-brunch": ">= 1.0 < 1.5",
"cssstyle": "0.2.3"