Skip to content

Commit 07efcf5

Browse files
ali-inceali-ince
authored
ci: upgrade script version (#2)
* ci: upgrade script version * build: fix maven warnings * ci: fix package command * ci: skip tests for packaging build
1 parent 45ac906 commit 07efcf5

File tree

10 files changed

+42
-46
lines changed

10 files changed

+42
-46
lines changed

‎.teamcity/builds/Build.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
package builds
22

3-
import jetbrains.buildServer.configs.kotlin.v10.toExtId
4-
import jetbrains.buildServer.configs.kotlin.v2019_2.Project
5-
import jetbrains.buildServer.configs.kotlin.v2019_2.sequential
6-
import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs
3+
import jetbrains.buildServer.configs.kotlin.Project
4+
import jetbrains.buildServer.configs.kotlin.sequential
5+
import jetbrains.buildServer.configs.kotlin.toId
6+
import jetbrains.buildServer.configs.kotlin.triggers.vcs
77

88
class Build(name: String, branchFilter: String, forPullRequests: Boolean) : Project({
9-
this.id(name.toExtId())
9+
this.id(name.toId())
1010
this.name = name
1111

12-
var packaging = Maven("${name}-package", "package", "clean package -pl :packaging -am")
12+
val packaging = Maven("${name}-package", "package", "clean package", "-DskipTests")
1313

1414
val bts = sequential {
1515
if (forPullRequests) buildType(WhiteListCheck("${name}-whitelist-check", "white-list check"))

‎.teamcity/builds/Common.kt‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
package builds
22

3-
import jetbrains.buildServer.configs.kotlin.v2019_2.BuildFeatures
4-
import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
5-
import jetbrains.buildServer.configs.kotlin.v2019_2.DslContext
6-
import jetbrains.buildServer.configs.kotlin.v2019_2.Requirements
7-
import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.PullRequests
8-
import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.commitStatusPublisher
9-
import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.freeDiskSpace
10-
import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.pullRequests
3+
import jetbrains.buildServer.configs.kotlin.BuildFeatures
4+
import jetbrains.buildServer.configs.kotlin.BuildType
5+
import jetbrains.buildServer.configs.kotlin.DslContext
6+
import jetbrains.buildServer.configs.kotlin.Requirements
7+
import jetbrains.buildServer.configs.kotlin.buildFeatures.PullRequests
8+
import jetbrains.buildServer.configs.kotlin.buildFeatures.commitStatusPublisher
9+
import jetbrains.buildServer.configs.kotlin.buildFeatures.freeDiskSpace
10+
import jetbrains.buildServer.configs.kotlin.buildFeatures.pullRequests
1111

1212
const val GITHUB_OWNER = "neo4j"
1313
const val GITHUB_REPOSITORY = "neo4j-kafka-connector"
1414

1515
enum class LinuxSize(val value: String) {
16-
SMALL("small"), LARGE("large")
16+
SMALL("small"),
17+
LARGE("large")
1718
}
1819

1920
fun Requirements.runOnLinux(size: LinuxSize = LinuxSize.SMALL) {

‎.teamcity/builds/Empty.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package builds
22

3-
import jetbrains.buildServer.configs.kotlin.v10.toExtId
4-
import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
3+
import jetbrains.buildServer.configs.kotlin.BuildType
4+
import jetbrains.buildServer.configs.kotlin.toId
55

66
class Empty(id: String, name: String) : BuildType({
7-
this.id(id.toExtId())
7+
this.id(id.toId())
88
this.name = name
99

1010
requirements {

‎.teamcity/builds/Maven.kt‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
package builds
22

3-
import jetbrains.buildServer.configs.kotlin.v10.toExtId
4-
import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
5-
import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.dockerSupport
6-
import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.freeDiskSpace
7-
import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.MavenBuildStep
8-
import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.maven
3+
import jetbrains.buildServer.configs.kotlin.BuildType
4+
import jetbrains.buildServer.configs.kotlin.buildFeatures.dockerSupport
5+
import jetbrains.buildServer.configs.kotlin.buildSteps.MavenBuildStep
6+
import jetbrains.buildServer.configs.kotlin.buildSteps.maven
7+
import jetbrains.buildServer.configs.kotlin.toId
98

109
class Maven(id: String, name: String, goals: String, args: String? = null) : BuildType({
11-
this.id(id.toExtId())
10+
this.id(id.toId())
1211
this.name = name
1312

1413
steps {

‎.teamcity/builds/PRCheck.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package builds
22

3-
import jetbrains.buildServer.configs.kotlin.v10.toExtId
4-
import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
5-
import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.dockerSupport
6-
import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.ScriptBuildStep
7-
import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.script
3+
import jetbrains.buildServer.configs.kotlin.BuildType
4+
import jetbrains.buildServer.configs.kotlin.buildFeatures.dockerSupport
5+
import jetbrains.buildServer.configs.kotlin.buildSteps.ScriptBuildStep
6+
import jetbrains.buildServer.configs.kotlin.buildSteps.script
7+
import jetbrains.buildServer.configs.kotlin.toId
88

99
class PRCheck(id: String, name: String) : BuildType({
10-
this.id(id.toExtId())
10+
this.id(id.toId())
1111
this.name = name
1212

1313
steps {

‎.teamcity/builds/WhiteListCheck.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package builds
22

3-
import jetbrains.buildServer.configs.kotlin.v10.toExtId
4-
import jetbrains.buildServer.configs.kotlin.v2019_2.AbsoluteId
5-
import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
6-
import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.script
3+
import jetbrains.buildServer.configs.kotlin.AbsoluteId
4+
import jetbrains.buildServer.configs.kotlin.BuildType
5+
import jetbrains.buildServer.configs.kotlin.buildSteps.script
6+
import jetbrains.buildServer.configs.kotlin.toId
77

88
class WhiteListCheck(id: String, name: String) : BuildType({
9-
this.id(id.toExtId())
9+
this.id(id.toId())
1010
this.name = name
1111

1212
dependencies {

‎.teamcity/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,13 @@
7878
<dependencies>
7979
<dependency>
8080
<groupId>org.jetbrains.teamcity</groupId>
81-
<artifactId>configs-dsl-kotlin</artifactId>
81+
<artifactId>configs-dsl-kotlin-latest</artifactId>
8282
<version>${teamcity.dsl.version}</version>
8383
<scope>compile</scope>
8484
</dependency>
8585
<dependency>
8686
<groupId>org.jetbrains.teamcity</groupId>
87-
<artifactId>configs-dsl-kotlin-plugins</artifactId>
87+
<artifactId>configs-dsl-kotlin-plugins-latest</artifactId>
8888
<version>1.0-SNAPSHOT</version>
8989
<type>pom</type>
9090
<scope>compile</scope>

‎.teamcity/settings.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import builds.Build
2-
import jetbrains.buildServer.configs.kotlin.v2019_2.project
3-
import jetbrains.buildServer.configs.kotlin.v2019_2.version
2+
import jetbrains.buildServer.configs.kotlin.project
3+
import jetbrains.buildServer.configs.kotlin.version
44

5-
version = "2021.2"
5+
version = "2023.05"
66

77
project {
88
params {

‎kafka-connect-neo4j/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
<plugins>
7676
<plugin>
7777
<artifactId>maven-resources-plugin</artifactId>
78+
<version>3.3.1</version>
7879
<configuration>
7980
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
8081
<resources>

‎pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -135,11 +135,6 @@
135135
<version>${neo4j.version}</version>
136136
<scope>test</scope>
137137
</dependency>
138-
<dependency>
139-
<groupId>org.hamcrest</groupId>
140-
<artifactId>hamcrest-all</artifactId>
141-
<version>${hamcrest.version}</version>
142-
</dependency>
143138
<dependency>
144139
<groupId>org.apache.kafka</groupId>
145140
<artifactId>kafka-clients</artifactId>

0 commit comments

Comments
 (0)