Release v1.2.0

.dockerignore

@@ -0,0 +1,17 @@
+#git
+.git
+.gitattributes
+.gitignore
+.github/
+#IDE
+.idea
+#build
+.gradle/
+build
+#data
+production_db
+#misc
+CHANGELOG
+LICENSE
+temp
+docker

.github/dependabot.yml

@@ -10,3 +10,5 @@ updates:
     target-branch: "development"
     schedule:
       interval: "weekly"
+    cooldown:
+      default-days: 3

.github/workflows/bootjar_testing.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        java: [17]
+        java: [17, 21]
 
     steps:
       - name: Checkout code
@@ -38,8 +38,8 @@ jobs:
           sleep 20  # Give the server time to start
 
       - name: hurl install
-        uses: gacts/install-hurl@v1
-
+        uses: gacts/install-hurl@v1.3.0
+        with: {disable-cache: true} # hurl installation sometimes fails on cache restore, trying to disable it as a workaround https://github.com/gacts/install-hurl/issues/93
       - name: hurl CRUD tests (windows)
         if: runner.os == 'Windows'
         shell: bash

.github/workflows/docker_publish.yml

@@ -0,0 +1,54 @@
+name: Create and publish a Docker image
+
+# Configures this workflow to run every time a change is pushed to the branch called `release`.
+on:
+  push:
+    branches: ['main']
+
+# Defines two custom environment variables for the workflow. These are used for the Container registry domain, and a name for the Docker image that this workflow builds.
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
+jobs:
+  build-and-push-image:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: ./docker
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          platforms: linux/amd64,linux/arm64
+
+      # This step generates an artifact attestation for the image, which is an unforgeable statement about where and how it was built. It increases supply chain security for people who consume the image. For more information, see [Using artifact attestations to establish provenance for builds](/actions/security-guides/using-artifact-attestations-to-establish-provenance-for-builds).
+      - name: Generate artifact attestation
+        uses: actions/attest-build-provenance@v3
+        with:
+          subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME}}
+          subject-digest: ${{ steps.push.outputs.digest }}
+          push-to-registry: true

.github/workflows/docker_testing.yml

