From 565f91254bb0ec81b507289dd210e1ad7b807dbd Mon Sep 17 00:00:00 2001 From: miryamfoiferCX Date: Thu, 26 Dec 2024 13:51:29 +0200 Subject: [PATCH 01/17] Update pom.xml --- checkmarx-ast-teamcity-plugin-server/pom.xml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/checkmarx-ast-teamcity-plugin-server/pom.xml b/checkmarx-ast-teamcity-plugin-server/pom.xml index 6200b72..5536ebd 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 @@ -113,7 +107,7 @@ org.springframework spring-context - 6.1.14 + 5.3.39 From 285a4f13f64d0a12393f1c225e7edf8c1dbf864f Mon Sep 17 00:00:00 2001 From: miryamfoiferCX Date: Thu, 26 Dec 2024 13:58:17 +0200 Subject: [PATCH 02/17] Update CheckmarxAdminPageController.java --- .../teamcity/server/CheckmarxAdminPageController.java | 5 ----- 1 file changed, 5 deletions(-) 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 3875f47e7244f336673b13b6b5235b4626ba5890 Mon Sep 17 00:00:00 2001 From: miryamfoiferCX Date: Thu, 26 Dec 2024 14:07:05 +0200 Subject: [PATCH 03/17] Update pom.xml --- pom.xml | 53 ----------------------------------------------------- 1 file changed, 53 deletions(-) diff --git a/pom.xml b/pom.xml index 4201780..84f096b 100644 --- a/pom.xml +++ b/pom.xml @@ -19,59 +19,6 @@ 6.1.14 - - - - org.jetbrains.teamcity - tests-support - ${teamcity-version} - - - org.springframework.ldap - spring-ldap-core - - - org.springframework.security - spring-security-config - - - org.springframework.security - spring-security-crypto - - - - - org.jetbrains.teamcity - server-api - ${teamcity-version} - - - org.springframework.security - spring-security-config - - - org.springframework.security - spring-security-crypto - - - - - org.springframework - spring-beans - ${springFramework.version} - - - org.springframework - spring-context-support - ${springFramework.version} - - - org.springframework - spring-jdbc - ${springFramework.version} - - - From 8661960fdd37ddf9795478de3408d5b8023a2e05 Mon Sep 17 00:00:00 2001 From: miryamfoiferCX Date: Thu, 26 Dec 2024 14:09:47 +0200 Subject: [PATCH 04/17] Update pom.xml --- checkmarx-ast-teamcity-plugin-agent/pom.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/checkmarx-ast-teamcity-plugin-agent/pom.xml b/checkmarx-ast-teamcity-plugin-agent/pom.xml index 14008a5..b352ed4 100644 --- a/checkmarx-ast-teamcity-plugin-agent/pom.xml +++ b/checkmarx-ast-teamcity-plugin-agent/pom.xml @@ -24,10 +24,6 @@ ${teamcity-version} provided - - org.springframework - spring-expression - commons-io commons-io From 6e28947cf25f42f43f338870fd0c948954159d1b Mon Sep 17 00:00:00 2001 From: miryamfoiferCX Date: Thu, 26 Dec 2024 14:13:10 +0200 Subject: [PATCH 05/17] Update pom.xml --- checkmarx-ast-teamcity-plugin-common/pom.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/checkmarx-ast-teamcity-plugin-common/pom.xml b/checkmarx-ast-teamcity-plugin-common/pom.xml index 8571494..5a062b5 100644 --- a/checkmarx-ast-teamcity-plugin-common/pom.xml +++ b/checkmarx-ast-teamcity-plugin-common/pom.xml @@ -16,10 +16,6 @@ ${teamcity-version} provided - - org.springframework - spring-expression - commons-io commons-io From de0f660d3853777a207c50d9fcd6f3c242a791cc Mon Sep 17 00:00:00 2001 From: miryamfoiferCX Date: Thu, 26 Dec 2024 14:17:26 +0200 Subject: [PATCH 06/17] Update pom.xml --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index 84f096b..77f5b16 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,6 @@ ${project.sourceCompatibility} ${project.targetCompatibility} - 3.13.0 org.jetbrains.teamcity From e78a1ab4782dade7a1bf787beb5e7cecb90e933f Mon Sep 17 00:00:00 2001 From: miryamfoiferCX Date: Thu, 26 Dec 2024 15:07:32 +0200 Subject: [PATCH 07/17] Update pom.xml --- build/pom.xml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/build/pom.xml b/build/pom.xml index 419a1c4..b1268e5 100644 --- a/build/pom.xml +++ b/build/pom.xml @@ -30,15 +30,6 @@ checkmarx-ast-teamcity-plugin-server 1.0-SNAPSHOT - - org.springframework - spring-webmvc - 6.1.14 - - - org.springframework - spring-web - 6.1.14 From 0065aee3c8f4915f754ad312ae1e2f190e70e4fd Mon Sep 17 00:00:00 2001 From: miryamfoiferCX Date: Thu, 26 Dec 2024 15:10:16 +0200 Subject: [PATCH 08/17] Update pom.xml --- checkmarx-ast-teamcity-plugin-agent/pom.xml | 120 -------------------- 1 file changed, 120 deletions(-) diff --git a/checkmarx-ast-teamcity-plugin-agent/pom.xml b/checkmarx-ast-teamcity-plugin-agent/pom.xml index b352ed4..5e8e311 100644 --- a/checkmarx-ast-teamcity-plugin-agent/pom.xml +++ b/checkmarx-ast-teamcity-plugin-agent/pom.xml @@ -23,49 +23,6 @@ agent-api ${teamcity-version} provided - - - commons-io - commons-io - - - org.bouncycastle - bcprov-jdk18on - - - org.bouncycastle - bcpkix-jdk18on - - - commons-collections - commons-collections - - - xalan - xalan - - - commons-httpclient - commons-httpclient - - - org.apache.commons - commons-compress - - - org.springframework - spring-context - - - org.springframework - spring-core - - - - - commons-io - commons-io - 2.14.0 @@ -73,83 +30,6 @@ tests-support ${teamcity-version} test - - - org.springframework - spring-expression - - - org.springframework - spring-web - - - org.springframework.security - spring-security-web - - - com.beust - jcommander - - - commons-collections - commons-collections - - - org.springframework.security - spring-security-core - - - xalan - xalan - - - commons-httpclient - commons-httpclient - - - org.apache.commons - commons-compress - - - org.bouncycastle - bcpkix-jdk18on - - - org.bouncycastle - bcprov-jdk15on - - - org.springframework - spring-context - - - org.testng - testng - - - org.bouncycastle - bcprov-jdk18on - - - org.apache.ant - ant - - - org.springframework - spring-core - - - org.jdom - jdom - - - com.google.guava - guava - - - org.springframework - spring-webmvc - From 8dadebea8ece3446aa296804f5163581d6b1499e Mon Sep 17 00:00:00 2001 From: miryamfoiferCX Date: Thu, 26 Dec 2024 15:12:26 +0200 Subject: [PATCH 09/17] Update pom.xml --- checkmarx-ast-teamcity-plugin-common/pom.xml | 39 -------------------- 1 file changed, 39 deletions(-) diff --git a/checkmarx-ast-teamcity-plugin-common/pom.xml b/checkmarx-ast-teamcity-plugin-common/pom.xml index 5a062b5..9e0fd4c 100644 --- a/checkmarx-ast-teamcity-plugin-common/pom.xml +++ b/checkmarx-ast-teamcity-plugin-common/pom.xml @@ -15,45 +15,6 @@ agent-api ${teamcity-version} provided - - - commons-io - commons-io - - - commons-collections - commons-collections - - - xalan - xalan - - - commons-httpclient - commons-httpclient - - - org.apache.commons - commons-compress - - - org.springframework - spring-context - - - org.springframework - spring-core - - - org.jdom - jdom - - - - - commons-io - commons-io - 2.14.0 From 255410449b5916e6551e454ea244a633b4bceac8 Mon Sep 17 00:00:00 2001 From: miryamfoiferCX Date: Thu, 26 Dec 2024 15:15:00 +0200 Subject: [PATCH 10/17] Update pom.xml --- checkmarx-ast-teamcity-plugin-server/pom.xml | 145 ------------------- 1 file changed, 145 deletions(-) diff --git a/checkmarx-ast-teamcity-plugin-server/pom.xml b/checkmarx-ast-teamcity-plugin-server/pom.xml index 5536ebd..45574e3 100644 --- a/checkmarx-ast-teamcity-plugin-server/pom.xml +++ b/checkmarx-ast-teamcity-plugin-server/pom.xml @@ -22,105 +22,6 @@ server-api ${teamcity-version} provided - - - org.springframework - spring-expression - - - org.bouncycastle - bcprov-jdk18on - - - org.bouncycastle - bcpkix-jdk18on - - - org.springframework - spring-web - - - org.springframework.security - spring-security-web - - - commons-collections - commons-collections - - - org.springframework.security - spring-security-core - - - xalan - xalan - - - commons-httpclient - commons-httpclient - - - org.apache.commons - commons-compress - - - org.bouncycastle - bcpkix-jdk18on - - - org.bouncycastle - bcprov-jdk18on - - - com.beust - jcommander - - - org.springframework - spring-context - - - org.springframework - spring-core - - - com.google.guava - guava - - - org.springframework - spring-webmvc - - - org.bouncycastle - bcprov-jdk15on - - - - - - org.springframework - spring-webmvc - 6.2.0 - - - - org.springframework - spring-context - 5.3.39 - - - - org.springframework - spring-core - 6.1.14 - - - - org.springframework - spring-web - 6.1.14 - org.jetbrains.teamcity @@ -135,52 +36,6 @@ tests-support ${teamcity-version} test - - - org.bouncycastle - bcprov-jdk18on - - - org.bouncycastle - bcpkix-jdk18on - - - org.bouncycastle - bcprov-jdk15on - - - org.testng - testng - - - com.beust - jcommander - - - org.springframework - spring-context - - - org.springframework - spring-core - - - org.apache.ant - ant - - - org.jdom - jdom - - - com.google.guava - guava - - - org.springframework - spring-webmvc - - From 3962f5fac70d776299b6f2e8f0914582d42bb8ba Mon Sep 17 00:00:00 2001 From: miryamfoiferCX Date: Thu, 26 Dec 2024 15:16:02 +0200 Subject: [PATCH 11/17] Update ci.yml --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4aad1a3..94bc6f3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,10 +20,10 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - - name: Set up JDK 17 + - name: Set up JDK 11 uses: actions/setup-java@v4 with: - java-version: 17 + java-version: 11 distribution: 'adopt' server-id: github settings-path: ${{ github.workspace }} From 73e69d83c895a87e832d9fae3197d4ccbf8c0937 Mon Sep 17 00:00:00 2001 From: miryamfoiferCX Date: Thu, 26 Dec 2024 15:19:18 +0200 Subject: [PATCH 12/17] Update pom.xml --- checkmarx-ast-teamcity-plugin-server/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/checkmarx-ast-teamcity-plugin-server/pom.xml b/checkmarx-ast-teamcity-plugin-server/pom.xml index 45574e3..d2c54d3 100644 --- a/checkmarx-ast-teamcity-plugin-server/pom.xml +++ b/checkmarx-ast-teamcity-plugin-server/pom.xml @@ -22,6 +22,7 @@ server-api ${teamcity-version} provided + org.jetbrains.teamcity From 750ebbaf38403723b10544a9fdea0b902475469e Mon Sep 17 00:00:00 2001 From: miryamfoiferCX Date: Thu, 26 Dec 2024 15:25:05 +0200 Subject: [PATCH 13/17] Update pom.xml --- checkmarx-ast-teamcity-plugin-agent/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/checkmarx-ast-teamcity-plugin-agent/pom.xml b/checkmarx-ast-teamcity-plugin-agent/pom.xml index 5e8e311..1f67b0a 100644 --- a/checkmarx-ast-teamcity-plugin-agent/pom.xml +++ b/checkmarx-ast-teamcity-plugin-agent/pom.xml @@ -30,7 +30,6 @@ tests-support ${teamcity-version} test - From dbf74f9ec6d2f69e5359faf3604806ff23e402e1 Mon Sep 17 00:00:00 2001 From: miryamfoiferCX Date: Thu, 26 Dec 2024 15:27:05 +0200 Subject: [PATCH 14/17] Update pom.xml --- build/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/build/pom.xml b/build/pom.xml index b1268e5..80e324c 100644 --- a/build/pom.xml +++ b/build/pom.xml @@ -30,7 +30,6 @@ checkmarx-ast-teamcity-plugin-server 1.0-SNAPSHOT - From f425ce5c793b0afe0c27db3edd2d12ac88917174 Mon Sep 17 00:00:00 2001 From: miryamfoiferCX Date: Thu, 26 Dec 2024 15:34:58 +0200 Subject: [PATCH 15/17] Update release.yml --- .github/workflows/release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8ae1929..44908e5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -60,10 +60,10 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - - name: Set up JDK 17 + - name: Set up JDK 11 uses: actions/setup-java@v4 with: - java-version: 17 + java-version: 11 distribution: 'adopt' settings-path: ${{ github.workspace }} @@ -123,4 +123,4 @@ jobs: with: teams_webhook_url: ${{ secrets.TEAMS_WEBHOOK_URI }} message: "

