Merge Develop back into main

.github/workflows/build-project.yml

@@ -21,19 +21,13 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Cache Docker Register
         uses: actions/cache@v3
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ hashFiles('**/Dockerfile') }}
-      - name: Cache Maven packages
-        uses: actions/cache@v3
-        with:
-          path: ~/.m2
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-m2
 
       - name: Set up Docker Buildx
         id: buildx
@@ -43,6 +37,7 @@ jobs:
         with:
           distribution: 'zulu'
           java-version: '17'
+          cache: 'maven'
 
       - name: Create custom Maven Settings.xml
         uses: whelk-io/maven-settings-xml-action@v21

.github/workflows/release-project.yml

@@ -16,19 +16,13 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Cache Docker Register
         uses: actions/cache@v3
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ hashFiles('**/Dockerfile') }}
-      - name: Cache Maven packages
-        uses: actions/cache@v3
-        with:
-          path: ~/.m2
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-m2
 
       - name: Extract tag name
         id: extract_tagname
@@ -41,11 +35,12 @@ jobs:
         with:
           distribution: 'zulu'
           java-version: '17'
+          cache: 'maven'
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@v3
       - name: Login to Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_TOKEN }}

.github/workflows/reuse.yml

@@ -11,6 +11,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: REUSE Compliance Check
         uses: fsfe/reuse-action@v2

.github/workflows/sonarcloud-analysis.yml

@@ -40,7 +40,7 @@ jobs:
         full_name: ${{ github.event.repository.full_name }}
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         repository: ${{ github.event.workflow_run.head_repository.full_name }}
         ref: ${{ github.event.workflow_run.head_branch }}
@@ -59,6 +59,7 @@ jobs:
         path: ~/.sonar/cache
         key: ${{ runner.os }}-sonar
         restore-keys: ${{ runner.os }}-sonar
+
     - name: Cache Maven packages
       uses: actions/cache@v3
       with:
@@ -71,7 +72,6 @@ jobs:
       with:
         distribution: 'zulu'
         java-version: '17'
-
     - name: Set Common Sonar Variables
       id: sonar_env
       run: |

.github/workflows/sonarcloud-build.yml

