Merge branch 'release'

gradle · May 12, 2021 · 9b23f11 · 9b23f11
2 parents 2ffe7d5 + 6fa254c
commit 9b23f11
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 71 deletions.
diff --git a/.teamcity/src/main/kotlin/promotion/PublishBranchSnapshotFromQuickFeedback.kt b/.teamcity/src/main/kotlin/promotion/PublishBranchSnapshotFromQuickFeedback.kt
@@ -17,6 +17,7 @@
 package promotion
 
 import jetbrains.buildServer.configs.kotlin.v2019_2.ParameterDisplay
+import jetbrains.buildServer.configs.kotlin.v2019_2.RelativeId
 import vcsroots.gradlePromotionBranches
 
 object PublishBranchSnapshotFromQuickFeedback : PublishGradleDistribution(
@@ -34,7 +35,7 @@ object PublishBranchSnapshotFromQuickFeedback : PublishGradleDistribution(
         val triggerName = this.triggerName
 
         params {
-            param("branch.qualifier", "%dep.Gradle_Master_Check_Stage_${triggerName}_Trigger.teamcity.build.branch%")
+            param("branch.qualifier", "%dep.${RelativeId("Check_Stage_${triggerName}_Trigger")}.teamcity.build.branch%")
             text(
                 "branch.to.promote",
                 "%branch.qualifier%",

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -1443,119 +1443,119 @@
             <sha256 value="4e8e553980d97d67fdafe422f410b4591a8ae4b78bce6ba99f381e2a07050b35" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
-      <component group="net.rubygrapefruit" name="file-events" version="0.22-milestone-15">
-         <artifact name="file-events-0.22-milestone-15.jar">
-            <sha256 value="5a5c2a012c93f0ec1404110d287e662cee40b436a52587fbdce287093ce250ad" origin="Generated by Gradle because artifact wasn't signed"/>
+      <component group="net.rubygrapefruit" name="file-events" version="0.22-milestone-16">
+         <artifact name="file-events-0.22-milestone-16.jar">
+            <sha256 value="c94237afd7238b0d856d8b3002ab4d552d6ed854d75ecc1424b365ef0c813a4b" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
-      <component group="net.rubygrapefruit" name="file-events-linux-aarch64" version="0.22-milestone-15">
-         <artifact name="file-events-linux-aarch64-0.22-milestone-15.jar">
-            <sha256 value="b13bd2a4773ea4c86b3a2b171ab20a639bba48a46d2c25e3b61036a5a9324838" origin="Generated by Gradle because artifact wasn't signed"/>
+      <component group="net.rubygrapefruit" name="file-events-linux-aarch64" version="0.22-milestone-16">
+         <artifact name="file-events-linux-aarch64-0.22-milestone-16.jar">
+            <sha256 value="018762c1774ef5f3abb9f667c81ffa71a859734e617d4f600d3b084073ad549a" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
-      <component group="net.rubygrapefruit" name="file-events-linux-amd64" version="0.22-milestone-15">
-         <artifact name="file-events-linux-amd64-0.22-milestone-15.jar">
-            <sha256 value="dd0b8530a96e38d01ebe2dc609d714bd51c58f0cdc3001bf6edea18c232d0309" origin="Generated by Gradle because artifact wasn't signed"/>
+      <component group="net.rubygrapefruit" name="file-events-linux-amd64" version="0.22-milestone-16">
+         <artifact name="file-events-linux-amd64-0.22-milestone-16.jar">
+            <sha256 value="ffdaf15c3f193c3777175895d56469037d7bdec289432c7c733561c90ce89698" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
-      <component group="net.rubygrapefruit" name="file-events-osx-aarch64" version="0.22-milestone-15">
-         <artifact name="file-events-osx-aarch64-0.22-milestone-15.jar">
-            <sha256 value="74d9aead9e9969237344dfa1c54583033d3804e66a6b0eedd0809b29ada56f9d" origin="Generated by Gradle because artifact wasn't signed"/>
+      <component group="net.rubygrapefruit" name="file-events-osx-aarch64" version="0.22-milestone-16">
+         <artifact name="file-events-osx-aarch64-0.22-milestone-16.jar">
+            <sha256 value="65418daa856dcad72ef78ee7a794483485799a0f9802740d59b7a1237b93d277" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
-      <component group="net.rubygrapefruit" name="file-events-osx-amd64" version="0.22-milestone-15">
-         <artifact name="file-events-osx-amd64-0.22-milestone-15.jar">
-            <sha256 value="40085c12f4ad656f2041c078ec56dd0e7e6247a089756893415a4fe4ef9e5bac" origin="Generated by Gradle because artifact wasn't signed"/>
+      <component group="net.rubygrapefruit" name="file-events-osx-amd64" version="0.22-milestone-16">
+         <artifact name="file-events-osx-amd64-0.22-milestone-16.jar">
+            <sha256 value="acb6edcc1f674d6efd893bb4e11adfa8bbd861f2ce6ff311f726bed459538555" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
-      <component group="net.rubygrapefruit" name="file-events-windows-amd64" version="0.22-milestone-15">
-         <artifact name="file-events-windows-amd64-0.22-milestone-15.jar">
-            <sha256 value="245e0a4d49dee73e03aaccd54a365cb403c04527922ca517a15a9f902be760a4" origin="Generated by Gradle because artifact wasn't signed"/>
+      <component group="net.rubygrapefruit" name="file-events-windows-amd64" version="0.22-milestone-16">
+         <artifact name="file-events-windows-amd64-0.22-milestone-16.jar">
+            <sha256 value="34d23e235cf0721aa4128d3b663e8ef347def1956b5b3abd595818a4e710be9d" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
-      <component group="net.rubygrapefruit" name="file-events-windows-amd64-min" version="0.22-milestone-15">
-         <artifact name="file-events-windows-amd64-min-0.22-milestone-15.jar">
-            <sha256 value="c3241c990f5cccb909d9c1fb626952df6186b006e869bae435dfcb2d08fbbfca" origin="Generated by Gradle because artifact wasn't signed"/>
+      <component group="net.rubygrapefruit" name="file-events-windows-amd64-min" version="0.22-milestone-16">
+         <artifact name="file-events-windows-amd64-min-0.22-milestone-16.jar">
+            <sha256 value="94589909c50eccdad880898b628715017abad2d23fb5c0b5cd537912cd6e7bf8" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
-      <component group="net.rubygrapefruit" name="file-events-windows-i386" version="0.22-milestone-15">
-         <artifact name="file-events-windows-i386-0.22-milestone-15.jar">
-            <sha256 value="9f78f0030d8382aa59a110e540724d77ab2fb7c6a2615a5af4abdb151ecc8997" origin="Generated by Gradle because artifact wasn't signed"/>
+      <component group="net.rubygrapefruit" name="file-events-windows-i386" version="0.22-milestone-16">
+         <artifact name="file-events-windows-i386-0.22-milestone-16.jar">
+            <sha256 value="8846e40ce8088aba82507eb72066de35687b4e81139d631ac8768b8a3edef27c" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
-      <component group="net.rubygrapefruit" name="file-events-windows-i386-min" version="0.22-milestone-15">
-         <artifact name="file-events-windows-i386-min-0.22-milestone-15.jar">
-            <sha256 value="ad97abd728f87dcc37314d2d179a94c86b864ab0a20aecfba19a2101f228255b" origin="Generated by Gradle because artifact wasn't signed"/>
+      <component group="net.rubygrapefruit" name="file-events-windows-i386-min" version="0.22-milestone-16">
+         <artifact name="file-events-windows-i386-min-0.22-milestone-16.jar">
+            <sha256 value="3ab91bcf823c3442e6bbe779deebc1856aa543de5cc5ff06abe6edf375b1f90d" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
-      <component group="net.rubygrapefruit" name="native-platform" version="0.22-milestone-15">
-         <artifact name="native-platform-0.22-milestone-15.jar">
-            <sha256 value="5e657f40191b048e6c262817e1c31fd6f81f7f0b7d4f7ede0cdeb6b233d36ea2" origin="Generated by Gradle because artifact wasn't signed"/>
+      <component group="net.rubygrapefruit" name="native-platform" version="0.22-milestone-16">
+         <artifact name="native-platform-0.22-milestone-16.jar">
+            <sha256 value="8f6ba153e0beaf197309540de77d3fa828f3fdee72f54a6b6c08e004989b0656" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
-      <component group="net.rubygrapefruit" name="native-platform-freebsd-amd64-libcpp" version="0.22-milestone-15">
-         <artifact name="native-platform-freebsd-amd64-libcpp-0.22-milestone-15.jar">
-            <sha256 value="982d32bfeebc1be09051832e3dd721ef043620d95501fec8f4a3be623cbccd5d" origin="Generated by Gradle because artifact wasn't signed"/>
+      <component group="net.rubygrapefruit" name="native-platform-freebsd-amd64-libcpp" version="0.22-milestone-16">
+         <artifact name="native-platform-freebsd-amd64-libcpp-0.22-milestone-16.jar">
+            <sha256 value="d7ad949264acb15a4f2296e4f27dcd126a24f8cc3387926d8956d7d14d7b60da" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
-      <component group="net.rubygrapefruit" name="native-platform-linux-aarch64" version="0.22-milestone-15">
-         <artifact name="native-platform-linux-aarch64-0.22-milestone-15.jar">
-            <sha256 value="2685f1c76bf85702c6f2f291de928d2caf7e22ac4729c3c461c1fd45e67e1990" origin="Generated by Gradle because artifact wasn't signed"/>
+      <component group="net.rubygrapefruit" name="native-platform-linux-aarch64" version="0.22-milestone-16">
+         <artifact name="native-platform-linux-aarch64-0.22-milestone-16.jar">
+            <sha256 value="0560b07f9f482fb255257d7e8674797055f84edd6b21749b87dc318fb62dfce3" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
-      <component group="net.rubygrapefruit" name="native-platform-linux-aarch64-ncurses5" version="0.22-milestone-15">
-         <artifact name="native-platform-linux-aarch64-ncurses5-0.22-milestone-15.jar">
-            <sha256 value="f396db351e75232af99d44d21301226050f1f7ec2a261e2280054a0dc72a3cf1" origin="Generated by Gradle because artifact wasn't signed"/>
+      <component group="net.rubygrapefruit" name="native-platform-linux-aarch64-ncurses5" version="0.22-milestone-16">
+         <artifact name="native-platform-linux-aarch64-ncurses5-0.22-milestone-16.jar">
+            <sha256 value="5e9eafd79e7cf23d8bbab9771a816817ed9c89fd73887730e9d86555cb943100" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
-      <component group="net.rubygrapefruit" name="native-platform-linux-aarch64-ncurses6" version="0.22-milestone-15">
-         <artifact name="native-platform-linux-aarch64-ncurses6-0.22-milestone-15.jar">
-            <sha256 value="cdb9201017b8a9d5075aaadc7f3407df397b225b91b8ec2ecc1319e032d3b3fb" origin="Generated by Gradle because artifact wasn't signed"/>
+      <component group="net.rubygrapefruit" name="native-platform-linux-aarch64-ncurses6" version="0.22-milestone-16">
+         <artifact name="native-platform-linux-aarch64-ncurses6-0.22-milestone-16.jar">
+            <sha256 value="0dc4719f27338fcde5dcaf3061a8d9ac06f532bbda6e577fcfb573159a113ac2" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
-      <component group="net.rubygrapefruit" name="native-platform-linux-amd64" version="0.22-milestone-15">
-         <artifact name="native-platform-linux-amd64-0.22-milestone-15.jar">
-            <sha256 value="ef75643bc5158d320c348771fb3f9de88d452ef59c605c17e6276a833922deda" origin="Generated by Gradle because artifact wasn't signed"/>
+      <component group="net.rubygrapefruit" name="native-platform-linux-amd64" version="0.22-milestone-16">
+         <artifact name="native-platform-linux-amd64-0.22-milestone-16.jar">
+            <sha256 value="c0bc70807647b5549d030ec931fea9999072cd4a0d63e869036d1a849924976f" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
-      <component group="net.rubygrapefruit" name="native-platform-linux-amd64-ncurses5" version="0.22-milestone-15">
-         <artifact name="native-platform-linux-amd64-ncurses5-0.22-milestone-15.jar">
-            <sha256 value="74ada00a5ff3e57a849baa2f16217aafc4500eff5b8766e345ef66ead4c3c441" origin="Generated by Gradle because artifact wasn't signed"/>
+      <component group="net.rubygrapefruit" name="native-platform-linux-amd64-ncurses5" version="0.22-milestone-16">
+         <artifact name="native-platform-linux-amd64-ncurses5-0.22-milestone-16.jar">
+            <sha256 value="b81ec609eab4d3269a16c5e5a5bafb7428fc7a9a06e226a97bb7ee31c3a9adeb" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
-      <component group="net.rubygrapefruit" name="native-platform-linux-amd64-ncurses6" version="0.22-milestone-15">
-         <artifact name="native-platform-linux-amd64-ncurses6-0.22-milestone-15.jar">
-            <sha256 value="df469a61e351f485b37293d9d71c65cb25e8e5568f015654f542f29e2e5f429a" origin="Generated by Gradle because artifact wasn't signed"/>
+      <component group="net.rubygrapefruit" name="native-platform-linux-amd64-ncurses6" version="0.22-milestone-16">
+         <artifact name="native-platform-linux-amd64-ncurses6-0.22-milestone-16.jar">
+            <sha256 value="8b4fd87fcb8833894da5d3800bff4d2a8ef8b3b41347c895522b05f87e4f7728" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
-      <component group="net.rubygrapefruit" name="native-platform-osx-aarch64" version="0.22-milestone-15">
-         <artifact name="native-platform-osx-aarch64-0.22-milestone-15.jar">
-            <sha256 value="94ccdae4d61146f34fad3622f51fc3350a961c558e929ec993371e00d0bd64ec" origin="Generated by Gradle because artifact wasn't signed"/>
+      <component group="net.rubygrapefruit" name="native-platform-osx-aarch64" version="0.22-milestone-16">
+         <artifact name="native-platform-osx-aarch64-0.22-milestone-16.jar">
+            <sha256 value="dde602c75fc5594bb72b05329684b5a45b2dcdb6a031499e7834bfa051498eaa" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
-      <component group="net.rubygrapefruit" name="native-platform-osx-amd64" version="0.22-milestone-15">
-         <artifact name="native-platform-osx-amd64-0.22-milestone-15.jar">
-            <sha256 value="8153fa88561117a9a5cdfe2a7330bc1b4883750c1f32edb01241670e3ea2c86c" origin="Generated by Gradle because artifact wasn't signed"/>
+      <component group="net.rubygrapefruit" name="native-platform-osx-amd64" version="0.22-milestone-16">
+         <artifact name="native-platform-osx-amd64-0.22-milestone-16.jar">
+            <sha256 value="30dc89a847adcd50df2a8f97f13a6e8ea210e99bed8205c1049ceabe893b6049" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
-      <component group="net.rubygrapefruit" name="native-platform-windows-amd64" version="0.22-milestone-15">
-         <artifact name="native-platform-windows-amd64-0.22-milestone-15.jar">
-            <sha256 value="a04b3e16877a861cdc15c143cb058adb5a3a990e3c6f1344264838548d460c20" origin="Generated by Gradle because artifact wasn't signed"/>
+      <component group="net.rubygrapefruit" name="native-platform-windows-amd64" version="0.22-milestone-16">
+         <artifact name="native-platform-windows-amd64-0.22-milestone-16.jar">
+            <sha256 value="088891fa4726f48fb59d22880ed61b2af69f1def005818ffa498871284b371c5" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
-      <component group="net.rubygrapefruit" name="native-platform-windows-amd64-min" version="0.22-milestone-15">
-         <artifact name="native-platform-windows-amd64-min-0.22-milestone-15.jar">
-            <sha256 value="4747927df2590a971095edc533899487e7ed01e86974cbe8cf1692546d4c5023" origin="Generated by Gradle because artifact wasn't signed"/>
+      <component group="net.rubygrapefruit" name="native-platform-windows-amd64-min" version="0.22-milestone-16">
+         <artifact name="native-platform-windows-amd64-min-0.22-milestone-16.jar">
+            <sha256 value="e09be0a9375ba6f83710d6e756e3d5d1f336ca6f82a844efdce277e40751e872" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
-      <component group="net.rubygrapefruit" name="native-platform-windows-i386" version="0.22-milestone-15">
-         <artifact name="native-platform-windows-i386-0.22-milestone-15.jar">
-            <sha256 value="02efd147a97745292206d71f5034b85b2b550f4a4506f0460183e55ed5616e98" origin="Generated by Gradle because artifact wasn't signed"/>
+      <component group="net.rubygrapefruit" name="native-platform-windows-i386" version="0.22-milestone-16">
+         <artifact name="native-platform-windows-i386-0.22-milestone-16.jar">
+            <sha256 value="64f0a2a51ae15111e025b84e6fa3e4aeee377f3bb033a29ac6dd5f691f2a94f6" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
-      <component group="net.rubygrapefruit" name="native-platform-windows-i386-min" version="0.22-milestone-15">
-         <artifact name="native-platform-windows-i386-min-0.22-milestone-15.jar">
-            <sha256 value="e2b1875b6f297ab50daf4b3ce82fdaf4dc8f277f3c468fb112e210658d670bdb" origin="Generated by Gradle because artifact wasn't signed"/>
+      <component group="net.rubygrapefruit" name="native-platform-windows-i386-min" version="0.22-milestone-16">
+         <artifact name="native-platform-windows-i386-min-0.22-milestone-16.jar">
+            <sha256 value="2dc43c90dfefd21dd89acc80042d9a2bd3cda22e3273b2e62aebc30efa69efbd" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
       <component group="net.sf.ezmorph" name="ezmorph" version="1.0.6">

diff --git a/subprojects/distributions-dependencies/build.gradle.kts b/subprojects/distributions-dependencies/build.gradle.kts
@@ -21,7 +21,7 @@ val jacksonVersion = "2.12.1"
 val jaxbVersion = "3.0.0"
 val jettyVersion = "9.4.36.v20210114"
 val mavenVersion = "3.6.3"
-val nativePlatformVersion = "0.22-milestone-15"
+val nativePlatformVersion = "0.22-milestone-16"
 val slf4jVersion = "1.7.30"
 val sshdVersion = "2.0.0" // Upgrade requires changes in package names and tests fail on expectations (but work otherwise)
 val tomljVersion = "1.0.0"