From a8d4109ef71c33b6113cc8b90f44d1236c59ca67 Mon Sep 17 00:00:00 2001
From: Jaime Soriano Pastor <jaime.soriano@elastic.co>
Date: Thu, 11 Sep 2025 19:23:57 +0200
Subject: [PATCH 01/10] Prepare release 3.5.0

---
 .buildkite/pipeline.trigger.compliance.tests.sh     |  4 ++--
 .go-version                                         |  2 +-
 go.mod                                              |  2 +-
 spec/changelog.yml                                  | 10 +++++++---
 spec/content/kibana/spec.yml                        |  8 +++++---
 spec/integration/data_stream/fields/fields.spec.yml |  2 +-
 spec/integration/kibana/spec.yml                    |  8 +++++---
 test/packages/good_content/manifest.yml             |  2 +-
 test/packages/good_v3/manifest.yml                  |  2 +-
 9 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/.buildkite/pipeline.trigger.compliance.tests.sh b/.buildkite/pipeline.trigger.compliance.tests.sh
index b0249c2b8..079e9c034 100755
--- a/.buildkite/pipeline.trigger.compliance.tests.sh
+++ b/.buildkite/pipeline.trigger.compliance.tests.sh
@@ -28,8 +28,8 @@ steps:
 EOF
 
 # Generate each test we want to do.
-compliance_test 9.1.0-SNAPSHOT 3.4.2
-compliance_test 8.19.0-SNAPSHOT 3.4.2
+compliance_test 9.2.0-SNAPSHOT 3.5.0
+compliance_test 8.19.3 3.4.2
 compliance_test 9.0.1 3.3.5
 compliance_test 8.14.0 3.1.5
 compliance_test 8.9.0 2.7.0
diff --git a/.go-version b/.go-version
index d8c40e539..8407e2600 100644
--- a/.go-version
+++ b/.go-version
@@ -1 +1 @@
-1.23.6
+1.24.7
diff --git a/go.mod b/go.mod
index e67c05fd5..ae0acf5d2 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/elastic/package-spec/v3
 
