Merge branch 'development' into 'master'

Release 2.5.1

See merge request !183

.gitlab-ci.yml

@@ -145,19 +145,19 @@ build-env:
     - docker push $CI_REGISTRY/$CI_PROJECT_PATH/build-env
 
 checkstyle:
-  image: $CI_REGISTRY/$CI_PROJECT_PATH/build-env@sha256:43ca04a98adaa2dc2c2d4ce5da58a2514f08d10b7784b3df8c328debac7afc51
+  image: $CI_REGISTRY/$CI_PROJECT_PATH/build-env@sha256:de694e33826dc2f9e9db7e50ff2a8591a01681c2ed96cac2b05f45047ca8995e
   stage: test
   script:
     - ./gradlew checkstyleMain checkstyleTest
 
 spotbugs:
-  image: $CI_REGISTRY/$CI_PROJECT_PATH/build-env@sha256:43ca04a98adaa2dc2c2d4ce5da58a2514f08d10b7784b3df8c328debac7afc51
+  image: $CI_REGISTRY/$CI_PROJECT_PATH/build-env@sha256:de694e33826dc2f9e9db7e50ff2a8591a01681c2ed96cac2b05f45047ca8995e
   stage: test
   script:
     - ./gradlew :spotbugsMain :core:spotbugsMain :worker:spotbugsMain
 
 test:
-  image: $CI_REGISTRY/$CI_PROJECT_PATH/build-env@sha256:43ca04a98adaa2dc2c2d4ce5da58a2514f08d10b7784b3df8c328debac7afc51
+  image: $CI_REGISTRY/$CI_PROJECT_PATH/build-env@sha256:de694e33826dc2f9e9db7e50ff2a8591a01681c2ed96cac2b05f45047ca8995e
   stage: test
   script:
     - ./gradlew test
@@ -189,7 +189,7 @@ test-coverage:
       cobertura: build/reports/jacoco/jacocoRootReport/cobertura.xml
 
 jar-core:
-  image: $CI_REGISTRY/$CI_PROJECT_PATH/build-env@sha256:43ca04a98adaa2dc2c2d4ce5da58a2514f08d10b7784b3df8c328debac7afc51
+  image: $CI_REGISTRY/$CI_PROJECT_PATH/build-env@sha256:de694e33826dc2f9e9db7e50ff2a8591a01681c2ed96cac2b05f45047ca8995e
   stage: jar
   script:
     - ./gradlew bootJar
@@ -199,7 +199,7 @@ jar-core:
     expire_in: 1h
 
 jar-worker:
-  image: $CI_REGISTRY/$CI_PROJECT_PATH/build-env@sha256:43ca04a98adaa2dc2c2d4ce5da58a2514f08d10b7784b3df8c328debac7afc51
+  image: $CI_REGISTRY/$CI_PROJECT_PATH/build-env@sha256:de694e33826dc2f9e9db7e50ff2a8591a01681c2ed96cac2b05f45047ca8995e
   stage: jar
   script:
     - ./gradlew :worker:jar

CHANGELOG.md

@@ -14,6 +14,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 ### Fixed
 
+## [2.5.1] - [2022-09-12]
+### Fixed
+* Reports for Submit no longer escape HTML entities (!180)
+
 ## [2.5.0] - [2022-09-12]
 ### Added
 * Submit script API integration (!177)

build-env.Dockerfile

@@ -10,7 +10,7 @@ RUN sh -c 'apt-get update \
     && apt-get install -y --no-install-recommends openjdk-11-jdk-headless python3 ruby ruby-dev \
             build-essential libicu67 libicu-dev zlib1g zlib1g-dev cmake pkg-config libssl1.1 \
             libssl-dev git python3-pip curl \
-    && curl -fsSL https://deb.nodesource.com/setup_16.x | bash - \
+    && curl -fsSL https://deb.nodesource.com/setup_18.x | bash - \
     && apt-get install -y nodejs \
     && pip3 install profanity-check pylint==2.14.5 \
     && gem install -N github-linguist \

build.gradle

@@ -26,7 +26,7 @@ allprojects {
     apply plugin: ScompPlugin
 
     group 'nl.tudelft.ewi'
-    version = '2.5.0'
+    version = '2.5.1'
 
     sourceCompatibility = '1.11'
     targetCompatibility = '1.11'

core/build.gradle

@@ -67,6 +67,7 @@ task initUi(type: Exec) {
 
     workingDir "${rootProject.projectDir}/ui"
 
+    environment 'NODE_OPTIONS', '--openssl-legacy-provider'
     commandLine 'npm', 'install'
 
     outputs.file("${uiRoot}/package-lock.json")
@@ -77,6 +78,7 @@ task buildUi(type: Exec) {
 
     workingDir "${rootProject.projectDir}/ui"
 
+    environment 'NODE_OPTIONS', '--openssl-legacy-provider'
     commandLine 'npm', 'run', 'build'
 
     outputs.dir("${rootProject.projectDir}/ui/dist/")

core/src/main/java/nl/tudelft/ewi/auta/core/report/SubmitAppReportGenerator.java

@@ -33,6 +33,6 @@ public class SubmitAppReportGenerator extends GenericReportGenerator {
      */
     @Override
     public String getTemplateName() {
-        return "submit/submit-report.ftlh";
+        return "submit/submit-report.ftl";
     }
 }

core/src/main/resources/nl/tudelft/ewi/auta/core/ui/submit/submit-report.ftlh → core/src/main/resources/nl/tudelft/ewi/auta/core/ui/submit/submit-report.ftl

@@ -3,7 +3,7 @@
 <#-- @ftlvariable name="warnings" type="java.util.Map<String, java.util.List>" -->
 <#-- @ftlvariable name="failures" type="java.util.Map<String, java.util.List>" -->
 <#if error??>
-## A server-side error occurred. Please show this message to your TA
+## A server-side error occurred. Please show this message to your TA.
 ${error}
 <#else>
 <#list tips as tip, entityNames>

ui/vue.config.js

@@ -20,4 +20,7 @@ module.exports = {
       }),
     ],
   },
+  devServer: {
+    proxy: 'http://localhost:8080/',
+  },
 };