Skip to content

Commit 114149e

Browse files
pascalwilbrinkpascalwilbrink
authored
Merge pull request #370 from com-pas/develop
Merge Develop back into main
2 parents 964e308 + 7fe7b54 commit 114149e

32 files changed

+20
-1472
lines changed

‎.github/workflows/build-project.yml‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,13 @@ jobs:
2121

2222
steps:
2323
- name: Checkout
24-
uses: actions/checkout@v3
24+
uses: actions/checkout@v4
2525

2626
- name: Cache Docker Register
2727
uses: actions/cache@v3
2828
with:
2929
path: /tmp/.buildx-cache
3030
key: ${{ runner.os }}-buildx-${{ hashFiles('**/Dockerfile') }}
31-
- name: Cache Maven packages
32-
uses: actions/cache@v3
33-
with:
34-
path: ~/.m2
35-
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
36-
restore-keys: ${{ runner.os }}-m2
3731

3832
- name: Set up Docker Buildx
3933
id: buildx
@@ -43,6 +37,7 @@ jobs:
4337
with:
4438
distribution: 'zulu'
4539
java-version: '17'
40+
cache: 'maven'
4641

4742
- name: Create custom Maven Settings.xml
4843
uses: whelk-io/maven-settings-xml-action@v21

‎.github/workflows/release-project.yml‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,13 @@ jobs:
1616

1717
steps:
1818
- name: Checkout
19-
uses: actions/checkout@v3
19+
uses: actions/checkout@v4
2020

2121
- name: Cache Docker Register
2222
uses: actions/cache@v3
2323
with:
2424
path: /tmp/.buildx-cache
2525
key: ${{ runner.os }}-buildx-${{ hashFiles('**/Dockerfile') }}
26-
- name: Cache Maven packages
27-
uses: actions/cache@v3
28-
with:
29-
path: ~/.m2
30-
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
31-
restore-keys: ${{ runner.os }}-m2
3226

3327
- name: Extract tag name
3428
id: extract_tagname
@@ -41,11 +35,12 @@ jobs:
4135
with:
4236
distribution: 'zulu'
4337
java-version: '17'
38+
cache: 'maven'
4439
- name: Set up Docker Buildx
4540
id: buildx
4641
uses: docker/setup-buildx-action@v3
4742
- name: Login to Docker Hub
48-
uses: docker/login-action@v2
43+
uses: docker/login-action@v3
4944
with:
5045
username: ${{ secrets.DOCKER_HUB_USERNAME }}
5146
password: ${{ secrets.DOCKER_HUB_TOKEN }}

‎.github/workflows/reuse.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Checkout
14-
uses: actions/checkout@v3
14+
uses: actions/checkout@v4
1515
- name: REUSE Compliance Check
1616
uses: fsfe/reuse-action@v2

‎.github/workflows/sonarcloud-analysis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
full_name: ${{ github.event.repository.full_name }}
4141
env:
4242
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
43-
- uses: actions/checkout@v3
43+
- uses: actions/checkout@v4
4444
with:
4545
repository: ${{ github.event.workflow_run.head_repository.full_name }}
4646
ref: ${{ github.event.workflow_run.head_branch }}
@@ -59,6 +59,7 @@ jobs:
5959
path: ~/.sonar/cache
6060
key: ${{ runner.os }}-sonar
6161
restore-keys: ${{ runner.os }}-sonar
62+
6263
- name: Cache Maven packages
6364
uses: actions/cache@v3
6465
with:
@@ -71,7 +72,6 @@ jobs:
7172
with:
7273
distribution: 'zulu'
7374
java-version: '17'
74-
7575
- name: Set Common Sonar Variables
7676
id: sonar_env
7777
run: |

‎.github/workflows/sonarcloud-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
if: ${{ (github.event_name != 'pull_request_target' && github.actor != 'dependabot[bot]') || (github.actor == 'dependabot[bot]' && github.event_name == 'pull_request_target') }}
2727
steps:
2828
- name: Checkout
29-
uses: actions/checkout@v3
29+
uses: actions/checkout@v4
3030
with:
3131
fetch-depth: 0
3232

