Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move scripts directory; Use standard directory for IntelliJ run configurations; Add project icon #370

Merged
merged 2 commits into from
Oct 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
.github/
.idea/
.run/
docs/
scripts/
# The source directory is required by Dockerfile.demo
Expand Down
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,12 @@ docs/Gemfile.lock
target/
.classpath
.project
.idea/
.vscode/

# windows
~

# IntelliJ
.idea/*
!.idea/icon.svg
!.idea/runConfigurations/
15 changes: 15 additions & 0 deletions .idea/icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions DEVELOPING.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ There are a few things you'll need on your journey:
* Docker (optional)

> We provide common [run configurations](https://www.jetbrains.com/help/idea/run-debug-configuration.html) for IntelliJ
> in the [`.run`](./.run) directory for convenience. IntelliJ will automatically pick those up when you open this
> in the [`.idea/runConfigurations`](.idea/runConfigurations) directory for convenience. IntelliJ will automatically pick those up when you open this
> repository.

## Core Technologies
Expand Down Expand Up @@ -97,7 +97,7 @@ To build and run the API server in one go, invoke the Jetty Maven plugin as foll
mvn jetty:run -P enhance -Dlogback.configurationFile=src/main/docker/logback.xml
```

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

## Debugging with Frontend
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash

DEFAULT_OUTPUT="./schema.sql"
DEFAULT_DNPROPS="./scripts/dbschema-generate.datanucleus.properties"
DEFAULT_DNPROPS="./dev/scripts/dbschema-generate.datanucleus.properties"

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