Skip to content

Commit

Permalink
Merge pull request #11 from virtualidentityag/staging
Browse files Browse the repository at this point in the history
Staging
  • Loading branch information
tkuzynow authored Dec 20, 2024
2 parents 195e402 + 38588cb commit bfdb221
Show file tree
Hide file tree
Showing 31 changed files with 290 additions and 483 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/dockerImage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
run: mvn -B -Pprod clean package -DskipTests
- name: Maven Verify
run: mvn -B -Pprod clean verify
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
with:
name: targetfiles
path: target/*.jar
Expand All @@ -65,7 +65,7 @@ jobs:
push_to_registry:
strategy:
matrix:
registry: ["docker.pkg.github.com", "ghcr.io"]
registry: ["ghcr.io"]
needs: [test]
name: Push Docker image to GitHub Packages
runs-on: ubuntu-latest
Expand All @@ -75,7 +75,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Download buildfiles artifact
uses: actions/download-artifact@v2
uses: actions/download-artifact@v4
with:
name: targetfiles
- name: Get current time
Expand Down
76 changes: 54 additions & 22 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,22 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.5.12</version>
<version>2.7.18</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
<version>2021.0.8</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
Expand All @@ -30,7 +42,7 @@
<openapi-generator-maven.version>6.2.1</openapi-generator-maven.version>
<springfox-boot-starter.version>3.0.0</springfox-boot-starter.version>
<spring-data-mongodb.version>3.3.5</spring-data-mongodb.version>
<spring-security.version>5.7.5</spring-security.version>
<spring-security.version>5.7.12</spring-security.version>
<ehcache.version>2.10.9.2</ehcache.version>
</properties>

Expand Down Expand Up @@ -64,6 +76,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-mongodb</artifactId>
<version>2.7.5</version>
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
Expand All @@ -73,7 +86,17 @@
<dependency>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
<version>6.1.6.Final</version>
</dependency>

<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-sleuth</artifactId>
<version>3.1.11</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-zipkin</artifactId>
<version>2.2.8.RELEASE</version>
</dependency>

<!-- OpenApi/Swagger dependencies -->
Expand Down Expand Up @@ -104,13 +127,6 @@
<version>4.3.1</version>
</dependency>

<!-- SpringFox: generate YAML file from POJOs and generate documentation -->
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-boot-starter</artifactId>
<version>${springfox-boot-starter.version}</version>
</dependency>

<!-- Keycloak dependencies -->
<dependency>
<groupId>org.keycloak</groupId>
Expand Down Expand Up @@ -150,7 +166,6 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.11</version>
</dependency>

<dependency>
Expand All @@ -168,7 +183,6 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-autoconfigure</artifactId>
<version>2.3.5.RELEASE</version>
</dependency>

<dependency>
Expand All @@ -195,23 +209,23 @@
<exclusions>
</exclusions>
</dependency>

<dependency>
<artifactId>powermock-module-junit4</artifactId>
<groupId>org.powermock</groupId>
<groupId>de.flapdoodle.embed</groupId>
<artifactId>de.flapdoodle.embed.mongo</artifactId>
<version>4.13.0</version>
<scope>test</scope>
<version>2.0.2</version>
</dependency>
<dependency>
<artifactId>powermock-api-mockito2</artifactId>
<groupId>org.powermock</groupId>
<scope>test</scope>
<version>2.0.2</version>
<groupId>de.flapdoodle.embed</groupId>
<artifactId>de.flapdoodle.embed.mongo.spring26x</artifactId>
<version>4.13.0</version>
</dependency>

<dependency>
<groupId>de.flapdoodle.embed</groupId>
<artifactId>de.flapdoodle.embed.mongo</artifactId>
<scope>test</scope>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.16.1</version>
</dependency>

<!-- EasyRandom -->
Expand All @@ -237,6 +251,24 @@
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>

<plugin>
<groupId>org.openrewrite.maven</groupId>
<artifactId>rewrite-maven-plugin</artifactId>
<version>5.30.0</version>
<configuration>
<activeRecipes>
<recipe>org.openrewrite.java.spring.boot2.UpgradeSpringBoot_2_7</recipe>
</activeRecipes>
</configuration>
<dependencies>
<dependency>
<groupId>org.openrewrite.recipe</groupId>
<artifactId>rewrite-spring</artifactId>
<version>5.9.0</version>
</dependency>
</dependencies>
</plugin>

<!-- OpenApi codegen maven plugin: generates api stubs -->
<plugin>
<groupId>org.openapitools</groupId>
Expand Down
12 changes: 0 additions & 12 deletions services/consultingtypeservice.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -310,12 +310,6 @@ components:
sessionDataInitializing:
allOf:
- $ref: '#/components/schemas/SessionDataInitializingDTO'
initializeFeedbackChat:
type: boolean
example: true
isPeerChat:
type: boolean
example: true
roles:
$ref: '#/components/schemas/RolesDTO'
notifications:
Expand Down Expand Up @@ -377,12 +371,6 @@ components:
sendFurtherStepsMessage:
type: boolean
example: true
initializeFeedbackChat:
type: boolean
example: true
isPeerChat:
type: boolean
example: true
furtherInformation:
allOf:
- $ref: '#/components/schemas/FurtherInformationDTO'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,6 @@

@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
public class StatisticsServiceApplication {

static {
System.setProperty("os.arch", "i686_64");
}

public static void main(String[] args) {
SpringApplication.run(StatisticsServiceApplication.class, args);
}
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package de.caritas.cob.statisticsservice.config;

import org.keycloak.adapters.KeycloakConfigResolver;
import org.keycloak.adapters.springboot.KeycloakSpringBootConfigResolver;
import org.springframework.cache.annotation.EnableCaching;
import org.springframework.context.MessageSource;
import org.springframework.context.annotation.Bean;
Expand All @@ -25,4 +27,14 @@ public LocalValidatorFactoryBean validator(MessageSource messageSource) {
return validatorFactoryBean;
}

/**
* Use the KeycloakSpringBootConfigResolver to be able to save the Keycloak settings in the spring
* application properties.
*/
@Bean
public KeycloakConfigResolver keyCloakConfigResolver() {
return new KeycloakSpringBootConfigResolver();
}


}

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,6 @@ protected void configure(HttpSecurity http) throws Exception {
.anyRequest().denyAll();
}

/**
* Use the KeycloakSpringBootConfigResolver to be able to save the Keycloak settings in the spring
* application properties.
*/
@Bean
public KeycloakConfigResolver keyCloakConfigResolver() {
return new KeycloakSpringBootConfigResolver();
}

/**
* Change springs authentication strategy to be stateless (no session is being created).
Expand Down
Loading

0 comments on commit bfdb221

Please sign in to comment.