Merge pull request #42 from kit-data-manager/development

Prepare next release

Author: VolkerHartmann

CHANGELOG.md

@@ -6,8 +6,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 ### Fixed
+### New Features
+### Changed
+
+## [1.0.4] . date 2024-02-09
+### Fixed
+- Missing project name while building docker via build script.
+- Fix relative paths for JS and CSS 
+
+### Changed
+- Bump gradle from 7.5.1 to 7.6.4
+- Add default context path (mapping-service)
+
+## [1.0.3] - date 2024-02-07
+### Fixed
 - Improved file extension correction for download allowing to distinguish between different textfile flavours
 
+### New Features
+- Dockerization of service
+
 ## [1.0.2] - date 2023-07-27
 ### New Features
 - Plugins loading their code via GitHub now also pull changes while being reloaded
@@ -53,7 +70,9 @@ and mapping of metadata documents delivered by RabbitMQ
 - Mapping of metadata documents with Gemma
 - Ingest to elasticsearch
 
-[Unreleased]: https://github.com/kit-data-manager/mapping-service/compare/v1.0.2...HEAD
+[Unreleased]: https://github.com/kit-data-manager/mapping-service/compare/v1.0.4...HEAD
+[1.0.4]: https://github.com/kit-data-manager/mapping-service/compare/v1.0.3...v1.0.4
+[1.0.3]: https://github.com/kit-data-manager/mapping-service/compare/v1.0.2...v1.0.3
 [1.0.2]: https://github.com/kit-data-manager/mapping-service/compare/v1.0.1...v1.0.2
 [1.0.1]: https://github.com/kit-data-manager/mapping-service/compare/v1.0.0...v1.0.1
 [1.0.0]: https://github.com/kit-data-manager/mapping-service/compare/v0.0.4...v1.0.0

gradle.properties

@@ -1,5 +1,8 @@
 systemProp.jdk.tls.client.protocols="TLSv1,TLSv1.1,TLSv1.2"
 
+// Name of project
+rootProject.name = 'mapping-service'
+// Version of project
 version=1.0.4-SNAPSHOT
 action.custom-1=allTests
 action.custom-1.args=--configure-on-demand -w -x check 

settings/application-default.properties

@@ -2,6 +2,12 @@
 spring.main.allow-bean-definition-overriding=true
 spring.main.allow-circular-references=true
 server.port=8095
+
+###############################################################################
+# Context Path
+###############################################################################
+server.servlet.context-path=/mapping-service
+
 # Data transfer settings, e.g. transfer compression and multipart message size.
 # The properties max-file-size and max-request-size define the maximum size of files 
 # transferred to and from the repository. Setting them to -1 removes all limits.
@@ -19,15 +25,15 @@ springdoc.swagger-ui.disable-swagger-default-url=true
 info.app.name=Mapping-Service
 info.app.description=Generic mapping service supporting different mapping implementations.
 info.app.group=edu.kit.datamanager
-info.app.version=1.0.0
+info.app.version=1.0.4
 management.endpoint.health.probes.enabled=true
 management.endpoints.web.exposure.include=*
 
 ##################################################
 # Database
 ##################################################
 spring.datasource.driver-class-name=org.h2.Driver
-spring.datasource.url=jdbc:h2:file:/tmp/mapping-service/database
+spring.datasource.url=jdbc:h2:file:./database/mapping-service
 spring.datasource.username=user
 spring.datasource.password=password
 spring.jpa.hibernate.ddl-auto=update

settings/application-docker.properties

@@ -27,7 +27,7 @@ management.endpoints.web.exposure.include=*
 # Database
 ##################################################
 spring.datasource.driver-class-name=org.h2.Driver
-spring.datasource.url=jdbc:h2:file:/tmp/mapping-service/database
+spring.datasource.url=jdbc:h2:file:./database/mapping-service
 spring.datasource.username=user
 spring.datasource.password=password
 spring.jpa.hibernate.ddl-auto=update

src/main/resources/static/addScheme.html

@@ -8,7 +8,7 @@
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet"
           integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.9.1/font/bootstrap-icons.css">
-    <link rel="stylesheet" href="CSS/dark-mode.css">
+    <link rel="stylesheet" href="./CSS/dark-mode.css">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/jsoneditor@9.7.4/dist/jsoneditor.css">
 
     <title>Mapping-Service (Administration)</title>
@@ -27,7 +27,7 @@ <h1 class="header col-auto">Mapping-Service GUI</h1>
             <input type="checkbox" class="form-check-input" id="darkSwitch">
             <label class="custom-control-label" for="darkSwitch">Dark Mode</label>
         </div>
