support OCSF 1.3.0

.github/workflows/build.yml

@@ -14,17 +14,20 @@ on:
 jobs:
   setup:
     runs-on: ubuntu-20.04
+    timeout-minutes: 5
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
+        with:
+          submodules: true
       - name: Install clojure tools
         uses: DeLaGuardo/[email protected]
         with:
           lein: 2.9.8
       - name: Cache project dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.m2/repository
@@ -40,16 +43,19 @@ jobs:
           set -x
           case "${GITHUB_EVENT_NAME}" in
             #scheduled)
-            #  echo '::set-output name=matrix::{"jdk":["8","11","17","21"],"cmd":["test"]}}'
+            #  echo '::set-output name=matrix::{"jdk":["11","17","21"],"cmd":["test"]}}'
             # ;;
             *)
-              echo '::set-output name=matrix::{"jdk":["8","11","17","21"],"cmd":["test"]}}'
+              echo '::set-output name=matrix::{"jdk":["11","17","21"],"cmd":["test"]}}'
               ;;
           esac
   lint:
     runs-on: ubuntu-20.04
+    timeout-minutes: 5
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
 
       - name: Install Java
         uses: actions/setup-java@v3
@@ -70,9 +76,12 @@ jobs:
     strategy:
       matrix: ${{fromJson(needs.setup.outputs.matrix)}}
     runs-on: ubuntu-20.04
+    timeout-minutes: 5
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
+        with:
+          submodules: true
       - name: Cache project dependencies
         uses: actions/cache@v3
         with:
@@ -98,6 +107,7 @@ jobs:
           CMD: ${{ matrix.cmd }}
   all-pr-checks:
     runs-on: ubuntu-20.04
+    timeout-minutes: 5
     needs: [test, lint]
     steps:
       - run: echo "All tests pass!"

README.md

@@ -5,9 +5,18 @@ to define data types, to annotate them with domain specific
 information, and to generate artifacts such as schemas, documentation,
 validators, etc.
 
+## OCSF Schemas
+
+Flanders provides [OCSF](https://schema.ocsf.io/) schemas via `flanders.ocsf.{schema,malli}`.
+
+Supported OCSF versions:
+- [v1.3.0](https://schema.ocsf.io/1.3.0/)
+
+See `flanders.ocsf/->flanders` for translating custom schemas.
+
 ## License
 
-Copyright © 2016-2023 Cisco Systems
+Copyright © 2016-2024 Cisco Systems
 
 Distributed under the Eclipse Public License either version 1.0 or (at
 your option) any later version.

deps.edn

@@ -1,13 +1,17 @@
 {:paths ["src"]
- :deps {metosin/ring-swagger {:mvn/version "0.26.2"}
-        metosin/schema-tools {:mvn/version "0.13.1"}
-        org.clojure/clojure {:mvn/version "1.10.1"}
+ :deps {org.clojure/clojure {:mvn/version "1.12.0"}
         org.clojure/core.match {:mvn/version "1.0.0"}
-        prismatic/schema {:mvn/version "1.4.1"}}
- :aliases {:test {:extra-paths ["test"]
+        prismatic/schema {:mvn/version "1.2.0"}
+        metosin/ring-swagger {:mvn/version "1.0.0"}
+        cheshire/cheshire {:mvn/version "5.13.0"}
+        metosin/schema-tools {:mvn/version "0.12.3"}}
+ :aliases {:test {:extra-paths ["test" "test-resources"]
                   :extra-deps {;; test runner
                                io.github.cognitect-labs/test-runner {:git/tag "v0.5.1" :git/sha "dfb30dd"}
                                ;; dev deps
-                               org.clojure/test.check {:mvn/version "1.1.1"}}
+                               org.clojure/test.check {:mvn/version "1.1.1"}
+                               clj-http/clj-http {:mvn/version "3.13.0"}
+                               metosin/malli {:mvn/version "0.17.0"}}
+                  :jvm-opts ["-Dflanders-dev-time=true"]
                   :main-opts ["-m" "cognitect.test-runner"]
                   :exec-fn cognitect.test-runner.api/test}}}

project.clj

@@ -4,11 +4,10 @@
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}
   :pedantic? :abort
-  :dependencies [[org.clojure/clojure "1.11.3"]
+  :dependencies [[org.clojure/clojure "1.12.0"]
                  [org.clojure/core.match "1.0.0"]
-                 [cheshire "5.9.0"]
-
                  [prismatic/schema "1.2.0"]
+                 [cheshire "5.9.0"]
                  [metosin/ring-swagger "1.0.0"]
                  [metosin/schema-tools "0.12.3"]]
   :global-vars {*warn-on-reflection* true}
@@ -21,7 +20,11 @@
                   ["change" "version" "leiningen.release/bump-version"]
                   ["vcs" "commit"]
                   ["vcs" "push"]]
-
+  :resource-paths ["resources"]
   :profiles {:dev
-             {:dependencies [[org.clojure/test.check "1.1.1"]
-                             [metosin/malli "0.13.0"]]}})
+             {:jvm-opts ["-Dflanders-dev-time=true"]
+              :dependencies [[org.clojure/test.check "1.1.1"]
+                             [clj-http "3.13.0"]
+                             [potemkin "0.4.7"]
+                             [metosin/malli "0.17.0"]]
+              :resource-paths ["test-resources"]}})