Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
517f2b4f1b | ||
|
|
f089d70d5f | ||
|
|
2a78b47d83 | ||
|
|
84baee6ebb | ||
|
|
35a1b49412 | ||
|
|
9453e10803 | ||
|
|
a2b85f402d | ||
|
|
3a9c70932d | ||
|
|
7e87623b0e | ||
|
|
1b71ef0614 |
@@ -1,20 +0,0 @@
|
|||||||
<component name="ProjectRunConfigurationManager">
|
|
||||||
<configuration default="false" name="MainApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
|
|
||||||
<module name="wahlrecht.server.main" />
|
|
||||||
<option name="SPRING_BOOT_MAIN_CLASS" value="de.twomartens.wahlrecht.MainApplication" />
|
|
||||||
<extension name="net.ashald.envfile">
|
|
||||||
<option name="IS_ENABLED" value="true" />
|
|
||||||
<option name="IS_SUBST" value="false" />
|
|
||||||
<option name="IS_PATH_MACRO_SUPPORTED" value="false" />
|
|
||||||
<option name="IS_IGNORE_MISSING_FILES" value="false" />
|
|
||||||
<option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
|
|
||||||
<ENTRIES>
|
|
||||||
<ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
|
|
||||||
<ENTRY IS_ENABLED="true" PARSER="env" IS_EXECUTABLE="false" PATH=".env" />
|
|
||||||
</ENTRIES>
|
|
||||||
</extension>
|
|
||||||
<method v="2">
|
|
||||||
<option name="Make" enabled="true" />
|
|
||||||
</method>
|
|
||||||
</configuration>
|
|
||||||
</component>
|
|
||||||
@@ -54,7 +54,7 @@ normalization.runtimeClasspath.metaInf {
|
|||||||
}
|
}
|
||||||
|
|
||||||
tasks.register("cleanLibs") {
|
tasks.register("cleanLibs") {
|
||||||
delete("${buildDir}/libs")
|
delete("${layout.buildDirectory}/libs")
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.build {
|
tasks.build {
|
||||||
|
|||||||
@@ -9,10 +9,10 @@ apply(plugin="com.netflix.nebula.release")
|
|||||||
tasks.register("writeVersionProperties") {
|
tasks.register("writeVersionProperties") {
|
||||||
group = "version"
|
group = "version"
|
||||||
mustRunAfter("release")
|
mustRunAfter("release")
|
||||||
outputs.file("$buildDir/version.properties")
|
outputs.file("${layout.buildDirectory}/version.properties")
|
||||||
val directory = buildDir
|
val directory = layout.buildDirectory.asFile
|
||||||
doLast {
|
doLast {
|
||||||
Files.createDirectories(directory.toPath())
|
Files.createDirectories(directory.get().toPath())
|
||||||
File("$buildDir/version.properties").writeText("VERSION=${project.version}\n")
|
File("${layout.buildDirectory}/version.properties").writeText("VERSION=${project.version}\n")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ dependencies {
|
|||||||
|
|
||||||
jib {
|
jib {
|
||||||
from {
|
from {
|
||||||
image = "amazoncorretto:" + properties["projectSourceCompatibility"]
|
image = "amazoncorretto:" + properties["projectSourceCompatibility"] + "-alpine"
|
||||||
platforms {
|
platforms {
|
||||||
platform {
|
platform {
|
||||||
architecture = "amd64"
|
architecture = "amd64"
|
||||||
|
|||||||
+20
@@ -0,0 +1,20 @@
|
|||||||
|
package de.twomartens.wahlrecht.configuration
|
||||||
|
|
||||||
|
import org.apache.kafka.clients.admin.AdminClientConfig
|
||||||
|
import org.springframework.beans.factory.annotation.Value
|
||||||
|
import org.springframework.context.annotation.Bean
|
||||||
|
import org.springframework.context.annotation.Configuration
|
||||||
|
import org.springframework.kafka.core.KafkaAdmin
|
||||||
|
|
||||||
|
@Configuration
|
||||||
|
open class KafkaConfiguration {
|
||||||
|
@Value(value = "\${spring.kafka.bootstrap-servers[0]}")
|
||||||
|
private val bootstrapServers: List<String> = mutableListOf()
|
||||||
|
|
||||||
|
@Bean
|
||||||
|
open fun kafkaAdmin(): KafkaAdmin {
|
||||||
|
val configs: MutableMap<String, Any?> = HashMap()
|
||||||
|
configs[AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG] = bootstrapServers.first()
|
||||||
|
return KafkaAdmin(configs)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -6,4 +6,4 @@ spring:
|
|||||||
config:
|
config:
|
||||||
import:
|
import:
|
||||||
- "classpath:config/wahlrecht.yaml"
|
- "classpath:config/wahlrecht.yaml"
|
||||||
- "optional:configserver:http://localhost:8888/config"
|
- "optional:configserver:${CONFIGSERVER_SCHEME:http}://${CONFIGSERVER_HOST:configserver}:${CONFIGSERVER_PORT:8888}${CONFIGSERVER_PREFIX:/config}"
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
spring:
|
spring:
|
||||||
config:
|
config:
|
||||||
import:
|
import:
|
||||||
- "configserver:http://configserver:8888/config"
|
- "configserver:${CONFIGSERVER_SCHEME:http}://${CONFIGSERVER_HOST:configserver}:${CONFIGSERVER_PORT:8888}${CONFIGSERVER_PREFIX:/config}"
|
||||||
kafka:
|
kafka:
|
||||||
bootstrap-servers:
|
bootstrap-servers:
|
||||||
- kafka:9092
|
- ${KAFKA_HOST:kafka}:${KAFKA_PORT:9092}
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ spring:
|
|||||||
oauth2:
|
oauth2:
|
||||||
resourceserver:
|
resourceserver:
|
||||||
jwt:
|
jwt:
|
||||||
jwk-set-uri: https://id.2martens.de/realms/2martens/protocol/openid-connect/certs
|
jwk-set-uri: ${KEYCLOAK_URL:https://id.2martens.de}/realms/${KEYCLOAK_REALM:2martens}/protocol/openid-connect/certs
|
||||||
application:
|
application:
|
||||||
name: wahlrecht
|
name: wahlrecht
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user