azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move to JDK_1_7 in maven project

Browse Source
This commit is contained in:
Nikolay Krasko
2022-08-11 15:48:23 +02:00
committed by Space
parent 930c63c324
commit 7c11ddf7ac
2 changed files with 51 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/pom.xml
+24
View File
@@ -299,6 +299,30 @@
<jdk_1_6>${env.JDK_16}</jdk_1_6> <jdk_1_6>${env.JDK_16}</jdk_1_6>
</properties> </properties>
</profile> </profile>
<profile>
<id>jdk_1_7_new</id>
<activation>
<property>
<name>env.JDK_1_7</name>
</property>
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<jdk_1_7>${env.JDK_1_7}</jdk_1_7>
</properties>
</profile>
<profile>
<id>jdk_1_7_old</id>
<activation>
<property>
<name>!env.JDK_1_7</name>
</property>
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<jdk_1_7>${env.JDK_17}</jdk_1_7>
</properties>
</profile>
<profile> <profile>
<id>sign-artifacts</id> <id>sign-artifacts</id>
libraries/tools/kotlin-maven-plugin-test/src/it/test-customJdk/pom.xml
+27 -1
View File
@@ -22,7 +22,7 @@
</dependencies> </dependencies>
<properties> <properties>
<kotlin.compiler.jdkHome>${env.JDK_17}</kotlin.compiler.jdkHome> <kotlin.compiler.jdkHome>${jdk_1_7}</kotlin.compiler.jdkHome>
</properties> </properties>
<build> <build>
@@ -45,4 +45,30 @@
</plugins> </plugins>
</build> </build>
<profiles>
<profile>
<id>jdk_1_7_new</id>
<activation>
<property>
<name>env.JDK_1_7</name>
</property>
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<jdk_1_7>${env.JDK_1_7}</jdk_1_7>
</properties>
</profile>
<profile>
<id>jdk_1_7_old</id>
<activation>
<property>
<name>!env.JDK_1_7</name>
</property>
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<jdk_1_7>${env.JDK_17}</jdk_1_7>
</properties>
</profile>
</profiles>
</project> </project>