Commit graph

174 commits

Author SHA1 Message Date
anhefti
c81d5dadbf prepare for next patch release 2024-09-02 15:11:45 +02:00
anhefti
e56605f405 preparing for release 2.0.0 2024-09-02 12:08:35 +02:00
anhefti
485273d05e fixed build 2024-06-24 13:46:25 +02:00
anhefti
a6b9554c76 fixed build 2024-06-24 13:35:41 +02:00
anhefti
99bf2f25da SEBSERV-549 fixed. was introduced by fix of SEBSERV-515 + code cleanup 2024-06-24 13:23:19 +02:00
anhefti
38fb5e06a0 Merge branch 'dev-1.6' into development
# Conflicts:
#	pom.xml
2024-06-24 11:47:40 +02:00
anhefti
37f5cf9ea9 Prepare for next patch release 1.6.2 2024-06-05 09:18:49 +02:00
anhefti
1ac7e99be0 Prepare for patch release 1.6.1 2024-06-05 08:49:09 +02:00
anhefti
9618b942fb SEBSERV-418 2024-05-22 13:32:30 +02:00
anhefti
a81447601b changed version from 1.7 to 2.0 2024-04-11 09:05:39 +02:00
anhefti
b15221753a fixed reporting for Java 17 2024-04-03 16:09:08 +02:00
anhefti
1657824285 fix build 2024-03-28 16:05:47 +01:00
anhefti
f8d70c4ab7 fix build 2024-03-28 15:58:24 +01:00
anhefti
7103e721b5 Merge branch 'dev-1.6' into development
# Conflicts:
#	pom.xml
2024-03-28 15:51:06 +01:00
anhefti
5d05cb4213 prepare for next patch 2024-03-28 15:50:16 +01:00
anhefti
b54844ec1a prepare for release 2024-03-28 15:04:59 +01:00
anhefti
4cfc666029 update pom Version to 1.7-SNAPSHOT 2024-03-11 15:48:59 +01:00
anhefti
816528de87 adapt to new jenkins reporting 2024-03-05 14:20:44 +01:00
anhefti
acc4532ff4 fixed let_reporting 2024-03-05 09:49:19 +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
1cbc97ef8f Merge remote-tracking branch 'origin/rel-1.5.2' into development
Conflicts:
	pom.xml
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamUpdateHandler.java
	src/main/resources/config/ehcache.xml
	src/main/resources/messages.properties
2023-10-03 08:13:03 +02:00
anhefti
3465f5b836 prepare for patch 1.5.2 2023-10-02 15:39:00 +02:00
anhefti
5982a9e864 SEBSERV-405 and SEBSERV-434 SEB Settings 2023-08-31 14:46:13 +02:00
anhefti
b9d3b4522a SEBSERV-369 mybatis update 2023-08-24 13:34:05 +02:00
anhefti
40c6d2b1f3 SEBSERV-405 boot 2.6.15 mybatis 3.5.6 (old) 2023-08-24 13:01:46 +02:00
anhefti
e0d1b48192 preparing for next relese 1.5.2 2023-06-19 14:21:50 +02:00
anhefti
24dd1b94c0 prepare for release 1.6 2023-05-08 19:45:00 +02:00
anhefti
51daaca892 prepare for next release 1.5.1 2023-05-08 19:43:37 +02:00
anhefti
64606ec4e7 prepare Release 1.5.0 2023-05-08 18:32:10 +02:00
anhefti
ce8a509fa9 prepare for UZH pre release 2023-04-06 15:10:01 +02:00
anhefti
166659af11 code cleanup 2022-10-03 12:26:32 +02:00
anhefti
2707fe3003 prepare for 1.5-SNAMPSHOT 2022-08-16 13:48:03 +02:00
anhefti
9625383f50 prepare for 1.4.1 patch 2022-08-15 14:15:27 +02:00
anhefti
422fbb61df prepare for release 2022-08-15 12:53:50 +02:00
anhefti
335cab3783 SEBSERV-332 2022-06-28 14:12:10 +02:00
anhefti
7fe89e7c39 prepare for v1.4-rc1 2022-06-23 08:53:27 +02:00
anhefti
5b56e6e1b9 SEBSERV-140 merged from api-docu branch. 2022-04-14 16:13:40 +02:00
anhefti
09b238d9c3 jenkins fix 2022-03-28 13:36:08 +02:00
anhefti
29e724b45c update jenkins pipline 2022-03-28 11:43:26 +02:00
anhefti
8dae41f754 Merge remote-tracking branch 'origin/dev-1.3' 2022-03-15 08:38:27 +01:00
anhefti
d8bcb358c2 prepare for rel 1.3.0 2022-03-14 10:23:16 +01:00
anhefti
c21f0ef463 # WARNING: head commit changed in the meantime
Merge remote-tracking branch 'origin/master' into dev-1.3
plus more unit tests
plus CircuitBreaker fix
2022-03-02 17:09:37 +01:00
anhefti
b1f48cc998 update log4j to version 2.17.0 2022-03-02 09:40:05 +01:00
anhefti
8112ee1993 preparing for version v1.3-rc2 2022-02-10 14:26:04 +01:00
anhefti
e0298a2727 set new version 1.3-rc1 2022-01-27 11:59:40 +01:00
anhefti
bf0c5cf07f Merge remote-tracking branch 'origin/dev-1.2' into development
Conflicts:
	pom.xml
2021-12-15 09:04:38 +01:00
anhefti
faab3eeb51 merge 2021-12-14 09:33:33 +01:00
anhefti
0ff6ce45ca prepare for patch release 1.2.6 (log4jshell scan false-pos prevention) 2021-12-14 09:18:59 +01:00
anhefti
f161587f6a Merge remote-tracking branch 'origin/dev-1.2' into development
Conflicts:
	src/main/java/ch/ethz/seb/sebserver/gui/content/MonitoringClientConnection.java
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ExamDAOImpl.java
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamSessionControlTask.java
2021-12-13 15:58:52 +01:00