Merge branch 'jetty-10.0.x' into jetty-11.0.x

jetty · Sep 7, 2024 · d6b7d63 · d6b7d63
2 parents cafd30e + 4a56ab2
commit d6b7d63
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -78,6 +78,10 @@ pipeline {
     }
     fixed {
       slackNotif()
+      websiteBuild()
+    }
+    success {
+      websiteBuild()
     }
   }
 }
@@ -128,4 +132,17 @@ def mavenBuild(jdk, cmdline, mvnName) {
   }
 }
 
+def websiteBuild() {
+  script {
+    try {
+      if (env.BRANCH_NAME == 'jetty-10.0.x' || env.BRANCH_NAME == 'jetty-11.0.x' || env.BRANCH_NAME == 'jetty-12.0.x') {
+        build(job: 'website/jetty.website/main', propagate: false, wait: false)
+      }
+    } catch (Exception e) {
+      e.printStackTrace()
+      echo "skip website build triggering: " + e.getMessage()
+    }
+  }
+}
+
 // vim: et:ts=2:sw=2:ft=groovy
diff --git a/jetty-gcloud/pom.xml b/jetty-gcloud/pom.xml
@@ -17,7 +17,7 @@
   </modules>
 
   <properties>
-    <gcloud.version>2.20.2</gcloud.version>
+    <gcloud.version>2.21.2</gcloud.version>
   </properties>
 
 </project>
diff --git a/pom.xml b/pom.xml
@@ -218,9 +218,9 @@
     <felix.version>7.0.5</felix.version>
     <findbugs.jsr305.version>3.0.2</findbugs.jsr305.version>
     <flatten.maven.plugin.version>1.6.0</flatten.maven.plugin.version>
-    <google.errorprone.version>2.29.2</google.errorprone.version>
+    <google.errorprone.version>2.30.0</google.errorprone.version>
     <groovy.version>4.0.6</groovy.version>
-    <grpc.version>1.65.1</grpc.version>
+    <grpc.version>1.66.0</grpc.version>
     <gson.version>2.11.0</gson.version>
     <guava.version>33.2.1-jre</guava.version>
     <guice.version>5.1.0</guice.version>
@@ -349,7 +349,7 @@
     <versions.maven.plugin.version>2.17.1</versions.maven.plugin.version>
     <weld.version>4.0.3.Final</weld.version>
     <wildfly.common.version>1.7.0.Final</wildfly.common.version>
-    <wildfly.elytron.version>2.5.0.Final</wildfly.elytron.version>
+    <wildfly.elytron.version>2.5.2.Final</wildfly.elytron.version>
     <xmemcached.version>2.4.8</xmemcached.version>
   </properties>