[archiva-parent] branch master updated: simplify

2022-04-14 Thread olamy
This is an automated email from the ASF dual-hosted git repository.

olamy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-parent.git


The following commit(s) were added to refs/heads/master by this push:
 new d294194  simplify
d294194 is described below

commit d294194d3a012ef7cea514efd3b4fb7b8552c2c0
Author: Olivier Lamy 
AuthorDate: Thu Apr 14 21:55:01 2022 +1000

simplify

Signed-off-by: Olivier Lamy 
---
 .github/workflows/maven.yml | 8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 972cbe2..abc6a5e 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -17,13 +17,7 @@
 
 name: GitHub CI
 
-on:
-  push:
-branches:
-- master
-  pull_request:
-branches:
-- master
+on: [push, pull_request]
 
 jobs:
   build:



[archiva-parent] branch master updated: simplify pipeline

2018-12-28 Thread olamy
This is an automated email from the ASF dual-hosted git repository.

olamy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-parent.git


The following commit(s) were added to refs/heads/master by this push:
 new d14d396  simplify pipeline
d14d396 is described below

commit d14d396a57aa4bc22c312bdf7b5318133b375275
Author: olivier lamy 
AuthorDate: Sat Dec 29 14:37:33 2018 +1000

simplify pipeline

Signed-off-by: olivier lamy 
---
 Jenkinsfile | 97 -
 1 file changed, 19 insertions(+), 78 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index ccb81f6..1be4029 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,79 +1,20 @@
-LABEL = 'ubuntu'
-buildJdk = 'JDK 1.8 (latest)'
-buildMvn = 'Maven 3.5.2'
-deploySettings = 'archiva-uid-jenkins'
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
-
-pipeline {
-agent {
-label "${LABEL}"
-}
-stages {
-stage('BuildAndDeploy') {
-steps {
-timeout(20) {
-withMaven(maven: buildMvn, jdk: buildJdk,
-mavenSettingsConfig: deploySettings,
-  publisherStrategy: 'EXPLICIT',
-mavenLocalRepo: ".repository",
-options: [pipelineGraphPublisher(disabled: false)]
-)
-{
-// Run test phase / ignore test failures
-sh "mvn -B -U -e -fae clean deploy"
-}
-}
-}
-post {
-success {
-archiveArtifacts '**/target/*-site.xml,pom.xml'
-}
-failure {
-notifyBuild("Failure in BuildAndDeploy stage")
-}
-}
-}
-}
-post {
-unstable {
-notifyBuild("Unstable Build")
-}
-//always {
-//cleanWs deleteDirs: true, notFailBuild: true, patterns: 
[[pattern: '.repository', type: 'EXCLUDE'],[pattern: '.repository/**', type: 
'EXCLUDE']]
-//}
-success {
-script {
-def previousResult = currentBuild.previousBuild?.result
-if (previousResult && 
!currentBuild.resultIsWorseOrEqualTo(previousResult)) {
-notifyBuild("Fixed")
-}
-}
-}
-}
-}
-
-// Send a notification about the build status
-def notifyBuild(String buildStatus) {
-// default the value
-buildStatus = buildStatus ?: "UNKNOWN"
-
-def email = "notificati...@archiva.apache.org"
-def summary = "${env.JOB_NAME}#${env.BUILD_NUMBER} - ${buildStatus} - 
${currentBuild?.currentResult}"
-def detail = """Job: ${env.JOB_NAME} 
[#${env.BUILD_NUMBER}]
-  ${buildStatus}
-  
-Build${env.BUILD_URL}
-Console${env.BUILD_URL}console
-Test Report${env.BUILD_URL}testReport/
-  
-  """
-
-emailext(
-to: email,
-subject: summary,
-body: detail,
-mimeType: 'text/html'
-)
-}
-
-// vim: et:ts=4:sw=4:ft=groovy
+asfStandardBuild params:[cmdline:"clean deploy"]



