From 5d1d335802e68a1867f12c7c9a3ed4242bd794cb Mon Sep 17 00:00:00 2001
From: miryamfoiferCX <miryam.foifer@checkmarx.com>
Date: Thu, 2 Jan 2025 11:14:21 +0200
Subject: [PATCH 01/13] add dependencyManagement and upgrade java version to 17

---
 .github/workflows/ci.yml                     |  4 +-
 .github/workflows/release-drafter.yml        |  4 +-
 .github/workflows/release.yml                |  4 +-
 checkmarx-ast-teamcity-plugin-common/pom.xml |  2 +-
 pom.xml                                      | 53 ++++++++++++++++++++
 5 files changed, 60 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 94bc6f3..4aad1a3 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 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'adopt'
           server-id: github
           settings-path: ${{ github.workspace }}
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index 3db68a4..4abd4e6 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 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'adopt'
           settings-path: ${{ github.workspace }}
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 44908e5..f732d0f 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 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'adopt'
           settings-path: ${{ github.workspace }}
 
diff --git a/checkmarx-ast-teamcity-plugin-common/pom.xml b/checkmarx-ast-teamcity-plugin-common/pom.xml
index 9e0fd4c..bdbea69 100644
--- a/checkmarx-ast-teamcity-plugin-common/pom.xml
+++ b/checkmarx-ast-teamcity-plugin-common/pom.xml
@@ -20,7 +20,7 @@
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
-      <version>3.15.0</version>
+      <version>3.17.0</version>
     </dependency>
   </dependencies>
 
diff --git a/pom.xml b/pom.xml
index 77f5b16..dbac75b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,6 +19,59 @@
         <springFramework.version>6.1.14</springFramework.version>
     </properties>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.jetbrains.teamcity</groupId>