‎README.md‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,8 @@ parts of this repository can also be used separately in your own component to ma
1919
Service Layer can be used as Java component to manage them. For more information about the architecture go
2020
to [documentation](doc/compas-scl-data-service.md).
2121

22-
There are currently two database implementations available.
22+
There is currently one database implementations available.
2323

24-
- For more development information about the BaseX Implementation go to [BaseX](doc/basex.md). (Profile activated by
25-
default.)
2624
- For more development information about the PostgreSQL Implementation go to [PostgreSQL](doc/postgresql.md).
2725

2826
> **Note:** When switching between implementation it's a good practise to first execute a maven clean to remove

‎app/pom.xml‎

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@ SPDX-License-Identifier: Apache-2.0
3131
<groupId>org.lfenergy.compas.scl.data</groupId>
3232
<artifactId>repository</artifactId>
3333
</dependency>
34-
<dependency>
35-
<groupId>org.lfenergy.compas.scl.data</groupId>
36-
<artifactId>repository-basex</artifactId>
37-
</dependency>
3834
<dependency>
3935
<groupId>org.lfenergy.compas.scl.data</groupId>
4036
<artifactId>repository-postgresql</artifactId>
@@ -171,28 +167,8 @@ SPDX-License-Identifier: Apache-2.0
171167
<goal>generate-code-tests</goal>
172168
</goals>
173169
</execution>
174-
<execution>
175-
<id>build-basex</id>
176-
<goals>
177-
<goal>build</goal>
178-
</goals>
179-
<configuration>
180-
<properties>
181-
<quarkus.profile>prod-basex</quarkus.profile>
182-
<quarkus.package.output-directory>basex-quarkus-app</quarkus.package.output-directory>
183-
<quarkus.docker.dockerfile-jvm-path>src/main/docker/Dockerfile-basex.jvm
184-
</quarkus.docker.dockerfile-jvm-path>
185-
<quarkus.docker.dockerfile-native-path>src/main/docker/Dockerfile-basex.native
186-
</quarkus.docker.dockerfile-native-path>
187-
<quarkus.container-image.tag>${project.version}-basex</quarkus.container-image.tag>
188-
<quarkus.container-image.additional-tags>latest-basex
189-
</quarkus.container-image.additional-tags>
190-
</properties>
191-
</configuration>
192-
</execution>
193170
<!-- Put this build execution as last, because we will use this image to do a basic native check (NativeHealthCheckIT).
194171
This information is written in "target\quarkus-artifact.properties" and used by the integration tests (failsafe).
195-
Sadly there is only 1 file create, so this build overwrites the one from basex.
196172
-->
197173
<execution>
198174
<id>build-postgresql</id>
@@ -285,23 +261,6 @@ SPDX-License-Identifier: Apache-2.0
285261
<artifactId>maven-failsafe-plugin</artifactId>
286262
<version>${surefire-plugin.version}</version>
287263
<executions>
288-
<execution>
289-
<id>integration-test-basex</id>
290-
<goals>
291-
<goal>integration-test</goal>
292-
<goal>verify</goal>
293-
</goals>
294-
<configuration>
295-
<systemPropertyVariables>
296-
<native.image.path>
297-
${project.build.directory}/basex-quarkus-app/${project.build.finalName}-runner
298-
</native.image.path>
299-
<java.util.logging.manager>org.jboss.logmanager.LogManager
300-
</java.util.logging.manager>
301-
<maven.home>${maven.home}</maven.home>
302-
</systemPropertyVariables>
303-
</configuration>
304-
</execution>
305264
</executions>
306265
</plugin>
307266
</plugins>

‎app/src/main/docker/Dockerfile-basex.jvm‎

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎app/src/main/docker/Dockerfile-basex.native‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
# docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/app-jvm
2222
#
2323
###
24-
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-860
24+
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1072.1697626218
2525

2626
ARG JAVA_PACKAGE=java-17-openjdk-headless
2727
ARG RUN_JAVA_VERSION=1.3.8

0 commit comments

Comments
 (0)