[archiva-parent] branch master updated: simplify as we are only deploying a parent pom

2018-12-13 Thread olamy
This is an automated email from the ASF dual-hosted git repository.

olamy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-parent.git


The following commit(s) were added to refs/heads/master by this push:
 new 3449ef2  simplify as we are only deploying a parent pom
3449ef2 is described below

commit 3449ef22f3a06c4e853d47b81f5f879394d25c4f
Author: olivier lamy 
AuthorDate: Fri Dec 14 13:01:13 2018 +1000

simplify as we are only deploying a parent pom

Signed-off-by: olivier lamy 
---
 Jenkinsfile | 62 ++---
 1 file changed, 2 insertions(+), 60 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 54fcbad..ccb81f6 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,7 +1,5 @@
 LABEL = 'ubuntu'
 buildJdk = 'JDK 1.8 (latest)'
-buildJdk9 = 'JDK 1.9 (latest)'
-buildJdk10 = 'JDK 10 (latest)'
 buildMvn = 'Maven 3.5.2'
 deploySettings = 'archiva-uid-jenkins'
 
@@ -16,19 +14,14 @@ pipeline {
 timeout(20) {
 withMaven(maven: buildMvn, jdk: buildJdk,
 mavenSettingsConfig: deploySettings,
+  publisherStrategy: 'EXPLICIT',
 mavenLocalRepo: ".repository",
-options: [concordionPublisher(disabled: true), 
dependenciesFingerprintPublisher(disabled: true),
-  findbugsPublisher(disabled: true), 
artifactsPublisher(disabled: true),
-  invokerPublisher(disabled: true), 
jgivenPublisher(disabled: true),
-  junitPublisher(disabled: true, 
ignoreAttachments: false),
-  openTasksPublisher(disabled: true), 
pipelineGraphPublisher(disabled: true)]
+options: [pipelineGraphPublisher(disabled: false)]
 )
 {
 // Run test phase / ignore test failures
 sh "mvn -B -U -e -fae clean deploy"
 }
-// Report failures in the jenkins UI
-//step([$class: 'JUnitResultArchiver', testResults: 
'**/target/surefire-reports/TEST-*.xml'])
 }
 }
 post {
@@ -40,57 +33,6 @@ pipeline {
 }
 }
 }
-
-stage('OtherJdks') {
-parallel {
-stage('JDK9') {
-steps {
-ws("${env.JOB_NAME}-JDK9") {
-checkout scm
-timeout(20) {
-withMaven(maven: buildMvn, jdk: buildJdk9,
-mavenSettingsConfig: deploySettings,
-mavenLocalRepo: ".repository",
-options: 
[concordionPublisher(disabled: true), 
dependenciesFingerprintPublisher(disabled: true),
-  findbugsPublisher(disabled: 
true), artifactsPublisher(disabled: true),
-  invokerPublisher(disabled: 
true), jgivenPublisher(disabled: true),
-  junitPublisher(disabled: 
true, ignoreAttachments: false),
-  openTasksPublisher(disabled: 
true), pipelineGraphPublisher(disabled: true)]
-)
-{
-// Run test phase / ignore test 
failures
-sh "mvn -B -U -e -fae clean 
install"
-}
-}
-}
-}
-}
-stage('JDK10') {
-steps {
-ws("${env.JOB_NAME}-JDK10") {
-checkout scm
-timeout(20) {
-withMaven(maven: buildMvn, jdk: buildJdk9,
-mavenSettingsConfig: deploySettings,
-mavenLocalRepo: ".repository",
-options: 
[concordionPublisher(disabled: true), 
dependenciesFingerprintPublisher(disabled: true),
-  findbugsPublisher(disabled: 
true), artifactsPublisher(disabled: true),
-  invokerPublisher(disabled: 
true), jgivenPublisher(disabled: true),
-  junitPublisher(disabled: 
true, ignoreAttachments: false),
-  openTasksPublisher(disabled: 
true), pipelineGraphPublisher(disabled