-go 1.23.0
+go 1.24.0
 
 require (
 	github.com/Masterminds/semver/v3 v3.4.0
diff --git a/spec/changelog.yml b/spec/changelog.yml
index f7affb9e7..f2f6500b1 100644
--- a/spec/changelog.yml
+++ b/spec/changelog.yml
@@ -2,14 +2,18 @@
 ## This file documents changes in the package specification. It is NOT a package specification file.
 ## Newer entries go at the bottom of each in-development version.
 ##
-- version: 3.5.0-next
+- version: 3.6.0-next
   changes:
+    # Pending on https://github.com/elastic/kibana/pull/186974
     - description: Add support for `slo` assets.
       type: enhancement
       link: https://github.com/elastic/package-spec/pull/767
+    # Pending on https://github.com/elastic/kibana/pull/194209
     - description: Add support for semantic_text field definition.
       type: enhancement
       link: https://github.com/elastic/package-spec/pull/807
+- version: 3.5.0
+  changes:
     - description: Add `duration` variable data type with `min_duration` and `max_duration` validation properties.
       type: enhancement
       link: https://github.com/elastic/package-spec/pull/948
@@ -22,7 +26,7 @@
     - description: Add support for OTel collector configuration in input packages.
       type: enhancement
       link: https://github.com/elastic/package-spec/pull/975
-- version: 3.4.2-next
+- version: 3.4.2
   changes:
     - description: Add support for opentelemetry category.
       type: enhancement
@@ -39,7 +43,7 @@
     - description: Fix paths with slashes displayed on Windows.
       type: bugfix
       link: https://github.com/elastic/package-spec/pull/953
-    - description: Add support for lookup indices.
+    - description: Add support for lookup indices in transforms.
       type: enhancement
       link: https://github.com/elastic/package-spec/pull/936
     - description: Fix dynamic_date_formats example type in data stream manifest schema.
diff --git a/spec/content/kibana/spec.yml b/spec/content/kibana/spec.yml
index 01f49b199..7f1ad9ce9 100644
--- a/spec/content/kibana/spec.yml
+++ b/spec/content/kibana/spec.yml
@@ -57,13 +57,15 @@ spec:
       contentMediaType: "application/json"
       pattern: '^.+\.json$'
 versions:
+  - before: 3.6.0
+    patch:
+      - op: remove
+        path: "/contents/2" # remove SLO definitions
   - before: 3.5.0
     patch:
       - op: remove
-        path: "/contents/5" # remove alerting rule template definitions
+        path: "/contents/4" # remove alerting rule template definitions
   - before: 3.4.0
     patch:
       - op: remove
         path: "/contents/3" # remove AI prompt definitions
-      - op: remove
-        path: "/contents/2" # remove SLO definitions
diff --git a/spec/integration/data_stream/fields/fields.spec.yml b/spec/integration/data_stream/fields/fields.spec.yml
index d6d6b6348..d780006c9 100644
--- a/spec/integration/data_stream/fields/fields.spec.yml
+++ b/spec/integration/data_stream/fields/fields.spec.yml
@@ -612,7 +612,7 @@ spec:
 
 # JSON patches for newer versions should be placed on top
 versions:
-  - before: 3.5.0
+  - before: 3.6.0
     patch:
       - op: remove
         path: "/items/properties/type/enum/35" #remove semantic_text type
diff --git a/spec/integration/kibana/spec.yml b/spec/integration/kibana/spec.yml
index 6d1dbf3e8..43c655c1c 100644
--- a/spec/integration/kibana/spec.yml
+++ b/spec/integration/kibana/spec.yml
@@ -146,12 +146,14 @@ spec:
       contentMediaType: "application/json"
       pattern: '^.+\.json$'
 versions:
-  - before: 3.5.0
+  - before: 3.6.0
     patch:
-      - op: remove
-        path: "/contents/14" # remove alerting rule template definitions
       - op: remove
         path: "/contents/13" # remove SLO definitions
+  - before: 3.5.0
+    patch:
+      - op: remove
+        path: "/contents/13" # remove alerting rule template definitions
   - before: 2.10.0
     patch:
       - op: remove
diff --git a/test/packages/good_content/manifest.yml b/test/packages/good_content/manifest.yml
index 74778cda4..6893ca514 100644
--- a/test/packages/good_content/manifest.yml
+++ b/test/packages/good_content/manifest.yml
@@ -1,4 +1,4 @@
-format_version: 3.5.0
+format_version: 3.6.0
 name: good_content
 title: Good content package
 description: >
diff --git a/test/packages/good_v3/manifest.yml b/test/packages/good_v3/manifest.yml
index 108563d69..cde55e300 100644
--- a/test/packages/good_v3/manifest.yml
+++ b/test/packages/good_v3/manifest.yml
@@ -1,4 +1,4 @@
-format_version: 3.5.0
+format_version: 3.6.0
 name: good_v3
 title: Good package
 description: This package is good for format version 3

From 097ebfb0088bdfb94f24ac057eae578d59895a5f Mon Sep 17 00:00:00 2001
From: Jaime Soriano Pastor <jaime.soriano@elastic.co>
Date: Thu, 11 Sep 2025 19:36:20 +0200
Subject: [PATCH 02/10] Fix link, change 9.0 version for compliance tests

---
 .buildkite/pipeline.trigger.compliance.tests.sh | 2 +-
 spec/changelog.yml                              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.buildkite/pipeline.trigger.compliance.tests.sh b/.buildkite/pipeline.trigger.compliance.tests.sh
index 079e9c034..6a5331c32 100755
--- a/.buildkite/pipeline.trigger.compliance.tests.sh
+++ b/.buildkite/pipeline.trigger.compliance.tests.sh
@@ -30,7 +30,7 @@ EOF
 # Generate each test we want to do.
 compliance_test 9.2.0-SNAPSHOT 3.5.0
 compliance_test 8.19.3 3.4.2
-compliance_test 9.0.1 3.3.5
+compliance_test 9.0.6 3.3.5
 compliance_test 8.14.0 3.1.5
 compliance_test 8.9.0 2.7.0
 
diff --git a/spec/changelog.yml b/spec/changelog.yml
index f2f6500b1..b384616a9 100644
--- a/spec/changelog.yml
+++ b/spec/changelog.yml
@@ -8,7 +8,7 @@
     - description: Add support for `slo` assets.
       type: enhancement
       link: https://github.com/elastic/package-spec/pull/767
-    # Pending on https://github.com/elastic/kibana/pull/194209
+    # Pending on https://github.com/elastic/kibana/issues/220294
     - description: Add support for semantic_text field definition.
       type: enhancement
       link: https://github.com/elastic/package-spec/pull/807

From a0de3d8420baca06c862548740924a2ed73afa32 Mon Sep 17 00:00:00 2001
From: Jaime Soriano Pastor <jaime.soriano@elastic.co>
Date: Thu, 11 Sep 2025 19:43:19 +0200
Subject: [PATCH 03/10] Use older Go version in windows build

---
 .buildkite/pipeline.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 4063de961..ad29ca28e 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -35,6 +35,9 @@ steps:
       - label: ":windows: Tests on Windows"
         key: windows-test
         command: ".buildkite/scripts/run-win-tests.ps1"
+        env:
+          # Latest 1.24 version in Chocolatey.
+          GO_VERSION: 1.24.6
         agents:
           provider: "gcp"
           image: "${GO_WINDOWS_AGENT_IMAGE}"

From 17ea08deb6fb16b780b97d9cd2940edf6e5988d9 Mon Sep 17 00:00:00 2001
From: Jaime Soriano Pastor <jaime.soriano@elastic.co>
Date: Thu, 11 Sep 2025 19:47:39 +0200
Subject: [PATCH 04/10] Fix patch for AI prompt definitions

---
 spec/content/kibana/spec.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/content/kibana/spec.yml b/spec/content/kibana/spec.yml
index 7f1ad9ce9..36b9563ca 100644
--- a/spec/content/kibana/spec.yml
+++ b/spec/content/kibana/spec.yml
@@ -68,4 +68,4 @@ versions:
   - before: 3.4.0
     patch:
       - op: remove
-        path: "/contents/3" # remove AI prompt definitions
+        path: "/contents/2" # remove AI prompt definitions

From 1aaf08d69578c01321783d38170ae1022d0d3518 Mon Sep 17 00:00:00 2001
From: Jaime Soriano Pastor <jaime.soriano@elastic.co>
Date: Thu, 11 Sep 2025 20:07:01 +0200
Subject: [PATCH 05/10] Try again to solve issue with windows

---
 .buildkite/pipeline.yml | 3 ---
 .go-version             | 2 +-
 go.mod                  | 2 ++
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index ad29ca28e..4063de961 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -35,9 +35,6 @@ steps:
       - label: ":windows: Tests on Windows"
         key: windows-test
         command: ".buildkite/scripts/run-win-tests.ps1"
-        env:
-          # Latest 1.24 version in Chocolatey.
-          GO_VERSION: 1.24.6
         agents:
           provider: "gcp"
           image: "${GO_WINDOWS_AGENT_IMAGE}"
diff --git a/.go-version b/.go-version
index 8407e2600..7a429d68a 100644
--- a/.go-version
+++ b/.go-version
@@ -1 +1 @@
-1.24.7
+1.24.6
diff --git a/go.mod b/go.mod
index ae0acf5d2..09ed4a0bb 100644
--- a/go.mod
+++ b/go.mod
@@ -2,6 +2,8 @@ module github.com/elastic/package-spec/v3
 
 go 1.24.0
 
+toolchain go1.24.7
+
 require (
 	github.com/Masterminds/semver/v3 v3.4.0
 	github.com/PaesslerAG/jsonpath v0.1.1

From b2b8b1497ea677efd4d337f63a2c5aa727f4e653 Mon Sep 17 00:00:00 2001
From: Jaime Soriano Pastor <jaime.soriano@elastic.co>
Date: Thu, 11 Sep 2025 20:08:26 +0200
Subject: [PATCH 06/10] Delay compliance test for content package with SLO

---
 compliance/features/basic.feature | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compliance/features/basic.feature b/compliance/features/basic.feature
index d846f2864..f55ca3412 100644
--- a/compliance/features/basic.feature
+++ b/compliance/features/basic.feature
@@ -20,7 +20,7 @@ Feature: Basic package types support
     Then there is a dashboard "basic_content-dashboard-abc-1"
      And there is a detection rule "12cea9e9-5766-474d-a9dc-34ef7c7677c7"
 
-  @3.5.0
+  @3.6.0
   Scenario: Content package can be installed
    Given the "good_content" package is installed
      And prebuilt detection rules are loaded

From 813079228d4ca4c9f1b526b02cc31905390ec11e Mon Sep 17 00:00:00 2001
From: Jaime Soriano Pastor <jaime.soriano@elastic.co>
Date: Fri, 12 Sep 2025 16:46:17 +0200
Subject: [PATCH 07/10] Hard-code 1.24.6 only for windows

---
 .buildkite/scripts/run-win-tests.ps1 | 2 +-
 .go-version                          | 2 +-
 go.mod                               | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.buildkite/scripts/run-win-tests.ps1 b/.buildkite/scripts/run-win-tests.ps1
index efb1bc1f6..eb1428e39 100644
--- a/.buildkite/scripts/run-win-tests.ps1
+++ b/.buildkite/scripts/run-win-tests.ps1
@@ -30,7 +30,7 @@ function installGoDependencies {
 }
 
 fixCRLF
-withGolang $env:GO_VERSION
+withGolang "1.24.6" # Latest 1.24 version in Chocolatey.
 installGoDependencies
 
 $ErrorActionPreference = "Continue" # set +e
diff --git a/.go-version b/.go-version
index 7a429d68a..8407e2600 100644
--- a/.go-version
+++ b/.go-version
@@ -1 +1 @@
-1.24.6
+1.24.7
diff --git a/go.mod b/go.mod
index 09ed4a0bb..ae0acf5d2 100644
--- a/go.mod
+++ b/go.mod
@@ -2,8 +2,6 @@ module github.com/elastic/package-spec/v3
 
 go 1.24.0
 
-toolchain go1.24.7
-
 require (
 	github.com/Masterminds/semver/v3 v3.4.0
 	github.com/PaesslerAG/jsonpath v0.1.1

From afa4a7cd06e87b69c51ddb59375a0f17340c1e0c Mon Sep 17 00:00:00 2001
From: Jaime Soriano Pastor <jaime.soriano@elastic.co>
Date: Fri, 12 Sep 2025 18:16:21 +0200
Subject: [PATCH 08/10] Try again to override go version in Windows with
 environment variables

---
 .buildkite/hooks/pre-command         | 3 ++-
 .buildkite/pipeline.yml              | 3 +++
 .buildkite/scripts/run-win-tests.ps1 | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.buildkite/hooks/pre-command b/.buildkite/hooks/pre-command
index a07e843fd..2744f2dfc 100644
--- a/.buildkite/hooks/pre-command
+++ b/.buildkite/hooks/pre-command
@@ -7,5 +7,6 @@ set -euo pipefail
 # Secrets must be redacted
 # https://buildkite.com/docs/pipelines/managing-log-output#redacted-environment-variables
 
-GO_VERSION=$(cat .go-version)
+FILE_GO_VERSION=$(cat .go-version)
+GO_VERSION="${GO_VERSION:-${FILE_GO_VERSION}}"
 export GO_VERSION
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 4063de961..02c3d185f 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -35,6 +35,9 @@ steps:
       - label: ":windows: Tests on Windows"
         key: windows-test
         command: ".buildkite/scripts/run-win-tests.ps1"
+        env:
+          # Latest 1.24 version supported by Chocolatey.
+          GO_VERSION: "1.24.6"
         agents:
           provider: "gcp"
           image: "${GO_WINDOWS_AGENT_IMAGE}"
diff --git a/.buildkite/scripts/run-win-tests.ps1 b/.buildkite/scripts/run-win-tests.ps1
index eb1428e39..efb1bc1f6 100644
--- a/.buildkite/scripts/run-win-tests.ps1
+++ b/.buildkite/scripts/run-win-tests.ps1
@@ -30,7 +30,7 @@ function installGoDependencies {
 }
 
 fixCRLF
-withGolang "1.24.6" # Latest 1.24 version in Chocolatey.
+withGolang $env:GO_VERSION
 installGoDependencies
 
 $ErrorActionPreference = "Continue" # set +e

From c4a75365a9e551a097d4a2d52e9f2de32e9de976 Mon Sep 17 00:00:00 2001
From: Jaime Soriano Pastor <jaime.soriano@elastic.co>
Date: Fri, 12 Sep 2025 18:24:17 +0200
Subject: [PATCH 09/10] Revert "Try again to override go version in Windows
 with environment variables"

This reverts commit afa4a7cd06e87b69c51ddb59375a0f17340c1e0c.
---
 .buildkite/hooks/pre-command         | 3 +--
 .buildkite/pipeline.yml              | 3 ---
 .buildkite/scripts/run-win-tests.ps1 | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/.buildkite/hooks/pre-command b/.buildkite/hooks/pre-command
index 2744f2dfc..a07e843fd 100644
--- a/.buildkite/hooks/pre-command
+++ b/.buildkite/hooks/pre-command
@@ -7,6 +7,5 @@ set -euo pipefail
 # Secrets must be redacted
 # https://buildkite.com/docs/pipelines/managing-log-output#redacted-environment-variables
 
-FILE_GO_VERSION=$(cat .go-version)
-GO_VERSION="${GO_VERSION:-${FILE_GO_VERSION}}"
+GO_VERSION=$(cat .go-version)
 export GO_VERSION
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 02c3d185f..4063de961 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -35,9 +35,6 @@ steps:
       - label: ":windows: Tests on Windows"
         key: windows-test
         command: ".buildkite/scripts/run-win-tests.ps1"
-        env:
-          # Latest 1.24 version supported by Chocolatey.
-          GO_VERSION: "1.24.6"
         agents:
           provider: "gcp"
           image: "${GO_WINDOWS_AGENT_IMAGE}"
diff --git a/.buildkite/scripts/run-win-tests.ps1 b/.buildkite/scripts/run-win-tests.ps1
index efb1bc1f6..eb1428e39 100644
--- a/.buildkite/scripts/run-win-tests.ps1
+++ b/.buildkite/scripts/run-win-tests.ps1
@@ -30,7 +30,7 @@ function installGoDependencies {
 }
 
 fixCRLF
-withGolang $env:GO_VERSION
+withGolang "1.24.6" # Latest 1.24 version in Chocolatey.
 installGoDependencies
 
 $ErrorActionPreference = "Continue" # set +e

From 4d9ed7222ff7d27aa19d6e0b48b78485c0ef0684 Mon Sep 17 00:00:00 2001
From: Jaime Soriano Pastor <jaime.soriano@elastic.co>
Date: Fri, 12 Sep 2025 18:34:48 +0200
Subject: [PATCH 10/10] Try yet another time to override go version in Windows
 with environment variables

---
 .buildkite/hooks/post-checkout       | 4 +++-
 .buildkite/hooks/pre-command         | 3 ++-
 .buildkite/pipeline.yml              | 3 +++
 .buildkite/scripts/run-win-tests.ps1 | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.buildkite/hooks/post-checkout b/.buildkite/hooks/post-checkout
index 3ad8382c7..1a33d1015 100644
--- a/.buildkite/hooks/post-checkout
+++ b/.buildkite/hooks/post-checkout
@@ -32,7 +32,9 @@ checkout_merge() {
     }
 }
 
-export GO_VERSION="$(< .go-version)"
+FILE_GO_VERSION=$(cat .go-version)
+GO_VERSION="${GO_VERSION:-${FILE_GO_VERSION}}"
+export GO_VERSION
 pull_request="${BUILDKITE_PULL_REQUEST:-false}"
 
 if [[ "${pull_request}" == "false" ]]; then
diff --git a/.buildkite/hooks/pre-command b/.buildkite/hooks/pre-command
index a07e843fd..2744f2dfc 100644
--- a/.buildkite/hooks/pre-command
+++ b/.buildkite/hooks/pre-command
@@ -7,5 +7,6 @@ set -euo pipefail
 # Secrets must be redacted
 # https://buildkite.com/docs/pipelines/managing-log-output#redacted-environment-variables
 
-GO_VERSION=$(cat .go-version)
+FILE_GO_VERSION=$(cat .go-version)
+GO_VERSION="${GO_VERSION:-${FILE_GO_VERSION}}"
 export GO_VERSION
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 4063de961..02c3d185f 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -35,6 +35,9 @@ steps:
       - label: ":windows: Tests on Windows"
         key: windows-test
         command: ".buildkite/scripts/run-win-tests.ps1"
+        env:
+          # Latest 1.24 version supported by Chocolatey.
+          GO_VERSION: "1.24.6"
         agents:
           provider: "gcp"
           image: "${GO_WINDOWS_AGENT_IMAGE}"
diff --git a/.buildkite/scripts/run-win-tests.ps1 b/.buildkite/scripts/run-win-tests.ps1
index eb1428e39..efb1bc1f6 100644
--- a/.buildkite/scripts/run-win-tests.ps1
+++ b/.buildkite/scripts/run-win-tests.ps1
@@ -30,7 +30,7 @@ function installGoDependencies {
 }
 
 fixCRLF
-withGolang "1.24.6" # Latest 1.24 version in Chocolatey.
+withGolang $env:GO_VERSION
 installGoDependencies
 
 $ErrorActionPreference = "Continue" # set +e