Merge remote-tracking branch 'origin/documenation/exam-exercise-updat…

…e-notification' into documenation/exam-exercise-update-notification
ls1intum · Oct 9, 2023 · 420b9ce · 420b9ce
2 parents aaf2ed6 + 3b27909
commit 420b9ce
Show file tree

Hide file tree

Showing 391 changed files with 5,372 additions and 12,050 deletions.
diff --git a/build.gradle b/build.gradle
@@ -29,7 +29,7 @@ plugins {
 }
 
 group = "de.tum.in.www1.artemis"
-version = "6.5.3"
+version = "6.6.0"
 description = "Interactive Learning with Individual Feedback"
 
 sourceCompatibility=17

diff --git a/checkstyle.xml b/checkstyle.xml
@@ -20,5 +20,6 @@
             <property name="allowedAnnotations" value="Override,Test,ParameterizedTest,BeforeEach,AfterEach,BeforeAll,AfterAll"/>
         </module>
         <module name="ModifierOrder"/>
+        <module name="NeedBracesCheck"/>
     </module>
 </module>
diff --git a/docker/atlassian.yml b/docker/atlassian.yml
@@ -9,7 +9,7 @@ services:
         extra_hosts:
             - "host.docker.internal:host-gateway"
         image: ghcr.io/ls1intum/artemis-jira:9.4.3
-        pull_policy: always
+        pull_policy: if_not_present
         volumes:
             - artemis-jira-data:/var/atlassian/application-data/jira
         ports:
@@ -25,7 +25,7 @@ services:
         extra_hosts:
             - "host.docker.internal:host-gateway"
         image: ghcr.io/ls1intum/artemis-bitbucket:8.13.1
-        pull_policy: always
+        pull_policy: if_not_present
         volumes:
             - artemis-bitbucket-data:/var/atlassian/application-data/bitbucket
         environment:
@@ -45,7 +45,7 @@ services:
         extra_hosts:
             - "host.docker.internal:host-gateway"
         image: ghcr.io/ls1intum/artemis-bamboo:9.3.3
-        pull_policy: always
+        pull_policy: if_not_present
         volumes:
             - artemis-bamboo-data:/var/atlassian/application-data/bamboo
         ports:
@@ -69,8 +69,8 @@ services:
         hostname: bamboo-build-agent
         extra_hosts:
             - "host.docker.internal:host-gateway"
-        image: ghcr.io/ls1intum/artemis-bamboo-build-agent:9.2.1
-        pull_policy: always
+        image: ghcr.io/ls1intum/artemis-bamboo-build-agent:9.3.3
+        pull_policy: if_not_present
         volumes:
             # The following path needs to be the same absolute path on the host because of the docker socket:
             # https://confluence.atlassian.com/bamkb/bamboo-in-docker-build-fails-due-to-a-missing-working-directory-when-using-docker-runner-1027119339.html

diff --git a/docker/atlassian/atlassian-setup.sh b/docker/atlassian/atlassian-setup.sh
@@ -1,52 +1,12 @@
 #!/bin/bash
 # for configuring instance over script
-jira_internal_port=8080
 jira_external_port=8081
-bamboo_port=8085
-bitbucket_port=7990
-
-same_credentials=false
 
 set -e
-
-while true; do
-    read -p $'Are you using the same Username + Password on all three systems (Jira, Bamboo, Bitbucket)? \n' yn
-    case $yn in
-        [Yy]* ) same_credentials=true; break;;
-        [Nn]* ) same_credentials=false; break;;
-        * ) echo "Please answer yes or no.";;
-    esac
-done
-
-if [ "$same_credentials" = true ] ; then
-    echo In order to work, you need to provide the Username and Password of an admin account for Jira, Bamboo and Bitbucket
-    echo Admin Account for ALL Systems
-    read -p 'Username: ' all_uservar
-    read -sp 'Password: ' all_passvar
-    echo
-    jira_uservar=$all_uservar
-    jira_passvar=$all_passvar
-    bamboo_uservar=$all_uservar
-    bamboo_passvar=$all_passvar
-    bitbucket_uservar=$all_uservar
-    bitbucket_passvar=$all_passvar
-else
-    echo In order to work, you need to provide the Username and Password of an admin account for Jira, Bamboo and Bitbucket
-    echo Jira Admin Account
-    read -p 'Username: ' jira_uservar
-    read -sp 'Password: ' jira_passvar
-    echo
-
-    echo Bamboo Admin Account
-    read -p 'Username: ' bamboo_uservar
-    read -sp 'Password: ' bamboo_passvar
-    echo
-
-    echo Bitbucket Admin Account
-    read -p 'Username: ' bitbucket_uservar
-    read -sp 'Password: ' bitbucket_passvar
-    echo
-fi
+echo In order to work, you need to provide the Username and Password of an admin account for Jira
+echo Jira Admin Account
+read -p 'Username: ' jira_uservar
+read -sp 'Password: ' jira_passvar
 
 # create groups
 
