Commit graph

2715 commits

Author SHA1 Message Date
anhefti
843b051597 Merge remote-tracking branch 'origin/dev-1.6' into development
# Conflicts:
#	src/main/java/ch/ethz/seb/sebserver/gui/service/examconfig/impl/AttributeMapping.java
2024-03-11 16:27:33 +01:00
anhefti
46c2ca997b SEBSERV-455 for 1.6 2024-03-11 16:20:37 +01:00
anhefti
3ae95e2bd2 Merge branch 'downgrade_exam_config' into dev-1.6
# Conflicts:
#	src/main/java/ch/ethz/seb/sebserver/gui/service/examconfig/impl/AttributeMapping.java
#	src/main/resources/config/application-dev-ws.properties
2024-03-11 16:06:37 +01:00
anhefti
4cfc666029 update pom Version to 1.7-SNAPSHOT 2024-03-11 15:48:59 +01:00
anhefti
4fe5ebea69 SEBSERV-455 for 1.7 and 1.6 2024-03-11 15:48:04 +01:00
anhefti
dc3b94c328 Merge branch 'downgrade_exam_config' into development
# Conflicts:
#	src/main/java/ch/ethz/seb/sebserver/gui/service/examconfig/impl/AttributeMapping.java
#	src/main/resources/config/application-dev-ws.properties
2024-03-11 15:36:16 +01:00
anhefti
5ddc230a9d SEBSERV-455 2024-03-07 15:25:26 +01:00
anhefti
e0265d2615 SEBSERV-455 2024-03-07 11:14:30 +01:00
anhefti
e821c22504 SEBSERV-455 2024-03-07 10:28:47 +01:00
anhefti
ae4b60e3e8 fix cleanup task 2024-03-06 13:01:36 +01:00
anhefti
25cdffbbb0 fix cleanup task 2024-03-06 12:55:55 +01:00
anhefti
640e398d49 Merge remote-tracking branch 'origin/development' into development 2024-03-06 12:09:42 +01:00
anhefti
3b123ff698 fix cleanup task 2024-03-06 12:09:34 +01:00
Andreas Hefti
d8c464be90
Merge pull request #110 from SafeExamBrowser/SEBSERV-508
SEBSERV-508 change base image to eclipse-temurin:17-jre
2024-03-06 11:52:01 +01:00
anhefti
816528de87 adapt to new jenkins reporting 2024-03-05 14:20:44 +01:00
anhefti
c1a10d564a remove double maven build for reporting 2024-03-05 13:21:34 +01:00
anhefti
52247e8a56 remove double maven build for reporting 2024-03-05 13:16:59 +01:00
anhefti
0ccc5d2164 remove double maven build for reporting 2024-03-05 12:58:51 +01:00
anhefti
3940dcb280 remove double maven build for reporting 2024-03-05 12:50:24 +01:00
anhefti
04ad9da947 fixed maven for reporting 2024-03-05 11:26:53 +01:00
anhefti
3b96c11324 fixed maven for reporting 2024-03-05 10:37:28 +01:00
anhefti
8e115d26d0 remove spotbugs (seems not be existing anymore) 2024-03-05 10:20:35 +01:00
anhefti
350d679300 remove spotbugs (seems not be existing anymore) 2024-03-05 10:09:13 +01:00
anhefti
87a7e11530 fixed let_reporting to 17 2024-03-05 09:59:32 +01:00
anhefti
acc4532ff4 fixed let_reporting 2024-03-05 09:49:19 +01:00
Nadim Ritter
ed68a5c74f SEBSLI-9 reset build yaml to development state 2024-03-05 09:33:28 +01:00
anhefti
4fc5f6fe95 Jenkins test 2024-03-05 09:24:35 +01:00
anhefti
e76d558e48 Jenkins test 2024-03-05 08:52:52 +01:00
anhefti
4ec0cc7aa6 Jenkins test 2024-03-05 08:18:53 +01:00
NadimETH
cd7c759b58
use correct version tag in build yaml 2024-03-04 17:37:35 +01:00
NadimETH
8f8ede317c
upgrade to java 17 in build yaml 2024-03-04 17:34:53 +01:00
anhefti
015806db5b test new Jenkinsfile and switch integration test port to 8888 2024-03-04 16:41:18 +01:00
anhefti
26406b4fdb test new Jenkinsfile 2024-03-04 16:15:46 +01:00
anhefti
d4fd49da9d test new Jenkinsfile 2024-03-04 16:11:44 +01:00
anhefti
543498c0c7 test new Jenkinsfile 2024-03-04 16:10:45 +01:00
anhefti
2c23b4e07d test new Jenkinsfile 2024-03-04 16:09:58 +01:00
anhefti
dfe593836d test new Jenkinsfile 2024-03-04 16:08:32 +01:00
anhefti
284109c77c test new Jenkinsfile 2024-03-04 16:00:06 +01:00
anhefti
69f5ae1d8f test new Jenkinsfile 2024-03-04 15:57:19 +01:00
anhefti
7d466f8151 test new Jenkinsfile 2024-03-04 15:56:17 +01:00
anhefti
0ca2622319 test new Jenkinsfile 2024-03-04 15:49:55 +01:00
anhefti
704578853c test new Jenkinsfile 2024-03-04 15:47:45 +01:00
anhefti
05d4dd11f1 test new Jenkinsfile 2024-03-04 15:46:26 +01:00
anhefti
d30188f01e test new Jenkinsfile 2024-03-04 15:45:25 +01:00
anhefti
4b264abee6 test new Jenkinsfile 2024-03-04 15:42:48 +01:00
anhefti
21f1708ac0 test new Jenkinsfile 2024-03-04 15:41:47 +01:00
anhefti
5667bc8000 test new Jenkinsfile 2024-03-04 15:40:17 +01:00
anhefti
807e4daf8f test new Jenkinsfile 2024-03-04 15:34:16 +01:00
NadimETH
675ae47e04
change base image to eclipse-temurin:17-jre 2024-03-04 15:22:24 +01:00
anhefti
6f97900447 Merge branch 'dev-1.6' into development 2024-03-04 13:24:28 +01:00