Skip to content

Commit 4ea7050

Browse files
authored
Merge pull request #370 from DependencyTrack/port-pr2675
Move `scripts` directory; Use standard directory for IntelliJ run configurations; Add project icon
2 parents d056b1e + a904156 commit 4ea7050

15 files changed

+23
-6
lines changed

.dockerignore

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
.github/
22
.idea/
3-
.run/
43
docs/
54
scripts/
65
# The source directory is required by Dockerfile.demo

.gitignore

+4-1
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,12 @@ docs/Gemfile.lock
1010
target/
1111
.classpath
1212
.project
13-
.idea/
1413
.vscode/
1514

1615
# windows
1716
~
1817

18+
# IntelliJ
19+
.idea/*
20+
!.idea/icon.svg
21+
!.idea/runConfigurations/

.idea/icon.svg

+15
Loading
File renamed without changes.
File renamed without changes.
File renamed without changes.

DEVELOPING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ There are a few things you'll need on your journey:
2727
* Docker (optional)
2828

2929
> We provide common [run configurations](https://www.jetbrains.com/help/idea/run-debug-configuration.html) for IntelliJ
30-
> in the [`.run`](./.run) directory for convenience. IntelliJ will automatically pick those up when you open this
30+
> in the [`.idea/runConfigurations`](.idea/runConfigurations) directory for convenience. IntelliJ will automatically pick those up when you open this
3131
> repository.
3232
3333
## Core Technologies
@@ -97,7 +97,7 @@ To build and run the API server in one go, invoke the Jetty Maven plugin as foll
9797
mvn jetty:run -P enhance -Dlogback.configurationFile=src/main/docker/logback.xml
9898
```
9999

100-
The above command is also suitable for debugging. For IntelliJ, simply *Debug* the [Jetty](./.run/Jetty.run.xml) run
100+
The above command is also suitable for debugging. For IntelliJ, simply *Debug* the [Jetty](.idea/runConfigurations/Jetty.run.xml) run
101101
configuration.
102102

103103
## Debugging with Frontend
File renamed without changes.

scripts/dbschema-generate.sh dev/scripts/dbschema-generate.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22

33
DEFAULT_OUTPUT="./schema.sql"
4-
DEFAULT_DNPROPS="./scripts/dbschema-generate.datanucleus.properties"
4+
DEFAULT_DNPROPS="./dev/scripts/dbschema-generate.datanucleus.properties"
55

66
function printHelp() {
77
echo "Generate the database schema for Dependency-Track."
@@ -40,4 +40,4 @@ mvn datanucleus:schema-create \
4040
-Dprops="${dnprops:-$DEFAULT_DNPROPS}" \
4141
-DcompleteDdl=true \
4242
-DddlFile="${output:-$DEFAULT_OUTPUT}" \
43-
-Dlog4jConfiguration=./scripts/dbschema-generate.log4j.properties
43+
-Dlog4jConfiguration=./dev/scripts/dbschema-generate.log4j.properties
File renamed without changes.

0 commit comments

Comments
 (0)