Merge pull request #592 from RADAR-base/release-0.7.1

Release 0.7.1

.github/workflows/main.yml

@@ -91,3 +91,21 @@ jobs:
         with:
           name: managementportal-logs
           path: mp.log
+
+      - name: Has SNAPSHOT version
+        id: is-snapshot
+        if: github.ref == 'refs/heads/dev'
+        run: grep "version =\\? \\?'.*-SNAPSHOT'" build.gradle
+
+      - name: Install gpg secret key
+        if: steps.is-snapshot.outcome == 'success'
+        run: |
+          cat <(echo -e "${{ secrets.OSSRH_GPG_SECRET_KEY }}") | gpg --batch --import
+          gpg --list-secret-keys --keyid-format LONG
+
+      - name: Publish to Maven Central
+        if: steps.is-snapshot.outcome == 'success'
+        env:
+          OSSRH_USER: ${{ secrets.OSSRH_USER }}
+          OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
+        run: ./gradlew -Psigning.gnupg.keyName=${{ secrets.OSSRH_GPG_SECRET_KEY_ID }} -Psigning.gnupg.executable=gpg -Psigning.gnupg.passphrase=${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} publish

.github/workflows/release.yml

@@ -58,4 +58,4 @@ jobs:
         env:
           OSSRH_USER: ${{ secrets.OSSRH_USER }}
           OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
-        run: ./gradlew -Psigning.gnupg.keyName={{ secrets.OSSRH_GPG_SECRET_KEY_ID }} -Psigning.gnupg.executable=gpg -Psigning.gnupg.passphrase=${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} publish
+        run: ./gradlew -Psigning.gnupg.keyName=${{ secrets.OSSRH_GPG_SECRET_KEY_ID }} -Psigning.gnupg.executable=gpg -Psigning.gnupg.passphrase=${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} publish closeAndReleaseSonatypeStagingRepository

build.gradle

