From 6f2732074d5ca71493480078f7fc13df07d06a4a Mon Sep 17 00:00:00 2001 From: Combi153 Date: Sun, 5 Nov 2023 18:03:06 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[refactor]=20gradle=20copy=20=EB=A1=9C?= =?UTF-8?q?=EC=A7=81=20=EC=82=AD=EC=A0=9C=20=EB=B0=8F=20submodule=20?= =?UTF-8?q?=EC=9C=84=EC=B9=98=EC=99=80=20=EB=82=B4=EC=9A=A9=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20(#531)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitmodules | 2 +- backend/build.gradle | 7 ------- backend/src/main/resources/config | 1 + sub-2023-trip-draw | 1 - 4 files changed, 2 insertions(+), 9 deletions(-) create mode 160000 backend/src/main/resources/config delete mode 160000 sub-2023-trip-draw diff --git a/.gitmodules b/.gitmodules index d8f4fd079..40933d123 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 8faf7df72..c8fe295b4 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 000000000..3554dac16 --- /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 0b7f20070..000000000 --- a/sub-2023-trip-draw +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0b7f20070585a1788a6a18534ccbeca12256fd35 From d2e1d75512d3bf4e6c9fd20a6fc218ba4e75800c Mon Sep 17 00:00:00 2001 From: Combi153 Date: Sun, 5 Nov 2023 18:03:52 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[refactor]=20=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20.gitignore=20=ED=95=AD=EB=AA=A9=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C=20(#531)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.gitignore b/.gitignore index 83ed42d81..c29e74466 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