From e5c038392faac9b8de04c7c61438f259275e407b Mon Sep 17 00:00:00 2001
From: Ethan Freestone <ethan.freestone@k-int.co.uk>
Date: Wed, 30 Oct 2024 12:41:08 +0000
Subject: [PATCH 1/2] chore: OkapiInterfaceVersion separated from module
 version

---
 service/build.gradle                                  | 2 ++
 service/gradle.properties                             | 1 +
 service/src/main/okapi/ModuleDescriptor-template.json | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/service/build.gradle b/service/build.gradle
index 0673e36..312df6b 100644
--- a/service/build.gradle
+++ b/service/build.gradle
@@ -263,6 +263,8 @@ project.gradle.projectsEvaluated {
     // Get a System property
     properties.setProperty('build.java.version', System.getProperty('java.version'))
 
+    properties.setProperty('okapiInterfaceVersion', "$okapiInterfaceVersion")
+
     // Write the properties back to the file
     grailsBuildInfoFile.withOutputStream {
       properties.store(it,null)
diff --git a/service/gradle.properties b/service/gradle.properties
index 89ef211..0ed4289 100644
--- a/service/gradle.properties
+++ b/service/gradle.properties
@@ -5,6 +5,7 @@ gormVersion=8.0.3
 # Application
 appName=mod-licenses
 appVersion=6.1.0-SNAPSHOT
+okapiInterfaceVersion=6.1
 dockerTagSuffix=
 dockerRepo=folioci
 
diff --git a/service/src/main/okapi/ModuleDescriptor-template.json b/service/src/main/okapi/ModuleDescriptor-template.json
index 6aebd89..aee75c5 100644
--- a/service/src/main/okapi/ModuleDescriptor-template.json
+++ b/service/src/main/okapi/ModuleDescriptor-template.json
@@ -4,7 +4,7 @@
   "provides": [
     {
       "id": "licenses",
-      "version": "${info.app.minorVersion}",
+      "version": "${okapiInterfaceVersion}",
       "handlers": [
         {
           "methods": [

From 6dc674a590abac842cdc36db6c7e94d146cc8e73 Mon Sep 17 00:00:00 2001
From: Ethan Freestone <ethan.freestone@k-int.co.uk>
Date: Wed, 30 Oct 2024 12:46:02 +0000
Subject: [PATCH 2/2] chore: Release 6.1.0

Updated NEWS.md and set version -> 6.1.0

ERM-3260
---
 NEWS.md                   | 5 ++++-
 service/gradle.properties | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index ff1e0ef..0a7d05e 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,4 +1,7 @@
-## 6.1.0 In progress
+## 6.1.0 2024-10-30
+  * ERM-3369 Update module license, guidance and dependencies for mod-licenses
+  * ERM-3089 missing content-type header in /licenses/licenses/${uuid}/linkedAgreements response
+  * Fix and automatically validate module descriptor (Eureka)
 
 ## 6.0.4 2024-10-18
   * ERM-3387 Description can be too long for index, causing mod-licenses error when updating from 5.0.x to later versions or failure on saving licenses with a long description
diff --git a/service/gradle.properties b/service/gradle.properties
index 0ed4289..b406e16 100644
--- a/service/gradle.properties
+++ b/service/gradle.properties
@@ -4,7 +4,7 @@ gormVersion=8.0.3
 
 # Application
 appName=mod-licenses
-appVersion=6.1.0-SNAPSHOT
+appVersion=6.1.0
 okapiInterfaceVersion=6.1
 dockerTagSuffix=
 dockerRepo=folioci