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 7e4d1f7 try new parameter
new d389b69 Merge pull request #11 from ebarboni/useexternal
7e4d1f7 is described below
commit 7e4d1f7f65006f082bbe27a5a3e88ff9eb3d837c
Author: Eric Barboni <sk...@apache.org>
AuthorDate: Sat Mar 7 23:50:28 2020 +0100
try new parameter
---
vars/asfMainNetBeansBuild.groovy | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/vars/asfMainNetBeansBuild.groovy b/vars/asfMainNetBeansBuild.groovy
index 6588675..ae81f80 100644
--- a/vars/asfMainNetBeansBuild.groovy
+++ b/vars/asfMainNetBeansBuild.groovy
@@ -133,17 +133,21 @@ def call(Map params = [:]) {
if (env.BRANCH_NAME=="master") {
// on master we build apidoc + populating
snapshot repository
// should be on line for each otherwise
cluster are wrong
+ sh "ant download-all-extbins"
sh "ant build-nbms"
sh "ant build-source-zips"
sh "ant build-javadoc
-Djavadoc.web.zip=${env.WORKSPACE}/WEBZIP.zip"
- sh "rm -rf ${env.WORKSPACE}/repoindex/"
+ //sh "rm -rf ${env.WORKSPACE}/repoindex/"
sh "rm -rf ${env.WORKSPACE}/.repository"
def localRepo = "${env.WORKSPACE}/.repository"
+ def netbeansbase = "nbbuild"
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.5-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.5:populate
-DnexusIndexDirectory=${env.WORKSPACE}/repoindex
-DnetbeansNbmDirectory=${env.WORKSPACE}/nbbuild/nbms
-DnetbeansInstallDirectory=${env.WORKSPACE}/nbbuild/netbeans
-DnetbeansSourcesDirectory=${env.WORKSPACE}/nbbuild/build/source-zips
-DnetbeansJavadocDirectory=${env.WORKSPACE}/nbbuild/build/javadoc
-DparentGAV=org.apache.netbeans:netbeans-parent:2
-DforcedVersion=${mavenVersion} -Ds [...]
+ 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";
+ def commonparam =
"-Dexternallist=${netbeansbase}/build/external.info"
+
+ //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 -DdeployUrl [...]
}
archiveArtifacts 'WEBZIP.zip'
} else if (month !='Invalid') {
@@ -271,13 +275,14 @@ def doParallelClusters(cconfigs) {
def localRepo = ".repository"
def netbeansbase =
"build-${clustername}-temp/nbbuild"
+ sh "ant -f build-${clustername}-temp/build.xml
download-all-extbins"
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.5-SNAPSHOT
-Dmaven.repo.local=${env.WORKSPACE}/.repository
-DremoteRepositories=apache.snapshots.https::::https://repository.apache.org/snapshots";
- def commonparam =
"-DnexusIndexDirectory=repoindex -Dmaven.repo.local=.repository"
- 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.5: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.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"
}
archiveArtifacts 'mavenrepository/**'
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
