Skip to content

Commit

Permalink
Merge pull request #1626 from codecentric/feature/Frontend-Maven-Plugin
Browse files Browse the repository at this point in the history 
Switch node and npm to frontend-maven-plugin #1553
  • Loading branch information
@erikpetzold
erikpetzold committed Feb 8, 2021
2 parents a4860c5 + 95a4c04 commit 0b4c004
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 44 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Expand Up @@ -21,6 +21,7 @@ target/

#nodejs
node_modules/
node/

#flattened POMs
.flattened-pom.xml
8 changes: 4 additions & 4 deletions pom.xml
View file
Expand Up @@ -60,7 +60,7 @@
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
<maven-war-plugin.version>3.3.1</maven-war-plugin.version>
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
<exec-maven-plugin.version>3.0.0</exec-maven-plugin.version>
<frontend-maven-plugin.version>1.11.0</frontend-maven-plugin.version>
<jacoco-maven-plugin.version>0.8.6</jacoco-maven-plugin.version>
<coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
<asciidoctor-maven-plugin.version>2.1.0</asciidoctor-maven-plugin.version>
Expand Down Expand Up @@ -364,9 +364,9 @@
</dependencies>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>${exec-maven-plugin.version}</version>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<version>${frontend-maven-plugin.version}</version>
</plugin>
<plugin>
<groupId>pl.project13.maven</groupId>
Expand Down
32 changes: 16 additions & 16 deletions spring-boot-admin-samples/spring-boot-admin-sample-custom-ui/pom.xml
View file
Expand Up @@ -32,35 +32,35 @@
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<executions>
<execution>
<id>install-node-and-npm</id>
<goals>
<goal>install-node-and-npm</goal>
</goals>
<configuration>
<nodeVersion>v15.6.0</nodeVersion>
<npmVersion>7.4.0</npmVersion>
</configuration>
</execution>
<execution>
<id>npm-install</id>
<phase>validate</phase>
<goals>
<goal>exec</goal>
<goal>npm</goal>
</goals>
<configuration>
<executable>npm</executable>
<arguments>
<argument>ci</argument>
</arguments>
<arguments>ci</arguments>
</configuration>
</execution>
<execution>
<id>npm-build</id>
<phase>generate-resources</phase>
<goals>
<goal>exec</goal>
<goal>npm</goal>
</goals>
<configuration>
<skip>${skipNpmBuild}</skip>
<executable>npm</executable>
<arguments>
<argument>run</argument>
<argument>build</argument>
</arguments>
<arguments>run build</arguments>
<environmentVariables>
<PROJECT_VERSION>${project.version}</PROJECT_VERSION>
</environmentVariables>
Expand Down
42 changes: 18 additions & 24 deletions spring-boot-admin-server-ui/pom.xml
View file
Expand Up @@ -71,53 +71,47 @@
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<executions>
<execution>
<id>install-node-and-npm</id>
<goals>
<goal>install-node-and-npm</goal>
</goals>
<configuration>
<nodeVersion>v15.6.0</nodeVersion>
<npmVersion>7.4.0</npmVersion>
</configuration>
</execution>
<execution>
<id>npm-install</id>
<phase>validate</phase>
<goals>
<goal>exec</goal>
<goal>npm</goal>
</goals>
<configuration>
<executable>npm</executable>
<arguments>
<argument>ci</argument>
</arguments>
<arguments>ci</arguments>
</configuration>
</execution>
<execution>
<id>npm-build</id>
<phase>generate-resources</phase>
<goals>
<goal>exec</goal>
<goal>npm</goal>
</goals>
<configuration>
<skip>${skipNpmBuild}</skip>
<executable>npm</executable>
<arguments>
<argument>run</argument>
<argument>build</argument>
</arguments>
<arguments>run build</arguments>
<environmentVariables>
<PROJECT_VERSION>${project.version}</PROJECT_VERSION>
</environmentVariables>
</configuration>
</execution>
<execution>
<id>npm-test</id>
<phase>test</phase>
<goals>
<goal>exec</goal>
<goal>npm</goal>
</goals>
<configuration>
<skip>${skipTests}</skip>
<executable>npm</executable>
<arguments>
<argument>run</argument>
<argument>test:unit</argument>
</arguments>
<arguments>run test:unit</arguments>
</configuration>
</execution>
</executions>
Expand Down

0 comments on commit 0b4c004

Please sign in to comment.