Added production server to OpenAPI

.gitignore

@@ -12,6 +12,7 @@ build/
 **/*.log
 **/*.hprof
 **/generated/**
+env.sh
 
 ### STS ###
 .apt_generated

buildSrc/src/main/kotlin/twomartens.java.gradle.kts

@@ -1,6 +1,4 @@
 import org.gradle.accessors.dm.LibrariesForLibs
-import java.time.ZonedDateTime
-import java.time.format.DateTimeFormatter
 
 plugins {
     jacoco
@@ -51,22 +49,6 @@ tasks.jacocoTestReport {
     }
 }
 
-val formatter: DateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSZ")
-
-tasks.jar {
-    doFirst {
-        manifest {
-            attributes["Implementation-Title"] = rootProject.name
-            attributes["Implementation-Version"] = archiveVersion.get()
-            attributes["Implementation-Vendor"] = "Jim Martens"
-            attributes["Build-Timestamp"] = ZonedDateTime.now().format(formatter)
-            attributes["Created-By"] = "Gradle ${gradle.gradleVersion}"
-            attributes["Build-Jdk"] = "${providers.systemProperty("java.version").get()} (${providers.systemProperty("java.vendor").get()} ${providers.systemProperty("java.vm.version").get()})"
-            attributes["Build-OS"] = "${providers.systemProperty("os.name").get()} ${providers.systemProperty("os.arch").get()} ${providers.systemProperty("os.version").get()}"
-        }
-    }
-}
-
 normalization.runtimeClasspath.metaInf {
     ignoreAttribute("Build-Timestamp")
 }

buildSrc/src/main/kotlin/twomartens.nebula-release.gradle.kts

@@ -13,6 +13,6 @@ tasks.register("writeVersionProperties") {
     val directory = buildDir
     doLast {
         Files.createDirectories(directory.toPath())
-        File("$buildDir/version.properties").writeText("VERSION=${project.version.toString()}\n")
+        File("$buildDir/version.properties").writeText("VERSION=${project.version}\n")
     }
 }

buildSrc/src/main/kotlin/twomartens.spring-boot.gradle.kts

@@ -1,4 +1,7 @@
 import org.gradle.accessors.dm.LibrariesForLibs
+import java.time.ZonedDateTime
+import java.time.format.DateTimeFormatter
+import java.time.format.DateTimeFormatter.ofPattern
 
 plugins {
     id("org.springframework.boot")
@@ -57,27 +60,21 @@ tasks.named("buildAll") {
     dependsOn("integrationTest")
 }
 
-springBoot {
+val formatter: DateTimeFormatter = ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSZ")
-    buildInfo()
-}
 
 tasks.bootJar {
-    enabled = false
+    manifest {
+        attributes["Implementation-Title"] = rootProject.name
+        attributes["Implementation-Version"] = archiveVersion.get()
+        attributes["Implementation-Vendor"] = "Jim Martens"
+        attributes["Build-Timestamp"] = ZonedDateTime.now().format(formatter)
+        attributes["Created-By"] = "Gradle ${gradle.gradleVersion}"
+        attributes["Build-Jdk"] = "${providers.systemProperty("java.version").get()} (${providers.systemProperty("java.vendor").get()} ${providers.systemProperty("java.vm.version").get()})"
+        attributes["Build-OS"] = "${providers.systemProperty("os.name").get()} ${providers.systemProperty("os.arch").get()} ${providers.systemProperty("os.version").get()}"
+    }
 }
 
-tasks.jar {
+springBoot {
-    enabled = true
+    buildInfo()
-    archiveClassifier.set("")
+    mainClass.set("de.twomartens.wahlrecht.MainApplicationKt")
-}
-
-tasks.bootDistZip {
-    dependsOn(tasks.jar)
-}
-
-tasks.bootDistTar {
-    dependsOn(tasks.jar)
-}
-
-tasks.bootStartScripts {
-    dependsOn(tasks.jar)
 }

module-deploy/deploy.gradle.kts

@@ -31,10 +31,8 @@ jib {
         }
     }
     container {
-        extraClasspath = listOf("/configmap")
+        mainClass = "de.twomartens.wahlrecht.MainApplicationKt"
-        mainClass = "de.twomartens.wahlrecht.MainApplication"
         jvmFlags = listOf("-XX:+UseContainerSupport",
-                "-XX:MaxRAMPercentage=75.0",
+                "-XX:MaxRAMPercentage=75.0")
-                "-Dlog4j.configurationFile=/configmap/log4j2.xml")
     }
 }

module-server/src/main/kotlin/de/twomartens/wahlrecht/configuration/OpenApiConfiguration.kt

@@ -6,6 +6,7 @@ import io.swagger.v3.oas.annotations.security.OAuthFlows
 import io.swagger.v3.oas.annotations.security.SecurityScheme
 import io.swagger.v3.oas.models.OpenAPI
 import io.swagger.v3.oas.models.info.Info
+import io.swagger.v3.oas.models.servers.Server
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
@@ -35,5 +36,7 @@ open class OpenApiConfiguration {
                     .version(apiVersion)
                     .description(apiDescription)
             )
+                .addServersItem(Server().url("http://localhost:12000"))
+                .addServersItem(Server().url("https://api.2martens.de"))
     }
 }

module-server/src/main/resources/application.yaml

@@ -23,9 +23,8 @@ management:
     http.server.requests: true
 
 spring:
-  spring:
   config:
-      import: "optional:configserver:http://localhost:8888/config"
+    import: "optional:configserver:http://127.0.0.1:8888/config"
   main:
     banner-mode: off
   profiles:

scripts/major.sh

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+./gradlew -Prelease.scope=major $@

scripts/minor.sh

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+./gradlew -Prelease.scope=minor $@

scripts/patch.sh

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+./gradlew -Prelease.scope=patch $@