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 684b728  revise logic
684b728 is described below

commit 684b7281f6813e32af8606f82db4862239c4fc0d
Author: Eric Barboni <[email protected]>
AuthorDate: Thu Apr 14 22:05:50 2022 +0200

    revise logic
---
 vars/asfMainNetBeansBuild.groovy | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/vars/asfMainNetBeansBuild.groovy b/vars/asfMainNetBeansBuild.groovy
index c47bee3..68acf50 100644
--- a/vars/asfMainNetBeansBuild.groovy
+++ b/vars/asfMainNetBeansBuild.groovy
@@ -369,20 +369,21 @@ def doParallelClusters(cconfigs) {
                                 def localRepo = ".repository"
                                 def netbeansbase = 
"build-${clustername}-temp/nbbuild"
                                 sh "ant -f build-${clustername}-temp/build.xml 
getallmavencoordinates -Dmetabuild.branch=${branch}"
-                                if (heavyrelease) { // skip install for vscode
                                 
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:${repopluginversion}
 -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:${repopluginversion}: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}/m [...]
-                                    
+                                   if (heavyrelease) { // skip mavenrepo for 
vscode
+                                      sh "mvn 
org.apache.netbeans.utilities:nb-repository-plugin:${repopluginversion}: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} [...]
+                                      archiveArtifacts 'mavenrepository/**'
+                                   }    
                                    // make vsix available to dist to pickup 
(only for main release) need a maven setup
                                    sh "ant -f 
build-${clustername}-temp/java/java.lsp.server build-vscode-ext 
-Dvsix.version=${vsixversion} -Dmetabuild.branch=${branch}"
                                    sh "cp -r 
build-${clustername}-temp/java/java.lsp.server/build/*.vsix dist/vsix/"
                                 }
-                                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