@@ -0,0 +1,86 @@
+name: Build and Test Dockerized App
+
+on:
+  push:
+  pull_request:
+    branches: [ main, development ]
+
+jobs:
+  build-and-test:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        java: [17, 21]
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up JDK ${{ matrix.java }}
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: ${{ matrix.java }}
+
+      - name: Grant execute permission for Gradle wrapper (Unix)
+        if: runner.os != 'Windows'
+        run: chmod +x gradlew
+
+      # Build Docker image instead of bootable JAR
+      - name: Build Docker image
+        run: |
+          docker build -f docker/Dockerfile -t wap-server:${{ matrix.os }}-${{ matrix.java }} .
+
+      # Run Docker container (detached, expose port 8080)
+      - name: Run Docker container
+        run: |
+          docker run -d -p 8080:8080 --name wap-server \
+            wap-server:${{ matrix.os }}-${{ matrix.java }}
+          echo "Wait for wap server to be healthy before proceeding to tests"
+          while true; do
+          docker ps -a
+          if ! docker ps | grep -q wap-server; then
+          echo "Docker container stopped unexpectedly. Aborting."
+          exit 1
+          fi
+          if curl -f http://localhost:8080; then
+          echo "Service is running."
+          break
+          fi
+          echo "Waiting for the service to be ready..."
+          docker logs --tail 20 wap-server
+          sleep 5
+          done
+
+      - name: hurl install
+        uses: gacts/[email protected]
+        with: {disable-cache: true}
+
+      - name: hurl CRUD tests (windows)
+        if: runner.os == 'Windows'
+        shell: bash
+        run: |
+          for file in ./integration_tests/CRUD/*.hurl; do
+            hurl --variable host=http://localhost:8080 --test "$file" --verbose --error-format=long --continue-on-error --report-html hurlreports
+          done
+
+      - name: hurl tests (other)
+        if: runner.os != 'Windows'
+        run: hurl --variable host=http://localhost:8080 --test ./integration_tests/CRUD/*.hurl --verbose --error-format=long --continue-on-error --report-html hurlreports
+
+      # Stop and clean up container
+      - name: Stop Docker container
+        if: always()
+        run: |
+          docker logs wap-server
+          docker stop wap-server
+          docker rm wap-server
+
+      # Upload artifacts (optional: you may want to upload Docker logs instead of JARs)
+      - name: Upload Docker logs
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: docker_logs_jdk${{ matrix.java }}_${{ matrix.os }}
+          path: ./hurlreports

.github/workflows/gradle.yml

@@ -18,7 +18,7 @@ jobs:
       matrix:
         operating-system: [ubuntu-latest, macOS-latest]
         # Use both LTS releases and latest one for tests
-        jdk: [ 17 ]
+        jdk: [ 17, 21 ]
     steps:
     - name: Checkout repo
       uses: actions/checkout@v4
@@ -32,11 +32,11 @@ jobs:
     - name: Build with Gradle
       run:   |
         if [ "$RUNNER_OS" == "Linux" ]; then
-              ./gradlew clean build 
+              ./gradlew clean build test --fail-fast
         elif [ "$RUNNER_OS" == "macOS" ]; then
-              ./gradlew clean build 
+              ./gradlew clean build test --fail-fast
         elif [ "$RUNNER_OS" == "Windows" ]; then
-              ./gradlew.bat clean build
+              ./gradlew.bat clean build test --fail-fast
         else
               echo "$RUNNER_OS not supported"
               exit 1
@@ -51,12 +51,12 @@ jobs:
     - name: Set up OpenJDK version ...
       uses: actions/setup-java@v2
       with:
-        distribution: 'zulu' 
+        distribution: 'temurin' 
         java-version: ${{ env.currentBuildVersion }}
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build with Gradle (JDK ${{ env.currentBuildVersion }})
-      run: ./gradlew clean check jacocoTestReport
+      run: ./gradlew clean check jacocoTestReport test --fail-fast
     - name: Codecov
       uses: codecov/codecov-action@v1
       with:

CHANGELOG

@@ -4,7 +4,49 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [1.2.0] - 2025-12-11
+### Added
+- Docker version
+- configurable context path
+- configurable proxy URL
+
+### Changed
+
+### Removed
+
+### Deprecated
+
+### Fixed
+- PUT Annotation with added via field results in erronous HTTP 409
+
+### Security
+
+### Full changelog
+
+* Bump dependencies by @GGoetzelmann in https://github.com/kit-data-manager/wap-server/pull/17
+* Bump com.github.java-json-tools:json-schema-validator from 2.2.8 to 2.2.14 by @dependabot[bot] in https://github.com/kit-data-manager/wap-server/pull/29
+* Bump io.spring.dependency-management from 1.1.0 to 1.1.7 by @dependabot[bot] in https://github.com/kit-data-manager/wap-server/pull/28
+* Bump net.researchgate.release from 3.0.2 to 3.1.0 by @dependabot[bot] in https://github.com/kit-data-manager/wap-server/pull/26
+* Bump com.nimbusds:nimbus-jose-jwt from 9.24.3 to 10.3 by @dependabot[bot] in https://github.com/kit-data-manager/wap-server/pull/25
+* Bump io.specto:hoverfly-java-junit5 from 0.20.0 to 0.20.2 by @dependabot[bot] in https://github.com/kit-data-manager/wap-server/pull/30
+* Bump org.springframework.boot from 3.4.5 to 3.5.0 by @dependabot[bot] in https://github.com/kit-data-manager/wap-server/pull/31
+* Bump com.h2database:h2 from 2.2.220 to 2.3.232 by @dependabot[bot] in https://github.com/kit-data-manager/wap-server/pull/36
+* Bump org.asciidoctor.jvm.convert from 3.3.2 to 4.0.4 by @dependabot[bot] in https://github.com/kit-data-manager/wap-server/pull/37
+* Bump io.freefair.maven-publish-java from 6.5.1 to 8.14 by @dependabot[bot] in https://github.com/kit-data-manager/wap-server/pull/38
+* Bump com.github.kt3k.coveralls from 2.12.0 to 2.12.2 by @dependabot[bot] in https://github.com/kit-data-manager/wap-server/pull/39
+* Bump org.owasp.dependencycheck from 7.3.0 to 12.1.3 by @dependabot[bot] in https://github.com/kit-data-manager/wap-server/pull/44
+* Bump com.gorylenko.gradle-git-properties from 2.4.1 to 2.5.2 by @dependabot[bot] in https://github.com/kit-data-manager/wap-server/pull/45
+* Bump org.springframework.boot from 3.5.0 to 3.5.5 by @dependabot[bot] in https://github.com/kit-data-manager/wap-server/pull/51
+* Bump org.owasp.dependencycheck from 12.1.3 to 12.1.5 by @dependabot[bot] in https://github.com/kit-data-manager/wap-server/pull/54
+* Bump org.apache.commons:commons-collections4 from 4.1 to 4.5.0 by @dependabot[bot] in https://github.com/kit-data-manager/wap-server/pull/48
+* Bump org.springframework.boot from 3.5.5 to 3.5.7 by @dependabot[bot] in https://github.com/kit-data-manager/wap-server/pull/63
+* PUT Annotation with added via field results in erronous HTTP 409 by @github-actions[bot] in https://github.com/kit-data-manager/wap-server/pull/66
+* Bump org.mockito:mockito-inline from 4.10.0 to 5.2.0 by @dependabot[bot] in https://github.com/kit-data-manager/wap-server/pull/64
+* Bump org.postgresql:postgresql from 42.7.2 to 42.7.8 by @dependabot[bot] in https://github.com/kit-data-manager/wap-server/pull/58
+* Extend URL configuration options by @GGoetzelmann in https://github.com/kit-data-manager/wap-server/pull/69
+* Dockerization by @GGoetzelmann in https://github.com/kit-data-manager/wap-server/pull/70
+
+**Full Changelog**: https://github.com/kit-data-manager/wap-server/compare/v1.1.0...v1.2.0
 
 ## [1.1.0] - 2025-06-13
 ### Added

CITATION.cff

@@ -0,0 +1,43 @@
+cff-version: 1.2.0
+message: If you use this software, please cite it using these metadata.
+type: software
+title: kitdatamanager/wap-server
+abstract: This project contains a server for creating and managing annotations 
+  based on the Web Annotation Data Model (WADM) implementing the complete Web 
+  Annotation Protocol (WAP). The service is realized as microservice using 
+  Spring Boot and can be operated standalone.
+version: v1.2.0-SNAPSHOT
+keywords:
+  - kit-data-manager
+  - metadata
+  - SPARQL
+  - RDF
+  - WADM
+  - Web Annotation
+  - jena-fuseki
+  - restful
+authors:
+  - given-names: Germaine
+    orcid: https://orcid.org/0000-0003-3974-3728
+    affiliation: Karlsruhe Institute of Technology (KIT)
+    family-names: Götzelmann
+  - given-names: Thomas
+    orcid: https://orcid.org/0000-0003-2804-688X
+    affiliation: Karlsruhe Institute of Technology (KIT)
+    family-names: Jejkal
+  - given-names: Danah
+    orcid: https://orcid.org/0000-0001-6296-7282
+    affiliation: Karlsruhe Institute of Technology (KIT)
+    family-names: Tonne
+contact:
+  - given-names: Germaine
+    orcid: https://orcid.org/0000-0003-3974-3728
+    affiliation: Karlsruhe Institute of Technology (KIT)
+    family-names: Götzelmann
+  - given-names: Thomas
+    orcid: https://orcid.org/0000-0003-2804-688X
+    affiliation: Karlsruhe Institute of Technology (KIT)
+    family-names: Jejkal
+license: Apache-2.0
+url: https://kit-data-manager.github.io/webpage/wap-server/
+repository-code: https://github.com/kit-data-manager/wap-server

README.md

@@ -7,7 +7,21 @@ This project contains a server for creating and managing annotations based on th
 the complete Web Annotation Protocol (WAP). The service is realized as microservice using Spring Boot and can be operated standalone.
 
 
-## How to build
+## How to build and use
+
+### Docker
+
+```
+docker build -f docker/Dockerfile -t wap-server .
+```
+
+To run the application at `http://localhost:<host port>`, use:
+
+```
+docker run -d -p <host port>:8080 -e WAPBASEPATH=http://localhost:<host port> wap-server
+```
+
+### From source
 
 To install the application from source, see [howtos](howtos/summary.md).