Merge pull request #48 from RADAR-base/release-0.7.0

Release 0.7.0

README.md

@@ -11,7 +11,7 @@ repositories {
 }
 
 dependencies {
-    api("org.radarbase:radar-jersey:0.6.2")
+    api("org.radarbase:radar-jersey:0.7.0")
 }
 ```
 
@@ -131,7 +131,6 @@ dependencies {
     runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:$log4j2Version")
     runtimeOnly("org.apache.logging.log4j:log4j-api:$log4j2Version")
     runtimeOnly("org.apache.logging.log4j:log4j-jul:$log4j2Version")
-
 }
 ```
 

build.gradle.kts

@@ -7,38 +7,22 @@ plugins {
     `maven-publish`
     signing
     id("org.jetbrains.dokka") apply false
-    id("com.github.ben-manes.versions") version "0.38.0"
+    id("com.github.ben-manes.versions") version "0.39.0"
     id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
 }
 
-fun isNonStable(version: String): Boolean {
-    val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.toUpperCase().contains(it) }
-    val regex = "^[0-9,.v-]+(-r)?$".toRegex()
-    val isStable = stableKeyword || regex.matches(version)
-    return isStable.not()
-}
-
 allprojects {
     group = "org.radarbase"
-    version = "0.6.2"
-
-    afterEvaluate {
-        tasks.withType<DependencyUpdatesTask> {
-            rejectVersionIf {
-                isNonStable(candidate.version)
-            }
-        }
-    }
+    version = "0.7.0"
 }
 
 subprojects {
     apply(plugin = "kotlin")
     apply(plugin = "maven-publish")
     apply(plugin = "signing")
-    apply(plugin = "com.github.ben-manes.versions")
     apply(plugin = "org.jetbrains.dokka")
 
-    val myproject = this
+    val myProject = this
 
     val githubRepoName = "RADAR-base/radar-jersey"
     val githubUrl = "https://github.com/$githubRepoName.git"
@@ -69,7 +53,7 @@ subprojects {
     }
 
     val sourcesJar by tasks.registering(Jar::class) {
-        from(myproject.the<SourceSetContainer>()["main"].allSource)
+        from(myProject.the<SourceSetContainer>()["main"].allSource)
         archiveClassifier.set("sources")
         val classes by tasks
         dependsOn(classes)
@@ -82,15 +66,19 @@ subprojects {
         dependsOn(dokkaJavadoc)
     }
 
-    afterEvaluate {
-        tasks.withType<KotlinCompile> {
-            kotlinOptions {
-                jvmTarget = "11"
-                apiVersion = "1.4"
-                languageVersion = "1.4"
-            }
+    tasks.withType<JavaCompile> {
+        options.release.set(11)
+    }
+
+    tasks.withType<KotlinCompile> {
+        kotlinOptions {
+            jvmTarget = "11"
+            apiVersion = "1.5"
+            languageVersion = "1.5"
         }
+    }
 
+    afterEvaluate {
         tasks.withType<Test> {
             testLogging {
                 events("passed", "skipped", "failed")
@@ -109,8 +97,8 @@ subprojects {
         tasks.withType<Jar> {
             manifest {
                 attributes(
-                    "Implementation-Title" to myproject.name,
-                    "Implementation-Version" to myproject.version
+                    "Implementation-Title" to myProject.name,
+                    "Implementation-Version" to myProject.version
                 )
             }
         }
@@ -129,8 +117,8 @@ subprojects {
                     artifact(dokkaJar)
 
                     pom {
-                        name.set(myproject.name)
-                        description.set(myproject.description)
+                        name.set(myProject.name)
+                        description.set(myProject.description)
                         url.set(githubUrl)
                         licenses {
                             license {
@@ -183,6 +171,20 @@ subprojects {
     }
 }
 
+val stableVersionRegex = "[0-9,.v-]+(-r)?".toRegex()
+
+fun isNonStable(version: String): Boolean {
+    val stableKeyword = listOf("RELEASE", "FINAL", "GA")
+        .any { version.toUpperCase().contains(it) }
+    return !stableKeyword && !stableVersionRegex.matches(version)
+}
+
+tasks.withType<DependencyUpdatesTask> {
+    rejectVersionIf {
+        isNonStable(candidate.version)
+    }
+}
+
 fun Project.propertyOrEnv(propertyName: String, envName: String): String? {
     return if (hasProperty(propertyName)) {
         property(propertyName)?.toString()
@@ -201,5 +203,5 @@ nexusPublishing {
 }
 
 tasks.wrapper {
-    gradleVersion = "7.0.2"
+    gradleVersion = "7.2"
 }

gradle.properties

@@ -3,29 +3,32 @@ org.gradle.jvmargs=-Xmx2000m
 org.gradle.vfs.watch=true
 kotlin.code.style=official
 
-kotlinVersion=1.5.0
-dokkaVersion=1.4.32
+kotlinVersion=1.5.31
+dokkaVersion=1.5.31
 
-jerseyVersion=3.0.2
-grizzlyVersion=3.0.0
-okhttpVersion=4.9.1
-junitVersion=5.7.2
+jerseyVersion=3.0.3
+grizzlyVersion=3.0.1
+okhttpVersion=4.9.2
+junitVersion=5.8.1
+hamcrestVersion=2.2
 
-hk2Version=2.6.1
-managementPortalVersion=0.7.1
-javaJwtVersion=3.16.0
+hk2Version=3.0.2
+managementPortalVersion=0.8.0
+javaJwtVersion=3.18.2
 jakartaWsRsVersion=3.0.0
 jakartaAnnotationVersion=2.0.0
-jacksonVersion=2.12.3
-slf4jVersion=1.7.30
+jacksonVersion=2.12.5
+slf4jVersion=1.7.32
 log4j2Version=2.14.1
 jakartaXmlBindVersion=3.0.1
-jakartaJaxbCoreVersion=3.0.1
-jakartaJaxbRuntimeVersion=3.0.1
+jakartaJaxbCoreVersion=3.0.2
+jakartaJaxbRuntimeVersion=3.0.2
+javaxValidationVersion=2.0.1.Final
 jakartaActivation=2.0.1
-swaggerVersion=2.1.9
+swaggerVersion=2.1.11
+mustacheVersion=0.9.10
 
-hibernateVersion=5.4.31.Final
-liquibaseVersion=4.3.5
-postgresVersion=42.2.20
+hibernateVersion=5.6.1.Final
+liquibaseVersion=4.5.0
+postgresVersion=42.3.1
 h2Version=1.4.200

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists