Skip to content

Commit

Permalink
[cloud-kubernetes] modules.xml entries cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
Vladimir I committed May 2, 2024
1 parent 46bdf6f commit 40ff422
Show file tree
Hide file tree
Showing 7 changed files with 144 additions and 18 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
*.iml
teamcity-kubernetes-plugin-server/target/*
teamcity-kubernetes-plugin-common/target/*
teamcity-kubernetes-plugin-agent/target/*
teamcity-kubernetes-plugin-agent/target/*
.idea
TeamCityDist
open-api
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<version>${revision}</version>
<packaging>pom</packaging>
<properties>
<teamcity-version>LOCAL-SNAPSHOT</teamcity-version>
<teamcity.version>LOCAL-SNAPSHOT</teamcity.version>
<kotlin.version>1.5.32</kotlin.version>
<local.repo.path>local-repo</local.repo.path>
<revision>1.0-SNAPSHOT</revision>
Expand Down
81 changes: 81 additions & 0 deletions target/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.jetbrains.teamcity</groupId>
<artifactId>teamcity-kubernetes-plugin</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
<module>teamcity-kubernetes-plugin-server</module>
<module>teamcity-kubernetes-plugin-agent</module>
<module>teamcity-kubernetes-plugin-common</module>
<module>build</module>
</modules>
<distributionManagement>
<repository>
<id>teamcity-space</id>
<url>https://packages.jetbrains.team/maven/p/tc/maven</url>
</repository>
</distributionManagement>
<properties>
<local.repo.path>local-repo</local.repo.path>
<revision>1.0-SNAPSHOT</revision>
<teamcity.version>LOCAL-SNAPSHOT</teamcity.version>
<kotlin.version>1.5.32</kotlin.version>
</properties>
<repositories>
<repository>
<snapshots>
<enabled>true</enabled>
</snapshots>
<id>local-teamcity-artifacts</id>
<url>file://${local.repo.path}</url>
</repository>
<repository>
<id>TeamCity</id>
<url>https://download.jetbrains.com/teamcity-repository/</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>TeamCity</id>
<url>https://download.jetbrains.com/teamcity-repository</url>
</pluginRepository>
</pluginRepositories>
<build>
<pluginManagement>
<plugins>
<plugin>
<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.2</version>
<configuration>
<teamcityDir>/home/user/projects/teamcity/2017.2.x/buildserver/.idea_artifacts/dist-teamcity-tomcat</teamcityDir>
<serverDebugStr>-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=10111</serverDebugStr>
</configuration>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.1.1</version>
<executions>
<execution>
<id>deploy-to-local-k8s-repo</id>
<phase>deploy</phase>
<goals>
<goal>deploy</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
</build>
</project>
6 changes: 3 additions & 3 deletions teamcity-kubernetes-plugin-agent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,21 @@
<dependency>
<groupId>org.jetbrains.teamcity</groupId>
<artifactId>agent-api</artifactId>
<version>${teamcity-version}</version>
<version>${teamcity.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.jetbrains.teamcity.internal</groupId>
<artifactId>agent</artifactId>
<version>${teamcity-version}</version>
<version>${teamcity.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.jetbrains.teamcity</groupId>
<artifactId>tests-support</artifactId>
<version>${teamcity-version}</version>
<version>${teamcity.version}</version>
<scope>test</scope>
</dependency>

Expand Down
42 changes: 42 additions & 0 deletions teamcity-kubernetes-plugin-common/.flattened-pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.jetbrains.teamcity</groupId>
<artifactId>teamcity-kubernetes-plugin-common</artifactId>
<version>1.0-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>org.jetbrains.teamcity</groupId>
<artifactId>server-api</artifactId>
<version>2024.07-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jetbrains.teamcity</groupId>
<artifactId>oauth</artifactId>
<version>2024.07-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>kubernetes-client</artifactId>
<version>5.12.5-teamcity-patched</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</project>
4 changes: 2 additions & 2 deletions teamcity-kubernetes-plugin-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
<dependency>
<groupId>org.jetbrains.teamcity</groupId>
<artifactId>server-api</artifactId>
<version>${teamcity-version}</version>
<version>${teamcity.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.jetbrains.teamcity</groupId>
<artifactId>oauth</artifactId>
<version>${teamcity-version}</version>
<version>${teamcity.version}</version>
<scope>provided</scope>
</dependency>

Expand Down
22 changes: 11 additions & 11 deletions teamcity-kubernetes-plugin-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<dependency>
<groupId>org.jetbrains.teamcity</groupId>
<artifactId>server-api</artifactId>
<version>${teamcity-version}</version>
<version>${teamcity.version}</version>
<scope>provided</scope>
</dependency>

Expand All @@ -47,56 +47,56 @@
<dependency>
<groupId>org.jetbrains.teamcity</groupId>
<artifactId>server-web-api</artifactId>
<version>${teamcity-version}</version>
<version>${teamcity.version}</version>
<type>war</type>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.jetbrains.teamcity.internal</groupId>
<artifactId>server</artifactId>
<version>${teamcity-version}</version>
<version>${teamcity.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.jetbrains.teamcity</groupId>
<artifactId>tests-support</artifactId>
<version>${teamcity-version}</version>
<version>${teamcity.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jetbrains.teamcity.internal</groupId>
<artifactId>integration-test</artifactId>
<version>${teamcity-version}</version>
<version>${teamcity.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.jetbrains.teamcity</groupId>
<artifactId>cloud-interface</artifactId>
<version>${teamcity-version}</version>
<version>${teamcity.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.jetbrains.teamcity</groupId>
<artifactId>oauth</artifactId>
<version>${teamcity-version}</version>
<version>${teamcity.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.jetbrains.teamcity</groupId>
<artifactId>cloud-shared</artifactId>
<version>${teamcity-version}</version>
<version>${teamcity.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.jetbrains.teamcity</groupId>
<artifactId>cloud-server-api</artifactId>
<version>${teamcity-version}</version>
<version>${teamcity.version}</version>
<scope>provided</scope>
</dependency>

Expand Down Expand Up @@ -156,7 +156,7 @@
<dependency>
<groupId>org.jetbrains.teamcity</groupId>
<artifactId>cloud-server</artifactId>
<version>${teamcity-version}</version>
<version>${teamcity.version}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
Expand All @@ -169,7 +169,7 @@
<dependency>
<groupId>org.jetbrains.teamcity</groupId>
<artifactId>common-impl</artifactId>
<version>${teamcity-version}</version>
<version>${teamcity.version}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
Expand Down

0 comments on commit 40ff422

Please sign in to comment.