You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zipkin.apache.org by je...@apache.org on 2019/05/05 00:39:36 UTC

[incubator-zipkin-api] branch jenkins-test updated (868c295 -> 5695b76)

This is an automated email from the ASF dual-hosted git repository.

jeqo pushed a change to branch jenkins-test
in repository https://gitbox.apache.org/repos/asf/incubator-zipkin-api.git.


    from 868c295  feat: test with jenkins
     new 3374cd7  feat: test npm with mvn
     new 5695b76  fix: test npm via mvn

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 Jenkinsfile |  4 +---
 pom.xml     | 41 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 3 deletions(-)


[incubator-zipkin-api] 02/02: fix: test npm via mvn

Posted by je...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

jeqo pushed a commit to branch jenkins-test
in repository https://gitbox.apache.org/repos/asf/incubator-zipkin-api.git

commit 5695b764aad82493677e215c812099df4f484ec5
Author: Jorge Quilcate Otoya <qu...@gmail.com>
AuthorDate: Sun May 5 02:39:28 2019 +0200

    fix: test npm via mvn
---
 Jenkinsfile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 96492fa..ba4adf3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -22,7 +22,6 @@ pipeline {
 
     tools {
         jdk 'JDK 1.8 (latest)'
-        nodejs "node"
     }
 
     options {
@@ -53,8 +52,7 @@ pipeline {
 
         stage('Test') {
             steps {
-                sh 'npm install'
-                sh 'npm run test'
+                sh './mvnw test -B'
             }
         }
 


[incubator-zipkin-api] 01/02: feat: test npm with mvn

Posted by je...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

jeqo pushed a commit to branch jenkins-test
in repository https://gitbox.apache.org/repos/asf/incubator-zipkin-api.git

commit 3374cd7d79703e272c124ecbb32e8cc7383346c9
Author: Jorge Quilcate Otoya <qu...@gmail.com>
AuthorDate: Sun May 5 02:38:32 2019 +0200

    feat: test npm with mvn
---
 pom.xml | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/pom.xml b/pom.xml
index e852d70..ad46076 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,6 +36,7 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
     <main.basedir>${project.basedir}</main.basedir>
+    <frontend-maven-plugin.version>1.7.5</frontend-maven-plugin.version>
   </properties>
 
   <name>zipkin-proto3</name>
@@ -156,6 +157,7 @@
             <exclude>Jenkinsfile</exclude>
             <exclude>package.json</exclude>
             <exclude>**/*.md</exclude>
+            <exclude>**/node_modules/**</exclude>
           </excludes>
           <strictCheck>true</strictCheck>
         </configuration>
@@ -170,6 +172,43 @@
       </plugin>
 
       <plugin>
+        <groupId>com.github.eirslett</groupId>
+        <artifactId>frontend-maven-plugin</artifactId>
+        <version>${frontend-maven-plugin.version}</version>
+        <configuration>
+          <installDirectory>target</installDirectory>
+          <nodeVersion>v10.15.1</nodeVersion>
+        </configuration>
+        <executions>
+          <execution>
+            <id>install node and npm</id>
+            <goals>
+              <goal>install-node-and-npm</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>npm install</id>
+            <goals>
+              <goal>npm</goal>
+            </goals>
+            <configuration>
+              <arguments>install</arguments>
+            </configuration>
+          </execution>
+          <execution>
+            <id>npm run test</id>
+            <goals>
+              <goal>npm</goal>
+            </goals>
+            <phase>test</phase>
+            <configuration>
+              <arguments>run test</arguments>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+	  <plugin>
         <artifactId>maven-enforcer-plugin</artifactId>
         <version>3.0.0-M2</version>
         <executions>
@@ -221,6 +260,8 @@
 
             <!-- NPM files -->
             <exclude>**/package.json</exclude>
+            <exclude>**/package-lock.json</exclude>
+            <exclude>**/node_modules/**</exclude>
 
             <!-- Maven Wrapper generated files -->
             <exclude>.mvn/wrapper/maven-wrapper.properties</exclude>