-        <script src="JS/dark-mode-switch.js"></script>
+        <script src="./JS/dark-mode-switch.js"></script>
     </div>
     <ul class="nav nav-pills d-flex flex-wrap py-3 mb-4 border-bottom p-3">
         <li class="nav-item"><a href="./index.html" class="nav-link" aria-current="page">Home</a></li>
@@ -190,7 +190,7 @@ <h6 class="bg-warning p-2 rounded text-black" id="errorMessage" hidden>Error mes
                 </div>
             </div>
 
-            <script src="/JS/addScheme.js"></script>
+            <script src="./JS/addScheme.js"></script>
             <div class="row align-items-center ms-1 mt-4" id="editSave" hidden>
                 <div class="spinner-border text-primary me-3 col-auto" role="status" id="editProgress" hidden>
                     <span class="visually-hidden">Loading...</span>

src/main/resources/static/index.html

@@ -7,15 +7,15 @@
     <!-- Bootstrap CSS -->
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet"
           integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
-    <link rel="stylesheet" href="CSS/dark-mode.css">
+    <link rel="stylesheet" href="./CSS/dark-mode.css">
 
     <title>Mapping-Service (Administration)</title>
 </head>
 <body class="p-3 bg-white">
 <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js"
         integrity="sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p"
         crossorigin="anonymous"></script>
-<script src="JS/addScheme.js"></script>
+<script src="./JS/addScheme.js"></script>
 
 <header class="row align-items-center navbar">
     <h1 class="header col-auto">Mapping-Service GUI</h1>
@@ -24,7 +24,7 @@ <h1 class="header col-auto">Mapping-Service GUI</h1>
             <input type="checkbox" class="form-check-input" id="darkSwitch">
             <label class="custom-control-label" for="darkSwitch">Dark Mode</label>
         </div>
-        <script src="JS/dark-mode-switch.js"></script>
+        <script src="./JS/dark-mode-switch.js"></script>
     </div>
     <ul class="nav nav-pills d-flex flex-wrap py-3 mb-4 border-bottom p-3">
         <li class="nav-item"><a href="./index.html" class="nav-link active" aria-current="page">Home</a></li>

src/main/resources/static/mapDocument.html

@@ -15,8 +15,8 @@
 <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js"
         integrity="sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p"
         crossorigin="anonymous"></script>
-<script defer src="JS/mapDocument.js"></script>
-<script defer src="JS/download.js"></script>
+<script defer src="./JS/mapDocument.js"></script>
+<script defer src="./JS/download.js"></script>
 
 <header class="row align-items-center navbar">
     <h1 class="header col-auto">Mapping-Service GUI</h1>
@@ -25,7 +25,7 @@ <h1 class="header col-auto">Mapping-Service GUI</h1>
             <input type="checkbox" class="form-check-input" id="darkSwitch">
             <label class="custom-control-label" for="darkSwitch">Dark Mode</label>
         </div>
-        <script src="JS/dark-mode-switch.js"></script>
+        <script src="./JS/dark-mode-switch.js"></script>
     </div>
     <ul class="nav nav-pills d-flex flex-wrap py-3 mb-4 border-bottom p-3">
         <li class="nav-item"><a href="./index.html" class="nav-link" aria-current="page">Home</a></li>

src/main/resources/static/showSchemes.html

@@ -7,15 +7,15 @@
     <!-- Bootstrap CSS -->
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet"
           integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
-    <link rel="stylesheet" href="CSS/dark-mode.css">
+    <link rel="stylesheet" href="./CSS/dark-mode.css">
 
     <title>Mapping-Service (Administration)</title>
 </head>
 <body class="p-3 bg-white" onload="getRecords()">
 <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js"
         integrity="sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p"
         crossorigin="anonymous"></script>
-<script src="JS/listSchemes.js"></script>
+<script src="./JS/listSchemes.js"></script>
 
 <header class="row align-items-center navbar">
     <h1 class="header col-auto">Mapping-Service GUI</h1>
@@ -24,7 +24,7 @@ <h1 class="header col-auto">Mapping-Service GUI</h1>
             <input type="checkbox" class="form-check-input" id="darkSwitch">
             <label class="custom-control-label" for="darkSwitch">Dark Mode</label>
         </div>
-        <script src="JS/dark-mode-switch.js"></script>
+        <script src="./JS/dark-mode-switch.js"></script>
     </div>
     <ul class="nav nav-pills d-flex flex-wrap py-3 mb-4 border-bottom p-3">
         <li class="nav-item"><a href="./index.html" class="nav-link" aria-current="page">Home</a></li>