YARN-9348. Application catalog build system bug fixes.
Contributed by Eric Yang
This commit is contained in:
parent
45f976fdcf
commit
01ada40ea4
@ -56,6 +56,7 @@
|
|||||||
<file>
|
<file>
|
||||||
<exists>/var/run/docker.sock</exists>
|
<exists>/var/run/docker.sock</exists>
|
||||||
</file>
|
</file>
|
||||||
|
<os><family>linux</family></os>
|
||||||
</activation>
|
</activation>
|
||||||
<id>application-catalog-docker-image</id>
|
<id>application-catalog-docker-image</id>
|
||||||
<build>
|
<build>
|
||||||
|
@ -1,3 +1,5 @@
|
|||||||
.classpath
|
.classpath
|
||||||
.project
|
.project
|
||||||
/target/
|
/target/
|
||||||
|
/node_modules/
|
||||||
|
yarn.lock
|
||||||
|
@ -14,26 +14,12 @@
|
|||||||
"bootstrap": "~3.3.7"
|
"bootstrap": "~3.3.7"
|
||||||
},
|
},
|
||||||
"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');\""
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -244,6 +244,9 @@
|
|||||||
<groupId>com.github.eirslett</groupId>
|
<groupId>com.github.eirslett</groupId>
|
||||||
<artifactId>frontend-maven-plugin</artifactId>
|
<artifactId>frontend-maven-plugin</artifactId>
|
||||||
<version>1.6</version>
|
<version>1.6</version>
|
||||||
|
<configuration>
|
||||||
|
<workingDirectory>target</workingDirectory>
|
||||||
|
</configuration>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<id>install node and yarn</id>
|
<id>install node and yarn</id>
|
||||||
@ -411,7 +414,10 @@
|
|||||||
<configuration>
|
<configuration>
|
||||||
<filesets>
|
<filesets>
|
||||||
<fileset>
|
<fileset>
|
||||||
<directory>${vendor.loc}</directory>
|
<directory>node</directory>
|
||||||
|
</fileset>
|
||||||
|
<fileset>
|
||||||
|
<directory>node_modules</directory>
|
||||||
</fileset>
|
</fileset>
|
||||||
</filesets>
|
</filesets>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
Loading…
Reference in New Issue
Block a user