Update framework version (#4659)

* Update Hexagon benchmark

* Update Hexagon benchmark

* Remove features not used in tests

* Remove MySql storage

* Enable Resin test

* Upgrade Hexagon to v0.11

* Disable Resin

* Fix dependencies

* Improve template rendering

* Test in travis

* Fix build script

* Restore Travis script

* Restore Travis script

* MySQL store support and MongoDB fix

* Fix MySQL test

* Fix MySQL test

* Fix MySQL test

* Travis testing

* Fix MySQL test

* Restore Travis

* Take MySQL URL from other test

* Add PostgreSQL support

* Update version and tests

* Update version and tests

* Only test Hexagon in fork

* Fix config

* Fix config

* Update version and tests

* Remove Resin tests

* Restore Travis

* Restore Travis

* Upgrade framework version

* Reduce local tests temporarily

* Disable Resin tests

* Fix Gradle Wrapper issues

* Restore Resin tests

* Add Bintray repository

* Disable Resin backend

* Restore master's

* Upgrade framework version

* Test only Hexagon changes (temporary)

* Test Hexagon in Travis CI

* Add Undertow support

* Test only Undertow

* Restore Travis jobs

* Enable all Hexagon's variants

* Optimize benchmark

* Fix documentation

* Fix documentation

* Add Gradle Wrapper

* Move code to conform with Kotlin's coding standards

* Trace more information (only in tests)

* Add mini performance tests (to be sure everything would be fine in TFB)

* Support different template engines

* Add configuration properties

* Drop Undertow engine

* Update versions and dependencies

* Update documentation

* Ignore Gradle directories

* Update configuration

* Update benchmark

* Improve benchmark

* Improve benchmark dockerfiles

* Next Hexagon release

* Delete Gatlin simulation

* Fix url for testing

* Remove Gatling test

* Update Hexagon benchmark

* Improve data update test

* Merge Hexagon config

* Remove batch for updates benchmark

* Fix compilation problem

* Update Kotlin version

* Update dependencies and tools

* Move source files to their package directories

* Update Gradle version

* Update

* Update Hexagon version

* Update Hexagon version

* Update Hexagon version

frameworks/Kotlin/hexagon/build.gradle

@@ -5,6 +5,7 @@ plugins {
 
 apply(from: "$gradleScripts/kotlin.gradle")
 apply(from: "$gradleScripts/service.gradle")
+apply(from: "$gradleScripts/testng.gradle")
 
 apply(plugin: "war")
 
@@ -20,20 +21,15 @@ war {
 installDist.dependsOn("war")
 
 dependencies {
-    compile("com.hexagonkt:store_mongodb:$hexagonVersion")
-    compile("com.hexagonkt:http_server_jetty:$hexagonVersion")
-    compile("com.hexagonkt:templates_pebble:$hexagonVersion")
+    implementation("com.hexagonkt:store_mongodb:$hexagonVersion")
+    implementation("com.hexagonkt:http_server_jetty:$hexagonVersion")
+    implementation("com.hexagonkt:templates_pebble:$hexagonVersion")
 
-    compile("com.zaxxer:HikariCP:$hikariVersion")
-    compile("org.postgresql:postgresql:$postgresqlVersion")
+    implementation("com.zaxxer:HikariCP:$hikariVersion")
+    implementation("org.postgresql:postgresql:$postgresqlVersion")
 
     // providedCompile excludes the dependency only in the WAR, not in the distribution
     providedCompile("org.eclipse.jetty:jetty-webapp:$jettyVersion") { exclude module: "slf4j-api" }
 
-    testCompile("com.hexagonkt:port_http_client:$hexagonVersion")
-    testCompile("org.testng:testng:$testngVersion")
-}
-
-test {
-    useTestNG()
+    testImplementation("com.hexagonkt:port_http_client:$hexagonVersion")
 }

frameworks/Kotlin/hexagon/gradle.properties

@@ -1,10 +1,11 @@
 description=Hexagon web framework's benchmark
-gradleScripts=https\://raw.githubusercontent.com/hexagonkt/hexagon/0.25.3/gradle
-hexagonVersion=0.25.3
+gradleScripts=https\://raw.githubusercontent.com/hexagonkt/hexagon/0.25.10/gradle
+hexagonVersion=0.25.10
 hikariVersion=3.3.1
-jettyVersion=9.4.14.v20181114
+jettyVersion=9.4.15.v20190215
 kotlinCoroutinesVersion=1.1.1
-kotlinVersion=1.3.21
+kotlinVersion=1.3.30
 logbackVersion=1.2.3
+name=hexagon
 postgresqlVersion=42.2.5.jre7
 testngVersion=6.14.3

frameworks/Kotlin/hexagon/hexagon-jetty-postgresql.dockerfile

@@ -2,7 +2,7 @@
 #
 # BUILD
 #
-FROM gradle:5.2.1-jdk11 AS gradle_build
+FROM gradle:5.3.1-jdk11 AS gradle_build
 USER root
 WORKDIR /hexagon
 

frameworks/Kotlin/hexagon/hexagon-resin-mongodb.dockerfile

@@ -2,7 +2,7 @@
 #
 # BUILD
 #
-FROM gradle:5.2.1-jdk11 AS gradle_build
+FROM gradle:5.3.1-jdk11 AS gradle_build
 USER root
 WORKDIR /hexagon
 

frameworks/Kotlin/hexagon/hexagon-resin-postgresql.dockerfile

@@ -2,7 +2,7 @@
 #
 # BUILD
 #
-FROM gradle:5.2.1-jdk11 AS gradle_build
+FROM gradle:5.3.1-jdk11 AS gradle_build
 USER root
 WORKDIR /hexagon
 

frameworks/Kotlin/hexagon/hexagon.dockerfile

@@ -2,7 +2,7 @@
 #
 # BUILD
 #
-FROM gradle:5.2.1-jdk11 AS gradle_build
+FROM gradle:5.3.1-jdk11 AS gradle_build
 USER root
 WORKDIR /hexagon
 

frameworks/Kotlin/hexagon/settings.gradle

@@ -1,2 +1,2 @@
 
-enableFeaturePreview 'STABLE_PUBLISHING'
+rootProject.name = name

frameworks/Kotlin/hexagon/src/main/kotlin/com/hexagonkt/Benchmark.kt

@@ -111,5 +111,5 @@ private fun Call.updateWorlds(store: BenchmarkStore) {
 @WebListener class Web : ServletServer(router)
 
 fun main() {
-    benchmarkServer.run()
+    benchmarkServer.start()
 }

frameworks/Kotlin/hexagon/src/main/kotlin/com/hexagonkt/BenchmarkStorage.kt

@@ -11,7 +11,7 @@ import com.zaxxer.hikari.HikariDataSource
 import java.sql.Connection
 import java.util.concurrent.ThreadLocalRandom
 
-internal const val WORLD_ROWS: Int = 10000
+internal const val WORLD_ROWS: Int = 10_000
 
 private val worldName: String = defaultSetting("worldCollection", "world")
 private val fortuneName: String = defaultSetting("fortuneCollection", "fortune")