Skip to content

S
spring-boot-admin
Commit a92150d4 by Johannes Edmeier Committed by Johannes Edmeier
Options

Use yarn instead of npm

parent 82d707e6
Showing with 28 additions and 27 deletions
.travis.yml
...@@ -5,6 +5,7 @@ env: ...@@ -5,6 +5,7 @@ env:
- NODE_VERSION=4 - NODE_VERSION=4
cache: cache:
yarn: true
directories: directories:
- $HOME/.m2 - $HOME/.m2
...@@ -12,6 +13,7 @@ before_install: ...@@ -12,6 +13,7 @@ before_install:
- 'if [[ -n "$DECRYPT_KEYPHRASE" ]]; then openssl aes-256-cbc -d -pass "env:DECRYPT_KEYPHRASE" -in .gnupg.tar.enc | tar xv; fi' - 'if [[ -n "$DECRYPT_KEYPHRASE" ]]; then openssl aes-256-cbc -d -pass "env:DECRYPT_KEYPHRASE" -in .gnupg.tar.enc | tar xv; fi'
- 'if [[ ${TRAVIS_TAG} != "" ]]; then ./mvnw versions:set -DnewVersion="${TRAVIS_TAG}"; fi' - 'if [[ ${TRAVIS_TAG} != "" ]]; then ./mvnw versions:set -DnewVersion="${TRAVIS_TAG}"; fi'
- 'nvm install ${NODE_VERSION} && nvm use ${NODE_VERSION}' - 'nvm install ${NODE_VERSION} && nvm use ${NODE_VERSION}'
- 'npm install -g yarn'
script: ./mvnw clean verify script: ./mvnw clean verify
......
spring-boot-admin-server-ui-hystrix/pom.xml
...@@ -49,26 +49,26 @@ ...@@ -49,26 +49,26 @@
<artifactId>exec-maven-plugin</artifactId> <artifactId>exec-maven-plugin</artifactId>
<executions> <executions>
<execution> <execution>
<id>npm-install</id> <id>yarn-install</id>
<phase>validate</phase> <phase>validate</phase>
<goals> <goals>
<goal>exec</goal> <goal>exec</goal>
</goals> </goals>
<configuration> <configuration>
<executable>npm</executable> <executable>yarn</executable>
<arguments> <arguments>
<argument>install</argument> <argument>install</argument>
</arguments> </arguments>
</configuration> </configuration>
</execution> </execution>
<execution> <execution>
<id>npm-build</id> <id>yarn-build</id>
<phase>generate-resources</phase> <phase>generate-resources</phase>
<goals> <goals>
<goal>exec</goal> <goal>exec</goal>
</goals> </goals>
<configuration> <configuration>
<executable>npm</executable> <executable>yarn</executable>
<arguments> <arguments>
<argument>run</argument> <argument>run</argument>
<argument>build</argument> <argument>build</argument>
...@@ -76,14 +76,14 @@ ...@@ -76,14 +76,14 @@
</configuration> </configuration>
</execution> </execution>
<execution> <execution>
<id>npm-test</id> <id>yarn-test</id>
<phase>test</phase> <phase>test</phase>
<goals> <goals>
<goal>exec</goal> <goal>exec</goal>
</goals> </goals>
<configuration> <configuration>
<skip>true</skip> <skip>true</skip>
<executable>npm</executable> <executable>yarn</executable>
<arguments> <arguments>
<argument>run</argument> <argument>run</argument>
<argument>test</argument> <argument>test</argument>
......
spring-boot-admin-server-ui-hystrix/yarn.lock 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
spring-boot-admin-server-ui-turbine/pom.xml
...@@ -46,26 +46,26 @@ ...@@ -46,26 +46,26 @@
<artifactId>exec-maven-plugin</artifactId> <artifactId>exec-maven-plugin</artifactId>
<executions> <executions>
<execution> <execution>
<id>npm-install</id> <id>yarn-install</id>
<phase>validate</phase> <phase>validate</phase>
<goals> <goals>
<goal>exec</goal> <goal>exec</goal>
</goals> </goals>
<configuration> <configuration>
<executable>npm</executable> <executable>yarn</executable>
<arguments> <arguments>
<argument>install</argument> <argument>install</argument>
</arguments> </arguments>
</configuration> </configuration>
</execution> </execution>
<execution> <execution>
<id>npm-build</id> <id>yarn-build</id>
<phase>generate-resources</phase> <phase>generate-resources</phase>
<goals> <goals>
<goal>exec</goal> <goal>exec</goal>
</goals> </goals>
<configuration> <configuration>
<executable>npm</executable> <executable>yarn</executable>
<arguments> <arguments>
<argument>run</argument> <argument>run</argument>
<argument>build</argument> <argument>build</argument>
...@@ -73,14 +73,14 @@ ...@@ -73,14 +73,14 @@
</configuration> </configuration>
</execution> </execution>
<execution> <execution>
<id>npm-test</id> <id>yarn-test</id>
<phase>test</phase> <phase>test</phase>
<goals> <goals>
<goal>exec</goal> <goal>exec</goal>
</goals> </goals>
<configuration> <configuration>
<skip>true</skip> <skip>true</skip>
<executable>npm</executable> <executable>yarn</executable>
<arguments> <arguments>
<argument>run</argument> <argument>run</argument>
<argument>test</argument> <argument>test</argument>
......
spring-boot-admin-server-ui-turbine/yarn.lock 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
spring-boot-admin-server-ui/README.md
...@@ -2,32 +2,32 @@ spring-boot-admin-server-ui ...@@ -2,32 +2,32 @@ spring-boot-admin-server-ui
================================ ================================
### Building this module ### Building this module
The jar **can be build with Maven** with the maven-exec-plugin. To do this node.js and npm must be installed on your machine and be on your $PATH. The jar **can be build with Maven** with the maven-exec-plugin. To do this node.js and yarn must be installed on your machine and be on your $PATH.
If you dont want to use the maven exec run the following commands: If you dont want to use the maven exec run the following commands:
### Build ### Build
```shell ```shell
npm install yarn install
npm run build yarn run build
``` ```
Repeated build with watching the files: Repeated build with watching the files:
```shell ```shell
npm run watch:js yarn run watch:js
``` ```
### Run dev-server ### Run dev-server
This starts a dev-server serving the ui only at port 9000. The rest requests are forwarded to port 8080. This starts a dev-server serving the ui only at port 9000. The rest requests are forwarded to port 8080.
```shell ```shell
npm run dev-server yarn run dev-server
``` ```
## Run tests ## Run tests
```shell ```shell
npm run test yarn run test
``` ```
Repeated tests with watching the files: Repeated tests with watching the files:
```shell ```shell
npm run watch:test yarn run watch:test
``` ```
\ No newline at end of file
spring-boot-admin-server-ui/pom.xml
...@@ -15,26 +15,26 @@ ...@@ -15,26 +15,26 @@
<artifactId>exec-maven-plugin</artifactId> <artifactId>exec-maven-plugin</artifactId>
<executions> <executions>
<execution> <execution>
<id>npm-install</id> <id>yarn-install</id>
<phase>validate</phase> <phase>validate</phase>
<goals> <goals>
<goal>exec</goal> <goal>exec</goal>
</goals> </goals>
<configuration> <configuration>
<executable>npm</executable> <executable>yarn</executable>
<arguments> <arguments>
<argument>install</argument> <argument>install</argument>
</arguments> </arguments>
</configuration> </configuration>
</execution> </execution>
<execution> <execution>
<id>npm-build</id> <id>yarn-build</id>
<phase>generate-resources</phase> <phase>generate-resources</phase>
<goals> <goals>
<goal>exec</goal> <goal>exec</goal>
</goals> </goals>
<configuration> <configuration>
<executable>npm</executable> <executable>yarn</executable>
<arguments> <arguments>
<argument>run</argument> <argument>run</argument>
<argument>build</argument> <argument>build</argument>
...@@ -42,13 +42,13 @@ ...@@ -42,13 +42,13 @@
</configuration> </configuration>
</execution> </execution>
<execution> <execution>
<id>npm-test</id> <id>yarn-test</id>
<phase>test</phase> <phase>test</phase>
<goals> <goals>
<goal>exec</goal> <goal>exec</goal>
</goals> </goals>
<configuration> <configuration>
<executable>npm</executable> <executable>yarn</executable>
<arguments> <arguments>
<argument>run</argument> <argument>run</argument>
<argument>test</argument> <argument>test</argument>
......
spring-boot-admin-server-ui/yarn.lock 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment