Do not hardcode kotlin version into maven plugin smoke test
This commit is contained in:
committed by
Ilya Chernikov
parent
c29e44f057
commit
1c6b858153
@@ -119,9 +119,15 @@
|
|||||||
<version>2.0.0</version>
|
<version>2.0.0</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
|
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
|
||||||
|
<properties>
|
||||||
|
<kotlin.version>${project.version}</kotlin.version>
|
||||||
|
</properties>
|
||||||
<settingsFile>src/it/settings.xml</settingsFile>
|
<settingsFile>src/it/settings.xml</settingsFile>
|
||||||
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
|
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
|
||||||
<postBuildHookScript>verify</postBuildHookScript> <!-- no extension required -->
|
<postBuildHookScript>verify</postBuildHookScript> <!-- no extension required -->
|
||||||
|
<scriptVariables>
|
||||||
|
<kotlinVersion>${project.version}</kotlinVersion>
|
||||||
|
</scriptVariables>
|
||||||
</configuration>
|
</configuration>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
|
|||||||
@@ -26,7 +26,7 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.jetbrains.kotlin</groupId>
|
<groupId>org.jetbrains.kotlin</groupId>
|
||||||
<artifactId>kotlin-maven-plugin</artifactId>
|
<artifactId>kotlin-maven-plugin</artifactId>
|
||||||
<version>1.1-SNAPSHOT</version>
|
<version>${kotlin.version}</version>
|
||||||
|
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ State state = new File(basedir, "build.log").readLines().collect { it.replaceAll
|
|||||||
replaceAll(/[0-9]+\s*ms/, "LLL ms").
|
replaceAll(/[0-9]+\s*ms/, "LLL ms").
|
||||||
trim().
|
trim().
|
||||||
replaceAll(/^\[[A-Z]+\]$/, "").
|
replaceAll(/^\[[A-Z]+\]$/, "").
|
||||||
replaceAll(/version [0-9a-z-+\.]+/, "version @snapshot@").
|
replace(kotlinVersion, "@snapshot@").
|
||||||
replaceAll(/\(JRE .+\)/, "(JRE <jre-version>)")
|
replaceAll(/\(JRE .+\)/, "(JRE <jre-version>)")
|
||||||
|
|
||||||
if (filtered != "") {
|
if (filtered != "") {
|
||||||
|
|||||||
Reference in New Issue
Block a user