Move to JDK_1_8 in maven project

This commit is contained in:
Nikolay Krasko
2022-08-11 15:37:05 +02:00
committed by Space
parent 569e72c34e
commit e92c7983d0
7 changed files with 32 additions and 9 deletions
@@ -116,7 +116,7 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<jvm>${env.JDK_18}/bin/java</jvm>
<jvm>${jdk_1_8}/bin/java</jvm>
</configuration>
</plugin>
+1 -1
View File
@@ -104,7 +104,7 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<jvm>${env.JDK_18}/bin/java</jvm>
<jvm>${jdk_1_8}/bin/java</jvm>
</configuration>
</plugin>
@@ -42,7 +42,7 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<jvm>${env.JDK_18}/bin/java</jvm>
<jvm>${jdk_1_8}/bin/java</jvm>
</configuration>
</plugin>
</plugins>
+25 -2
View File
@@ -2,7 +2,6 @@
<project
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">
<modelVersion>4.0.0</modelVersion>
<groupId>org.jetbrains.kotlin</groupId>
@@ -51,7 +50,7 @@
<kotlin-dist>${project-root}/dist</kotlin-dist>
<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.target>1.6</maven.compiler.target>
@@ -252,6 +251,30 @@
</build>
<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>
<id>sign-artifacts</id>
<build>
@@ -75,7 +75,7 @@
<groupId>org.jetbrains.kotlin</groupId>
<version>${project.version}</version>
<configuration>
<jdkHome>${env.JDK_18}</jdkHome>
<jdkHome>${jdk_1_8}</jdkHome>
<annotationPaths>
<annotationPath>${basedir}/kotlinAnnotation</annotationPath>
</annotationPaths>
@@ -130,7 +130,7 @@
</file>
</activation>
<properties>
<toolsjar>${env.JDK_18}/lib/tools.jar</toolsjar>
<toolsjar>${jdk_1_8}/lib/tools.jar</toolsjar>
</properties>
<dependencies>
<dependency>
@@ -82,7 +82,7 @@
<goal>verify</goal>
</goals>
<configuration>
<jvm>${env.JDK_18}/bin/java</jvm>
<jvm>${jdk_1_8}/bin/java</jvm>
<forkMode>once</forkMode>
<systemProperties>
<property>
+1 -1
View File
@@ -99,7 +99,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire-version}</version>
<configuration>
<jvm>${env.JDK_18}/bin/java</jvm>
<jvm>${jdk_1_8}/bin/java</jvm>
</configuration>
</plugin>
</plugins>