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 }} 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 }} 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 }} 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 diff --git a/build/pom.xml b/build/pom.xml index 419a1c4..80e324c 100644 --- a/build/pom.xml +++ b/build/pom.xml @@ -30,16 +30,6 @@ checkmarx-ast-teamcity-plugin-server 1.0-SNAPSHOT - - org.springframework - spring-webmvc - 6.1.14 - - - org.springframework - spring-web - 6.1.14 - diff --git a/checkmarx-ast-teamcity-plugin-agent/pom.xml b/checkmarx-ast-teamcity-plugin-agent/pom.xml index 14008a5..1f67b0a 100644 --- a/checkmarx-ast-teamcity-plugin-agent/pom.xml +++ b/checkmarx-ast-teamcity-plugin-agent/pom.xml @@ -23,53 +23,6 @@ agent-api ${teamcity-version} provided - - - org.springframework - spring-expression - - - 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 @@ -77,84 +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 - - diff --git a/checkmarx-ast-teamcity-plugin-common/pom.xml b/checkmarx-ast-teamcity-plugin-common/pom.xml index 8571494..9e0fd4c 100644 --- a/checkmarx-ast-teamcity-plugin-common/pom.xml +++ b/checkmarx-ast-teamcity-plugin-common/pom.xml @@ -15,49 +15,6 @@ agent-api ${teamcity-version} provided - - - org.springframework - spring-expression - - - 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 diff --git a/checkmarx-ast-teamcity-plugin-server/pom.xml b/checkmarx-ast-teamcity-plugin-server/pom.xml index 6200b72..d2c54d3 100644 --- a/checkmarx-ast-teamcity-plugin-server/pom.xml +++ b/checkmarx-ast-teamcity-plugin-server/pom.xml @@ -22,110 +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 - - - - - jakarta.servlet - jakarta.servlet-api - 6.1.0 - provided - - - - org.springframework - spring-webmvc - 6.2.0 - - - - org.springframework - spring-context - 6.1.14 - - - - org.springframework - spring-core - 6.1.14 - - - - org.springframework - spring-web - 6.1.14 @@ -141,52 +37,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 - - 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; - } } diff --git a/pom.xml b/pom.xml index 4201780..77f5b16 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} - - - @@ -109,7 +56,6 @@ ${project.sourceCompatibility} ${project.targetCompatibility} - 3.13.0 org.jetbrains.teamcity