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

PR for v1.1.0

Author: ThomasJejkal

.github/workflows/CI.yml

@@ -17,35 +17,41 @@ jobs:
     strategy:
       matrix:
 #        os: [ubuntu-latest, windows-latest, macos-latest]
-        os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-latest]
         jdk: [17]
-        python-version: [3.9]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Set up OpenJDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
+          distribution: 'zulu'
           java-version: ${{ matrix.jdk }}
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+      - name: Set up Python
+        uses: actions/setup-python@v5
         with:
-          python-version: ${{ matrix.python-version }}
+          python-version: '3.10'
       - name: Get Python location
         run: python -c "import os, sys; print(sys.executable)"
       - name: Update pip
         run: python3 -m pip install --upgrade pip
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
+      - name: Prepare
+        run: mkdir -p /tmp/mapping-service/{schemas,plugins}
+      - name: Copy Plugins
+        run: cp plugins/* /tmp/mapping-service/plugins
+      - name: List Plugins
+        run: ls -la /tmp/mapping-service/plugins
       - name: Clean
         run: ./gradlew clean
 #      - if: matrix.os == 'windows-latest'
 #        name: Test with Gradle on Windows
 #        run: ./gradlew build -DapplicationProperties="src\test\resources\test-config\application-test-windows.properties"
       - if: matrix.os != 'windows-latest'
         name: Test with Gradle on ${{ matrix.os }}
-        run: ./gradlew build -DapplicationProperties="src/test/resources/test-config/application-test.properties" -DpythonLocation=`which python3`
+        run: ./gradlew build -DapplicationProperties="src/test/resources/test-config/application-test.properties"
       - name: Generate report
         run: ./gradlew jacocoTestReport
 #      - name: Codecov

.github/workflows/codeql-analysis.yml

@@ -37,19 +37,20 @@ jobs:
         # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python3
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: '3.10'
     - name: Set up OpenJDK
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v4
       with:
+        distribution: 'zulu'
         java-version: 17
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -78,7 +79,7 @@ jobs:
        ./gradlew build -DapplicationProperties="src/test/resources/test-config/application-test.properties"
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
       with:
         category: "/language:java"
 
@@ -95,22 +96,23 @@ jobs:
       matrix:
         language: [ 'java' ]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Python3
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.10'
 
       - name: Set up OpenJDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
+          distribution: 'zulu'
           java-version: 17
 
       - name: 'Dependency Review'
-        uses: actions/dependency-review-action@v2
+        uses: actions/dependency-review-action@v4
         with:
-          allow-licenses: MIT, Apache-2.0, ISC, BSD-2-Clause, 0BSD, NOASSERTION
+          allow-licenses: MIT, Apache-2.0, ISC, BSD-2-Clause, 0BSD
           base-ref: ${{ github.event.pull_request.base.sha || 'main' }}
           head-ref: ${{ github.event.pull_request.head.sha || github.ref }}
 

.github/workflows/docker-publish.yml

@@ -60,7 +60,7 @@ jobs:
       # It uses the `context` parameter to define the build's context as the set of files located in the specified path. For more information, see "[Usage](https://github.com/docker/build-push-action#usage)" in the README of the `docker/build-push-action` repository.
       # It uses the `tags` and `labels` parameters to tag and label the image with the output from the "meta" step.
       - name: Build and push Docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: true
@@ -109,7 +109,7 @@ jobs:
       # It uses the `context` parameter to define the build's context as the set of files located in the specified path. For more information, see "[Usage](https://github.com/docker/build-push-action#usage)" in the README of the `docker/build-push-action` repository.
       # It uses the `tags` and `labels` parameters to tag and label the image with the output from the "meta" step.
       - name: Build and push Docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: true

CHANGELOG.md

@@ -9,6 +9,60 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### New Features
 ### Changed
 
+## [1.1.0] - date 2025-01-20
+### New Feature
+* Support of asynchronous mapping via /api/v1/mappingExecution/schedule/ (see API docs for more details)
+
+## Changed
+* Bump org.postgresql:postgresql from 42.5.0 to 42.7.4 by @dependabot in https://github.com/kit-data-manager/mapping-service/pull/53
+* Update dependency jacoco to v0.8.12 by @renovate in https://github.com/kit-data-manager/mapping-service/pull/59
+* Update dependency org.springframework.boot:spring-boot-starter-actuator to v2.7.18 by @renovate in https://github.com/kit-data-manager/mapping-service/pull/65
+* Update dependency org.springframework.boot:spring-boot-configuration-processor to v2.7.18 by @renovate in https://github.com/kit-data-manager/mapping-service/pull/64
+* Update dependency org.apache.httpcomponents:httpclient to v4.5.14 by @renovate in https://github.com/kit-data-manager/mapping-service/pull/60
+* Update dependency org.junit.jupiter:junit-jupiter-migrationsupport to v5.11.3 by @renovate in https://github.com/kit-data-manager/mapping-service/pull/85
+* Update plugin com.gorylenko.gradle-git-properties to v2.4.2 by @renovate in https://github.com/kit-data-manager/mapping-service/pull/74
+* Update dependency org.springframework.boot:spring-boot-starter-web to v2.7.18 by @renovate in https://github.com/kit-data-manager/mapping-service/pull/70
+* Update dependency org.springframework.boot:spring-boot-starter-security to v2.7.18 by @renovate in https://github.com/kit-data-manager/mapping-service/pull/67
+* Update dependency org.springframework.boot:spring-boot-starter-data-jpa to v2.7.18 by @renovate in https://github.com/kit-data-manager/mapping-service/pull/66
+* Update dependency org.springframework.boot:spring-boot-starter-test to v2.7.18 by @renovate in https://github.com/kit-data-manager/mapping-service/pull/68
+* Update dependency org.springframework.boot:spring-boot-starter-validation to v2.7.18 by @renovate in https://github.com/kit-data-manager/mapping-service/pull/69
+* Update dependency org.springframework:spring-test to v5.3.39 by @renovate in https://github.com/kit-data-manager/mapping-service/pull/73
+* Update dependency org.junit.vintage:junit-vintage-engine to v5.11.3 by @renovate in https://github.com/kit-data-manager/mapping-service/pull/87
+* Update dependency org.junit:junit-bom to v5.11.3 by @renovate in https://github.com/kit-data-manager/mapping-service/pull/98
+* Update dependency com.h2database:h2 to v2.3.232 by @renovate in https://github.com/kit-data-manager/mapping-service/pull/91
+* Update dependency org.projectlombok:lombok to v1.18.36 by @renovate in https://github.com/kit-data-manager/mapping-service/pull/89
+* Bump org.junit.jupiter:junit-jupiter from 5.9.0 to 5.11.3 by @dependabot in https://github.com/kit-data-manager/mapping-service/pull/106
+* Bump com.github.jknack:handlebars from 4.3.0 to 4.4.0 by @dependabot in https://github.com/kit-data-manager/mapping-service/pull/105
+* Update dependency org.springdoc:springdoc-openapi-webmvc-core to v1.8.0 by @renovate in https://github.com/kit-data-manager/mapping-service/pull/102
+* Update actions/setup-java action to v4 by @renovate in https://github.com/kit-data-manager/mapping-service/pull/112
+* Update actions/checkout action to v4 by @renovate in https://github.com/kit-data-manager/mapping-service/pull/109
+* Update dependency org.springdoc:springdoc-openapi-data-rest to v1.8.0 by @renovate in https://github.com/kit-data-manager/mapping-service/pull/100
+* Update actions/dependency-review-action action to v4 by @renovate in https://github.com/kit-data-manager/mapping-service/pull/110
+* Update actions/setup-python action to v5 by @renovate in https://github.com/kit-data-manager/mapping-service/pull/113
+* Update dependency org.springframework.security:spring-security-test to v5.8.15 by @renovate in https://github.com/kit-data-manager/mapping-service/pull/103
+* Update dependency org.springframework.restdocs:spring-restdocs-asciidoctor to v3.0.3 by @renovate in https://github.com/kit-data-manager/mapping-service/pull/111
+* Update dependency org.springdoc:springdoc-openapi-ui to v1.8.0 by @renovate in https://github.com/kit-data-manager/mapping-service/pull/101
+* Update github/codeql-action action to v3 by @renovate in https://github.com/kit-data-manager/mapping-service/pull/131
+* Update eclipse-temurin Docker tag to v23 by @renovate in https://github.com/kit-data-manager/mapping-service/pull/130
+* Update docker/build-push-action action to v6 by @renovate in https://github.com/kit-data-manager/mapping-service/pull/129
+* Update plugin io.freefair.maven-publish-java to v8.11 by @renovate in https://github.com/kit-data-manager/mapping-service/pull/128
+* Update plugin io.freefair.lombok to v8.11 by @renovate in https://github.com/kit-data-manager/mapping-service/pull/127
+* Update dependency org.javers:javers-spring-boot-starter-sql to v7.7.0 by @renovate in https://github.com/kit-data-manager/mapping-service/pull/126
+* Update dependency org.springframework.restdocs:spring-restdocs-mockmvc to v3.0.3 by @renovate in https://github.com/kit-data-manager/mapping-service/pull/125
+* Update dependency org.json:json to v20240303 by @renovate in https://github.com/kit-data-manager/mapping-service/pull/119
+* Update dependency commons-io:commons-io to v2.18.0 by @renovate in https://github.com/kit-data-manager/mapping-service/pull/133
+* Update dependency gradle to v8.12 by @renovate in https://github.com/kit-data-manager/mapping-service/pull/146
+* Update plugin io.spring.dependency-management to v1.1.7 by @renovate in https://github.com/kit-data-manager/mapping-service/pull/145
+* Update dependency com.google.guava:guava to v33.4.0-jre by @renovate in https://github.com/kit-data-manager/mapping-service/pull/144
+* Update dependency net.bytebuddy:byte-buddy to v1.16.1 by @renovate in https://github.com/kit-data-manager/mapping-service/pull/143
+* Update dependency org.mockito:mockito-core to v5.15.2 by @renovate in https://github.com/kit-data-manager/mapping-service/pull/148
+* Update dependency edu.kit.datamanager:service-base to v1.3.3 by @renovate in https://github.com/kit-data-manager/mapping-service/pull/147
+* Update plugin com.gradle.enterprise to v3.19 by @renovate in https://github.com/kit-data-manager/mapping-service/pull/142
+* Update plugin org.owasp.dependencycheck to v11.1.1 by @renovate in https://github.com/kit-data-manager/mapping-service/pull/141
+* Update dependency org.eclipse.jgit:org.eclipse.jgit to v7.1.0.202411261347-r by @renovate in https://github.com/kit-data-manager/mapping-service/pull/140
+* Update plugin org.springframework.boot to v3.4.1 by @renovate in https://github.com/kit-data-manager/mapping-service/pull/136
+* Update springDocVersion to v2.8.3 by @renovate in https://github.com/kit-data-manager/mapping-service/pull/137
+
 ## [1.0.5] . date 2024-08-27
 ### Changed
 - Bump com.google.guava:guava from 31.1-jre to 33.3.0-jre
@@ -77,7 +131,8 @@ 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.5...HEAD
+[Unreleased]: https://github.com/kit-data-manager/mapping-service/compare/v1.1.0...HEAD
+[1.1.0]: https://github.com/kit-data-manager/mapping-service/compare/v1.0.5...v1.1.0
 [1.0.5]: https://github.com/kit-data-manager/mapping-service/compare/v1.0.4...v1.0.5
 [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

Dockerfile

@@ -11,7 +11,7 @@ ARG SERVICE_ROOT_DIRECTORY_DEFAULT=/spring/
 ####################################################
 # Building environment (java & git)
 ####################################################
-FROM eclipse-temurin:17 AS build-env-java
+FROM eclipse-temurin:23 AS build-env-java
 LABEL maintainer=webmaster@datamanager.kit.edu
 LABEL stage=build-env
 
@@ -48,7 +48,7 @@ RUN bash ./build.sh $SERVICE_DIRECTORY
 ####################################################
 # Runtime environment 4 metastore2
 ####################################################
-FROM eclipse-temurin:17 AS run-service-mapping-service
+FROM eclipse-temurin:23 AS run-service-mapping-service
 LABEL maintainer=webmaster@datamanager.kit.edu
 LABEL stage=run