big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "YARN-9348. Application catalog build system bug fixes."

Browse Source 
This reverts commit 01ada40ea4.
This commit is contained in:
Billie Rinaldi 2019-03-12 11:49:55 -07:00
parent 024b3bae8a
commit 55069bfb09
4 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/pom.xml
View File

@ -56,7 +56,6 @@
<file>
<exists>/var/run/docker.sock</exists>
</file>
<os><family>linux</family></os>
</activation>
<id>application-catalog-docker-image</id>
<build>

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/.gitignore vendored
View File

@ -1,5 +1,3 @@
.classpath
.project
/target/
/node_modules/
yarn.lock

16
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/package.json
View File

@ -14,12 +14,26 @@
"bootstrap": "~3.3.7"
},
"devDependencies": {
"http-server": "^0.6.1",
"requirejs": "^2.1.0",
"karma": "4.0.0",
"karma-requirejs": "^0.2.2",
"karma-script-launcher": "^0.1.0",
"karma-chrome-launcher": "^0.1.4",
"karma-firefox-launcher": "^0.1.3",
"karma-jasmine": "^0.1.5",
"karma-junit-reporter": "^0.2.2",
"shelljs": "^0.2.6",
"apidoc": "0.17.7"
},
"scripts": {
"prestart": "npm install & mvn clean package",
"pretest": "npm install"
"start": "http-server target/app -a localhost -p 8000",
"pretest": "npm install",
"test": "karma start src/test/javascript/karma.conf.js",
"test-single-run": "karma start src/test/javascript/karma.conf.js --single-run",
"preupdate-webdriver": "npm install",
"update-webdriver": "webdriver-manager update",
"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');\""
}
}

8
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/pom.xml
View File

@ -244,9 +244,6 @@
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<version>1.6</version>
<configuration>
<workingDirectory>target</workingDirectory>
</configuration>
<executions>
<execution>
<id>install node and yarn</id>
@ -414,10 +411,7 @@
<configuration>
<filesets>
<fileset>
<directory>node</directory>
</fileset>
<fileset>
<directory>node_modules</directory>
<directory>${vendor.loc}</directory>
</fileset>
</filesets>
</configuration>