Skip to content

Commit 95a4c04

Browse files
committed
Switch node and npm to frontend-maven-plugin codecentric#1553
1 parent a4860c5 commit 95a4c04

File tree

4 files changed

+39
-44
lines changed

4 files changed

+39
-44
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ target/
2121

2222
#nodejs
2323
node_modules/
24+
node/
2425

2526
#flattened POMs
2627
.flattened-pom.xml

pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
6161
<maven-war-plugin.version>3.3.1</maven-war-plugin.version>
6262
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
63-
<exec-maven-plugin.version>3.0.0</exec-maven-plugin.version>
63+
<frontend-maven-plugin.version>1.11.0</frontend-maven-plugin.version>
6464
<jacoco-maven-plugin.version>0.8.6</jacoco-maven-plugin.version>
6565
<coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
6666
<asciidoctor-maven-plugin.version>2.1.0</asciidoctor-maven-plugin.version>
@@ -364,9 +364,9 @@
364364
</dependencies>
365365
</plugin>
366366
<plugin>
367-
<groupId>org.codehaus.mojo</groupId>
368-
<artifactId>exec-maven-plugin</artifactId>
369-
<version>${exec-maven-plugin.version}</version>
367+
<groupId>com.github.eirslett</groupId>
368+
<artifactId>frontend-maven-plugin</artifactId>
369+
<version>${frontend-maven-plugin.version}</version>
370370
</plugin>
371371
<plugin>
372372
<groupId>pl.project13.maven</groupId>

spring-boot-admin-samples/spring-boot-admin-sample-custom-ui/pom.xml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -32,35 +32,35 @@
3232
<build>
3333
<plugins>
3434
<plugin>
35-
<groupId>org.codehaus.mojo</groupId>
36-
<artifactId>exec-maven-plugin</artifactId>
35+
<groupId>com.github.eirslett</groupId>
36+
<artifactId>frontend-maven-plugin</artifactId>
3737
<executions>
38+
<execution>
39+
<id>install-node-and-npm</id>
40+
<goals>
41+
<goal>install-node-and-npm</goal>
42+
</goals>
43+
<configuration>
44+
<nodeVersion>v15.6.0</nodeVersion>
45+
<npmVersion>7.4.0</npmVersion>
46+
</configuration>
47+
</execution>
3848
<execution>
3949
<id>npm-install</id>
40-
<phase>validate</phase>
4150
<goals>
42-
<goal>exec</goal>
51+
<goal>npm</goal>
4352
</goals>
4453
<configuration>
45-
<executable>npm</executable>
46-
<arguments>
47-
<argument>ci</argument>
48-
</arguments>
54+
<arguments>ci</arguments>
4955
</configuration>
5056
</execution>
5157
<execution>
5258
<id>npm-build</id>
53-
<phase>generate-resources</phase>
5459
<goals>
55-
<goal>exec</goal>
60+
<goal>npm</goal>
5661
</goals>
5762
<configuration>
58-
<skip>${skipNpmBuild}</skip>
59-
<executable>npm</executable>
60-
<arguments>
61-
<argument>run</argument>
62-
<argument>build</argument>
63-
</arguments>
63+
<arguments>run build</arguments>
6464
<environmentVariables>
6565
<PROJECT_VERSION>${project.version}</PROJECT_VERSION>
6666
</environmentVariables>

spring-boot-admin-server-ui/pom.xml

Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -71,53 +71,47 @@
7171
<build>
7272
<plugins>
7373
<plugin>
74-
<groupId>org.codehaus.mojo</groupId>
75-
<artifactId>exec-maven-plugin</artifactId>
74+
<groupId>com.github.eirslett</groupId>
75+
<artifactId>frontend-maven-plugin</artifactId>
7676
<executions>
77+
<execution>
78+
<id>install-node-and-npm</id>
79+
<goals>
80+
<goal>install-node-and-npm</goal>
81+
</goals>
82+
<configuration>
83+
<nodeVersion>v15.6.0</nodeVersion>
84+
<npmVersion>7.4.0</npmVersion>
85+
</configuration>
86+
</execution>
7787
<execution>
7888
<id>npm-install</id>
79-
<phase>validate</phase>
8089
<goals>
81-
<goal>exec</goal>
90+
<goal>npm</goal>
8291
</goals>
8392
<configuration>
84-
<executable>npm</executable>
85-
<arguments>
86-
<argument>ci</argument>
87-
</arguments>
93+
<arguments>ci</arguments>
8894
</configuration>
8995
</execution>
9096
<execution>
9197
<id>npm-build</id>
92-
<phase>generate-resources</phase>
9398
<goals>
94-
<goal>exec</goal>
99+
<goal>npm</goal>
95100
</goals>
96101
<configuration>
97-
<skip>${skipNpmBuild}</skip>
98-
<executable>npm</executable>
99-
<arguments>
100-
<argument>run</argument>
101-
<argument>build</argument>
102-
</arguments>
102+
<arguments>run build</arguments>
103103
<environmentVariables>
104104
<PROJECT_VERSION>${project.version}</PROJECT_VERSION>
105105
</environmentVariables>
106106
</configuration>
107107
</execution>
108108
<execution>
109109
<id>npm-test</id>
110-
<phase>test</phase>
111110
<goals>
112-
<goal>exec</goal>
111+
<goal>npm</goal>
113112
</goals>
114113
<configuration>
115-
<skip>${skipTests}</skip>
116-
<executable>npm</executable>
117-
<arguments>
118-
<argument>run</argument>
119-
<argument>test:unit</argument>
120-
</arguments>
114+
<arguments>run test:unit</arguments>
121115
</configuration>
122116
</execution>
123117
</executions>

0 commit comments

Comments
 (0)