Merge pull request #799 from naver/release/3.5.5

Release 3.5.5

Author: Imbyungjun

README.md

@@ -1,5 +1,5 @@
 * Please post questions in [Discussions](https://github.com/naver/ngrinder/discussions) not Issues.
-* nGrinder 3.5.4 has been released. See https://github.com/naver/ngrinder/releases
+* nGrinder 3.5.5 has been released. See https://github.com/naver/ngrinder/releases
 
 nGrinder 
 ========

RELEASE-NOTE.md

@@ -1,3 +1,20 @@
+3.5.5 (2021.04.30)
+==================
+- Changes
+   - Support controller subregion
+       * In cluster mode, you can configure subregion to manage agents in different context
+       * See [Controller Subregion In Cluster Mode](https://github.com/naver/ngrinder/wiki/Controller-Subregion-In-Cluster-Mode)
+   - Support multipart request in new HTTP client
+       * See [Sample code](https://github.com/naver/ngrinder/wiki/The-New-nGrinder-HTTP-Client#send-a-multipart-form-data)
+   - Add new HTTP client based script template
+       * When creating a script, you can choose between the old and the new HTTP client based template.
+   - Use OSSRH when release to maven central
+   - Change agent configurations
+       * `agent.region` has been removed, `agent.subregion` and `agent.owner` have been added.
+       * See [Agent Configuration Guide](https://github.com/naver/ngrinder/wiki/Agent-Configuration-Guide)
+- Bug fix
+    - #788 Fix fail of auto-upgrade from 3.4.x to 3.5.x
+
 3.5.4 (2021.03.19)
 ==================
 - Changes

build.gradle

@@ -1,12 +1,8 @@
-plugins {
-  id "com.jfrog.bintray" version "1.8.5"
-}
-
 allprojects  {
   apply plugin: "idea"
 
   group = "org.ngrinder"
-  version = "3.5.4"
+  version = "3.5.5"
 
   idea {
     module {
@@ -25,7 +21,9 @@ allprojects  {
 subprojects {
   apply plugin: "java"
   apply plugin: "maven-publish"
-  apply plugin: "com.jfrog.bintray"
+  apply plugin: "maven"
+  apply plugin: "signing"
+  apply plugin: "java-library"
 
   compileJava.options.encoding = "UTF-8"
   compileTestJava.options.encoding = "UTF-8"
@@ -45,14 +43,15 @@ subprojects {
     mockito_version = "2.23.4"
     handlebars_version = "4.0.5"
     jackson_version = "2.11.2"
+    lombok_version = "1.18.20"
     groovy_version = project.property("groovy.version")
     junit_version = project.property("junit.version")
   }
 
   repositories {
     mavenCentral()
-    maven { url "http://repo.springsource.org/release" }
-    maven { url "http://maven.scm-manager.org/nexus/content/repositories/releases" }
+    maven { url "https://repo.springsource.org/release" }
+    maven { url "https://maven.scm-manager.org/nexus/content/repositories/releases" }
   }
 
   test {
@@ -69,66 +68,65 @@ subprojects {
     classifier "sources"
   }
 
-  publishing {
-    publications {
-      nGrinerModules(MavenPublication) {
-        from components.java
-        artifact sourceJar
-        artifact javadocJar
-        pom {
+  artifacts {
+    archives javadocJar, sourceJar
+  }
+
+  if (hasAllProperties("signing.keyId", "signing.password", "signing.secretKeyRingFile")) {
+    signing {
+      sign configurations.archives
+    }
+  }
+
+  uploadArchives {
+    repositories {
+      mavenDeployer {
+        beforeDeployment { deployment -> signing.signPom(deployment) }
+
+        if (hasAllProperties("ossrhUsername", "ossrhPassword")) {
+          repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
+            authentication(userName: ossrhUsername, password: ossrhPassword)
+          }
+
+          snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
+            authentication(userName: ossrhUsername, password: ossrhPassword)
+          }
+        }
+
+        pom.project {
           name = "org.ngrinder:${project.name}"
           description = "${project.name} module"
           url = "https://github.com/naver/ngrinder"
+
+          scm {
+            connection = "scm:git:git://github.com/naver/ngrinder.git"
+            developerConnection = "scm:git:ssh://github.com/naver/ngrinder.git"
+            url = "https://github.com/naver/ngrinder"
+          }
+
           licenses {
             license {
               name = "The Apache License, Version 2.0"
               url = "http://www.apache.org/licenses/LICENSE-2.0.txt"
             }
           }
-//          Below field is required to publish to the Maven central. Please modify before publishing.
-//          developers {
-//            developer {
-//              id = "{please_input_your_id}"
-//              name = "{please_input_your_name}"
-//              email = "{please_input_your_email}"
-//            }
-//          }
-          scm {
-            connection = "scm:git:git://github.com/naver/ngrinder.git"
-            developerConnection = "scm:git:ssh://github.com/naver/ngrinder.git"
-            url = "https://github.com/naver/ngrinder"
+
+          // Below field is required to publish to the Maven central. Please modify before publishing.
+          developers {
+            developer {
+              id = "{please_input_your_id}"
+              name = "{please_input_your_name}"
+              email = "{please_input_your_email}"
+            }
           }
-        }
-      }
-    }
-  }
 
-  bintray {
-    user =  project.hasProperty("bintrayUser") ? bintrayUser : ""
-    key =  project.hasProperty("bintrayKey") ? bintrayKey : ""
-    publications = ["nGrinerModules"]
-    publish = true
-    override = true
-
-    pkg {
-      repo = "ngrinder"
-      name = project.name
-      userOrg = "navercorp"
-      licenses = ["Apache-2.0"]
-      websiteUrl = "https://github.com/naver/ngrinder"
-      issueTrackerUrl = "https://github.com/naver/ngrinder/issues"
-      vcsUrl = "https://github.com/naver/ngrinder.git"
-      labels = ["ngrinder"]
-      publicDownloadNumbers = true
-      version {
-        name = project.version
-        released = new Date()
-        gpg {
-          sign = true
-          passphrase = project.hasProperty("bintrayGpgPassphrase") ? bintrayGpgPassphrase : ""
         }
       }
     }
   }
 
 }
+
+def hasAllProperties(String... keys) {
+  return keys.every() { key -> project.hasProperty(key) }
+}

gradle.properties

@@ -2,3 +2,12 @@ org.gradle.daemon=true
 jna.version=5.6.0
 groovy.version=3.0.5
 junit.version=4.13.1
+
+#signing.keyId={please_input_your_gpg_key}
+#signing.password={please_input_your_gpg_key_password}
+#signing.secretKeyRingFile={please_input_your_path_of_secring.gpg}
+
+#ossrhUsername={please_input_your_ossrh_username}
+#ossrhPassword={please_input_your_ossrh_password}
+
+#guide https://central.sonatype.org/publish/publish-gradle/

ngrinder-controller/build.gradle

@@ -26,60 +26,57 @@ dependencyManagement {
 }
 
 dependencies {
-    compile project(":ngrinder-core")
-
-    compile (group: "org.springframework.boot", name: "spring-boot-starter-web")
-    compile (group: "org.springframework.boot", name: "spring-boot-starter-freemarker")
-    compile (group: "org.springframework.boot", name: "spring-boot-starter-security")
-    compile (group: "org.springframework.boot", name: "spring-boot-starter-data-jpa")
-    compile (group: "org.springframework.boot", name: "spring-boot-starter-cache")
-    compile (group: "org.springframework.boot", name: "spring-boot-starter-webflux")
-
-    compile (group: "com.github.jknack", name: "handlebars-springmvc", version: handlebars_version)
-    compile (group: "com.github.jknack", name: "handlebars-helpers", version: handlebars_version)
-    compile (group: "rome", name: "rome", version: "1.0")
-    compile (group: "com.ibm.icu", name: "icu4j", version: "4.6")
-    compile (group: "sonia.svnkit", name: "svnkit-dav", version: svnkit_version)
-    compile (group: "sonia.svnkit", name: "svnkit", version: svnkit_version) {
+    implementation project(":ngrinder-core")
+    implementation (group: "org.springframework.boot", name: "spring-boot-starter-web")
+    implementation (group: "org.springframework.boot", name: "spring-boot-starter-freemarker")
+    implementation (group: "org.springframework.boot", name: "spring-boot-starter-security")
+    implementation (group: "org.springframework.boot", name: "spring-boot-starter-data-jpa")
+    implementation (group: "org.springframework.boot", name: "spring-boot-starter-cache")
+    implementation (group: "org.springframework.boot", name: "spring-boot-starter-webflux")
+
+    implementation (group: "com.github.jknack", name: "handlebars-springmvc", version: handlebars_version)
+    implementation (group: "com.github.jknack", name: "handlebars-helpers", version: handlebars_version)
+    implementation (group: "rome", name: "rome", version: "1.0")
+    implementation (group: "com.ibm.icu", name: "icu4j", version: "4.6")
+    implementation (group: "sonia.svnkit", name: "svnkit-dav", version: svnkit_version)
+    implementation (group: "sonia.svnkit", name: "svnkit", version: svnkit_version) {
         exclude (module: "platform")
     }
-    compile (group: "javax.servlet.jsp", name: "jsp-api", version: "2.1")
-    compile (group: "com.google.guava", name: "guava", version: "20.0")
-    compile (group: "org.springframework.security", name: "spring-security-taglibs", version: spring_security_version)
-    compile (group: "org.liquibase", name: "liquibase-core", version: "3.5.3")
-    compile (group: "org.hibernate", name: "hibernate-jcache", version: hibernate_version)
-    compile (group: "com.github.ben-manes.caffeine", name: "caffeine", version: "2.6.2")
-    compile (group: "com.github.ben-manes.caffeine", name: "jcache", version: "2.6.2")
-    compile (group: "mysql", name: "mysql-connector-java", version: "8.0.13")
-    compile (group: "commons-httpclient", name: "commons-httpclient", version: "3.1")
-    compile (group: "com.h2database", name: "h2", version: "1.4.197")
-    compile (group: "commons-fileupload", name: "commons-fileupload", version: "1.3.1")
-    compile (group: "commons-dbcp", name: "commons-dbcp", version: "1.4")
-    compile (group: "com.fasterxml.jackson.core", name: "jackson-annotations", version: jackson_version)
-    compile (group: "com.fasterxml.jackson.core", name: "jackson-databind", version: jackson_version)
-    compile (group: "jaxen", name: "jaxen", version: "1.1.4")
-    compile (group: "com.beust", name: "jcommander", version: "1.32")
-    compile (group: "org.pf4j", name: "pf4j", version: "3.0.1")
-    compile (group: "org.yaml", name: "snakeyaml", version: "1.25")
-    compile (group: "commons-collections", name: "commons-collections", version: "3.2.1")
-    compile (group: "org.reflections", name: "reflections", version: "0.9.9")
-    compile (group: "com.hazelcast", name: "hazelcast", version: hazelcast_version)
-    compile (group: "com.hazelcast", name: "hazelcast-spring", version: hazelcast_version)
-    compile (group: "org.kohsuke", name: "github-api", version: "1.99")
-    compile (group: "commons-validator", name: "commons-validator", version: "1.6")
-    compile (group: "org.codehaus.groovy", name: "groovy-jsr223", version: groovy_version)
-    compile (group: "com.unboundid", name: "unboundid-ldapsdk", version: "5.1.1")
-
-    compileOnly (group: "org.projectlombok", name: "lombok", version: "1.18.8")
-    annotationProcessor (group: "org.projectlombok", name: "lombok", version: "1.18.8")
+    implementation (group: "javax.servlet.jsp", name: "jsp-api", version: "2.1")
+    implementation (group: "com.google.guava", name: "guava", version: "20.0")
+    implementation (group: "org.springframework.security", name: "spring-security-taglibs", version: spring_security_version)
+    implementation (group: "org.liquibase", name: "liquibase-core", version: "3.5.3")
+    implementation (group: "org.hibernate", name: "hibernate-jcache", version: hibernate_version)
+    implementation (group: "com.github.ben-manes.caffeine", name: "caffeine", version: "2.6.2")
+    implementation (group: "com.github.ben-manes.caffeine", name: "jcache", version: "2.6.2")
+    implementation (group: "mysql", name: "mysql-connector-java", version: "8.0.13")
+    implementation (group: "commons-httpclient", name: "commons-httpclient", version: "3.1")
+    implementation (group: "com.h2database", name: "h2", version: "1.4.197")
+    implementation (group: "commons-fileupload", name: "commons-fileupload", version: "1.3.1")
+    implementation (group: "commons-dbcp", name: "commons-dbcp", version: "1.4")
+    implementation (group: "com.fasterxml.jackson.core", name: "jackson-annotations", version: jackson_version)
+    implementation (group: "com.fasterxml.jackson.core", name: "jackson-databind", version: jackson_version)
+    implementation (group: "jaxen", name: "jaxen", version: "1.1.4")
+    implementation (group: "com.beust", name: "jcommander", version: "1.32")
+    implementation (group: "org.pf4j", name: "pf4j", version: "3.0.1")
+    implementation (group: "org.yaml", name: "snakeyaml", version: "1.25")
+    implementation (group: "commons-collections", name: "commons-collections", version: "3.2.1")
+    implementation (group: "org.reflections", name: "reflections", version: "0.9.9")
+    implementation (group: "com.hazelcast", name: "hazelcast", version: hazelcast_version)
+    implementation (group: "com.hazelcast", name: "hazelcast-spring", version: hazelcast_version)
+    implementation (group: "org.kohsuke", name: "github-api", version: "1.99")
+    implementation (group: "commons-validator", name: "commons-validator", version: "1.6")
+    implementation (group: "org.codehaus.groovy", name: "groovy-jsr223", version: groovy_version)
+    implementation (group: "com.unboundid", name: "unboundid-ldapsdk", version: "5.1.1")
+
+    compileOnly (group: "org.projectlombok", name: "lombok", version: lombok_version)
+    annotationProcessor (group: "org.projectlombok", name: "lombok", version: lombok_version)
 
     providedRuntime (group: "org.springframework.boot", name: "spring-boot-starter-tomcat", version: spring_boot_version)
 
-    testCompile (group: "junit", name: "junit", version: junit_version)
-    testCompile (group: "org.easytesting", name: "fest-assert", version: "1.4")
-    testCompile (group: "org.springframework.boot", name: "spring-boot-starter-test", version: spring_boot_version)
-    testCompileOnly (group: "org.projectlombok", name: "lombok", version: "1.18.8")
-    testAnnotationProcessor (group: "org.projectlombok", name: "lombok", version: "1.18.8")
+    testImplementation (group: "junit", name: "junit", version: junit_version)
+    testImplementation (group: "org.easytesting", name: "fest-assert", version: "1.4")
+    testImplementation (group: "org.springframework.boot", name: "spring-boot-starter-test", version: spring_boot_version)
 }
 
 
@@ -109,7 +106,7 @@ processResources {
 }
 
 test {
-    jvmArgs "-Xms600m", "-Xmx1024m", "-XX:MaxPermSize=200m"
+    jvmArgs "-Xms600m", "-Xmx1024m"
 }
 
 tasks.bootWar.dependsOn convert_cr_lf