Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge with onlineberatung 07022025 #36

Merged
merged 11 commits into from
Feb 7, 2025
Merged

Merge with onlineberatung 07022025 #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
db307c1
feat: upgrade liveService to spring boot 3.1 - initial change (to be …
tkuzynow Dec 12, 2024
ce18aaf
feat: upgrade liveService to spring boot 3.1 and fix sonarlint issues
Leandro13Silva13 Dec 12, 2024
3322660
fix: upload-artifact and download-artifact versions
Leandro13Silva13 Dec 12, 2024
56c2d07
fix: fix Trivy vulnerability
Leandro13Silva13 Dec 12, 2024
d7fb468
fix: make the LiveServiceApplicationIT tests run more reliable
Leandro13Silva13 Dec 16, 2024
ec0b074
Merge pull request #85 from Onlineberatung/TSYSTEMS-196-upgrade-sprin…
Leandro13Silva13 Jan 3, 2025
e3972d0
Feat: Tsys-196
Leandro13Silva13 Jan 7, 2025
e5c3135
Feat: Tsys-196
Leandro13Silva13 Jan 8, 2025
7798da6
Merge pull request #86 from Onlineberatung/TSYSTEMS-196-upgrade-sprin…
tkuzynow Jan 8, 2025
23dc9d1
Merge pull request #87 from Onlineberatung/TSYSTEMS-196-upgrade-sprin…
tkuzynow Jan 8, 2025
149a2a4
Merge remote-tracking branch 'onlineberatung/develop' into merge-with…
Leandro13Silva13 Feb 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/dockerImage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ jobs:
java-version: 17.0.7
java-package: jdk
architecture: x64

- name: Caching maven dependencies
uses: actions/cache@v1
env:
Expand All @@ -44,7 +43,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 Down Expand Up @@ -75,7 +74,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 Expand Up @@ -191,3 +190,4 @@ jobs:
url: 'https://git.mms-support.de/api/v4/projects/${{ secrets.TSYS_SERVICE_ID }}/repository/tags?ref=master&tag_name=${{ env.DOCKER_IMAGE_TAG }}'
method: 'POST'
customHeaders: '{"PRIVATE-TOKEN": "${{ secrets.TSYS_ACCESS_TOKEN }}"}'

2 changes: 1 addition & 1 deletion google_checks_light.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@
</module>
-->
<module name="JavadocMethod">
<property name="scope" value="public"/>
<property name="accessModifiers" value="public"/>
<property name="allowMissingParamTags" value="true"/>
<property name="allowMissingReturnTag" value="true"/>
<property name="allowedAnnotations" value="Override, Test"/>
Expand Down
52 changes: 27 additions & 25 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.0.6</version>
<version>3.3.7</version>
<relativePath/>
</parent>

Expand All @@ -26,9 +26,8 @@
<!-- force at least version 2.16 due to https://logging.apache.org/log4j/2.x/security.html -->
<log4j.version>2.19.0</log4j.version>
<jackson-databind-nullable.version>0.2.3</jackson-databind-nullable.version>
<spring-security.version>6.0.5</spring-security.version>
<spring-security.version>6.3.4</spring-security.version>
<openapi-generator-maven-plugin.version>6.6.0</openapi-generator-maven-plugin.version>
<springfox-boot-starter.version>3.0.0</springfox-boot-starter.version>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<ehcache.version>2.10.9.2</ehcache.version>
Expand Down Expand Up @@ -58,7 +57,6 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
<version>${spring-security.version}</version>
</dependency>

<!-- Spring actuator -->
Expand Down Expand Up @@ -121,23 +119,15 @@
<artifactId>jackson-databind-nullable</artifactId>
<version>${jackson-databind-nullable.version}</version>
</dependency>
<!-- SpringFox: generate YAML file from POJOs and generate documentation -->
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-annotations</artifactId>
<version>2.2.15</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>

<dependency>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
<version>${hibernate.validator.version}</version>
</dependency>

<!-- Keycloak dependencies -->
Expand Down Expand Up @@ -173,7 +163,6 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.11</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand All @@ -190,18 +179,15 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
<version>${log4j.version}</version>
</dependency>

<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>2.0</version>
</dependency>

<dependency>
Expand All @@ -220,17 +206,16 @@
<groupId>org.powermock</groupId>
<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>
<exclusions>
<exclusion>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<version>4.0.3</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -301,14 +286,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.1.1</version>
<version>3.6.0</version>
<executions>
<execution>
<id>validate</id>
<phase>validate</phase>
<configuration>
<configLocation>google_checks_light.xml</configLocation>
<encoding>UTF-8</encoding>
<failsOnError>true</failsOnError>
<consoleOutput>true</consoleOutput>
<failOnViolation>true</failOnViolation>
Expand Down Expand Up @@ -358,6 +342,24 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.openrewrite.maven</groupId>
<artifactId>rewrite-maven-plugin</artifactId>
<version>5.47.0</version>
<configuration>
<exportDatatables>true</exportDatatables>
<activeRecipes>
<recipe>org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_3</recipe>
</activeRecipes>
</configuration>
<dependencies>
<dependency>
<groupId>org.openrewrite.recipe</groupId>
<artifactId>rewrite-spring</artifactId>
<version>5.25.0</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>

Expand Down
22 changes: 0 additions & 22 deletions src/main/java/de/caritas/cob/liveservice/api/config/CustomSwaggerPathWebMvcConfigurer.java
View file
Open in desktop

This file was deleted.

89 changes: 0 additions & 89 deletions src/main/java/de/caritas/cob/liveservice/api/config/SpringFoxConfig.java
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions src/main/java/de/caritas/cob/liveservice/api/controller/LiveController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
import de.caritas.cob.liveservice.api.facade.LiveEventFacade;
import de.caritas.cob.liveservice.api.model.LiveEventMessage;
import de.caritas.cob.liveservice.generated.api.controller.LiveeventApi;
import io.swagger.annotations.Api;
import javax.validation.Valid;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
Expand All @@ -19,8 +19,8 @@
* Controller for triggering live events.
*/
@RestController
@Tag(name = "live-controller")
@RequiredArgsConstructor
@Api(tags = "live-controller")
public class LiveController implements LiveeventApi {

private final @NonNull LiveEventFacade liveEventFacade;
Expand Down
Loading
Loading