neilcsmith-net commented on code in PR #73:
URL: 
https://github.com/apache/netbeans-jenkins-lib/pull/73#discussion_r1011728419


##########
vars/asfMainNetBeansBuild.groovy:
##########
@@ -392,23 +396,26 @@ def doParallelClusters(cconfigs) {
                                 // apidoc
                                 
publishToNightlies("/netbeans/apidocs/${env.BRANCH_NAME}","**/WEBZIP.zip")
                                 
-                                archiveArtifacts 'WEBZIP.zip'
+                                archiveArtifacts 'WEBZIP.zip' // XXX REMOVE
                                 junit testResults: 
"build-${clustername}-temp/nbbuild/build/javadoc/checklinks-errors.xml", 
allowEmptyResults:true
                                 def localRepo = ".repository"
                                 def netbeansbase = 
"build-${clustername}-temp/nbbuild"
                                 sh "ant -f build-${clustername}-temp/build.xml 
getallmavencoordinates -Dmetabuild.branch=${branch}"
                                 
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";
-                                   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:3 
-DforcedVersion=${mavenVersion} -DskipInstall=true 
-DdeployUrl=file://${env.WORKSPACE}/mavenrepository"
-                                      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/"
+                                    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";
+                                    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:3 
-DforcedVersion=${mavenVersion} -DskipInstall=true 
-DdeployUrl=file://${env.WORKSPACE}/mavenrepository"
+                                        zip 
zipFile:'mavenrepo.zip',dir:'mavenrepository',archive:'false'
+                                        //archiveArtifacts 'mavenrepository/**'
+                                        
publishToNightlies("/netbeans/candidate/mavenrepository","mavenrepo.zip")
+                                    }    
+                                    // 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/"

Review Comment:
   Isn't that line needed to archive vsix on build?



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]


---------------------------------------------------------------------
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