@@ -26,7 +26,7 @@ jobs:
     if: ${{ (github.event_name != 'pull_request_target' && github.actor != 'dependabot[bot]') || (github.actor == 'dependabot[bot]' && github.event_name == 'pull_request_target') }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 

README.md

@@ -19,10 +19,8 @@ parts of this repository can also be used separately in your own component to ma
 Service Layer can be used as Java component to manage them. For more information about the architecture go
 to [documentation](doc/compas-scl-data-service.md).
 
-There are currently two database implementations available.
+There is currently one database implementations available.
 
-- For more development information about the BaseX Implementation go to [BaseX](doc/basex.md). (Profile activated by
-  default.)
 - For more development information about the PostgreSQL Implementation go to [PostgreSQL](doc/postgresql.md).
 
 > **Note:** When switching between implementation it's a good practise to first execute a maven clean to remove

app/pom.xml

@@ -31,10 +31,6 @@ SPDX-License-Identifier: Apache-2.0
             <groupId>org.lfenergy.compas.scl.data</groupId>
             <artifactId>repository</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.lfenergy.compas.scl.data</groupId>
-            <artifactId>repository-basex</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.lfenergy.compas.scl.data</groupId>
             <artifactId>repository-postgresql</artifactId>
@@ -171,28 +167,8 @@ SPDX-License-Identifier: Apache-2.0
                             <goal>generate-code-tests</goal>
                         </goals>
                     </execution>
-                    <execution>
-                        <id>build-basex</id>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
-                        <configuration>
-                            <properties>
-                                <quarkus.profile>prod-basex</quarkus.profile>
-                                <quarkus.package.output-directory>basex-quarkus-app</quarkus.package.output-directory>
-                                <quarkus.docker.dockerfile-jvm-path>src/main/docker/Dockerfile-basex.jvm
-                                </quarkus.docker.dockerfile-jvm-path>
-                                <quarkus.docker.dockerfile-native-path>src/main/docker/Dockerfile-basex.native
-                                </quarkus.docker.dockerfile-native-path>
-                                <quarkus.container-image.tag>${project.version}-basex</quarkus.container-image.tag>
-                                <quarkus.container-image.additional-tags>latest-basex
-                                </quarkus.container-image.additional-tags>
-                            </properties>
-                        </configuration>
-                    </execution>
                     <!-- Put this build execution as last, because we will use this image to do a basic native check (NativeHealthCheckIT).
                          This information is written in "target\quarkus-artifact.properties" and used by the integration tests (failsafe).
-                         Sadly there is only 1 file create, so this build overwrites the one from basex.
                       -->
                     <execution>
                         <id>build-postgresql</id>
@@ -285,23 +261,6 @@ SPDX-License-Identifier: Apache-2.0
                         <artifactId>maven-failsafe-plugin</artifactId>
                         <version>${surefire-plugin.version}</version>
                         <executions>
-                            <execution>
-                                <id>integration-test-basex</id>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                                <configuration>
-                                    <systemPropertyVariables>
-                                        <native.image.path>
-                                            ${project.build.directory}/basex-quarkus-app/${project.build.finalName}-runner
-                                        </native.image.path>
-                                        <java.util.logging.manager>org.jboss.logmanager.LogManager
-                                        </java.util.logging.manager>
-                                        <maven.home>${maven.home}</maven.home>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
                         </executions>
                     </plugin>
                 </plugins>

app/src/main/docker/Dockerfile-postgresql.jvm

@@ -21,7 +21,7 @@
 # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/app-jvm
 #
 ###
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-860 
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1072.1697626218 
 
 ARG JAVA_PACKAGE=java-17-openjdk-headless
 ARG RUN_JAVA_VERSION=1.3.8

app/src/main/docker/Dockerfile-postgresql.native

@@ -14,7 +14,7 @@
 # docker run -i --rm -p 8080:8080 quarkus/app
 #
 ###
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-860
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1072.1697626218
 WORKDIR /work/
 RUN chown 1001 /work \
     && chmod "g+rwX" /work \

app/src/main/resources/application-dev-postgresql.properties

@@ -14,10 +14,6 @@ quarkus.log.category."org.lfenergy.compas.scl.data".level = DEBUG
 quarkus.http.auth.permission.develop-quarkus-services.paths  = /compas-scl-data-service/q/swagger-ui/*,/compas-scl-data-service/index.html
 quarkus.http.auth.permission.develop-quarkus-services.policy = permit
 
-# Exclude the other repository implementations from being scanned
-quarkus.arc.exclude-dependency.basex-repository.group-id    = org.lfenergy.compas.scl.data
-quarkus.arc.exclude-dependency.basex-repository.artifact-id = repository-basex
-
 # Datasource configuration for PostgreSQL
 quarkus.datasource.devservices.enabled = false
 quarkus.datasource.db-kind             = postgresql

app/src/main/resources/application-prod-postgresql.properties

@@ -4,10 +4,6 @@
 
 # Production PostgreSQL configuration.
 
-# Exclude the other repository implementations from being scanned
-quarkus.arc.exclude-dependency.basex-repository.group-id    = org.lfenergy.compas.scl.data
-quarkus.arc.exclude-dependency.basex-repository.artifact-id = repository-basex
-
 # Add scanning these dependencies for scanning, also used by native compilation.
 quarkus.index-dependency.postgresql-repository.group-id    = org.lfenergy.compas.scl.data
 quarkus.index-dependency.postgresql-repository.artifact-id = repository-postgresql

app/src/main/resources/application-test.properties

@@ -4,10 +4,6 @@
 
 # Test configuration.
 
-# Exclude the other repository implementations from being scanned
-quarkus.arc.exclude-dependency.basex-repository.group-id    = org.lfenergy.compas.scl.data
-quarkus.arc.exclude-dependency.basex-repository.artifact-id = repository-basex
-
 # Datasource configuration for PostgreSQL
 quarkus.datasource.devservices.enabled = true
 quarkus.datasource.db-kind             = postgresql