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

Jump to bottom

[Sprint 101] IFS-2771 corrects error message in rest concept 2.x #340

Merged
merged 6 commits into from
Jun 20, 2024
Merged

[Sprint 101] IFS-2771 corrects error message in rest concept 2.x #340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ed6da03
build: IFS-2771 bumps version to 2.5.1
FabianPerl Apr 12, 2024
03c896b
docs: IFS-2771 corrects error message in rest concept
FabianPerl Apr 12, 2024
95f0ba3
build: IFS-2771 use version management from isyfact-standards-bom
frgreiner Apr 12, 2024
790100b
build: IFS-2771 use revision property for CI-friendly builds
frgreiner Apr 12, 2024
7dd7351
ci: IFS-2771 calculate NEXT_VERSION for 2.x builds
frgreiner Apr 12, 2024
f2f71d8
Merge branch 'release/2.x' into hotfix/IFS-2771_fehlermeldung_doku_2.x
GrosseNe Jun 20, 2024
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
9 changes: 7 additions & 2 deletions .github/workflows/maven_build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,25 @@ on:
- 'isyfact-standards-doc'

jobs:
Version:
uses: IsyFact/isyfact-standards/.github/workflows/next_version.yml@master

Maven:
needs: [Version]
uses: IsyFact/isyfact-standards/.github/workflows/maven_build_template.yml@master
with:
jdk-version: 8
version: ${{ needs.Version.outputs.next-version }}
secrets:
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

Snapshot:
if: github.event_name == 'push'
needs: [Maven]
needs: [Version, Maven]
uses: IsyFact/isyfact-standards/.github/workflows/maven_deploy_template.yml@master
with:
jdk-version: 8
version: '2.5.0-SNAPSHOT' # required by template, does not affect snapshot's version without ci friendly versions
version: ${{ needs.Version.outputs.next-version }}
maven-opts: '-DaltDeploymentRepository=github::default::https://maven.pkg.github.com/IsyFact/isyfact-standards'
deploy-server-id: github
secrets:
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,5 @@ bin/
hs_err_pid*

# Ignore Maven-specific files
target/
target/
.flattened-pom.xml
2 changes: 1 addition & 1 deletion isy-aufrufkontext/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>de.bund.bva.isyfact</groupId>
<artifactId>isyfact-standards</artifactId>
<version>2.5.0</version>
<version>${revision}</version>
</parent>

<artifactId>isy-aufrufkontext</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion isy-batchrahmen/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>de.bund.bva.isyfact</groupId>
<artifactId>isyfact-standards</artifactId>
<version>2.5.0</version>
<version>${revision}</version>
</parent>

<artifactId>isy-batchrahmen</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion isy-datetime/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>de.bund.bva.isyfact</groupId>
<artifactId>isyfact-standards</artifactId>
<version>2.5.0</version>
<version>${revision}</version>
</parent>

<artifactId>isy-datetime</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion isy-exception-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>de.bund.bva.isyfact</groupId>
<artifactId>isyfact-standards</artifactId>
<version>2.5.0</version>
<version>${revision}</version>
</parent>

<artifactId>isy-exception-core</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion isy-exception-sst/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>de.bund.bva.isyfact</groupId>
<artifactId>isyfact-standards</artifactId>
<version>2.5.0</version>
<version>${revision}</version>
</parent>

<artifactId>isy-exception-sst</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion isy-konfiguration/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>de.bund.bva.isyfact</groupId>
<artifactId>isyfact-standards</artifactId>
<version>2.5.0</version>
<version>${revision}</version>
</parent>

<artifactId>isy-konfiguration</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion isy-logging/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>de.bund.bva.isyfact</groupId>
<artifactId>isyfact-standards</artifactId>
<version>2.5.0</version>
<version>${revision}</version>
</parent>

<artifactId>isy-logging</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion isy-persistence/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>de.bund.bva.isyfact</groupId>
<artifactId>isyfact-standards</artifactId>
<version>2.5.0</version>
<version>${revision}</version>
</parent>

<artifactId>isy-persistence</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion isy-polling/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>de.bund.bva.isyfact</groupId>
<artifactId>isyfact-standards</artifactId>
<version>2.5.0</version>
<version>${revision}</version>
</parent>

<artifactId>isy-polling</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion isy-service-rest/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>de.bund.bva.isyfact</groupId>
<artifactId>isyfact-standards</artifactId>
<version>2.5.0</version>
<version>${revision}</version>
</parent>

