Skip to content

Commit 45415f5

Browse files
author
Dennis Labordus
committed
Make basex the default profile. Better for tooling to make script work.
Signed-off-by: Dennis Labordus <[email protected]>
1 parent 1cfe663 commit 45415f5

File tree

7 files changed

+14
-10
lines changed

7 files changed

+14
-10
lines changed

.github/workflows/build-project.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]'
5353
- name: Build Native with Maven
5454
if: ${{ github.event_name == 'pull_request' }}
55-
run: ./mvnw -s custom_maven_settings.xml -P basex -B clean verify -Pnative
55+
run: ./mvnw -s custom_maven_settings.xml -B clean verify -Pnative
5656
- name: Build with Maven
5757
if: ${{ github.event_name == 'push' }}
58-
run: ./mvnw -s custom_maven_settings.xml -P basex -B clean verify
58+
run: ./mvnw -s custom_maven_settings.xml -B clean verify

.github/workflows/release-project.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,6 @@ jobs:
5656
env:
5757
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5858
- name: Deploy with Maven to GitHub Packages and Docker Hub
59-
run: ./mvnw -B -s custom_maven_settings.xml -P basex,release,native clean deploy
59+
run: ./mvnw -B -s custom_maven_settings.xml -P release,native clean deploy
6060
env:
6161
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/sonarcloud-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5757
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
5858
run: |
59-
./mvnw -s custom_maven_settings.xml -B -P basex,sonar \
59+
./mvnw -s custom_maven_settings.xml -B -P sonar \
6060
-Dsonar.projectKey=com-pas_compas-scl-data-service \
6161
-Dsonar.organization=com-pas \
6262
-Dsonar.host.url=https://sonarcloud.io \

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ to [documentation](doc/compas-scl-data-service.md).
2121

2222
There are currently two database implementations available.
2323

24-
- For more information about the BaseX Implementation go to [BaseX](doc/basex.md).
24+
- For more information about the BaseX Implementation go to [BaseX](doc/basex.md). (Profile activated by default.)
2525
- For more information about the PostgreSQL Implementation go to [PostgreSQL](doc/postgresql.md).
2626

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

app/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,10 @@ SPDX-License-Identifier: Apache-2.0
146146
<profile>
147147
<id>basex</id>
148148

149+
<activation>
150+
<activeByDefault>true</activeByDefault>
151+
</activation>
152+
149153
<properties>
150154
<quarkus.profile>prod,prod-basex</quarkus.profile>
151155
</properties>

doc/basex.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,23 +42,23 @@ docker run --rm --name compas_basex \
4242
You can run the following command to build the BaseX version of the application.
4343

4444
```shell script
45-
./mvnw -P basex clean verify
45+
./mvnw clean verify
4646
```
4747

4848
### Running the application in dev mode
4949

5050
You can run your application in dev mode that enables live coding using:
5151

5252
```shell script
53-
./mvnw -P basex -DskipTests=true -Dquarkus.profile=dev,prod-basex package io.quarkus:quarkus-maven-plugin::dev
53+
./mvnw -Dquarkus.profile=dev,prod-basex package io.quarkus:quarkus-maven-plugin::dev
5454
```
5555

5656
### Creating a native executable
5757

5858
You can create a native executable using:
5959

6060
```shell script
61-
./mvnw -P basex,native package
61+
./mvnw -P native package
6262
```
6363

6464
This will run the native executable build in a container, because in the native profile the property

doc/postgresql.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ docker run --rm --name compas_postgres \
4747
You can run the following command to build the BaseX version of the application.
4848

4949
```shell script
50-
./mvnw -P postgres clean verify
50+
./mvnw -P !basex,postgres clean verify
5151
```
5252

5353
### Running the application in dev mode
5454

5555
You can run your application in dev mode that enables live coding using:
5656

5757
```shell script
58-
./mvnw -P postgres -DskipTests=true -Dquarkus.profile=dev,prod-postgres package io.quarkus:quarkus-maven-plugin::dev
58+
./mvnw -P !basex,postgres -DskipTests=true -Dquarkus.profile=dev,prod-postgres package io.quarkus:quarkus-maven-plugin::dev
5959
```
6060

0 commit comments

Comments
 (0)