Skip to content

Commit 22dd14f

Browse files
authored
Merge pull request #1749 from DependencyTrack/issue-1710
2 parents c4d852e + c6e6a19 commit 22dd14f

File tree

3 files changed

+6
-12
lines changed

3 files changed

+6
-12
lines changed

.github/workflows/update-config-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
scriptargs: >-
5454
--template ./scripts/config-docs.md.peb
5555
--output ./docs/reference/configuration/api-server.md
56-
./hyades-apiserver/src/main/resources/application.properties
56+
./hyades-apiserver/apiserver/src/main/resources/application.properties
5757
- name: Generate Mirror Service Documentation
5858
uses: jbangdev/jbang-action@36d4a384d215d91c2c7e74014a486cedfe09d760 # tag=v0.119.0
5959
with:

docs/development/building.md

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -98,15 +98,10 @@ This segment provides build instructions for the `DependencyTrack/hyades-apiserv
9898
To build an executable JAR:
9999

100100
```shell
101-
mvn clean package \
102-
-Pclean-exclude-wars \
103-
-Penhance \
104-
-Pembedded-jetty \
105-
-DskipTests \
106-
-Dlogback.configuration.file=src/main/docker/logback.xml
101+
mvn clean package -DskipTests
107102
```
108103

109-
The resulting file is placed in `./target` as `dependency-track-apiserver.jar`.
104+
The resulting file is placed in `./apiserver/target` as `dependency-track-apiserver.jar`.
110105
The JAR ships with an embedded Jetty server, there's no need to deploy it in an application server like Tomcat or WildFly.
111106

112107
### Container
@@ -120,10 +115,9 @@ To build the API server image:
120115

121116
```shell
122117
docker build \
123-
--build-arg WAR_FILENAME=dependency-track-apiserver.jar \
124118
-t ghcr.io/dependencytrack/hyades-apiserver:local \
125-
-f ./src/main/docker/Dockerfile \
126-
.
119+
-f ./apiserver/src/main/docker/Dockerfile \
120+
./apiserver
127121
```
128122

129123
## `hyades-frontend`

docs/development/testing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ When testing changes that are limited to the API server, such as updates to the
140140
it's possible to launch the API server in [dev services](../reference/configuration/api-server.md#devservicesenabled) mode:
141141

142142
```shell
143-
mvn -Penhance -Pdev-services jetty:run -Dlogback.configurationFile=src/main/docker/logback.xml
143+
mvn -pl apiserver -Pdev-services jetty:run
144144
```
145145

146146
The container images used may be configured via:

0 commit comments

Comments
 (0)