From 9f23d75b2ecb1cf4f973b045ddd32212e34dea71 Mon Sep 17 00:00:00 2001 From: AlvoBen Date: Tue, 10 Dec 2024 16:00:06 +0200 Subject: [PATCH 1/6] upfrade spring-webmvc version to 6.2.0 --- checkmarx-ast-teamcity-plugin-server/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checkmarx-ast-teamcity-plugin-server/pom.xml b/checkmarx-ast-teamcity-plugin-server/pom.xml index 6bddab6..387b296 100644 --- a/checkmarx-ast-teamcity-plugin-server/pom.xml +++ b/checkmarx-ast-teamcity-plugin-server/pom.xml @@ -101,7 +101,7 @@ org.springframework spring-webmvc - 5.3.39 + 6.2.0 From 92fc52811d694121ace909ee25e7046c00bf6d1c Mon Sep 17 00:00:00 2001 From: AlvoBen Date: Tue, 10 Dec 2024 16:23:15 +0200 Subject: [PATCH 2/6] upfrade spring-webmvc version to 6.2.0 --- checkmarx-ast-teamcity-plugin-server/pom.xml | 6 ++++++ .../teamcity/server/CheckmarxAdminPageController.java | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/checkmarx-ast-teamcity-plugin-server/pom.xml b/checkmarx-ast-teamcity-plugin-server/pom.xml index 387b296..6200b72 100644 --- a/checkmarx-ast-teamcity-plugin-server/pom.xml +++ b/checkmarx-ast-teamcity-plugin-server/pom.xml @@ -97,6 +97,12 @@ + + jakarta.servlet + jakarta.servlet-api + 6.1.0 + provided + org.springframework diff --git a/checkmarx-ast-teamcity-plugin-server/src/main/java/com/checkmarx/teamcity/server/CheckmarxAdminPageController.java b/checkmarx-ast-teamcity-plugin-server/src/main/java/com/checkmarx/teamcity/server/CheckmarxAdminPageController.java index b42e9ac..dad38d2 100644 --- a/checkmarx-ast-teamcity-plugin-server/src/main/java/com/checkmarx/teamcity/server/CheckmarxAdminPageController.java +++ b/checkmarx-ast-teamcity-plugin-server/src/main/java/com/checkmarx/teamcity/server/CheckmarxAdminPageController.java @@ -82,4 +82,9 @@ private ActionErrors validateForm(final HttpServletRequest request) { return errors; } + + @Override + protected ModelAndView handleRequestInternal(jakarta.servlet.http.HttpServletRequest request, jakarta.servlet.http.HttpServletResponse response) throws Exception { + return null; + } } From 7fd5b7820b5c3bf5d5ba507db4c6ec570bdb5505 Mon Sep 17 00:00:00 2001 From: AlvoBen Date: Tue, 10 Dec 2024 17:49:42 +0200 Subject: [PATCH 3/6] upgrade team-city version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index af5f7ce..db284f9 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 1.0-SNAPSHOT pom - 2024.11-SNAPSHOT + 2025.03-SNAPSHOT 1.8 1.8 From c79c8aa1756645cfd389901b97eb5a0aa6a4ea56 Mon Sep 17 00:00:00 2001 From: AlvoBen Date: Wed, 11 Dec 2024 10:12:17 +0200 Subject: [PATCH 4/6] Revert "upfrade spring-webmvc version to 6.2.0" This reverts commit 92fc52811d694121ace909ee25e7046c00bf6d1c. --- checkmarx-ast-teamcity-plugin-server/pom.xml | 6 ------ .../teamcity/server/CheckmarxAdminPageController.java | 5 ----- 2 files changed, 11 deletions(-) diff --git a/checkmarx-ast-teamcity-plugin-server/pom.xml b/checkmarx-ast-teamcity-plugin-server/pom.xml index 6200b72..387b296 100644 --- a/checkmarx-ast-teamcity-plugin-server/pom.xml +++ b/checkmarx-ast-teamcity-plugin-server/pom.xml @@ -97,12 +97,6 @@ - - jakarta.servlet - jakarta.servlet-api - 6.1.0 - provided - org.springframework diff --git a/checkmarx-ast-teamcity-plugin-server/src/main/java/com/checkmarx/teamcity/server/CheckmarxAdminPageController.java b/checkmarx-ast-teamcity-plugin-server/src/main/java/com/checkmarx/teamcity/server/CheckmarxAdminPageController.java index dad38d2..b42e9ac 100644 --- a/checkmarx-ast-teamcity-plugin-server/src/main/java/com/checkmarx/teamcity/server/CheckmarxAdminPageController.java +++ b/checkmarx-ast-teamcity-plugin-server/src/main/java/com/checkmarx/teamcity/server/CheckmarxAdminPageController.java @@ -82,9 +82,4 @@ private ActionErrors validateForm(final HttpServletRequest request) { return errors; } - - @Override - protected ModelAndView handleRequestInternal(jakarta.servlet.http.HttpServletRequest request, jakarta.servlet.http.HttpServletResponse response) throws Exception { - return null; - } } From 8c73a40f50e955d791e89ef57b7486dcf8066f37 Mon Sep 17 00:00:00 2001 From: AlvoBen Date: Wed, 11 Dec 2024 10:12:39 +0200 Subject: [PATCH 5/6] Reapply "upfrade spring-webmvc version to 6.2.0" This reverts commit c79c8aa1756645cfd389901b97eb5a0aa6a4ea56. --- checkmarx-ast-teamcity-plugin-server/pom.xml | 6 ++++++ .../teamcity/server/CheckmarxAdminPageController.java | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/checkmarx-ast-teamcity-plugin-server/pom.xml b/checkmarx-ast-teamcity-plugin-server/pom.xml index 387b296..6200b72 100644 --- a/checkmarx-ast-teamcity-plugin-server/pom.xml +++ b/checkmarx-ast-teamcity-plugin-server/pom.xml @@ -97,6 +97,12 @@ + + jakarta.servlet + jakarta.servlet-api + 6.1.0 + provided + org.springframework diff --git a/checkmarx-ast-teamcity-plugin-server/src/main/java/com/checkmarx/teamcity/server/CheckmarxAdminPageController.java b/checkmarx-ast-teamcity-plugin-server/src/main/java/com/checkmarx/teamcity/server/CheckmarxAdminPageController.java index b42e9ac..dad38d2 100644 --- a/checkmarx-ast-teamcity-plugin-server/src/main/java/com/checkmarx/teamcity/server/CheckmarxAdminPageController.java +++ b/checkmarx-ast-teamcity-plugin-server/src/main/java/com/checkmarx/teamcity/server/CheckmarxAdminPageController.java @@ -82,4 +82,9 @@ private ActionErrors validateForm(final HttpServletRequest request) { return errors; } + + @Override + protected ModelAndView handleRequestInternal(jakarta.servlet.http.HttpServletRequest request, jakarta.servlet.http.HttpServletResponse response) throws Exception { + return null; + } } From 54c42c170b37f14d49e4b00950a572cf4c434973 Mon Sep 17 00:00:00 2001 From: AlvoBen Date: Wed, 11 Dec 2024 10:12:48 +0200 Subject: [PATCH 6/6] Revert "upgrade team-city version" This reverts commit 7fd5b7820b5c3bf5d5ba507db4c6ec570bdb5505. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index db284f9..af5f7ce 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 1.0-SNAPSHOT pom - 2025.03-SNAPSHOT + 2024.11-SNAPSHOT 1.8 1.8