From de11bb9532080cdbb76f7864963631d150fcb376 Mon Sep 17 00:00:00 2001 From: nscuro Date: Thu, 19 Oct 2023 16:33:37 +0200 Subject: [PATCH 1/2] Move `scripts` to `dev` directory Partially ported from https://github.com/DependencyTrack/dependency-track/pull/2675. Docker Compose files live in the hyades repository now and don't have to be ported here. Signed-off-by: nscuro --- {scripts => dev/scripts}/data-nist-generate-dummy.sh | 0 .../scripts}/dbschema-generate.datanucleus.properties | 0 {scripts => dev/scripts}/dbschema-generate.log4j.properties | 0 {scripts => dev/scripts}/dbschema-generate.sh | 4 ++-- {scripts => dev/scripts}/logs-clear.sh | 0 5 files changed, 2 insertions(+), 2 deletions(-) rename {scripts => dev/scripts}/data-nist-generate-dummy.sh (100%) rename {scripts => dev/scripts}/dbschema-generate.datanucleus.properties (100%) rename {scripts => dev/scripts}/dbschema-generate.log4j.properties (100%) rename {scripts => dev/scripts}/dbschema-generate.sh (86%) rename {scripts => dev/scripts}/logs-clear.sh (100%) diff --git a/scripts/data-nist-generate-dummy.sh b/dev/scripts/data-nist-generate-dummy.sh similarity index 100% rename from scripts/data-nist-generate-dummy.sh rename to dev/scripts/data-nist-generate-dummy.sh diff --git a/scripts/dbschema-generate.datanucleus.properties b/dev/scripts/dbschema-generate.datanucleus.properties similarity index 100% rename from scripts/dbschema-generate.datanucleus.properties rename to dev/scripts/dbschema-generate.datanucleus.properties diff --git a/scripts/dbschema-generate.log4j.properties b/dev/scripts/dbschema-generate.log4j.properties similarity index 100% rename from scripts/dbschema-generate.log4j.properties rename to dev/scripts/dbschema-generate.log4j.properties diff --git a/scripts/dbschema-generate.sh b/dev/scripts/dbschema-generate.sh similarity index 86% rename from scripts/dbschema-generate.sh rename to dev/scripts/dbschema-generate.sh index 198b7a9fd..ee0230c04 100755 --- a/scripts/dbschema-generate.sh +++ b/dev/scripts/dbschema-generate.sh @@ -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." @@ -40,4 +40,4 @@ mvn datanucleus:schema-create \ -Dprops="${dnprops:-$DEFAULT_DNPROPS}" \ -DcompleteDdl=true \ -DddlFile="${output:-$DEFAULT_OUTPUT}" \ - -Dlog4jConfiguration=./scripts/dbschema-generate.log4j.properties \ No newline at end of file + -Dlog4jConfiguration=./dev/scripts/dbschema-generate.log4j.properties \ No newline at end of file diff --git a/scripts/logs-clear.sh b/dev/scripts/logs-clear.sh similarity index 100% rename from scripts/logs-clear.sh rename to dev/scripts/logs-clear.sh From a904156159d6711f14209ae7c80f69433f420597 Mon Sep 17 00:00:00 2001 From: nscuro Date: Thu, 19 Oct 2023 16:40:11 +0200 Subject: [PATCH 2/2] Use IntelliJ standard directory for run configurations, and add project icon Ported from https://github.com/DependencyTrack/dependency-track/pull/2913 Signed-off-by: nscuro --- .dockerignore | 1 - .gitignore | 5 ++++- .idea/icon.svg | 15 +++++++++++++++ .../Build API Server Image.run.xml | 0 .../runConfigurations}/Build API Server.run.xml | 0 .../DataNucleus Enhance.run.xml | 0 .../Jetty with PostgreSQL.run.xml | 0 {.run => .idea/runConfigurations}/Jetty.run.xml | 0 {.run => .idea/runConfigurations}/Test.run.xml | 0 DEVELOPING.md | 4 ++-- 10 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 .idea/icon.svg rename {.run => .idea/runConfigurations}/Build API Server Image.run.xml (100%) rename {.run => .idea/runConfigurations}/Build API Server.run.xml (100%) rename {.run => .idea/runConfigurations}/DataNucleus Enhance.run.xml (100%) rename {.run => .idea/runConfigurations}/Jetty with PostgreSQL.run.xml (100%) rename {.run => .idea/runConfigurations}/Jetty.run.xml (100%) rename {.run => .idea/runConfigurations}/Test.run.xml (100%) diff --git a/.dockerignore b/.dockerignore index 53a60c200..e125fd555 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,6 +1,5 @@ .github/ .idea/ -.run/ docs/ scripts/ # The source directory is required by Dockerfile.demo diff --git a/.gitignore b/.gitignore index d8e714db4..6d373cb93 100644 --- a/.gitignore +++ b/.gitignore @@ -10,9 +10,12 @@ docs/Gemfile.lock target/ .classpath .project -.idea/ .vscode/ # windows ~ +# IntelliJ +.idea/* +!.idea/icon.svg +!.idea/runConfigurations/ \ No newline at end of file diff --git a/.idea/icon.svg b/.idea/icon.svg new file mode 100644 index 000000000..f76a7e895 --- /dev/null +++ b/.idea/icon.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/.run/Build API Server Image.run.xml b/.idea/runConfigurations/Build API Server Image.run.xml similarity index 100% rename from .run/Build API Server Image.run.xml rename to .idea/runConfigurations/Build API Server Image.run.xml diff --git a/.run/Build API Server.run.xml b/.idea/runConfigurations/Build API Server.run.xml similarity index 100% rename from .run/Build API Server.run.xml rename to .idea/runConfigurations/Build API Server.run.xml diff --git a/.run/DataNucleus Enhance.run.xml b/.idea/runConfigurations/DataNucleus Enhance.run.xml similarity index 100% rename from .run/DataNucleus Enhance.run.xml rename to .idea/runConfigurations/DataNucleus Enhance.run.xml diff --git a/.run/Jetty with PostgreSQL.run.xml b/.idea/runConfigurations/Jetty with PostgreSQL.run.xml similarity index 100% rename from .run/Jetty with PostgreSQL.run.xml rename to .idea/runConfigurations/Jetty with PostgreSQL.run.xml diff --git a/.run/Jetty.run.xml b/.idea/runConfigurations/Jetty.run.xml similarity index 100% rename from .run/Jetty.run.xml rename to .idea/runConfigurations/Jetty.run.xml diff --git a/.run/Test.run.xml b/.idea/runConfigurations/Test.run.xml similarity index 100% rename from .run/Test.run.xml rename to .idea/runConfigurations/Test.run.xml diff --git a/DEVELOPING.md b/DEVELOPING.md index ed6d1f335..53b19875d 100644 --- a/DEVELOPING.md +++ b/DEVELOPING.md @@ -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 @@ -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