Skip to content

Commit 55069bf

Browse files
committed
Revert "YARN-9348. Application catalog build system bug fixes."
This reverts commit 01ada40.
1 parent 024b3ba commit 55069bf

File tree

4 files changed

+16
-11
lines changed
  • hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog

4 files changed

+16
-11
lines changed

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
<file>
5757
<exists>/var/run/docker.sock</exists>
5858
</file>
59-
<os><family>linux</family></os>
6059
</activation>
6160
<id>application-catalog-docker-image</id>
6261
<build>
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
.classpath
22
.project
33
/target/
4-
/node_modules/
5-
yarn.lock

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/package.json

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,26 @@
1414
"bootstrap": "~3.3.7"
1515
},
1616
"devDependencies": {
17+
"http-server": "^0.6.1",
1718
"requirejs": "^2.1.0",
19+
"karma": "4.0.0",
20+
"karma-requirejs": "^0.2.2",
21+
"karma-script-launcher": "^0.1.0",
22+
"karma-chrome-launcher": "^0.1.4",
23+
"karma-firefox-launcher": "^0.1.3",
24+
"karma-jasmine": "^0.1.5",
25+
"karma-junit-reporter": "^0.2.2",
1826
"shelljs": "^0.2.6",
1927
"apidoc": "0.17.7"
2028
},
2129
"scripts": {
2230
"prestart": "npm install & mvn clean package",
23-
"pretest": "npm install"
31+
"start": "http-server target/app -a localhost -p 8000",
32+
"pretest": "npm install",
33+
"test": "karma start src/test/javascript/karma.conf.js",
34+
"test-single-run": "karma start src/test/javascript/karma.conf.js --single-run",
35+
"preupdate-webdriver": "npm install",
36+
"update-webdriver": "webdriver-manager update",
37+
"update-index-async": "node -e \"require('shelljs/global'); sed('-i', /\\/\\/@@NG_LOADER_START@@[\\s\\S]*\\/\\/@@NG_LOADER_END@@/, '//@@NG_LOADER_START@@\\n' + cat('src/main/webapp/vendor/angular-loader/angular-loader.min.js') + '\\n//@@NG_LOADER_END@@', 'src/main/webapp/index.html');\""
2438
}
2539
}

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/pom.xml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -244,9 +244,6 @@
244244
<groupId>com.github.eirslett</groupId>
245245
<artifactId>frontend-maven-plugin</artifactId>
246246
<version>1.6</version>
247-
<configuration>
248-
<workingDirectory>target</workingDirectory>
249-
</configuration>
250247
<executions>
251248
<execution>
252249
<id>install node and yarn</id>
@@ -414,10 +411,7 @@
414411
<configuration>
415412
<filesets>
416413
<fileset>
417-
<directory>node</directory>
418-
</fileset>
419-
<fileset>
420-
<directory>node_modules</directory>
414+
<directory>${vendor.loc}</directory>
421415
</fileset>
422416
</filesets>
423417
</configuration>

0 commit comments

Comments
 (0)