You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by sk...@apache.org on 2019/03/14 16:52:36 UTC

[incubator-netbeans-tools] branch master updated: add D to parameter for maven cli

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

skygo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans-tools.git


The following commit(s) were added to refs/heads/master by this push:
     new d5a9282  add D to parameter for maven cli
d5a9282 is described below

commit d5a9282cb15b06c3d621813a59cb023458e458a0
Author: Eric Barboni <sk...@apache.org>
AuthorDate: Thu Mar 14 17:52:26 2019 +0100

    add D to parameter for maven cli
---
 buildscripts/conveniences/Jenkinsfile-maven-master.groovy     | 2 +-
 buildscripts/conveniences/Jenkinsfile-maven-release100.groovy | 2 +-
 buildscripts/conveniences/Jenkinsfile-maven-release110.groovy | 2 +-
 buildscripts/conveniences/Jenkinsfile-maven-release90.groovy  | 2 +-
 buildscripts/conveniences/generatebuildscript.sh              | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/buildscripts/conveniences/Jenkinsfile-maven-master.groovy b/buildscripts/conveniences/Jenkinsfile-maven-master.groovy
index ce616b6..fbe0509 100644
--- a/buildscripts/conveniences/Jenkinsfile-maven-master.groovy
+++ b/buildscripts/conveniences/Jenkinsfile-maven-master.groovy
@@ -62,7 +62,7 @@ pipeline {
               script {
                         sh "mvn org.netbeans.maven:nb-repository-plugin:1.4-SNAPSHOT:download -DnexusIndexDirectory=${env.WORKSPACE}/repoindex -Dmaven.repo.local=${env.WORKSPACE}/.repository -DrepositoryUrl=https://repo.maven.apache.org/maven2"
                         sh 'mkdir -p testrepo/.m2'
-                        sh "mvn org.netbeans.maven:nb-repository-plugin:1.4-SNAPSHOT:populate -DnexusIndexDirectory=${env.WORKSPACE}/repoindex -DnetbeansNbmDirectory=${env.WORKSPACE}/netbeanssources/nbbuild/nbms -DnetbeansInstallDirectory=${env.WORKSPACE}/netbeanssources/nbbuild/netbeans -DnetbeansSourcesDirectory=${env.WORKSPACE}/netbeanssources/nbbuild/build/source-zips -DnebeansJavadocDirectory=${env.WORKSPACE}/netbeanssources/nbbuild/build/javadoc  -Dmaven.repo.local=${env.WORKSPACE} [...]
+                        sh "mvn org.netbeans.maven:nb-repository-plugin:1.4-SNAPSHOT:populate -DnexusIndexDirectory=${env.WORKSPACE}/repoindex -DnetbeansNbmDirectory=${env.WORKSPACE}/netbeanssources/nbbuild/nbms -DnetbeansInstallDirectory=${env.WORKSPACE}/netbeanssources/nbbuild/netbeans -DnetbeansSourcesDirectory=${env.WORKSPACE}/netbeanssources/nbbuild/build/source-zips -DnebeansJavadocDirectory=${env.WORKSPACE}/netbeanssources/nbbuild/build/javadoc  -Dmaven.repo.local=${env.WORKSPACE} [...]
               }
               archiveArtifacts 'testrepo/.m2/**'
           }
