YARN-9348. Application catalog build system bug fixes. Contributed by Eric Yang
This commit is contained in:
parent
7ee32a2eb1
commit
d9e9e5657d
|
@ -1,3 +1,5 @@
|
||||||
.classpath
|
.classpath
|
||||||
.project
|
.project
|
||||||
/target/
|
/target/
|
||||||
|
/node_modules/
|
||||||
|
yarn.lock
|
||||||
|
|
|
@ -15,26 +15,12 @@
|
||||||
"roboto-fontface": "0.10.0"
|
"roboto-fontface": "0.10.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"http-server": "^0.6.1",
|
|
||||||
"requirejs": "^2.1.0",
|
"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",
|
"shelljs": "^0.2.6",
|
||||||
"apidoc": "0.17.7"
|
"apidoc": "0.17.7"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"prestart": "npm install & mvn clean package",
|
"prestart": "npm install & mvn clean package",
|
||||||
"start": "http-server target/app -a localhost -p 8000",
|
"pretest": "npm install"
|
||||||
"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');\""
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -229,6 +229,9 @@
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>com.github.eirslett</groupId>
|
<groupId>com.github.eirslett</groupId>
|
||||||
<artifactId>frontend-maven-plugin</artifactId>
|
<artifactId>frontend-maven-plugin</artifactId>
|
||||||
|
<configuration>
|
||||||
|
<workingDirectory>target</workingDirectory>
|
||||||
|
</configuration>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<id>install node and yarn</id>
|
<id>install node and yarn</id>
|
||||||
|
@ -416,15 +419,49 @@
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
<!--
|
|
||||||
<profiles>
|
<profiles>
|
||||||
|
<profile>
|
||||||
|
<id>parallel-tests</id>
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.hadoop</groupId>
|
||||||
|
<artifactId>hadoop-maven-plugins</artifactId>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<id>parallel-tests-createdir</id>
|
||||||
|
<goals>
|
||||||
|
<goal>parallel-tests-createdir</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-surefire-plugin</artifactId>
|
||||||
|
<configuration>
|
||||||
|
<forkCount>${testsThreadCount}</forkCount>
|
||||||
|
<reuseForks>false</reuseForks>
|
||||||
|
<argLine>${maven-surefire-plugin.argLine} -DminiClusterDedicatedDirs=true</argLine>
|
||||||
|
<systemPropertyVariables>
|
||||||
|
<testsThreadCount>${testsThreadCount}</testsThreadCount>
|
||||||
|
<test.build.data>${test.build.data}/${surefire.forkNumber}</test.build.data>
|
||||||
|
<test.build.dir>${test.build.dir}/${surefire.forkNumber}</test.build.dir>
|
||||||
|
<hadoop.tmp.dir>${hadoop.tmp.dir}/${surefire.forkNumber}</hadoop.tmp.dir>
|
||||||
|
|
||||||
|
<!-- Due to a Maven quirk, setting this to just -->
|
||||||
|
<!-- surefire.forkNumber won't do the parameter substitution. -->
|
||||||
|
<!-- Putting a prefix in front of it like "fork-" makes it -->
|
||||||
|
<!-- work. -->
|
||||||
|
<test.unique.fork.id>fork-${surefire.forkNumber}</test.unique.fork.id>
|
||||||
|
</systemPropertyVariables>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
</profile>
|
||||||
<profile>
|
<profile>
|
||||||
<id>rest-docs</id>
|
<id>rest-docs</id>
|
||||||
<activation>
|
|
||||||
<file>
|
|
||||||
<exists>${basedir}/node_modules/.bin/apidoc</exists>
|
|
||||||
</file>
|
|
||||||
</activation>
|
|
||||||
<build>
|
<build>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
|
@ -450,6 +487,5 @@
|
||||||
</build>
|
</build>
|
||||||
</profile>
|
</profile>
|
||||||
</profiles>
|
</profiles>
|
||||||
-->
|
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|
Loading…
Reference in New Issue