@@ -113,190 +73,3 @@ for i in {1..20}; do
             }" \
     "$jira_group_add_url$group"
 done
-
-# Application Links
-
-jira_url="http://localhost:$jira_external_port/rest/applinks/latest/applicationlinkForm/createAppLink"
-bamboo_url="http://localhost:$bamboo_port/rest/applinks/latest/applicationlinkForm/createAppLink"
-bitbucket_url="http://localhost:$bitbucket_port/rest/applinks/latest/applicationlinkForm/createAppLink"
-
-internal_jira_url="http://jira:$jira_internal_port"
-internal_bamboo_url="http://bamboo:$bamboo_port"
-internal_bitbucket_url="http://bitbucket:$bitbucket_port"
-
-echo $'\nConfiguring ApplicationLinks'
-# Jira
-# add link from jira to bitbucket
-curl -u "$jira_uservar":"$jira_passvar" \
-    -s \
-    --fail \
-    --show-error \
-    --header "Content-Type: application/json" \
-    --request POST \
-    --data "{
-                \"applicationLink\": {
-                    \"typeId\": \"stash\",
-                    \"name\": \"LS1 Bitbucket Server\",
-                    \"displayUrl\": \"$internal_bitbucket_url\",
-                    \"rpcUrl\": \"$internal_bitbucket_url\",
-                    \"isPrimary\": true,
-                    \"isSystem\": true
-                },
-                \"username\": \"$bitbucket_uservar\",
-                \"password\": \"$bitbucket_passvar\",
-                \"customRpcURL\": false,
-                \"rpcUrl\": \"$internal_jira_url\",
-                \"createTwoWayLink\": false,
-                \"configFormValues\": {
-                \"trustEachOther\": true,
-                \"shareUserbase\": true
-                }
-            }" \
-    $jira_url
-# add link from jira to bamboo
-curl -u "$jira_uservar":"$jira_passvar" \
-    --fail \
-    --show-error \
-    --header "Content-Type: application/json" \
-    --request POST \
-    --data "{
-                \"applicationLink\": {
-                    \"typeId\": \"bamboo\",
-                    \"name\": \"LS1 Bamboo Server\",
-                    \"displayUrl\": \"$internal_bamboo_url\",
-                    \"rpcUrl\": \"$internal_bamboo_url\",
-                    \"isPrimary\": true,
-                    \"isSystem\": true
-                },
-                \"username\": \"$bamboo_uservar\",
-                \"password\": \"$bamboo_passvar\",
-                \"customRpcURL\": false,
-                \"rpcUrl\": \"$internal_jira_url\",
-                \"createTwoWayLink\": false,
-                \"configFormValues\": {
-                \"trustEachOther\": true,
-                \"shareUserbase\": true
-                }
-            }" \
-    $jira_url
-# Bamboo
-# add link from bamboo to bitbucket
-curl -u "$bamboo_uservar":"$bamboo_passvar" \
-    --fail \
-    --show-error \
-    --header "Content-Type: application/json" \
-    --request POST \
-    --data "{
-                \"applicationLink\": {
-                    \"typeId\": \"stash\",
-                    \"name\": \"LS1 Bitbucket Server\",
-                    \"displayUrl\": \"$internal_bitbucket_url\",
-                    \"rpcUrl\": \"$internal_bitbucket_url\",
-                    \"isPrimary\": true,
-                    \"isSystem\": true
-                },
-                \"username\": \"$bitbucket_uservar\",
-                \"password\": \"$bitbucket_passvar\",
-                \"customRpcURL\": false,
-                \"rpcUrl\": \"$internal_bamboo_url\",
-                \"createTwoWayLink\": false,
-                \"configFormValues\": {
-                \"trustEachOther\": true,
-                \"shareUserbase\": true
-                }
-            }" \
-    $bamboo_url
-# add link from bamboo to jira
-curl -u "$bamboo_uservar":"$bamboo_passvar" \
-    --fail \
-    --show-error \
-    --header "Content-Type: application/json" \
-    --request POST \
-    --data "{
-                \"applicationLink\": {
-                    \"typeId\": \"jira\",
-                    \"name\": \"LS1 Jira Server\",
-                    \"displayUrl\": \"$internal_jira_url\",
-                    \"rpcUrl\": \"$internal_jira_url\",
-                    \"isPrimary\": true,
-                    \"isSystem\": true
-                },
-                \"username\": \"$jira_uservar\",
-                \"password\": \"$jira_passvar\",
-                \"customRpcURL\": false,
-                \"rpcUrl\": \"$internal_bamboo_url\",
-                \"createTwoWayLink\": false,
-                \"configFormValues\": {
-                \"trustEachOther\": true,
-                \"shareUserbase\": true
-                }
-            }" \
-    $bamboo_url
-#Bitbucket
-# add link from bitbucket to jira
-curl -u "$bitbucket_uservar":"$bitbucket_passvar" \
-    --fail \
-    --show-error \
-    --header "Content-Type: application/json" \
-    --request POST \
-    --data "{
-                \"applicationLink\": {
-                    \"typeId\": \"jira\",
-                    \"name\": \"LS1 Jira Server\",
-                    \"displayUrl\": \"$internal_jira_url\",
-                    \"rpcUrl\": \"$internal_jira_url\",
-                    \"isPrimary\": true,
-                    \"isSystem\": true
-                },
-                \"username\": \"$jira_uservar\",
-                \"password\": \"$jira_passvar\",
-                \"customRpcURL\": false,
-                \"rpcUrl\": \"$internal_bitbucket_url\",
-                \"createTwoWayLink\": false,
-                \"configFormValues\": {
-                \"trustEachOther\": true,
-                \"shareUserbase\": true
-                }
-            }" \
-    $bitbucket_url
-# add link from bitbucket to bamboo
-curl -u "$bitbucket_uservar":"$bitbucket_passvar" \
-    --fail \
-    --show-error \
-    --header "Content-Type: application/json" \
-    --request POST \
-    --data "{
-                \"applicationLink\": {
-                    \"typeId\": \"bamboo\",
-                    \"name\": \"LS1 Bamboo Server\",
-                    \"displayUrl\": \"$internal_bamboo_url\",
-                    \"rpcUrl\": \"$internal_bamboo_url\",
-                    \"isPrimary\": true,
-                    \"isSystem\": true
-                },
-                \"username\": \"$bamboo_uservar\",
-                \"password\": \"$bamboo_passvar\",
-                \"customRpcURL\": false,
-                \"rpcUrl\": \"$internal_bitbucket_url\",
-                \"createTwoWayLink\": false,
-                \"configFormValues\": {
-                \"trustEachOther\": true,
-                \"shareUserbase\": true
-                }
-            }" \
-    $bitbucket_url
-echo ApplicationLinks created
-echo Please finish configuration of ApplicationLinks in browser
-
-jira_application_links_url="http://localhost:$jira_external_port/plugins/servlet/applinks/listApplicationLinks"
-bamboo_application_links_url="http://localhost:$bamboo_port/plugins/servlet/applinks/listApplicationLinks"
-bitbucket_application_links_url="http://localhost:$bitbucket_port/plugins/servlet/applinks/listApplicationLinks"
-
-if [ "$(uname)" == "Darwin" ]
-then
-    open $jira_application_links_url $bamboo_application_links_url $bitbucket_application_links_url
-else
-    xdg-open $jira_application_links_url
-    xdg-open $bamboo_application_links_url
-    xdg-open $bitbucket_application_links_url
-fi
diff --git a/docker/broker-registry.yml b/docker/broker-registry.yml
@@ -2,7 +2,7 @@ services:
     jhipster-registry:
         container_name: artemis-jhipster-registry
         image: docker.io/jhipster/jhipster-registry:v6.1.2
