From fe7ed7f415b6a4f68c60c5267021697de86d44ff Mon Sep 17 00:00:00 2001 From: zzz-Ricky <120093810+zzz-Ricky@users.noreply.github.com> Date: Fri, 14 Mar 2025 20:08:04 +0000 Subject: [PATCH 1/4] Fixed build.gradle configuration --- build.gradle | 3 +-- docs/BDD_video.mp4 | Bin 12191007 -> 12191004 bytes 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index ff7b120e..876776d6 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ plugins { // gretty is a gradle plugin to make it easy to run a server and hotswap code at runtime. // https://plugins.gradle.org/plugin/org.gretty - id 'org.gretty' version '3.0.4' + id 'org.gretty' version '3.0.6' // provides access to a database versioning tool. id "org.flywaydb.flyway" version "6.0.8" @@ -663,4 +663,3 @@ task runPerfTests(type:Exec) { } - diff --git a/docs/BDD_video.mp4 b/docs/BDD_video.mp4 index 27c4646cf01956f75756fca4569d3aedbc1417d6..571239ede95cfe30e98aab42f099e7dc7eba9064 100644 GIT binary patch delta 665 zcmWN=*;$oTM0_k9wjMRd$n&N#bVm6W(xQ701wha zD-ZE7Q+b4GOlJl&d6dVP#cbyAI8X2-b9st+Jk2va%X2)>d|qGyFY*!#S;S(Nu#{yi z=Ve}D1+TKwu$ooQ5WCw|Ww>3{|GeyurD|T|b=L3(Ygxy7-sCOb<{dWhF7L6C_u0f| zK41%5`H+wJm`~Wor?l}I+xeVg2Vc<6m+WL0yV=8D_VE?_`I>L|mhbqU1N^{24snGpG55U-^yS`GY?>!(W`GgTFb)Kb+?Rom`~BzlLMUY=~b5bj@Sp delta 671 zcmWO1*)|ja0Eh827)vOHqD7I&(qgGbo61fhlvF~9HcM2tGV*7bN~J7ig!UMfqG_&r z2Y2%Z-OM}mUHs1ZZaLbXww z6sB-())sBmHbrQ=b|_L&+No&mQjB7?TXBk4f)ceyd$mvdm84{)ET@{BhCqwSnTi8A zh(ji!EK`F{`4(Cyh3#hf5QbsJV?4oAjNlob;{`_X60b0ZaZF$m zuki*`uwfc+F@ssm;T_)N13uytKI03%Vjc^yV-er*9Y3&ypZJAktl&2s_~Wp Date: Fri, 14 Mar 2025 20:19:38 +0000 Subject: [PATCH 2/4] add BDD_video.mp4 to gitIgnore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 09eb20a6..87817df3 100644 --- a/.gitignore +++ b/.gitignore @@ -76,3 +76,4 @@ node_modules/ .classpath .project .settings/ +docs/BDD_video.mp4 From 1d7b19cf4d64afeb53170b34435f09c97301f79f Mon Sep 17 00:00:00 2001 From: XichengW <144160760+XichengW@users.noreply.github.com> Date: Fri, 14 Mar 2025 23:02:20 +0000 Subject: [PATCH 3/4] Add dockerfile and change gradle -7.0 to gradle 7.3 --- .../gradle/wrapper/gradle-wrapper.properties | 2 +- dockerfile | 39 +++++++++++++++++++ gradle/wrapper/gradle-wrapper.properties | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 dockerfile diff --git a/desktop_app/gradle/wrapper/gradle-wrapper.properties b/desktop_app/gradle/wrapper/gradle-wrapper.properties index f371643e..e750102e 100644 --- a/desktop_app/gradle/wrapper/gradle-wrapper.properties +++ b/desktop_app/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/dockerfile b/dockerfile new file mode 100644 index 00000000..c7e350db --- /dev/null +++ b/dockerfile @@ -0,0 +1,39 @@ +FROM ubuntu:22.04 +COPY . /project +WORKDIR /project + +#install tool +RUN apt-get update && apt-get install -y \ + wget \ + curl \ + software-properties-common +# #python +# RUN apt-get install -y python3 python3-pip && \ +# ln -s /usr/bin/python3 /usr/bin/python +#java +RUN apt-get install -y openjdk-17-jdk +RUN apt-get install -y openjdk-17-jre +# RUN java -version && python --version +RUN java -version +#unzip +RUN apt-get update && apt-get install -y unzip +# #gradle +ENV GRADLE_VERSION=8.13 +RUN wget https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip -O /tmp/gradle.zip && \ + unzip /tmp/gradle.zip -d /opt && \ + rm /tmp/gradle.zip +ENV GRADLE_HOME=/opt/gradle-${GRADLE_VERSION} +ENV PATH=$PATH:$GRADLE_HOME/bin +#chorme driver +RUN CHROMEDRIVER_VERSION=$(wget -qO - https://chromedriver.storage.googleapis.com/LATEST_RELEASE) && \ + wget -q -O /tmp/chromedriver.zip https://chromedriver.storage.googleapis.com/${CHROMEDRIVER_VERSION}/chromedriver_linux64.zip && \ + unzip /tmp/chromedriver.zip -d /usr/local/bin/ && \ + rm /tmp/chromedriver.zip +RUN chmod +x /usr/local/bin/chromedriver +RUN chromedriver --version + +#Clean +RUN apt-get clean && rm -rf /var/lib/apt/lists/* + +EXPOSE 8080 +# CMD [ "./gradlew","apprun" ] \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f371643e..e750102e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/ui_tests/java/gradle/wrapper/gradle-wrapper.properties b/src/ui_tests/java/gradle/wrapper/gradle-wrapper.properties index f371643e..e750102e 100644 --- a/src/ui_tests/java/gradle/wrapper/gradle-wrapper.properties +++ b/src/ui_tests/java/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 426332f54fc4316d9cb1de2edafed6a9f97d6917 Mon Sep 17 00:00:00 2001 From: Akaash Aujla Date: Sun, 16 Mar 2025 16:09:49 -0600 Subject: [PATCH 4/4] README change for push and pull request. --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index cef0ff62..a6e60760 100644 --- a/README.md +++ b/README.md @@ -183,3 +183,5 @@ For example, to set it all up on a [local Windows box](https://raw.githubusercon ![SonarQube analysis](https://c2.staticflickr.com/8/7823/33202009548_e678128200_b.jpg) ![Running performance tests](https://c2.staticflickr.com/8/7854/47077017751_7e045f68dd_b.jpg) + +Change made to demonstrate push and pull request... \ No newline at end of file