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/netbeans-jenkins-lib.git


The following commit(s) were added to refs/heads/master by this push:
     new 4c4be07  use 1.6 of plugin
4c4be07 is described below

commit 4c4be078178fe636483b44e8168e99e313657d1e
Author: Eric Barboni <[email protected]>
AuthorDate: Mon Mar 16 10:08:26 2020 +0100

    use 1.6 of plugin
---
 vars/asfMainNetBeansBuild.groovy | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/vars/asfMainNetBeansBuild.groovy b/vars/asfMainNetBeansBuild.groovy
index 009045e..43b4d39 100644
--- a/vars/asfMainNetBeansBuild.groovy
+++ b/vars/asfMainNetBeansBuild.groovy
@@ -157,10 +157,10 @@ def call(Map params = [:]) {
                                     sh "rm -rf ${env.WORKSPACE}/.repository"
                                     
withMaven(maven:tooling.myMaven,jdk:tooling.jdktool,publisherStrategy: 
'EXPLICIT',mavenLocalRepo: localRepo)
                                     {
-                                        sh "mvn 
org.apache.maven.plugins:maven-dependency-plugin:3.1.1:get 
-Dartifact=org.apache.netbeans.utilities:nb-repository-plugin:1.6-SNAPSHOT 
-DremoteRepositories=apache.snapshots.https::::https://repository.apache.org/snapshots";
+                                        //sh "mvn 
org.apache.maven.plugins:maven-dependency-plugin:3.1.1:get 
-Dartifact=org.apache.netbeans.utilities:nb-repository-plugin:1.6-SNAPSHOT 
-DremoteRepositories=apache.snapshots.https::::https://repository.apache.org/snapshots";
                                     
                                         //sh "mvn 
org.apache.netbeans.utilities:nb-repository-plugin:1.5:download 
-DnexusIndexDirectory=${env.WORKSPACE}/repoindex 
-DrepositoryUrl=https://repo.maven.apache.org/maven2";
-                                        sh "mvn 
org.apache.netbeans.utilities:nb-repository-plugin:1.6-SNAPSHOT:populate 
${commonparam} -DnetbeansNbmDirectory=${netbeansbase}/nbms 
-DnetbeansInstallDirectory=${netbeansbase}/netbeans 
-DnetbeansSourcesDirectory=${netbeansbase}/build/source-zips 
-DnetbeansJavadocDirectory=${netbeansbase}/build/javadoc 
-DparentGAV=org.apache.netbeans:netbeans-parent:2 
-DforcedVersion=${mavenVersion} -DskipInstall=true 
-DdeployId=apache.snapshots.https -Ddeplo [...]
+                                        sh "mvn 
org.apache.netbeans.utilities:nb-repository-plugin:1.6:populate ${commonparam} 
-DnetbeansNbmDirectory=${netbeansbase}/nbms 
-DnetbeansInstallDirectory=${netbeansbase}/netbeans 
-DnetbeansSourcesDirectory=${netbeansbase}/build/source-zips 
-DnetbeansJavadocDirectory=${netbeansbase}/build/javadoc 
-DparentGAV=org.apache.netbeans:netbeans-parent:2 
-DforcedVersion=${mavenVersion} -DskipInstall=true 
-DdeployId=apache.snapshots.https -DdeployUrl=http [...]
                                     }                         
                                 }
                             }
@@ -351,10 +351,10 @@ def doParallelClusters(cconfigs) {
                                         
                                 
withMaven(maven:tooling.myMaven,jdk:tooling.jdktool,publisherStrategy: 
'EXPLICIT',mavenLocalRepo: localRepo,options:[artifactsPublisher(disabled: 
true)])
                                 {
-                                    sh "mvn 
org.apache.maven.plugins:maven-dependency-plugin:3.1.1:get 
-Dartifact=org.apache.netbeans.utilities:nb-repository-plugin:1.6-SNAPSHOT 
-Dmaven.repo.local=${env.WORKSPACE}/.repository 
-DremoteRepositories=apache.snapshots.https::::https://repository.apache.org/snapshots";
+                                    //sh "mvn 
org.apache.maven.plugins:maven-dependency-plugin:3.1.1:get 
-Dartifact=org.apache.netbeans.utilities:nb-repository-plugin:1.6-SNAPSHOT 
-Dmaven.repo.local=${env.WORKSPACE}/.repository 
-DremoteRepositories=apache.snapshots.https::::https://repository.apache.org/snapshots";
                                     def commonparam = 
"-Dexternallist=${netbeansbase}/build/external.info"
                                     //sh "mvn 
org.apache.netbeans.utilities:nb-repository-plugin:1.5:download ${commonparam} 
-DrepositoryUrl=https://repo.maven.apache.org/maven2";
-                                    sh "mvn 
org.apache.netbeans.utilities:nb-repository-plugin:1.6-SNAPSHOT:populate 
${commonparam} -DnetbeansNbmDirectory=${netbeansbase}/nbms 
-DnetbeansInstallDirectory=${netbeansbase}/netbeans 
-DnetbeansSourcesDirectory=${netbeansbase}/build/source-zips 
-DnetbeansJavadocDirectory=${netbeansbase}/build/javadoc 
-DparentGAV=org.apache.netbeans:netbeans-parent:2 
-DforcedVersion=${mavenVersion} -DskipInstall=true 
-DdeployUrl=file://${env.WORKSPACE}/mavenrepository"
+                                    sh "mvn 
org.apache.netbeans.utilities:nb-repository-plugin:1.6:populate ${commonparam} 
-DnetbeansNbmDirectory=${netbeansbase}/nbms 
-DnetbeansInstallDirectory=${netbeansbase}/netbeans 
-DnetbeansSourcesDirectory=${netbeansbase}/build/source-zips 
-DnetbeansJavadocDirectory=${netbeansbase}/build/javadoc 
-DparentGAV=org.apache.netbeans:netbeans-parent:2 
-DforcedVersion=${mavenVersion} -DskipInstall=true 
-DdeployUrl=file://${env.WORKSPACE}/mavenrepository"
                                 }                            
                                 archiveArtifacts 'mavenrepository/**'
                                                    


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

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

Reply via email to