-        pull_policy: always
+        pull_policy: if_not_present
         volumes:
             - ./registry:/central-config
         # When run with the "dev" Spring profile, the JHipster Registry will
@@ -25,7 +25,7 @@ services:
     activemq-broker:
         container_name: artemis-activemq-broker
         image: docker.io/vromero/activemq-artemis:latest
-        pull_policy: always
+        pull_policy: if_not_present
         environment:
             ARTEMIS_USERNAME: guest
             ARTEMIS_PASSWORD: guest

diff --git a/docker/cypress.yml b/docker/cypress.yml
@@ -5,8 +5,8 @@
 services:
     artemis-cypress:
         # Cypress image with node and chrome browser installed (Cypress installation needs to be done separately because we require additional dependencies)
-        image: docker.io/cypress/browsers:node-18.16.0-chrome-114.0.5735.133-1-ff-114.0.2-edge-114.0.1823.51-1
-        pull_policy: always
+        image: docker.io/cypress/browsers:node-20.6.1-chrome-116.0.5845.187-1-ff-117.0-edge-116.0.1938.76-1
+        pull_policy: if_not_present
         environment:
             CYPRESS_baseUrl: "https://artemis-nginx"
             CYPRESS_video: "${bamboo_cypress_video_enabled}"

diff --git a/docker/gitlab-gitlabci.yml b/docker/gitlab-gitlabci.yml
@@ -34,7 +34,7 @@ services:
         shm_size: "256m"
     gitlab-runner:
         image: docker.io/gitlab/gitlab-runner:latest
