Skip to content

Commit 339f5f3

Browse files
authored
Merge pull request #355 from com-pas/remove_basex
Remove basex
2 parents dafe456 + 2f6b3b7 commit 339f5f3

File tree

23 files changed

+2
-1444
lines changed

23 files changed

+2
-1444
lines changed

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/resources/application-dev-basex.properties

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

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ quarkus.log.category."org.lfenergy.compas.scl.data".level = DEBUG
1414
quarkus.http.auth.permission.develop-quarkus-services.paths = /compas-scl-data-service/q/swagger-ui/*,/compas-scl-data-service/index.html
1515
quarkus.http.auth.permission.develop-quarkus-services.policy = permit
1616

17-
# Exclude the other repository implementations from being scanned
18-
quarkus.arc.exclude-dependency.basex-repository.group-id = org.lfenergy.compas.scl.data
19-
quarkus.arc.exclude-dependency.basex-repository.artifact-id = repository-basex
20-
2117
# Datasource configuration for PostgreSQL
2218
quarkus.datasource.devservices.enabled = false
2319
quarkus.datasource.db-kind = postgresql

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

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

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44

55
# Production PostgreSQL configuration.
66

7-
# Exclude the other repository implementations from being scanned
8-
quarkus.arc.exclude-dependency.basex-repository.group-id = org.lfenergy.compas.scl.data
9-
quarkus.arc.exclude-dependency.basex-repository.artifact-id = repository-basex
10-
117
# Add scanning these dependencies for scanning, also used by native compilation.
128
quarkus.index-dependency.postgresql-repository.group-id = org.lfenergy.compas.scl.data
139
quarkus.index-dependency.postgresql-repository.artifact-id = repository-postgresql

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44

55
# Test configuration.
66

7-
# Exclude the other repository implementations from being scanned
8-
quarkus.arc.exclude-dependency.basex-repository.group-id = org.lfenergy.compas.scl.data
9-
quarkus.arc.exclude-dependency.basex-repository.artifact-id = repository-basex
10-
117
# Datasource configuration for PostgreSQL
128
quarkus.datasource.devservices.enabled = true
139
quarkus.datasource.db-kind = postgresql

doc/basex.md

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

0 commit comments

Comments
 (0)