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 8df9885 try new plugin
8df9885 is described below
commit 8df9885d6cd44a495f9d3c980250a64dfeb8c5c7
Author: Eric Barboni <[email protected]>
AuthorDate: Fri Mar 20 11:08:14 2020 +0100
try new plugin
---
vars/asfMainNetBeansBuild.groovy | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/vars/asfMainNetBeansBuild.groovy b/vars/asfMainNetBeansBuild.groovy
index 43b4d39..a428ef8 100644
--- a/vars/asfMainNetBeansBuild.groovy
+++ b/vars/asfMainNetBeansBuild.groovy
@@ -43,7 +43,8 @@ def vote=""
def mavenVersion=""
@groovy.transform.Field
def tooling=[:]
-
[email protected]
+def repopluginversion="1.6-SNAPSHOT"
def call(Map params = [:]) {
// variable needed for apidoc
@@ -157,10 +158,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:${repopluginversion}
-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: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 [...]
+ 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
-DdeployId=apache.snapshots.https [...]
}
}
}
@@ -351,10 +352,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:${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: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"
+ 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 [...]
}
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