diff --git a/buildscripts/conveniences/Jenkinsfile-maven-release100.groovy b/buildscripts/conveniences/Jenkinsfile-maven-release100.groovy
index 9a819ff..601cd22 100644
--- a/buildscripts/conveniences/Jenkinsfile-maven-release100.groovy
+++ b/buildscripts/conveniences/Jenkinsfile-maven-release100.groovy
@@ -62,7 +62,7 @@ pipeline {
               script {
                         sh "mvn org.netbeans.maven:nb-repository-plugin:1.4-SNAPSHOT:download -DnexusIndexDirectory=${env.WORKSPACE}/repoindex -Dmaven.repo.local=${env.WORKSPACE}/.repository -DrepositoryUrl=https://repo.maven.apache.org/maven2"
                         sh 'mkdir -p testrepo/.m2'
-                        sh "mvn org.netbeans.maven:nb-repository-plugin:1.4-SNAPSHOT:populate -DnexusIndexDirectory=${env.WORKSPACE}/repoindex -DnetbeansNbmDirectory=${env.WORKSPACE}/netbeanssources/nbbuild/nbms -DnetbeansInstallDirectory=${env.WORKSPACE}/netbeanssources/nbbuild/netbeans -DnetbeansSourcesDirectory=${env.WORKSPACE}/netbeanssources/nbbuild/build/source-zips -DnebeansJavadocDirectory=${env.WORKSPACE}/netbeanssources/nbbuild/build/javadoc  -Dmaven.repo.local=${env.WORKSPACE} [...]
+                        sh "mvn org.netbeans.maven:nb-repository-plugin:1.4-SNAPSHOT:populate -DnexusIndexDirectory=${env.WORKSPACE}/repoindex -DnetbeansNbmDirectory=${env.WORKSPACE}/netbeanssources/nbbuild/nbms -DnetbeansInstallDirectory=${env.WORKSPACE}/netbeanssources/nbbuild/netbeans -DnetbeansSourcesDirectory=${env.WORKSPACE}/netbeanssources/nbbuild/build/source-zips -DnebeansJavadocDirectory=${env.WORKSPACE}/netbeanssources/nbbuild/build/javadoc  -Dmaven.repo.local=${env.WORKSPACE} [...]
               }
               archiveArtifacts 'testrepo/.m2/**'
           }
diff --git a/buildscripts/conveniences/Jenkinsfile-maven-release110.groovy b/buildscripts/conveniences/Jenkinsfile-maven-release110.groovy
index e923a48..6b2b790 100644
--- a/buildscripts/conveniences/Jenkinsfile-maven-release110.groovy
+++ b/buildscripts/conveniences/Jenkinsfile-maven-release110.groovy
@@ -62,7 +62,7 @@ pipeline {
               script {
                         sh "mvn org.netbeans.maven:nb-repository-plugin:1.4-SNAPSHOT:download -DnexusIndexDirectory=${env.WORKSPACE}/repoindex -Dmaven.repo.local=${env.WORKSPACE}/.repository -DrepositoryUrl=https://repo.maven.apache.org/maven2"
                         sh 'mkdir -p testrepo/.m2'
-                        sh "mvn org.netbeans.maven:nb-repository-plugin:1.4-SNAPSHOT:populate -DnexusIndexDirectory=${env.WORKSPACE}/repoindex -DnetbeansNbmDirectory=${env.WORKSPACE}/netbeanssources/nbbuild/nbms -DnetbeansInstallDirectory=${env.WORKSPACE}/netbeanssources/nbbuild/netbeans -DnetbeansSourcesDirectory=${env.WORKSPACE}/netbeanssources/nbbuild/build/source-zips -DnebeansJavadocDirectory=${env.WORKSPACE}/netbeanssources/nbbuild/build/javadoc  -Dmaven.repo.local=${env.WORKSPACE} [...]
+                        sh "mvn org.netbeans.maven:nb-repository-plugin:1.4-SNAPSHOT:populate -DnexusIndexDirectory=${env.WORKSPACE}/repoindex -DnetbeansNbmDirectory=${env.WORKSPACE}/netbeanssources/nbbuild/nbms -DnetbeansInstallDirectory=${env.WORKSPACE}/netbeanssources/nbbuild/netbeans -DnetbeansSourcesDirectory=${env.WORKSPACE}/netbeanssources/nbbuild/build/source-zips -DnebeansJavadocDirectory=${env.WORKSPACE}/netbeanssources/nbbuild/build/javadoc  -Dmaven.repo.local=${env.WORKSPACE} [...]
               }
               archiveArtifacts 'testrepo/.m2/**'
           }
