From 29389e380baf02e538bebaca9e20c968fd173f27 Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Mon, 30 Mar 2026 11:32:59 +0200
Subject: [PATCH 1/2] ci: update Jenkinsfile branch guards from struts-6-7-x to
 struts-6-8-x

The Build Source & JavaDoc, Deploy Snapshot, and Upload nightlies stages
still referenced release/struts-6-7-x in their when conditions, causing
them to be skipped on every release/struts-6-8-x build. This prevented
6.9.0-SNAPSHOT artifacts from being published to nightlies.

Made-with: Cursor
---
 Jenkinsfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 6c8efef0e2..0e27dd3e73 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -145,7 +145,7 @@ pipeline {
         }
         stage('Build Source & JavaDoc') {
           when {
-            branch 'release/struts-6-7-x'
+            branch 'release/struts-6-8-x'
           }
           steps {
             dir("local-snapshots-dir/") {
@@ -156,7 +156,7 @@ pipeline {
         }
         stage('Deploy Snapshot') {
           when {
-            branch 'release/struts-6-7-x'
+            branch 'release/struts-6-8-x'
           }
           steps {
             withCredentials([file(credentialsId: 'lukaszlenart-repository-access-token', variable: 'CUSTOM_SETTINGS')]) {
@@ -166,7 +166,7 @@ pipeline {
         }
         stage('Upload nightlies') {
           when {
-            branch 'release/struts-6-7-x'
+            branch 'release/struts-6-8-x'
           }
           steps {
             sh './mvnw -B package -DskipTests'

From 85464cc7881cc1bf899bfd338209949013baf8dc Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Mon, 30 Mar 2026 11:40:23 +0200
Subject: [PATCH 2/2] chore: add .metals, .bloop, and .vscode to .gitignore

Made-with: Cursor
---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 4105b54628..c658b6fce0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,3 +49,6 @@ test-output/
 
 # Claude Code specific local settings
 .claude/
+.metals/
+.bloop/
+.vscode/