You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by sk...@apache.org on 2018/12/01 11:24:34 UTC
[incubator-netbeans-mavenutils] 02/02: merge conflict
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/incubator-netbeans-mavenutils.git
commit c84a4bde0ec9380979abb4b07c52dfe10e80309a
Merge: 0ec09b4 6c92b51
Author: Eric Barboni <sk...@apache.org>
AuthorDate: Sat Dec 1 12:24:39 2018 +0100
merge conflict
.gitignore | 4 +-
Jenkinsfile-site.groovy | 30 +-
nb-repository-plugin/src/site/site.xml | 7 +-
nbm-maven-plugin/src/site/site.xml | 7 +-
.../src/site/site.xml | 22 +-
parent/pom.xml | 2 +-
{nb-repository-plugin => parent}/src/site/site.xml | 20 +-
webskin/pom.xml | 35 ++
webskin/src/main/resources/META-INF/maven/site.vm | 115 +++++++
webskin/src/main/resources/css/netbeans.css | 1 +
.../src/main/resources/images/apache-netbeans.svg | 36 ++
.../main/resources/images/apache-netbeansx1024.png | Bin 0 -> 63751 bytes
.../src/main/resources/images/asf_logo_wide.svg | 138 ++++++++
.../main/resources/images/hero-background-2.jpg | Bin 0 -> 107721 bytes
.../src/main/resources/images/hero-background.jpg | Bin 0 -> 91705 bytes
.../images/incubator_feather_egg_logo_bw_crop.png | Bin 0 -> 56218 bytes
.../images/incubator_feather_egg_logo_sm.png | Bin 0 -> 17961 bytes
webskin/src/main/resources/images/nblogo32x32.png | Bin 0 -> 1561 bytes
webskin/src/main/resources/images/nblogo48x48.png | Bin 0 -> 2118 bytes
webskin/src/main/resources/images/nblogo64x64.png | Bin 0 -> 2661 bytes
webskin/src/main/resources/images/nblogo96x96.png | Bin 0 -> 4532 bytes
.../resources/images/touch-icon-ipad-retina.png | Bin 0 -> 7763 bytes
.../src/main/resources/images/touch-icon-ipad.png | Bin 0 -> 6810 bytes
.../resources/images/touch-icon-iphone-retina.png | Bin 0 -> 8074 bytes
webskin/src/main/resources/js/netbeans.js | 29 ++
.../src/main/resources/js/vendor/foundation.min.js | 5 +
.../main/resources/js/vendor/jquery-3.2.1.min.js | 4 +
.../resources/js/vendor/jquery.colorbox-min.js | 6 +
webskin/src/main/resources/js/vendor/what-input.js | 361 +++++++++++++++++++++
29 files changed, 787 insertions(+), 35 deletions(-)
diff --cc Jenkinsfile-site.groovy
index e6a90cc,6001430..2d2db9c
--- a/Jenkinsfile-site.groovy
+++ b/Jenkinsfile-site.groovy
@@@ -21,21 -21,50 +21,47 @@@ pipeline
agent none
tools {
maven 'Maven 3.3.9'
- jdk 'jdk8'
+ jdk 'JDK 1.8 (latest)'
}
- //label 'git-websites'
stages {
stage('SCM operation'){
- agent {label 'git-websites'}
+ agent {label 'ubuntu'}
steps {
checkout([$class: 'GitSCM', branches: [[name: '*/master']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'CloneOption', noTags: true, reference: '', shallow: true], [$class: 'MessageExclusion', excludedMessage: 'Automated site publishing.*'], [$class: 'RelativeTargetDirectory', relativeTargetDir: 'master-branch']], submoduleCfg: [], userRemoteConfigs: [[url: 'https://github.com/apache/incubator-netbeans-mavenutils/']]])
- sh 'rm -rf asf-site-branch'
- //sh 'mkdir asf-site-branch'
- checkout([$class: 'GitSCM', branches: [[name: '*/asf-site']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'MessageExclusion', excludedMessage: 'Automated site publishing.*'], [$class: 'RelativeTargetDirectory', relativeTargetDir: 'asf-site-branch']], submoduleCfg: [], userRemoteConfigs: [[credentialsId: '9b041bd0-aea9-4498-a576-9eeb771411dd', url: 'https://gitbox.apache.org/repos/asf//incubator-netbeans-mavenutils/']]])
+ sh 'rm -rf stagedsite'
}
}
+ stage('Prepare Publish Site'){
+ agent {label 'git-websites'}
+ steps {
+ dir('asf-site-branch') {
+ echo 'Adding content...'
+ sshagent (credentials: ['9b041bd0-aea9-4498-a576-9eeb771411dd']) {
+ sh 'git checkout asf-site'
+ sh 'git fetch origin asf-site'
+ sh 'git pull origin asf-site'
+ // remove mavenutils git will see what change later
+ sh 'rm -rf content/mavenutils/'
+ sh 'mkdir -p content/mavenutils'
+ }
+ }
+ }
+ }
stage('Build Site'){
- agent {label 'git-websites'}
+ agent {label 'ubuntu'}
steps {
-
+ // build site skin
+ script {
+ def mvnfoldersforsite = ['parent','webskin']
+ def BASEDIR = pwd()
+ for (String mvnproject in mvnfoldersforsite) {
+ dir('master-branch/'+mvnproject) {
+ sh "mvn clean install -Dmaven.repo.local=${BASEDIR}/.repository"
+ }
+ }
+ }
+ // build site
script {
def mvnfoldersforsite = ['parent','nbm-shared','nb-repository-plugin',/*'nbm-maven-harness',*/ 'nbm-maven-plugin']
def BASEDIR = pwd()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists