From 3a06b1c544f33d16d94969438bb9a9d0cff96038 Mon Sep 17 00:00:00 2001
From: Balduin Landolt <33053745+BalduinLandolt@users.noreply.github.com>
Date: Mon, 30 Sep 2024 15:01:06 +0200
Subject: [PATCH] docs: Add DSP-META to docs (#137)

---
 .gitmodules          | 3 +++
 Makefile             | 2 +-
 README.md            | 1 +
 dsp/dsp-api          | 2 +-
 dsp/dsp-app          | 2 +-
 dsp/dsp-ingest       | 2 +-
 dsp/dsp-meta         | 1 +
 dsp/dsp-tools        | 2 +-
 mkdocs.yml           | 2 +-
 release.mk           | 6 ++++--
 update-and-deploy.sh | 3 ++-
 updated-versions.sh  | 1 +
 12 files changed, 18 insertions(+), 9 deletions(-)
 create mode 160000 dsp/dsp-meta

diff --git a/.gitmodules b/.gitmodules
index bd2bc27a1..72fafad41 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,3 +10,6 @@
 [submodule "dsp/dsp-ingest"]
 	path = dsp/dsp-ingest
 	url = https://github.com/dasch-swiss/dsp-ingest
+[submodule "dsp/dsp-meta"]
+	path = dsp/dsp-meta
+	url = https://github.com/dasch-swiss/dsp-meta
diff --git a/Makefile b/Makefile
index 567ca0515..425fae82b 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ init-submodules: ## init the documentation from each connected repo; this comman
 
 .PHONY: update-submodules
 update-submodules: ## grab the current documentation from each connected repo
-	'$(CURRENT_DIR)/update-and-deploy.sh' dsp=$(DSP) api=$(API) app=$(APP) tools=$(TOOLS) ingest=$(INGEST) deploy=false
+	'$(CURRENT_DIR)/update-and-deploy.sh' dsp=$(DSP) api=$(API) app=$(APP) tools=$(TOOLS) ingest=$(INGEST) meta=$(META) deploy=false
 	
 .PHONY: openapi-update
 openapi-update: 
diff --git a/README.md b/README.md
index c79705322..b22e8687e 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,7 @@ It includes these components:
 - [DSP-APP](https://github.com/dasch-swiss/dsp-das)
 - [DSP-TOOLS](https://github.com/dasch-swiss/dsp-tools)
 - [DSP-INGEST](https://github.com/dasch-swiss/dsp-ingest)
+- [DSP-META](https://github.com/dasch-swiss/dsp-meta)
 
 ## File structure
 
diff --git a/dsp/dsp-api b/dsp/dsp-api
index 7b25174b0..268055603 160000
--- a/dsp/dsp-api
+++ b/dsp/dsp-api
@@ -1 +1 @@
-Subproject commit 7b25174b090024b6f656fde1caa991017b4be104
+Subproject commit 268055603642ada6212c0bfae3ef94a3efea6573
diff --git a/dsp/dsp-app b/dsp/dsp-app
index d8b057f77..38f71751e 160000
--- a/dsp/dsp-app
+++ b/dsp/dsp-app
@@ -1 +1 @@
-Subproject commit d8b057f77513c24a286cfea995d6e9d435e42347
+Subproject commit 38f71751e038da3156b6b8bef203b5a3af91ae3c
diff --git a/dsp/dsp-ingest b/dsp/dsp-ingest
index 13d0dacfe..e4d54a424 160000
--- a/dsp/dsp-ingest
+++ b/dsp/dsp-ingest
@@ -1 +1 @@
-Subproject commit 13d0dacfea0a3b122c0de8be77af5306e296566b
+Subproject commit e4d54a4240e8ddf1537bcb8388a4dc08ae47e748
diff --git a/dsp/dsp-meta b/dsp/dsp-meta
new file mode 160000
index 000000000..a98e2b6d5
--- /dev/null
+++ b/dsp/dsp-meta
@@ -0,0 +1 @@
+Subproject commit a98e2b6d524ce10bbf5a79e316af9bad4216d5d4
diff --git a/dsp/dsp-tools b/dsp/dsp-tools
index fdf58b9b8..2bf8ad8bc 160000
--- a/dsp/dsp-tools
+++ b/dsp/dsp-tools
@@ -1 +1 @@
-Subproject commit fdf58b9b8b7b244f3a99cc3629ffdb4e7d02d612
+Subproject commit 2bf8ad8bc61b21234b8bcd1ed6fcdd0ac94b419f
diff --git a/mkdocs.yml b/mkdocs.yml
index d4afa337e..385f328c8 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -6,6 +6,7 @@ nav:
   - DSP-API: "!include ./dsp/dsp-api/mkdocs.yml"
   - DSP-TOOLS: "!include ./dsp/dsp-tools/mkdocs.yml"
   - DSP-INGEST: "!include ./dsp/dsp-ingest/mkdocs.yml"
+  - DSP-META: "!include ./dsp/dsp-meta/mkdocs.yml"
   - Developers:
       - Getting Started: developers/getting-started.md
       - Basics:
@@ -67,4 +68,3 @@ markdown_extensions:
       custom_checkbox: true
   - pymdownx.tabbed:
       alternate_style: true
-
diff --git a/release.mk b/release.mk
index 6ba5bdb01..e44e791b9 100644
--- a/release.mk
+++ b/release.mk
@@ -1,8 +1,10 @@
-# for DSP, API, APP, see https://github.com/dasch-swiss/ops-deploy/blob/main/versions/RELEASE.json
+# for DSP, API, APP, Ingest, see https://github.com/dasch-swiss/ops-deploy/blob/main/versions/RELEASE.json
 # for TOOLS, see https://github.com/dasch-swiss/dsp-tools/releases
+# for META, see https://github.com/dasch-swiss/dsp-meta/releases (NB: tags start with 'dsp-meta-')
 DSP := "2024.08.02"
 API := "v30.18.4"
 APP := "v11.18.2"
-TOOLS := "fdf58b9b8b7b244f3a99cc3629ffdb4e7d02d612"
+TOOLS := "v9.0.2"
 INGEST := "v0.12.3"
+META := "dsp-meta-v2.3.0"
 
diff --git a/update-and-deploy.sh b/update-and-deploy.sh
index de71df019..2febb24d5 100755
--- a/update-and-deploy.sh
+++ b/update-and-deploy.sh
@@ -14,7 +14,7 @@ stop() {
 }
 
 usage() {
-	echo "usage: <command> dsp=[main version] api=[api version] app=[app version] tools=[tools version] ingest=[ingest version] deploy=[false]"
+	echo "usage: <command> dsp=[main version] api=[api version] app=[app version] tools=[tools version] ingest=[ingest version] meta=[meta version] deploy=[false]"
 	echo ${sep}
 }
 
@@ -23,6 +23,7 @@ api=""
 app=""
 tools=""
 ingest=""
+meta=""
 
 deploy=false
 
diff --git a/updated-versions.sh b/updated-versions.sh
index 2d0d6a1dd..b30c59f3b 100755
--- a/updated-versions.sh
+++ b/updated-versions.sh
@@ -22,6 +22,7 @@ API := \"\(.value.api)\"
 APP := \"\(.value.app)\"
 TOOLS := \"$tools\"
 INGEST := \"\(.value.ingest)\""
+META := \"\(.value.meta)\"
 EOF
 
 getDeployReleases | jq 'to_entries[0]' | jq -r "$template"