Checkmarx TeamCity Plugin ${{ env.RELEASE_VERSION }}

${{ steps.clean.outputs.clean }}" - if: ${{ inputs.rchannels == '' || inputs.rchannels == null }} \ No newline at end of file + if: ${{ inputs.rchannels == '' || inputs.rchannels == null }} From 66291f0de9db7ecdb834721a3d4bfc3c29e5c741 Mon Sep 17 00:00:00 2001 From: miryamfoiferCX Date: Thu, 26 Dec 2024 15:35:32 +0200 Subject: [PATCH 16/17] Update release-drafter.yml --- .github/workflows/release-drafter.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index 4abd4e6..3db68a4 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -20,10 +20,10 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - - name: Set up JDK 17 + - name: Set up JDK 11 uses: actions/setup-java@v4 with: - java-version: 17 + java-version: 11 distribution: 'adopt' settings-path: ${{ github.workspace }} From 589ad4bfaaae66f9a9dd944aa916f572fee77f87 Mon Sep 17 00:00:00 2001 From: miryamfoiferCX Date: Thu, 26 Dec 2024 15:52:45 +0200 Subject: [PATCH 17/17] Update CODEOWNERS --- CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CODEOWNERS b/CODEOWNERS index 5f0f510..039bbd5 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -2,4 +2,4 @@ # Each line is a file pattern followed by one or more owners # Specify the default owners for the entire repository -* @OrShamirCM @AlvoBen +* @AlvoBen @greensd4 @miryamfoiferCX