Skip to content

Commit 1c6b858

Browse files
ilya-gligee
authored andcommitted
Do not hardcode kotlin version into maven plugin smoke test
1 parent c29e44f commit 1c6b858

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

libraries/tools/kotlin-maven-plugin/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,15 @@
119119
<version>2.0.0</version>
120120
<configuration>
121121
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
122+
<properties>
123+
<kotlin.version>${project.version}</kotlin.version>
124+
</properties>
122125
<settingsFile>src/it/settings.xml</settingsFile>
123126
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
124127
<postBuildHookScript>verify</postBuildHookScript> <!-- no extension required -->
128+
<scriptVariables>
129+
<kotlinVersion>${project.version}</kotlinVersion>
130+
</scriptVariables>
125131
</configuration>
126132
<executions>
127133
<execution>

libraries/tools/kotlin-maven-plugin/src/it/simple/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<plugin>
2727
<groupId>org.jetbrains.kotlin</groupId>
2828
<artifactId>kotlin-maven-plugin</artifactId>
29-
<version>1.1-SNAPSHOT</version>
29+
<version>${kotlin.version}</version>
3030

3131
<executions>
3232
<execution>

libraries/tools/kotlin-maven-plugin/src/it/simple/verify.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ State state = new File(basedir, "build.log").readLines().collect { it.replaceAll
3535
replaceAll(/[0-9]+\s*ms/, "LLL ms").
3636
trim().
3737
replaceAll(/^\[[A-Z]+\]$/, "").
38-
replaceAll(/version [0-9a-z-+\.]+/, "version @snapshot@").
38+
replace(kotlinVersion, "@snapshot@").
3939
replaceAll(/\(JRE .+\)/, "(JRE <jre-version>)")
4040

4141
if (filtered != "") {

0 commit comments

Comments
 (0)