Skip to content

Commit

Permalink
♻️ Correct merge conflicts (from sprint). 🎨 Spotless:apply.
Browse files Browse the repository at this point in the history
  • Loading branch information
sfi2022 committed Nov 27, 2024
2 parents ae99d3e + d0b982d commit b2f4e9e
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/release-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,8 @@ jobs:

- name: Set Maven Project Version
id: set-version
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
current_version=$(mvn help:evaluate -f pom.xml -Dexpression=project.version -q -DforceStdout)
echo "Current version: $current_version"
Expand All @@ -103,6 +105,8 @@ jobs:
mvn -B versions:set -DnewVersion=$new_version -f pom.xml
git config --global user.email "[email protected]"
git config --global user.name "GitHub Actions"
git checkout -b release-$new_version
git add pom.xml
git commit -m "Bump version to $new_version"
git push
git commit -m "Bump sprint version to $new_version"
git push --set-upstream origin release-$new_version
gh pr create --title "Bump eai version to $new_version" --base sprint --head release-$new_version --body "Bump eai version to $new_version after Release build"
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>de.muenchen.mobidam</groupId>
<artifactId>mobidam-s3-eai</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>0.0.2-SNAPSHOT</version>
<name>mobidam-s3-eai</name>
<description>Mobidam S3 EAI.</description>

Expand Down
3 changes: 0 additions & 3 deletions src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@ de.muenchen.mobidam:
tenant-default:
access-key-env-var: MOBIDAM_ACCESS_KEY
secret-key-env-var: MOBIDAM_SECRET_KEY
int-pitprojektmdask-vespa:
access-key-env-var: MOBIDAM_PITPROJEKTMDASK_ACCESS_KEY
secret-key-env-var: MOBIDAM_PITPROJEKTMDASK_SECRET_KEY
archive:
expiration-months: 1
limit:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
import software.amazon.awssdk.services.s3.S3Client;
import software.amazon.awssdk.services.s3.model.*;


@CamelSpringBootTest
@SpringBootTest(
classes = { Application.class }, webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT,
Expand Down

0 comments on commit b2f4e9e

Please sign in to comment.