diff --git a/.gitignore b/.gitignore index 83ed42d8..c29e7446 100644 --- a/.gitignore +++ b/.gitignore @@ -26,14 +26,6 @@ misc.xml deploymentTargetDropDown.xml render.experimental.xml -# private files -/backend/src/main/resources/application-dev.yml -/backend/src/main/resources/application-dev1.yml -/backend/src/main/resources/application-dev2.yml -/backend/src/main/resources/application-prod.yml -/backend/src/main/resources/application-prod1.yml -/backend/src/main/resources/application-prod2.yml - # Keystore files *.jks *.keystore diff --git a/.gitmodules b/.gitmodules index d8f4fd07..40933d12 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "sub-2023-trip-draw"] - path = sub-2023-trip-draw + path = backend/src/main/resources/config url = https://github.com/trip-draw/sub-2023-trip-draw.git diff --git a/backend/build.gradle b/backend/build.gradle index 8faf7df7..c8fe295b 100644 --- a/backend/build.gradle +++ b/backend/build.gradle @@ -68,13 +68,6 @@ dependencies { implementation 'org.mindrot:jbcrypt:0.4' } -processResources.dependsOn('copySecret') - -tasks.register('copySecret', Copy) { - from '../sub-2023-trip-draw' - into 'src/main/resources' -} - tasks.named('test') { useJUnitPlatform() } diff --git a/backend/src/main/resources/config b/backend/src/main/resources/config new file mode 160000 index 00000000..3554dac1 --- /dev/null +++ b/backend/src/main/resources/config @@ -0,0 +1 @@ +Subproject commit 3554dac160340853c4dd23fe12b95ef4e441ee7f diff --git a/sub-2023-trip-draw b/sub-2023-trip-draw deleted file mode 160000 index 0b7f2007..00000000 --- a/sub-2023-trip-draw +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0b7f20070585a1788a6a18534ccbeca12256fd35