You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@helix.apache.org by jx...@apache.org on 2022/12/06 19:12:21 UTC
[helix] branch master updated: Add npm run build:mvn script to enable building helix-front module with maven (#2303)
This is an automated email from the ASF dual-hosted git repository.
jxue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/helix.git
The following commit(s) were added to refs/heads/master by this push:
new ed4d29621 Add npm run build:mvn script to enable building helix-front module with maven (#2303)
ed4d29621 is described below
commit ed4d29621e27e22c4393623ed9e928a4fa2eb2a5
Author: helix-bot <11...@users.noreply.github.com>
AuthorDate: Tue Dec 6 11:12:15 2022 -0800
Add npm run build:mvn script to enable building helix-front module with maven (#2303)
Add npm run build:mvn script to enable
building helix-front module with Maven.
Configure maven-surefire to skip.
---
helix-front/package.json | 1 +
helix-front/pom.xml | 22 +++++++++++++++-------
pom.xml | 2 +-
3 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/helix-front/package.json b/helix-front/package.json
index fab4489be..260e92730 100644
--- a/helix-front/package.json
+++ b/helix-front/package.json
@@ -23,6 +23,7 @@
"ng": "ng",
"build": "rm -rf dist && mkdir dist && ng build --aot --configuration production && tsc -p server",
"build:dev": "rm -rf dist && mkdir dist && yarn check:config && ng build --aot --configuration development && tsc -p server",
+ "build:mvn": "npm run copy:config && npm run build",
"start": "concurrently -r \"ng serve\" \"tsc -w -p server\" \"nodemon dist/server/app.js\"",
"prod": "yarn run build && node dist/server/app.js",
"test": "ng test",
diff --git a/helix-front/pom.xml b/helix-front/pom.xml
index 41856694d..ec8459d1f 100644
--- a/helix-front/pom.xml
+++ b/helix-front/pom.xml
@@ -83,22 +83,22 @@
<executions>
<execution>
- <id>install node and yarn</id>
+ <id>install node and npm</id>
<phase>process-resources</phase>
<goals>
- <goal>install-node-and-yarn</goal>
+ <goal>install-node-and-npm</goal>
</goals>
<configuration>
<nodeVersion>v14.17.6</nodeVersion>
- <yarnVersion>v1.22.18</yarnVersion>
+ <npmVersion>6.14.17</npmVersion>
</configuration>
</execution>
<execution>
- <id>yarn install</id>
+ <id>npm install</id>
<phase>compile</phase>
<goals>
- <goal>yarn</goal>
+ <goal>npm</goal>
</goals>
<configuration>
<arguments>install</arguments>
@@ -109,10 +109,10 @@
<id>build</id>
<phase>process-test-resources</phase>
<goals>
- <goal>yarn</goal>
+ <goal>npm</goal>
</goals>
<configuration>
- <arguments>run build</arguments>
+ <arguments>run-script build:mvn</arguments>
</configuration>
</execution>
</executions>
@@ -154,6 +154,14 @@
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>true</skipTests>
+ </configuration>
+ </plugin>
+
</plugins>
</build>
</project>
diff --git a/pom.xml b/pom.xml
index da33ee1b2..031dc660c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -934,6 +934,6 @@
<SKIP_INTEGRATION_TESTS>false</SKIP_INTEGRATION_TESTS>
</properties>
</profile>
- <!-- Configuration for unit/integration tests section 3 of 3 (profiles) ENDS HERE.-->
+ <!-- Configuration for unit and integration tests. Section 3 of 3 (profiles) ENDS HERE.-->
</profiles>
</project>