From 21d88a777a384cd3f14de81b0cd7802cefc8f3ef Mon Sep 17 00:00:00 2001 From: Ambrose Bonnaire-Sergeant Date: Thu, 23 Jan 2025 10:44:54 -0600 Subject: [PATCH 1/6] prepare 1.1.0 release --- CHANGES.md | 4 ++++ project.clj | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index fb44a077..0b680210 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,9 @@ # NEXT +# 1.1.0 - 23rd January 2025 + +- add OCSF schema support + # 1.0.2 - 16th July 2024 - fix string escaping when generating markdown diff --git a/project.clj b/project.clj index 346893c2..dc402953 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject threatgrid/flanders "1.0.3-SNAPSHOT" +(defproject threatgrid/flanders "1.1.0-SNAPSHOT" :description "flanders" :url "http://github.com/threatgrid/flanders" :license {:name "Eclipse Public License" From 6a92139897f167d840832bb73a661a811c225c5e Mon Sep 17 00:00:00 2001 From: Ambrose Bonnaire-Sergeant Date: Thu, 23 Jan 2025 10:47:00 -0600 Subject: [PATCH 2/6] Version 1.1.0 --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index dc402953..82726cab 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject threatgrid/flanders "1.1.0-SNAPSHOT" +(defproject threatgrid/flanders "1.1.0" :description "flanders" :url "http://github.com/threatgrid/flanders" :license {:name "Eclipse Public License" From 1e40c25b4569f700493bd77b50c4caa57470e22c Mon Sep 17 00:00:00 2001 From: Ambrose Bonnaire-Sergeant Date: Thu, 23 Jan 2025 10:47:10 -0600 Subject: [PATCH 3/6] Version 1.1.1-SNAPSHOT --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index 82726cab..40dba740 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject threatgrid/flanders "1.1.0" +(defproject threatgrid/flanders "1.1.1-SNAPSHOT" :description "flanders" :url "http://github.com/threatgrid/flanders" :license {:name "Eclipse Public License" From cdbd6f253302d4d1bf553b5d78a570c4f687a9e3 Mon Sep 17 00:00:00 2001 From: Ambrose Bonnaire-Sergeant Date: Thu, 23 Jan 2025 10:51:43 -0600 Subject: [PATCH 4/6] instructions --- README.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/README.md b/README.md index 8ed2a554..9cae3b86 100644 --- a/README.md +++ b/README.md @@ -139,6 +139,19 @@ of via the bulk export: (flanders.malli/->malli (ocsf/->flanders (get-in ocsf-1-3-0-export ["objects" "authorization"])))) ``` +## Releasing + +To release flanders `x.y.z`: + +1. Create a new feature branch. +2. Update `CHANGES.md` for the upcoming version. +3. Change the project.clj version to `x.y.z-SNAPSHOT`. +4. Run `lein deploy clojars` to deploy a snapshot to test your credentials. +5. If that works, run `lein release` to release a new version. +6. Open a PR for your branch. +7. You must close your PR using a merge commit, not squash. +8. Once merged, double check the git tag `x.y.z` is present. + ## License Copyright © 2016-2025 Cisco Systems From b9092a2f604aa44d55f87454405df5cab5392266 Mon Sep 17 00:00:00 2001 From: Ambrose Bonnaire-Sergeant Date: Thu, 23 Jan 2025 10:52:28 -0600 Subject: [PATCH 5/6] wording --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9cae3b86..957b27f3 100644 --- a/README.md +++ b/README.md @@ -149,7 +149,7 @@ To release flanders `x.y.z`: 4. Run `lein deploy clojars` to deploy a snapshot to test your credentials. 5. If that works, run `lein release` to release a new version. 6. Open a PR for your branch. -7. You must close your PR using a merge commit, not squash. +7. You must merge your PR using a merge commit, not squash. 8. Once merged, double check the git tag `x.y.z` is present. ## License From ea49e66e28b03d8e4ae20ac154b3a2a49d0688c2 Mon Sep 17 00:00:00 2001 From: Ambrose Bonnaire-Sergeant Date: Thu, 23 Jan 2025 10:54:33 -0600 Subject: [PATCH 6/6] instructions --- README.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 957b27f3..dd2dae8d 100644 --- a/README.md +++ b/README.md @@ -146,11 +146,12 @@ To release flanders `x.y.z`: 1. Create a new feature branch. 2. Update `CHANGES.md` for the upcoming version. 3. Change the project.clj version to `x.y.z-SNAPSHOT`. -4. Run `lein deploy clojars` to deploy a snapshot to test your credentials. -5. If that works, run `lein release` to release a new version. -6. Open a PR for your branch. -7. You must merge your PR using a merge commit, not squash. -8. Once merged, double check the git tag `x.y.z` is present. +4. Commit changes. +5. Run `lein deploy clojars` to deploy a snapshot to test your credentials. +6. If that works, run `lein release` to release a new version. +7. Open a PR for your branch. +8. You must merge your PR using a merge commit, not squash. +9. Once merged, double check the git tag `x.y.z` is present. ## License