You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2022/08/03 08:29:20 UTC
[karaf] branch karaf-4.3.x updated: [KARAF-7508] Upgrade to Pax Web 7.3.26
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch karaf-4.3.x
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/karaf-4.3.x by this push:
new 62ebc20609 [KARAF-7508] Upgrade to Pax Web 7.3.26
new b4d504ea10 Merge pull request #1607 from jbonofre/KARAF-7508
62ebc20609 is described below
commit 62ebc20609ee2fc02c72fbeb080f09f3da653c98
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Mon Aug 1 09:56:42 2022 +0200
[KARAF-7508] Upgrade to Pax Web 7.3.26
---
Jenkinsfile | 17 ++++-------------
.../features/standard/src/main/feature/feature.xml | 2 +-
pom.xml | 2 +-
3 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 2da7880463..99ce976ffe 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -89,19 +89,10 @@ pipeline {
}
}
- stage('Code Quality') {
- steps {
- echo 'Checking Code Quality on SonarCloud'
- withCredentials([string(credentialsId: 'sonarcloud-key-apache-karaf', variable: 'SONAR_TOKEN')]) {
- sh 'mvn sonar:sonar -Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=apache -Dsonar.projectKey=apache_karaf -Dsonar.branch.name=${BRANCH_NAME} -Dsonar.login=${SONAR_TOKEN}'
- }
- }
- }
-
stage('Deploy') {
when {
expression {
- env.BRANCH_NAME ==~ /(karaf-4.2.x|main)/
+ env.BRANCH_NAME ==~ /(karaf-4.2.x|karaf-4.3.x|main)/
}
}
steps {
@@ -116,7 +107,7 @@ pipeline {
// If this build failed, send an email to the list.
failure {
script {
- if(env.BRANCH_NAME == "karaf-4.2.x" || env.BRANCH_NAME == "main") {
+ if(env.BRANCH_NAME == "karaf-4.2.x" || env.BRANCH_NAME == "karaf-4.3.x" || env.BRANCH_NAME == "main") {
emailext(
subject: "[BUILD-FAILURE]: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]'",
body: """
@@ -133,7 +124,7 @@ Check console output at "<a href="${env.BUILD_URL}">${env.JOB_NAME} [${env.BRANC
// If this build didn't fail, but there were failing tests, send an email to the list.
unstable {
script {
- if(env.BRANCH_NAME == "karaf-4.2.x" || env.BRANCH_NAME == "main") {
+ if(env.BRANCH_NAME == "karaf-4.2.x" || env.BRANCH_NAME == "karaf-4.3.x" || env.BRANCH_NAME == "main") {
emailext(
subject: "[BUILD-UNSTABLE]: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]'",
body: """
@@ -153,7 +144,7 @@ Check console output at "<a href="${env.BUILD_URL}">${env.JOB_NAME} [${env.BRANC
// (in this cae we probably don't have to do any post-build analysis)
deleteDir()
script {
- if ((env.BRANCH_NAME == "karaf-4.2.x" || env.BRANCH_NAME == "main") && (currentBuild.previousBuild != null) && (currentBuild.previousBuild.result != 'SUCCESS')) {
+ if ((env.BRANCH_NAME == "karaf-4.2.x" || env.BRANCH_NAME == "karaf-4.3.x" || env.BRANCH_NAME == "main") && (currentBuild.previousBuild != null) && (currentBuild.previousBuild.result != 'SUCCESS')) {
emailext (
subject: "[BUILD-STABLE]: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]'",
body: """
diff --git a/assemblies/features/standard/src/main/feature/feature.xml b/assemblies/features/standard/src/main/feature/feature.xml
index e16f7c9912..29903a9570 100644
--- a/assemblies/features/standard/src/main/feature/feature.xml
+++ b/assemblies/features/standard/src/main/feature/feature.xml
@@ -896,7 +896,7 @@ org.osgi.service.http.port=8181
<feature>pax-web-war</feature>
</feature>
- <feature name="jetty" description="Transition feature for backward compatibility" version="9.4.46.v20220331">
+ <feature name="jetty" description="Transition feature for backward compatibility" version="9.4.48.v20220622">
<feature>pax-jetty</feature>
</feature>
diff --git a/pom.xml b/pom.xml
index de6f73aeea..b6d94c8f29 100644
--- a/pom.xml
+++ b/pom.xml
@@ -298,7 +298,7 @@
<pax.base.version>1.5.1</pax.base.version>
<pax.swissbox.version>1.8.5</pax.swissbox.version>
<pax.url.version>2.6.11</pax.url.version>
- <pax.web.version>7.3.25</pax.web.version>
+ <pax.web.version>7.3.26</pax.web.version>
<pax.tinybundle.version>3.0.0</pax.tinybundle.version>
<pax.jdbc.version>1.5.3</pax.jdbc.version>
<pax.jms.version>1.1.0</pax.jms.version>