<artifactId>isy-service-rest</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion isy-service-rest/src/docs/asciidoc/konzept/inhalt.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -846,7 +846,7 @@ Fehler werden in einem Array zurückgegeben um auch das Senden mehrerer Fehler,
"timestamp": "2020-08-23T14:53:33.452+02:00",
"status": 404,
"error": "Not Found",
"message": "0001 Die Nachricht mit der ID=1 konnte nicht gefunden werden. 4321",
"message": "#0001 Die Nachricht mit der ID=1 konnte nicht gefunden werden. #4321",
"path": "/ressource/1234"
}
]
Expand Down
2 changes: 1 addition & 1 deletion isy-serviceapi-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>de.bund.bva.isyfact</groupId>
<artifactId>isyfact-standards</artifactId>
<version>2.5.0</version>
<version>${revision}</version>
</parent>

<artifactId>isy-serviceapi-core</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion isy-serviceapi-sst/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>de.bund.bva.isyfact</groupId>
<artifactId>isyfact-standards</artifactId>
<version>2.5.0</version>
<version>${revision}</version>
</parent>

<artifactId>isy-serviceapi-sst</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion isy-sicherheit/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>de.bund.bva.isyfact</groupId>
<artifactId>isyfact-standards</artifactId>
<version>2.5.0</version>
<version>${revision}</version>
</parent>

<artifactId>isy-sicherheit</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion isy-sonderzeichen/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>de.bund.bva.isyfact</groupId>
<artifactId>isyfact-standards</artifactId>
<version>2.5.0</version>
<version>${revision}</version>
</parent>

<artifactId>isy-sonderzeichen</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion isy-sst-bridge/bridge-documentation/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>de.bund.bva.isyfact</groupId>
<artifactId>isy-sst-bridge</artifactId>
<version>2.5.0</version>
<version>${revision}</version>
</parent>

<artifactId>bridge-documentation</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion isy-sst-bridge/isy-exception-sst-bridge/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>de.bund.bva.isyfact</groupId>
<artifactId>isy-sst-bridge</artifactId>
<version>2.5.0</version>
<version>${revision}</version>
</parent>

<artifactId>isy-exception-sst-bridge</artifactId>
Expand Down
3 changes: 1 addition & 2 deletions isy-sst-bridge/isy-serviceapi-core-bridge/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>de.bund.bva.isyfact</groupId>
<artifactId>isy-sst-bridge</artifactId>
<version>2.5.0</version>
<version>${revision}</version>
</parent>

<artifactId>isy-serviceapi-core-bridge</artifactId>
Expand All @@ -18,7 +18,6 @@
<dependency>
<groupId>de.bund.bva.isyfact</groupId>
<artifactId>isy-serviceapi-sst-bridge</artifactId>
<version>2.5.0</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
Expand Down
2 changes: 1 addition & 1 deletion isy-sst-bridge/isy-serviceapi-sst-bridge/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>de.bund.bva.isyfact</groupId>
<artifactId>isy-sst-bridge</artifactId>
<version>2.5.0</version>
<version>${revision}</version>
</parent>

<artifactId>isy-serviceapi-sst-bridge</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion isy-sst-bridge/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>de.bund.bva.isyfact</groupId>
<artifactId>isyfact-standards</artifactId>
<version>2.5.0</version>
<version>${revision}</version>
</parent>

<artifactId>isy-sst-bridge</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion isy-task/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>de.bund.bva.isyfact</groupId>
<artifactId>isyfact-standards</artifactId>
<version>2.5.0</version>
<version>${revision}</version>
</parent>

<artifactId>isy-task</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion isy-ueberwachung/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>de.bund.bva.isyfact</groupId>
<artifactId>isyfact-standards</artifactId>
<version>2.5.0</version>
<version>${revision}</version>
</parent>

<artifactId>isy-ueberwachung</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion isy-util/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>de.bund.bva.isyfact</groupId>
<artifactId>isyfact-standards</artifactId>
<version>2.5.0</version>
<version>${revision}</version>
</parent>

<artifactId>isy-util</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion isyfact-products-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>de.bund.bva.isyfact</groupId>
<artifactId>isyfact-standards</artifactId>
<version>2.5.0</version>
<version>${revision}</version>
</parent>

<artifactId>isyfact-products-bom</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion isyfact-standards-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>de.bund.bva.isyfact</groupId>
<artifactId>isyfact-standards</artifactId>
<version>2.5.0</version>
<version>${revision}</version>
</parent>

<artifactId>isyfact-standards-bom</artifactId>
Expand Down
3 changes: 2 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>de.bund.bva.isyfact</groupId>
<artifactId>isyfact-standards</artifactId>
<version>2.5.0</version>
<version>${revision}</version>
<packaging>pom</packaging>

<name>IsyFact-Standards (Module- &amp; Parent-POM)</name>
Expand Down Expand Up @@ -61,6 +61,7 @@

<properties>
<!-- Build properties -->
<revision>0.0.0-SNAPSHOT</revision>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.compile.version>1.8</java.compile.version>
<maven.build.timestamp.format>dd.MM.yyyy</maven.build.timestamp.format>
Expand Down
Loading