diff --git a/libraries/pom.xml b/libraries/pom.xml
index 3370f8b5ff7..a734c3d6c32 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -50,6 +50,7 @@
${project-root}/dist
${kotlin-dist}/kotlinc
+ ${env.JDK_16}
1.6
1.6
@@ -79,6 +80,8 @@
tools/runtime
stdlib
+ stdlib/jre7
+ stdlib/jre8
tools/kotlin-reflect
tools/kotlin-osgi-bundle
@@ -161,6 +164,7 @@
${surefire-version}
once
+ ${env.JDK_16}/bin/java
false
false
false
diff --git a/libraries/stdlib/jre7/pom.xml b/libraries/stdlib/jre7/pom.xml
new file mode 100644
index 00000000000..5d844692192
--- /dev/null
+++ b/libraries/stdlib/jre7/pom.xml
@@ -0,0 +1,101 @@
+
+
+
+ 4.0.0
+
+
+ org.jetbrains.kotlin
+ kotlin-project
+ 1.1-SNAPSHOT
+ ../../pom.xml
+
+
+ kotlin-stdlib-jre7
+
+
+
+ org.jetbrains.kotlin
+ kotlin-stdlib
+ ${project.version}
+
+
+ org.jetbrains.kotlin
+ kotlin-test-junit
+ ${project.version}
+ test
+
+
+
+
+ src
+ test
+
+
+
+
+ org.jetbrains.kotlin
+ kotlin-maven-plugin
+ ${project.version}
+
+
+ ${env.JDK_17}
+
+ -Xallow-kotlin-package
+
+
+
+
+
+ compile
+ process-sources
+
+ compile
+
+
+
+ -Xmultifile-parts-inherit
+ -Xdump-declarations-to
+ ${basedir}/target/stdlib-jre7-declarations.json
+
+
+
+
+
+ test-compile
+ test-compile
+
+ test-compile
+
+
+
+ ${basedir}/test
+ ${basedir}/../test
+
+
+
+
+
+
+
+ maven-surefire-plugin
+
+ once
+ ${env.JDK_17}/bin/java
+
+
+
+ binary-compatibility-test
+ test
+ test
+
+ ${basedir}/../test
+ ${basedir}/../target/test-classes
+
+
+
+
+
+
+
diff --git a/libraries/stdlib/jre8/pom.xml b/libraries/stdlib/jre8/pom.xml
new file mode 100644
index 00000000000..2dda86eae00
--- /dev/null
+++ b/libraries/stdlib/jre8/pom.xml
@@ -0,0 +1,101 @@
+
+
+
+ 4.0.0
+
+
+ org.jetbrains.kotlin
+ kotlin-project
+ 1.1-SNAPSHOT
+ ../../pom.xml
+
+
+ kotlin-stdlib-jre8
+
+
+
+ org.jetbrains.kotlin
+ kotlin-stdlib-jre7
+ ${project.version}
+
+
+ org.jetbrains.kotlin
+ kotlin-test-junit
+ ${project.version}
+ test
+
+
+
+
+ src
+ test
+
+
+
+ org.jetbrains.kotlin
+ kotlin-maven-plugin
+ ${project.version}
+
+
+ ${env.JDK_18}
+
+ -Xallow-kotlin-package
+
+
+
+
+
+ compile
+ process-sources
+
+ compile
+
+
+
+ -Xmultifile-parts-inherit
+ -Xdump-declarations-to
+ ${basedir}/target/stdlib-jre8-declarations.json
+
+
+
+
+
+ test-compile
+ test-compile
+
+ test-compile
+
+
+
+ ${basedir}/test
+ ${basedir}/../jdk7/test
+ ${basedir}/../test
+
+
+
+
+
+
+
+ maven-surefire-plugin
+
+ once
+ ${env.JDK_18}/bin/java
+
+
+
+ binary-compatibility-test
+ test
+ test
+
+ ${basedir}/../test
+ ${basedir}/../target/test-classes
+
+
+
+
+
+
+
diff --git a/libraries/stdlib/pom.xml b/libraries/stdlib/pom.xml
index 7bcd433dfef..f94dbdbe19c 100644
--- a/libraries/stdlib/pom.xml
+++ b/libraries/stdlib/pom.xml
@@ -32,7 +32,7 @@
test
-
+
org.jetbrains.kotlin
kotlin-maven-plugin
${project.version}
@@ -68,6 +68,13 @@
+
+ maven-surefire-plugin
+
+ once
+ ${env.JDK_16}/bin/java
+
+