Move to JDK_1_8 in maven project
This commit is contained in:
@@ -116,7 +116,7 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<artifactId>maven-surefire-plugin</artifactId>
|
<artifactId>maven-surefire-plugin</artifactId>
|
||||||
<configuration>
|
<configuration>
|
||||||
<jvm>${env.JDK_18}/bin/java</jvm>
|
<jvm>${jdk_1_8}/bin/java</jvm>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
|
||||||
|
|||||||
@@ -104,7 +104,7 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<artifactId>maven-surefire-plugin</artifactId>
|
<artifactId>maven-surefire-plugin</artifactId>
|
||||||
<configuration>
|
<configuration>
|
||||||
<jvm>${env.JDK_18}/bin/java</jvm>
|
<jvm>${jdk_1_8}/bin/java</jvm>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
|
||||||
|
|||||||
@@ -42,7 +42,7 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<artifactId>maven-surefire-plugin</artifactId>
|
<artifactId>maven-surefire-plugin</artifactId>
|
||||||
<configuration>
|
<configuration>
|
||||||
<jvm>${env.JDK_18}/bin/java</jvm>
|
<jvm>${jdk_1_8}/bin/java</jvm>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
|
|||||||
+25
-2
@@ -2,7 +2,6 @@
|
|||||||
<project
|
<project
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://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">
|
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
||||||
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<groupId>org.jetbrains.kotlin</groupId>
|
<groupId>org.jetbrains.kotlin</groupId>
|
||||||
@@ -51,7 +50,7 @@
|
|||||||
|
|
||||||
<kotlin-dist>${project-root}/dist</kotlin-dist>
|
<kotlin-dist>${project-root}/dist</kotlin-dist>
|
||||||
<kotlin-sdk>${kotlin-dist}/kotlinc</kotlin-sdk>
|
<kotlin-sdk>${kotlin-dist}/kotlinc</kotlin-sdk>
|
||||||
<kotlin.compiler.jdkHome>${env.JDK_18}</kotlin.compiler.jdkHome>
|
<kotlin.compiler.jdkHome>${jdk_1_8}</kotlin.compiler.jdkHome>
|
||||||
|
|
||||||
<maven.compiler.source>1.6</maven.compiler.source>
|
<maven.compiler.source>1.6</maven.compiler.source>
|
||||||
<maven.compiler.target>1.6</maven.compiler.target>
|
<maven.compiler.target>1.6</maven.compiler.target>
|
||||||
@@ -252,6 +251,30 @@
|
|||||||
</build>
|
</build>
|
||||||
|
|
||||||
<profiles>
|
<profiles>
|
||||||
|
<profile>
|
||||||
|
<id>jdk_1_8_new</id>
|
||||||
|
<activation>
|
||||||
|
<property>
|
||||||
|
<name>env.JDK_1_8</name>
|
||||||
|
</property>
|
||||||
|
<activeByDefault>true</activeByDefault>
|
||||||
|
</activation>
|
||||||
|
<properties>
|
||||||
|
<jdk_1_8>${env.JDK_1_8}</jdk_1_8>
|
||||||
|
</properties>
|
||||||
|
</profile>
|
||||||
|
<profile>
|
||||||
|
<id>jdk_1_8_old</id>
|
||||||
|
<activation>
|
||||||
|
<property>
|
||||||
|
<name>!env.JDK_1_8</name>
|
||||||
|
</property>
|
||||||
|
<activeByDefault>true</activeByDefault>
|
||||||
|
</activation>
|
||||||
|
<properties>
|
||||||
|
<jdk_1_8>${env.JDK_18}</jdk_1_8>
|
||||||
|
</properties>
|
||||||
|
</profile>
|
||||||
<profile>
|
<profile>
|
||||||
<id>sign-artifacts</id>
|
<id>sign-artifacts</id>
|
||||||
<build>
|
<build>
|
||||||
|
|||||||
@@ -75,7 +75,7 @@
|
|||||||
<groupId>org.jetbrains.kotlin</groupId>
|
<groupId>org.jetbrains.kotlin</groupId>
|
||||||
<version>${project.version}</version>
|
<version>${project.version}</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<jdkHome>${env.JDK_18}</jdkHome>
|
<jdkHome>${jdk_1_8}</jdkHome>
|
||||||
<annotationPaths>
|
<annotationPaths>
|
||||||
<annotationPath>${basedir}/kotlinAnnotation</annotationPath>
|
<annotationPath>${basedir}/kotlinAnnotation</annotationPath>
|
||||||
</annotationPaths>
|
</annotationPaths>
|
||||||
@@ -130,7 +130,7 @@
|
|||||||
</file>
|
</file>
|
||||||
</activation>
|
</activation>
|
||||||
<properties>
|
<properties>
|
||||||
<toolsjar>${env.JDK_18}/lib/tools.jar</toolsjar>
|
<toolsjar>${jdk_1_8}/lib/tools.jar</toolsjar>
|
||||||
</properties>
|
</properties>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|||||||
@@ -82,7 +82,7 @@
|
|||||||
<goal>verify</goal>
|
<goal>verify</goal>
|
||||||
</goals>
|
</goals>
|
||||||
<configuration>
|
<configuration>
|
||||||
<jvm>${env.JDK_18}/bin/java</jvm>
|
<jvm>${jdk_1_8}/bin/java</jvm>
|
||||||
<forkMode>once</forkMode>
|
<forkMode>once</forkMode>
|
||||||
<systemProperties>
|
<systemProperties>
|
||||||
<property>
|
<property>
|
||||||
|
|||||||
@@ -99,7 +99,7 @@
|
|||||||
<artifactId>maven-surefire-plugin</artifactId>
|
<artifactId>maven-surefire-plugin</artifactId>
|
||||||
<version>${surefire-version}</version>
|
<version>${surefire-version}</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<jvm>${env.JDK_18}/bin/java</jvm>
|
<jvm>${jdk_1_8}/bin/java</jvm>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
|
|||||||
Reference in New Issue
Block a user