-        pull_policy: always
+        pull_policy: if_not_present
         container_name: artemis-gitlab-runner
         volumes:
             - /var/run/docker.sock:/var/run/docker.sock

diff --git a/docker/mailhog.yml b/docker/mailhog.yml
@@ -8,7 +8,7 @@ services:
     mailhog:
         container_name: artemis-mailhog
         image: docker.io/mailhog/mailhog
-        pull_policy: always
+        pull_policy: if_not_present
         ports:
             - "1025:1025"
             - "8025:8025"

diff --git a/docker/monitoring.yml b/docker/monitoring.yml
@@ -3,14 +3,14 @@
 # ----------------------------------------------------------------------------------------------------------------------
 # This configuration is intended for development purpose, it's **your** responsibility to harden it for production
 #
-# Out of the box this setup just works with a non-containerized Artemis instancezs
+# Out of the box this setup just works with a non-containerized Artemis instances
 # ----------------------------------------------------------------------------------------------------------------------
 
 services:
   prometheus:
     container_name: artemis-prometheus
     image: docker.io/prom/prometheus:v2.34.0
-    pull_policy: always
+    pull_policy: if_not_present
     volumes:
         - ./monitoring/prometheus/:/etc/prometheus/
     # If you want to expose these ports outside your dev PC,
@@ -26,7 +26,7 @@ services:
   grafana:
     container_name: artemis-grafana
     image: docker.io/grafana/grafana:9.0.2
-    pull_policy: always
+    pull_policy: if_not_present
     volumes:
       - ./monitoring/grafana/provisioning/:/etc/grafana/provisioning/
     environment:

diff --git a/docker/mysql.yml b/docker/mysql.yml
@@ -6,7 +6,7 @@ services:
     mysql:
         container_name: artemis-mysql
         image: docker.io/library/mysql:8.0.33
-        pull_policy: always
+        pull_policy: if_not_present
         volumes:
             - artemis-mysql-data:/var/lib/mysql
         # DO NOT use this default file for production systems!

diff --git a/docker/nginx.yml b/docker/nginx.yml
@@ -7,7 +7,7 @@ services:
         # nginx setup based on artemis prod ansible repository
         container_name: artemis-nginx
         image: docker.io/library/nginx:1.23
-        pull_policy: always
+        pull_policy: if_not_present
         volumes:
             - ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro
             - ./nginx/timeouts.conf:/etc/nginx/conf.d/timeouts.conf:ro