+                <artifactId>tests-support</artifactId>
+                <version>${teamcity-version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.springframework.ldap</groupId>
+                        <artifactId>spring-ldap-core</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.springframework.security</groupId>
+                        <artifactId>spring-security-config</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.springframework.security</groupId>
+                        <artifactId>spring-security-crypto</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.jetbrains.teamcity</groupId>
+                <artifactId>server-api</artifactId>
+                <version>${teamcity-version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.springframework.security</groupId>
+                        <artifactId>spring-security-config</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.springframework.security</groupId>
+                        <artifactId>spring-security-crypto</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-beans</artifactId>
+                <version>${springFramework.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-context-support</artifactId>
+                <version>${springFramework.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-jdbc</artifactId>
+                <version>${springFramework.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 
     <pluginRepositories>
         <pluginRepository>

From efbaed7e512944feede9f0f89d17206549823a35 Mon Sep 17 00:00:00 2001
From: miryamfoiferCX <miryam.foifer@checkmarx.com>
Date: Thu, 2 Jan 2025 11:27:29 +0200
Subject: [PATCH 02/13] add agent-api to dependencyManagement

---
 checkmarx-ast-teamcity-plugin-agent/pom.xml  |  1 -
 checkmarx-ast-teamcity-plugin-common/pom.xml |  1 -
 pom.xml                                      | 12 ++++++++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/checkmarx-ast-teamcity-plugin-agent/pom.xml b/checkmarx-ast-teamcity-plugin-agent/pom.xml
index 1f67b0a..45b2425 100644
--- a/checkmarx-ast-teamcity-plugin-agent/pom.xml
+++ b/checkmarx-ast-teamcity-plugin-agent/pom.xml
@@ -21,7 +21,6 @@
         <dependency>
             <groupId>org.jetbrains.teamcity</groupId>
             <artifactId>agent-api</artifactId>
-            <version>${teamcity-version}</version>
             <scope>provided</scope>
         </dependency>
 
diff --git a/checkmarx-ast-teamcity-plugin-common/pom.xml b/checkmarx-ast-teamcity-plugin-common/pom.xml
index bdbea69..b1a45dc 100644
--- a/checkmarx-ast-teamcity-plugin-common/pom.xml
+++ b/checkmarx-ast-teamcity-plugin-common/pom.xml
@@ -13,7 +13,6 @@
     <dependency>
       <groupId>org.jetbrains.teamcity</groupId>
       <artifactId>agent-api</artifactId>
-      <version>${teamcity-version}</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index dbac75b..db9bc2a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,6 +70,18 @@
                 <artifactId>spring-jdbc</artifactId>
                 <version>${springFramework.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.jetbrains.teamcity</groupId>
+                <artifactId>agent-api</artifactId>
+                <version>${teamcity-version}</version>
+                <scope>provided</scope>
+                <exclusions>
+                    <exclusion>
+                        <groupId>commons-collections</groupId>
+                        <artifactId>commons-collections</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

From b2553278e58ce731991ad59b6a1658d39e374e14 Mon Sep 17 00:00:00 2001
From: miryamfoiferCX <miryam.foifer@checkmarx.com>
Date: Thu, 2 Jan 2025 11:46:49 +0200
Subject: [PATCH 03/13] upgrade most spring packages version

---
 pom.xml | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/pom.xml b/pom.xml
index db9bc2a..13464c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,6 +82,56 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-aop</artifactId>
+                <version>${springFramework.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-aspects</artifactId>
+                <version>${springFramework.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-expression</artifactId>
+                <version>${springFramework.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-instrument</artifactId>
+                <version>${springFramework.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-instrument</artifactId>
+                <version>${springFramework.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-tx</artifactId>
+                <version>${springFramework.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-jdbc</artifactId>
+                <version>${springFramework.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-instrument</artifactId>
+                <version>${springFramework.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-jcl</artifactId>
+                <version>${springFramework.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-web</artifactId>
+                <version>${springFramework.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

From 4260938f3d4881b631041d7cb28ac159d8e38653 Mon Sep 17 00:00:00 2001
From: miryamfoiferCX <miryam.foifer@checkmarx.com>
Date: Thu, 2 Jan 2025 12:13:40 +0200
Subject: [PATCH 04/13] exclude bcprov-jdk15on

---
 pom.xml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 13464c1..a3f2313 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <version>1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <properties>
-        <teamcity-version>2024.11-SNAPSHOT</teamcity-version>
+        <teamcity-version>2024.12</teamcity-version>
 
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
@@ -45,6 +45,10 @@
                 <artifactId>server-api</artifactId>
                 <version>${teamcity-version}</version>
                 <exclusions>
+                    <exclusion>
+                        <groupId>org.bouncycastle</groupId>
+                        <artifactId>bcprov-jdk15on</artifactId>
+                    </exclusion>
                     <exclusion>
                         <groupId>org.springframework.security</groupId>
                         <artifactId>spring-security-config</artifactId>
@@ -132,6 +136,11 @@
                 <artifactId>spring-web</artifactId>
                 <version>${springFramework.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.bouncycastle</groupId>
+                <artifactId>bcprov-jdk18on</artifactId>
+                <version>1.79</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

From ed2628f64c1b0d0c264f843204dfe07e8bb1e40c Mon Sep 17 00:00:00 2001
From: miryamfoiferCX <miryam.foifer@checkmarx.com>
Date: Thu, 2 Jan 2025 12:18:43 +0200
Subject: [PATCH 05/13] upgrade xalan version

---
 pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pom.xml b/pom.xml
index a3f2313..8889fff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -141,6 +141,11 @@
                 <artifactId>bcprov-jdk18on</artifactId>
                 <version>1.79</version>
             </dependency>
+            <dependency>
+                <groupId>xalan</groupId>
+                <artifactId>xalan</artifactId>
+                <version>2.7.3</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

From a6d8f27646e5ad00e0a3d8d3a7a31ad8905ba02a Mon Sep 17 00:00:00 2001
From: miryamfoiferCX <miryam.foifer@checkmarx.com>
Date: Thu, 2 Jan 2025 12:30:51 +0200
Subject: [PATCH 06/13] exclude jdom

---
 pom.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pom.xml b/pom.xml
index 8889fff..f54a7e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,6 +57,10 @@
                         <groupId>org.springframework.security</groupId>
                         <artifactId>spring-security-crypto</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>org.jdom</groupId>
+                        <artifactId>jdom</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
@@ -84,6 +88,10 @@
                         <groupId>commons-collections</groupId>
                         <artifactId>commons-collections</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>org.jdom</groupId>
+                        <artifactId>jdom</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
@@ -146,6 +154,11 @@
                 <artifactId>xalan</artifactId>
                 <version>2.7.3</version>
             </dependency>
+            <dependency>
+                <groupId>org.jdom</groupId>
+                <artifactId>jdom2</artifactId>
+                <version>2.0.6.1</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

From ecfbcdf1823dd2073eaf524c5e62177027ad719d Mon Sep 17 00:00:00 2001
From: miryamfoiferCX <miryam.foifer@checkmarx.com>
Date: Thu, 2 Jan 2025 13:30:19 +0200
Subject: [PATCH 07/13] remove exclusion of jdom

---
 checkmarx-ast-teamcity-plugin-server/pom.xml |  2 --
 pom.xml                                      | 13 +++++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/checkmarx-ast-teamcity-plugin-server/pom.xml b/checkmarx-ast-teamcity-plugin-server/pom.xml
index d2c54d3..0308675 100644
--- a/checkmarx-ast-teamcity-plugin-server/pom.xml
+++ b/checkmarx-ast-teamcity-plugin-server/pom.xml
@@ -20,7 +20,6 @@
     <dependency>
       <groupId>org.jetbrains.teamcity</groupId>
       <artifactId>server-api</artifactId>
-      <version>${teamcity-version}</version>
       <scope>provided</scope>
     </dependency>
 
@@ -35,7 +34,6 @@
     <dependency>
       <groupId>org.jetbrains.teamcity</groupId>
       <artifactId>tests-support</artifactId>
-      <version>${teamcity-version}</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index f54a7e6..51ccb11 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,10 +57,10 @@
                         <groupId>org.springframework.security</groupId>
                         <artifactId>spring-security-crypto</artifactId>
                     </exclusion>
-                    <exclusion>
-                        <groupId>org.jdom</groupId>
-                        <artifactId>jdom</artifactId>
-                    </exclusion>
+<!--                    <exclusion>-->
+<!--                        <groupId>org.jdom</groupId>-->
+<!--                        <artifactId>jdom</artifactId>-->
+<!--                    </exclusion>-->
                 </exclusions>
             </dependency>
             <dependency>
@@ -159,6 +159,11 @@
                 <artifactId>jdom2</artifactId>
                 <version>2.0.6.1</version>
             </dependency>
+            <dependency>
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava</artifactId>
+                <version>33.4.0-android</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

From bda30ca6d7bba76f77731fac1f84f72691dc7cb2 Mon Sep 17 00:00:00 2001
From: miryamfoiferCX <miryam.foifer@checkmarx.com>
Date: Thu, 2 Jan 2025 16:26:48 +0200
Subject: [PATCH 08/13] jcommander & bcpkix-jdk18on

---
 checkmarx-ast-teamcity-plugin-agent/pom.xml |  1 -
 pom.xml                                     | 10 ++++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/checkmarx-ast-teamcity-plugin-agent/pom.xml b/checkmarx-ast-teamcity-plugin-agent/pom.xml
index 45b2425..d2cc002 100644
--- a/checkmarx-ast-teamcity-plugin-agent/pom.xml
+++ b/checkmarx-ast-teamcity-plugin-agent/pom.xml
@@ -27,7 +27,6 @@
         <dependency>
             <groupId>org.jetbrains.teamcity</groupId>
             <artifactId>tests-support</artifactId>
-            <version>${teamcity-version}</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/pom.xml b/pom.xml
index 51ccb11..64dfd08 100644
--- a/pom.xml
+++ b/pom.xml
@@ -164,6 +164,16 @@
                 <artifactId>guava</artifactId>
                 <version>33.4.0-android</version>
             </dependency>
+            <dependency>
+                <groupId>com.beust</groupId>
+                <artifactId>jcommander</artifactId>
+                <version>1.82</version>
+            </dependency>
+            <dependency>
+                <groupId>org.bouncycastle</groupId>
+                <artifactId>bcpkix-jdk18on</artifactId>
+                <version>1.79</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

From 7f343ccb74467b399ae1fa5010cc100ffa39f659 Mon Sep 17 00:00:00 2001
From: miryamfoiferCX <miryam.foifer@checkmarx.com>
Date: Thu, 2 Jan 2025 16:35:41 +0200
Subject: [PATCH 09/13] ant

---
 pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pom.xml b/pom.xml
index 64dfd08..eb0b031 100644
--- a/pom.xml
+++ b/pom.xml
@@ -174,6 +174,11 @@
                 <artifactId>bcpkix-jdk18on</artifactId>
                 <version>1.79</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.ant</groupId>
+                <artifactId>ant</artifactId>
+                <version>1.10.15</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

From 2d1af740f00bd2ecb2102d726a3d3247246450c2 Mon Sep 17 00:00:00 2001
From: miryamfoiferCX <miryam.foifer@checkmarx.com>
Date: Thu, 2 Jan 2025 16:47:30 +0200
Subject: [PATCH 10/13] exclude commons-httpclient

---
 pom.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pom.xml b/pom.xml
index eb0b031..5e08808 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,6 +57,10 @@
                         <groupId>org.springframework.security</groupId>
                         <artifactId>spring-security-crypto</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>commons-httpclient</groupId>
+                        <artifactId>commons-httpclient</artifactId>
+                    </exclusion>
 <!--                    <exclusion>-->
 <!--                        <groupId>org.jdom</groupId>-->
 <!--                        <artifactId>jdom</artifactId>-->
@@ -92,6 +96,10 @@
                         <groupId>org.jdom</groupId>
                         <artifactId>jdom</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>commons-httpclient</groupId>
+                        <artifactId>commons-httpclient</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
@@ -179,6 +187,7 @@
                 <artifactId>ant</artifactId>
                 <version>1.10.15</version>
             </dependency>
+
         </dependencies>
     </dependencyManagement>
 

From e603191b2519ef8629c317a61abb805d0528cd66 Mon Sep 17 00:00:00 2001
From: miryamfoiferCX <miryam.foifer@checkmarx.com>
Date: Thu, 2 Jan 2025 16:56:52 +0200
Subject: [PATCH 11/13] spring-security core & web

---
 pom.xml | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 5e08808..973220e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -187,7 +187,21 @@
                 <artifactId>ant</artifactId>
                 <version>1.10.15</version>
             </dependency>
-
+            <dependency>
+                <groupId>org.springframework.security</groupId>
+                <artifactId>spring-security-web</artifactId>
+                <version>5.8.16</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework.security</groupId>
+                <artifactId>spring-security-web</artifactId>
+                <version>5.8.16</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework.security</groupId>
+                <artifactId>spring-security-core</artifactId>
+                <version>5.8.16</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

From 9742a1b50829dbb23d38752b0ff5221538dc1af2 Mon Sep 17 00:00:00 2001
From: miryamfoiferCX <miryam.foifer@checkmarx.com>
Date: Thu, 2 Jan 2025 17:05:14 +0200
Subject: [PATCH 12/13] delete comment

---
 pom.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 973220e..014bf3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,10 +61,6 @@
                         <groupId>commons-httpclient</groupId>
                         <artifactId>commons-httpclient</artifactId>
                     </exclusion>
-<!--                    <exclusion>-->
-<!--                        <groupId>org.jdom</groupId>-->
-<!--                        <artifactId>jdom</artifactId>-->
-<!--                    </exclusion>-->
                 </exclusions>
             </dependency>
             <dependency>

From 4854ee558d323afa2fdb7eecd22a208320e00653 Mon Sep 17 00:00:00 2001
From: miryamfoiferCX <miryam.foifer@checkmarx.com>
Date: Sun, 5 Jan 2025 11:39:42 +0200
Subject: [PATCH 13/13] commons-collections 3.2.2

---
 pom.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pom.xml b/pom.xml
index 014bf3a..fb4cf6d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,6 +61,10 @@
                         <groupId>commons-httpclient</groupId>
                         <artifactId>commons-httpclient</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>commons-collections</groupId>
+                        <artifactId>commons-collections</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>