From ce2c90a5f0bb3713e1a287ac2fd97a183b9f044f Mon Sep 17 00:00:00 2001 From: tj-wazei <158822022+tj-wazei@users.noreply.github.com> Date: Sun, 19 May 2024 20:02:33 +0100 Subject: [PATCH] Merge to master (#20) * Update README.md * Improve GHA and usual repository boilerplate (#12) Refactoring GHA for code quality * Repository cleanup (#19) * Delete unnecessary files * Setup multi modular gradle project properly * Rename GUILD.md to README.md * Run Spotless on all files * Update Spring plugin to latest for Java 21 support * Create pre-commit.yaml GHA * Use .yaml for Spring properties * Packaged JShellWrapper * Add docker-compose.yaml * Update README.md --------- Co-authored-by: Alathreon <45936420+Alathreon@users.noreply.github.com> Co-authored-by: Suraj Kumar Co-authored-by: Suraj Kumar --- JShellAPI/build.gradle | 2 +- JShellWrapper/build.gradle | 2 +- build.gradle | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/JShellAPI/build.gradle b/JShellAPI/build.gradle index 7a2380b..a465f8b 100644 --- a/JShellAPI/build.gradle +++ b/JShellAPI/build.gradle @@ -36,4 +36,4 @@ shadowJar { archiveBaseName.set('JShellPlaygroundBackend') archiveClassifier.set('') archiveVersion.set('') -} \ No newline at end of file +} diff --git a/JShellWrapper/build.gradle b/JShellWrapper/build.gradle index 279e8c0..debf2c9 100644 --- a/JShellWrapper/build.gradle +++ b/JShellWrapper/build.gradle @@ -41,4 +41,4 @@ shadowJar { archiveBaseName.set('JShellWrapper') archiveClassifier.set('') archiveVersion.set('') -} \ No newline at end of file +} diff --git a/build.gradle b/build.gradle index c38eabb..c543ba9 100644 --- a/build.gradle +++ b/build.gradle @@ -65,7 +65,12 @@ subprojects { } dependencies { +<<<<<<< HEAD testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2' testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2' +======= + testImplementation 'org.junit.jupiter:junit-jupiter:5.8.1' + testImplementation 'org.junit.jupiter:junit-jupiter:5.8.1' +>>>>>>> 1a41fc8 (Merge to master (#20)) } } \ No newline at end of file