diff --git a/buildscripts/conveniences/Jenkinsfile-maven-release90.groovy b/buildscripts/conveniences/Jenkinsfile-maven-release90.groovy
index 686a7a9..5236b46 100644
--- a/buildscripts/conveniences/Jenkinsfile-maven-release90.groovy
+++ b/buildscripts/conveniences/Jenkinsfile-maven-release90.groovy
@@ -62,7 +62,7 @@ pipeline {
               script {
                         sh "mvn org.netbeans.maven:nb-repository-plugin:1.4-SNAPSHOT:download -DnexusIndexDirectory=${env.WORKSPACE}/repoindex -Dmaven.repo.local=${env.WORKSPACE}/.repository -DrepositoryUrl=https://repo.maven.apache.org/maven2"
                         sh 'mkdir -p testrepo/.m2'
-                        sh "mvn org.netbeans.maven:nb-repository-plugin:1.4-SNAPSHOT:populate -DnexusIndexDirectory=${env.WORKSPACE}/repoindex -DnetbeansNbmDirectory=${env.WORKSPACE}/netbeanssources/nbbuild/nbms -DnetbeansInstallDirectory=${env.WORKSPACE}/netbeanssources/nbbuild/netbeans -DnetbeansSourcesDirectory=${env.WORKSPACE}/netbeanssources/nbbuild/build/source-zips -DnebeansJavadocDirectory=${env.WORKSPACE}/netbeanssources/nbbuild/build/javadoc  -Dmaven.repo.local=${env.WORKSPACE} [...]
+                        sh "mvn org.netbeans.maven:nb-repository-plugin:1.4-SNAPSHOT:populate -DnexusIndexDirectory=${env.WORKSPACE}/repoindex -DnetbeansNbmDirectory=${env.WORKSPACE}/netbeanssources/nbbuild/nbms -DnetbeansInstallDirectory=${env.WORKSPACE}/netbeanssources/nbbuild/netbeans -DnetbeansSourcesDirectory=${env.WORKSPACE}/netbeanssources/nbbuild/build/source-zips -DnebeansJavadocDirectory=${env.WORKSPACE}/netbeanssources/nbbuild/build/javadoc  -Dmaven.repo.local=${env.WORKSPACE} [...]
               }
               archiveArtifacts 'testrepo/.m2/**'
           }
diff --git a/buildscripts/conveniences/generatebuildscript.sh b/buildscripts/conveniences/generatebuildscript.sh
index 538d64b..a5c088c 100644
--- a/buildscripts/conveniences/generatebuildscript.sh
+++ b/buildscripts/conveniences/generatebuildscript.sh
@@ -159,7 +159,7 @@ for arelease in releaseinfo:
   nbbuildpath = "${env.WORKSPACE}/netbeanssources/nbbuild"
   mavenbuildfile.write("                        sh "+'"'+'mvn org.netbeans.maven:nb-repository-plugin:'+arelease[6]+':download -DnexusIndexDirectory=${env.WORKSPACE}/repoindex -Dmaven.repo.local=${env.WORKSPACE}/.repository'+ ' -DrepositoryUrl=https://repo.maven.apache.org/maven2"'+"\n")
   mavenbuildfile.write("                        sh 'mkdir -p testrepo/.m2'\n")
-  mavenbuildfile.write("                        sh "+'"'+'mvn org.netbeans.maven:nb-repository-plugin:'+arelease[6]+':populate -DnexusIndexDirectory=${env.WORKSPACE}/repoindex -DnetbeansNbmDirectory='+nbbuildpath+'/nbms -DnetbeansInstallDirectory='+nbbuildpath+'/netbeans -DnetbeansSourcesDirectory='+nbbuildpath+'/build/source-zips -DnebeansJavadocDirectory='+nbbuildpath+'/build/javadoc  -Dmaven.repo.local=${env.WORKSPACE}/.repository -DparentGAV='+arelease[8]+' -DforcedVersion='+arelease [...]
+  mavenbuildfile.write("                        sh "+'"'+'mvn org.netbeans.maven:nb-repository-plugin:'+arelease[6]+':populate -DnexusIndexDirectory=${env.WORKSPACE}/repoindex -DnetbeansNbmDirectory='+nbbuildpath+'/nbms -DnetbeansInstallDirectory='+nbbuildpath+'/netbeans -DnetbeansSourcesDirectory='+nbbuildpath+'/build/source-zips -DnebeansJavadocDirectory='+nbbuildpath+'/build/javadoc  -Dmaven.repo.local=${env.WORKSPACE}/.repository -DparentGAV='+arelease[8]+' -DforcedVersion='+arelease [...]
 )
   mavenbuildfile.write("              }\n")
   mavenbuildfile.write("              archiveArtifacts 'testrepo/.m2/**'\n")


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists