Skip to content
This repository was archived by the owner on Apr 5, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion .github/workflows/featureRelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@ jobs:
uses: actions/checkout@v2
-
name: Set up JDK
uses: actions/setup-java@v1
uses: actions/setup-java@v2
with:
java-version: '11.0.8'
distribution: 'adopt'
architecture: x64
-
name: Build Docker Image
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/featureTests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Set up JDK
uses: actions/setup-java@v1
uses: actions/setup-java@v2
with:
java-version: '11.0.8'
distribution: 'adopt'
architecture: x64
- name: Run Tests
run: |
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/latestRelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@ jobs:
uses: actions/checkout@v2
-
name: Set up JDK
uses: actions/setup-java@v1
uses: actions/setup-java@v2
with:
java-version: '11.0.8'
distribution: 'adopt'
architecture: x64
-
name: Build Docker Image
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/masterTests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Set up JDK
uses: actions/setup-java@v1
uses: actions/setup-java@v2
with:
java-version: '11.0.8'
distribution: 'adopt'
architecture: x64
- name: Run Tests and update Sonar
run: |
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/stableRelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@ jobs:
uses: actions/checkout@v2
-
name: Set up JDK
uses: actions/setup-java@v1
uses: actions/setup-java@v2
with:
java-version: '11.0.8'
distribution: 'adopt'
architecture: x64
-
name: Build Docker Image
Expand Down
18 changes: 9 additions & 9 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.4.4</version>
<version>2.4.5</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>de.filefighter</groupId>
Expand All @@ -16,7 +16,7 @@

<properties>
<java.version>11</java.version>
<cucumber.version>6.10.2</cucumber.version>
<cucumber.version>6.10.4</cucumber.version>
<sonar.coverage.exclusions>**/data/**/*.java,**/configuration/*.java,**/exceptions/*.java
</sonar.coverage.exclusions>
</properties>
Expand All @@ -42,13 +42,13 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot</artifactId>
<version>2.4.4</version>
<version>2.4.5</version>
</dependency>

<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-crypto</artifactId>
<version>5.3.4.RELEASE</version>
<version>5.4.6</version>
</dependency>

<dependency>
Expand All @@ -61,7 +61,7 @@
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-ui</artifactId>
<version>1.5.6</version>
<version>1.5.8</version>
</dependency>

<!-- running script plugin -->
Expand All @@ -86,12 +86,12 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.8.0</version>
<version>3.10.0</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<version>3.8.0</version>
<version>3.10.0</version>
</dependency>
<dependency>
<groupId>org.jetbrains</groupId>
Expand Down Expand Up @@ -175,12 +175,12 @@
<plugin>
<groupId>org.sonarsource.scanner.maven</groupId>
<artifactId>sonar-maven-plugin</artifactId>
<version>3.8.0.2131</version>
<version>3.9.0.2155</version>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.6</version>
<version>0.8.7</version>
<configuration>
<excludes>
<exclude>de/filefighter/rest/domain/**/data/**/*.class</exclude>
Expand Down