@@ -5,11 +5,12 @@ plugins {
     id "com.moowork.node" version "1.2.0"
     id "io.spring.dependency-management" version "1.0.7.RELEASE"
     id 'de.undercouch.download' version '4.1.1' apply false
+    id("io.github.gradle-nexus.publish-plugin") version "1.0.0"
 }
 
 allprojects {
     group 'org.radarbase'
-    version '0.7.0' // project version
+    version '0.7.1' // project version
 
     // The comment on the previous line is only there to identify the project version line easily
     // with a sed command, to auto-update the version number with the prepare-release-branch.sh
@@ -258,4 +259,14 @@ task downloadDependencies {
     configurations.runtimeClasspath.files
 }
 
-apply from: 'gradle/publishing.gradle'
+ext.projectLanguage = "java"
+apply from: 'gradle/artifacts.gradle'
+
+nexusPublishing {
+    repositories {
+        sonatype {
+            username = project.hasProperty("ossrh.user") ? project.property("ossrh.user") : System.getenv("OSSRH_USER")
+            password = project.hasProperty("ossrh.password") ? project.property("ossrh.password") : System.getenv("OSSRH_PASSWORD")
+        }
+    }
+}

gradle/artifacts.gradle

@@ -0,0 +1,32 @@
+
+def sharedManifest = manifest {
+    attributes("Implementation-Title": project.name,
+            "Implementation-Version": version)
+}
+
+jar {
+    manifest.from sharedManifest
+}
+
+// custom tasks for creating source/javadoc jars
+task sourcesJar(type: Jar, dependsOn: classes) {
+    archiveClassifier.set('sources')
+    from sourceSets.main.allSource
+    manifest.from sharedManifest
+}
+
+if (!project.hasProperty("projectLanguage") || projectLanguage == "java") {
+    task javadocJar(type: Jar, dependsOn: javadoc) {
+        archiveClassifier.set('javadoc')
+        from javadoc.destinationDir
+        manifest.from sharedManifest
+    }
+} else if (projectLanguage == "kotlin") {
+    task javadocJar(type: Jar, dependsOn: dokkaJavadoc) {
+        from("$buildDir/dokka/javadoc")
+        archiveClassifier.set("javadoc")
+        manifest.from sharedManifest
+    }
+}
+
+assemble.dependsOn(javadocJar, sourcesJar)

gradle/publishing.gradle

@@ -1,42 +1,12 @@
 apply plugin: 'maven-publish'
 apply plugin: 'signing'
 
-def sharedManifest = manifest {
-    attributes("Implementation-Title": project.name,
-            "Implementation-Version": version)
-}
-
-jar {
-    manifest.from sharedManifest
-}
-
-// custom tasks for creating source/javadoc jars
-task sourcesJar(type: Jar, dependsOn: classes) {
-    archiveClassifier.set('sources')
-    from sourceSets.main.allSource
-    manifest.from sharedManifest
-}
-
-if (!ext.hasProperty("projectLanguage") || ext.projectLanguage == "java") {
-    task javadocJar(type: Jar, dependsOn: javadoc) {
-        archiveClassifier.set('javadoc')
-        from javadoc.destinationDir
-        manifest.from sharedManifest
-    }
-} else if (ext.projectLanguage == "kotlin") {
-    task javadocJar(type: Jar, dependsOn: dokkaJavadoc) {
-        from("$buildDir/dokka/javadoc")
-        archiveClassifier.set("javadoc")
-        manifest.from sharedManifest
-    }
-}
-
-assemble.dependsOn(javadocJar, sourcesJar)
+apply from: "$rootDir/gradle/artifacts.gradle"
 
 publishing {
     publications {
         mavenJar(MavenPublication) { publication ->
-            if (ext.hasProperty("isShadowed") && ext.isShadowed) {
+            if (project.hasProperty("isShadowed") && isShadowed) {
                 project.shadow.component(publication)
             } else {
                 from components.java
@@ -91,20 +61,6 @@ publishing {
 
         }
     }
-
-    repositories {
-        maven {
-            name = "OSSRH"
-            credentials {
-                username = project.hasProperty("ossrh.user") ? project.property("ossrh.user") : System.getenv("OSSRH_USER")
-                password = project.hasProperty("ossrh.password") ? project.property("ossrh.password") : System.getenv("OSSRH_PASSWORD")
-            }
-
-            def releasesRepoUrl = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
-            def snapshotsRepoUrl = uri("https://oss.sonatype.org/content/repositories/snapshots/")
-            url = version.toString().endsWith("SNAPSHOT") ? snapshotsRepoUrl : releasesRepoUrl
-        }
-    }
 }
 
 signing {

managementportal-client/build.gradle

@@ -7,25 +7,25 @@
  * See the file LICENSE in the root of this repository.
  */
 plugins {
-    id 'org.jetbrains.kotlin.jvm' version "1.4.31"
-    id 'org.jetbrains.dokka' version "1.4.20"
+    id 'org.jetbrains.kotlin.jvm' version "1.4.32"
+    id 'org.jetbrains.dokka' version "1.4.32"
     id 'maven-publish'
 }
 
 description = "Kotlin ManagementPortal client"
 
 repositories {
-    jcenter()
+    mavenCentral()
 }
 
 ext {
-    jacksonModuleVersion = "2.11.4"
-    okhttpVersion = "4.9.0"
+    jacksonModuleVersion = "2.12.3"
+    okhttpVersion = "4.9.1"
 }
 
 dependencies {
-    api("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.31")
-    implementation("org.jetbrains.kotlin:kotlin-reflect:1.4.31")
+    api("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32")
+    implementation("org.jetbrains.kotlin:kotlin-reflect:1.4.32")
     api(project(":oauth-client-util"))
 
     implementation group: 'com.squareup.okhttp3', name: 'okhttp', version: okhttpVersion
@@ -34,14 +34,16 @@ dependencies {
     implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonModuleVersion")
     runtimeOnly("com.fasterxml.jackson.datatype:jackson-datatype-jdk8:$jacksonModuleVersion")
 
-    dokkaHtmlPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:1.4.20")
+    dokkaHtmlPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:1.4.32")
 }
 
 task ghPagesJavadoc(type: Copy, dependsOn: dokkaJavadoc) {
     from file("$buildDir/dokka/javadoc")
     into file("$rootDir/public/managementportal-client-javadoc")
 }
 
+ext.isShadowed = false
 ext.projectLanguage = "kotlin"
+ext.publishToMavenCentral = true
 
 apply from: "$rootDir/gradle/publishing.gradle"

managementportal-client/src/main/kotlin/org/radarbase/management/client/MPClient.kt

@@ -154,11 +154,11 @@ class MPClient(
         urlBuilder: HttpUrl.Builder.() -> Unit,
         requestBuilder: (Request.Builder.() -> Unit) = { },
     ) {
-        request(urlBuilder, requestBuilder, { request, response ->
+        request(urlBuilder, requestBuilder) { request, response ->
             if (!response.isSuccessful) {
                 throw IOException("Request to ${request.url} failed (code ${response.code})")
             }
-        })
+        }
     }
 
     /**
@@ -178,7 +178,7 @@ class MPClient(
             url(baseUrl.newBuilder().apply {
                 urlBuilder()
             }.build())
-            header("Authorization", "Bearer $validToken")
+            header("Authorization", "Bearer ${validToken.accessToken}")
             requestBuilder()
         }.build()
 

oauth-client-util/build.gradle

@@ -27,5 +27,8 @@ task ghPagesJavadoc(type: Copy, dependsOn: javadoc) {
     into file("$rootDir/public/oauth-client-util-javadoc")
 }
 
+ext.isShadowed = false
+ext.projectLanguage = "java"
+
 apply from: '../gradle/style.gradle'
 apply from: '../gradle/publishing.gradle'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "management-portal",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "Description for ManagementPortal",
   "private": true,
   "cacheDirectories": [

radar-auth/build.gradle

@@ -1,6 +1,5 @@
 plugins {
     id 'com.github.johnrengelman.shadow' version '6.1.0'
-    id 'signing'
 }
 
 apply plugin: 'maven-publish'
@@ -62,6 +61,7 @@ task ghPagesJavadoc(type: Copy, dependsOn: javadoc) {
 }
 
 ext.isShadowed = true
+ext.projectLanguage = "java"
 
 apply from: "$rootDir/gradle/publishing.gradle"
 apply from: "$rootDir/gradle/style.gradle"

src/main/webapp/app/entities/project/project-dialog.component.ts

@@ -118,7 +118,8 @@ export class ProjectDialogComponent implements OnInit {
 
     addSourceType(event: NgbTypeaheadSelectItemEvent) {
         const sourceType = event.item as SourceType;
-        this.project.sourceTypes.push(sourceType);
+        const currentSourceTypes = this.project.sourceTypes || [];
+        this.project.sourceTypes = [ ...currentSourceTypes, sourceType ];
         this.sourceTypeInputText = '';
         event.preventDefault();
     }