lots of updates to the foundational xml and bumps of dependencies

Jenkinsfile

@@ -8,7 +8,7 @@ pipeline {
             sh 'JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 mvn package'
         } }
         stage('Archive') { steps {
-            archiveArtifacts artifacts: 'target/anka-build-tc.zip', onlyIfSuccessful: true, allowEmptyArchive: true
+            archiveArtifacts artifacts: 'target/anka-build-cloud-teamcity-plugin.zip', onlyIfSuccessful: true, allowEmptyArchive: true
         } }
     }
 }

README.md

@@ -1,2 +1,5 @@
-# teamcity-anka-cloud
-Connects Teamcity and Anka Cloud
+# Anka Build Cloud Teamcity Plugin
+
+Connects Teamcity and [Anka Build Cloud](https://veertu.com/anka-build/).
+
+Documentation can be found [HERE](https://docs.veertu.com/anka/plugins-and-integrations/controller-+-registry/teamcity/).

ankaCloud-agent/pom.xml → agent/pom.xml

@@ -2,18 +2,17 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>anka-build-tc</artifactId>
     <groupId>com.veertu</groupId>
-    <version>1.7</version>
+    <artifactId>anka-build-cloud-teamcity-plugin</artifactId>
+    <version>1.9.0</version>
   </parent>
-  <artifactId>anka-build-tc-agent</artifactId>
+  <artifactId>agent</artifactId>
   <packaging>jar</packaging>
   <dependencies>
-
     <dependency>
       <groupId>com.veertu</groupId>
-      <version>1.7</version>
-      <artifactId>anka-build-tc-common</artifactId>
+      <version>1.9.0</version>
+      <artifactId>common</artifactId>
       <scope>compile</scope>
     </dependency>
     <dependency>

build/plugin-agent-assembly.xml

@@ -7,16 +7,16 @@
     </formats>
     <files>
         <file>
-            <source>../ankaCloud-agent/teamcity-plugin.xml</source>
+            <source>../agent/teamcity-plugin.xml</source>
             <outputDirectory>/</outputDirectory>
         </file>
     </files>
     <moduleSets>
         <moduleSet>
             <useAllReactorProjects>true</useAllReactorProjects>
             <includes>
-                <include>com.veertu:anka-build-tc-agent</include>
-                <include>com.veertu:anka-build-tc-common</include>
+                <include>com.veertu:agent</include>
+                <include>com.veertu:common</include>
             </includes>
             <binaries>
                 <outputDirectory>lib</outputDirectory>

build/plugin-assembly.xml

@@ -11,16 +11,16 @@
          <outputDirectory>/</outputDirectory>
      </file> 
      <file>
-         <source>target/anka-build-tc-agent.zip</source>
-         <outputDirectory>agent</outputDirectory>
+        <source>target/anka-build-cloud-teamcity-plugin-${project.version}.zip</source>
+        <outputDirectory>agent</outputDirectory>
      </file> 
   </files>
   <moduleSets>
     <moduleSet>
        <useAllReactorProjects>true</useAllReactorProjects>
        <includes>
-           <include>com.veertu:anka-build-tc-server</include>
-           <include>com.veertu:anka-build-tc-common</include>
+           <include>com.veertu:server</include>
+           <include>com.veertu:common</include>
        </includes> 
        <binaries>
            <outputDirectory>server</outputDirectory>

build/pom.xml

@@ -2,9 +2,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>anka-build-tc</artifactId>
     <groupId>com.veertu</groupId>
-    <version>1.7</version>
+    <artifactId>anka-build-cloud-teamcity-plugin</artifactId>
+    <version>1.9.0</version>
   </parent>
   <artifactId>build</artifactId>
   <packaging>pom</packaging>
@@ -17,26 +17,26 @@
   <dependencies>
       <dependency>
            <groupId>com.veertu</groupId>
-           <artifactId>anka-build-tc-agent</artifactId>
-           <version>1.7</version>
+           <artifactId>agent</artifactId>
+           <version>1.9.0</version>
       </dependency>
       <dependency>
            <groupId>com.veertu</groupId>
-           <artifactId>anka-build-tc-common</artifactId>
-           <version>1.7</version>
+           <artifactId>common</artifactId>
+           <version>1.9.0</version>
       </dependency>
       <dependency>
            <groupId>com.veertu</groupId>
-           <artifactId>anka-build-tc-server</artifactId>
-           <version>1.7</version>
+           <artifactId>server</artifactId>
+           <version>1.9.0</version>
       </dependency>
   </dependencies>
   <build>
     <plugins>
         <plugin>
             <groupId>com.google.code.maven-replacer-plugin</groupId>
             <artifactId>replacer</artifactId>
-            <version>1.5.2</version>
+            <version>1.5.3</version>
             <executions>                
                 <execution>
                     <phase>process-sources</phase>
@@ -66,7 +66,7 @@
         </plugin>
         <plugin>
             <artifactId>maven-assembly-plugin</artifactId>
-            <version>2.4</version>
+            <version>3.7.1</version>
             <executions>
               <execution>
                 <id>make-agent-assembly</id>
@@ -75,7 +75,7 @@
                   <goal>single</goal>
                 </goals>
                 <configuration>
-                  <finalName>anka-build-tc-agent</finalName>
+                  <finalName>anka-build-cloud-teamcity-plugin-${project.version}</finalName>
                   <appendAssemblyId>false</appendAssemblyId>
                   <descriptors>
                     <descriptor>plugin-agent-assembly.xml</descriptor>
@@ -89,7 +89,7 @@
                   <goal>single</goal>
                 </goals>
                 <configuration>
-                  <finalName>anka-build-tc</finalName>
+                  <finalName>anka-build-cloud-teamcity-plugin</finalName>
                   <outputDirectory>${project.parent.build.directory}</outputDirectory>
                   <appendAssemblyId>false</appendAssemblyId>
                   <descriptors>

ankaCloud-common/pom.xml → common/pom.xml

@@ -2,10 +2,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>anka-build-tc</artifactId>
         <groupId>com.veertu</groupId>
-        <version>1.7</version>
+        <artifactId>anka-build-cloud-teamcity-plugin</artifactId>
+        <version>1.9.0</version>
     </parent>
-    <artifactId>anka-build-tc-common</artifactId>
+    <artifactId>common</artifactId>
     <packaging>jar</packaging>
 </project>

pom.xml

@@ -1,51 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.veertu</groupId>
-  <artifactId>anka-build-tc</artifactId>
-  <version>1.7</version>
-  <packaging>pom</packaging>
-  <properties>
-      <teamcity-version>2017.1</teamcity-version>
-  </properties>
-  <repositories>
-    <repository>
-        <id>JetBrains</id>
-        <url>https://download.jetbrains.com/teamcity-repository</url>
-    </repository>
-  </repositories>
-  <pluginRepositories>
-      <pluginRepository>
-          <id>JetBrains</id>
-          <url>http://repository.jetbrains.com/all</url>
-      </pluginRepository>
-  </pluginRepositories>
-  <build>
-      <pluginManagement>
-          <plugins>
-              <plugin>
-                  <groupId>org.apache.maven.plugins</groupId>
-                  <artifactId>maven-compiler-plugin</artifactId>
-                  <configuration>
-                      <source>1.8</source>
-                      <target>1.8</target>
-                  </configuration>
-              </plugin>
-              <plugin>
-                  <groupId>org.jetbrains.teamcity</groupId>
-                  <artifactId>teamcity-sdk-maven-plugin</artifactId>
-                  <version>0.4</version>
-                  <configuration>
-                      <!-- <teamcityDir>/path/to/tc/distro</teamcityDir> -->
-                  </configuration>
-              </plugin>
-          </plugins>
-      </pluginManagement>
-  </build>
-  <modules>
-      <module>ankaCloud-server</module>
-      <module>ankaCloud-agent</module>
-      <module>ankaCloud-common</module>
-      <module>build</module>
-  </modules>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.veertu</groupId>
+    <artifactId>anka-build-cloud-teamcity-plugin</artifactId>
+    <version>1.9.0</version>
+    <packaging>pom</packaging>
+    <properties>
+        <teamcity-version>2021.2</teamcity-version>
+    </properties>
+    <repositories>
+        <repository>
+            <id>JetBrains</id>
+            <url>https://download.jetbrains.com/teamcity-repository</url>
+        </repository>
+    </repositories>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>JetBrains</id>
+            <url>http://repository.jetbrains.com/all</url>
+        </pluginRepository>
+    </pluginRepositories>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.jetbrains.teamcity</groupId>
+                <artifactId>teamcity-sdk-maven-plugin</artifactId>
+                <version>0.4.1</version>
+                <configuration>
+                    <!-- <teamcityDir>/path/to/tc/distro</teamcityDir> -->
+                </configuration>
+            </plugin>
+        </plugins>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.jetbrains.teamcity</groupId>
+                    <artifactId>teamcity-sdk-maven-plugin</artifactId>
+                    <version>0.4.1</version>
+                    <configuration>
+                        <!-- <teamcityDir>/path/to/tc/distro</teamcityDir> -->
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+    <modules>
+        <module>server</module>
+        <module>agent</module>
+        <module>common</module>
+        <module>build</module>
+    </modules>
 </project>

ankaCloud-server/pom.xml → server/pom.xml

@@ -1,21 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>anka-build-tc</artifactId>
         <groupId>com.veertu</groupId>
-        <version>1.7</version>
+        <artifactId>anka-build-cloud-teamcity-plugin</artifactId>
+        <version>1.9.0</version>
     </parent>
-    <artifactId>anka-build-tc-server</artifactId>
+    <artifactId>server</artifactId>
     <packaging>jar</packaging>
-
     <dependencies>
         <dependency>
-           <groupId>org.apache.httpcomponents</groupId>
-           <artifactId>httpclient</artifactId>
-           <version>4.5.13</version>
-       </dependency>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
+            <version>5.3.1</version>
+        </dependency>
         <dependency>
             <groupId>org.jetbrains.teamcity.internal</groupId>
             <artifactId>server</artifactId>
@@ -24,8 +22,8 @@
         </dependency>
         <dependency>
             <groupId>com.veertu</groupId>
-            <version>1.7</version>
-            <artifactId>anka-build-tc-common</artifactId>
+            <version>1.9.0</version>
+            <artifactId>common</artifactId>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -62,39 +60,37 @@
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
-            <version>20180130</version>
+            <version>20240303</version>
         </dependency>
         <dependency>
-            <groupId>com.jcraft</groupId>
+            <groupId>com.github.mwiede</groupId>
             <artifactId>jsch</artifactId>
-            <version>0.1.55</version>
+            <version>0.2.19</version>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15on</artifactId>
-            <version>1.69</version>
+            <artifactId>bcprov-jdk18on</artifactId>
+            <version>1.78.1</version>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcpkix-jdk15on</artifactId>
-            <version>1.69</version>
+            <artifactId>bcpkix-jdk18on</artifactId>
+            <version>1.78.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.12.0</version>
+            <version>3.16.0</version>
         </dependency>
-
-
     </dependencies>
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.13.0</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <release>8</release>
                 </configuration>
                 <executions>
                     <execution>
@@ -115,6 +111,4 @@
             </plugin>
         </plugins>
     </build>
-
-
 </project>

teamcity-plugin.xml

@@ -3,8 +3,8 @@
   <info>
     <name>ankaCloud</name>
     <display-name>Anka Build Cloud</display-name>
-    <version>1.8.0</version>
-    <description>Connects TeamCity with Anka Build Cloud</description>
+    <version>1.9.0</version>
+    <description>Connects TeamCity with the Anka Build Cloud</description>
     <download-url>Plugin download URL</download-url>
     <email>[email protected]</email>
     <vendor>