Merge remote-tracking branch 'origin/master' into kotlin-experiments

util/build.gradle

@@ -10,4 +10,14 @@ dependencies {
     implementation group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: bouncycastleVersion
 
     testImplementation group: 'junit', name: 'junit', version: junitVersion
-}
+}
+
+task(genRsa, dependsOn: classes, type: JavaExec) {
+    def utilSubproject = project(':util')
+    def utilClasspath = utilSubproject.sourceSets.main.runtimeClasspath
+
+    main = 'org.apollo.util.tools.RsaKeyGenerator'
+    classpath = utilClasspath
+    jvmArgs = ['-Xmx1024M']
+    workingDir = project.rootDir
+}