Merge pull request #340 from IsyFact/hotfix/IFS-2771_fehlermeldung_do…

…ku_2.x [Sprint 101] IFS-2771 corrects error message in rest concept 2.x
IsyFact · Jun 20, 2024 · 6833c5f · 6833c5f
2 parents 51ac022 + f2f71d8
commit 6833c5f
Show file tree

Hide file tree

Showing 28 changed files with 36 additions and 30 deletions.
diff --git a/.github/workflows/maven_build.yml b/.github/workflows/maven_build.yml
@@ -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:

diff --git a/.gitignore b/.gitignore
@@ -18,4 +18,5 @@ bin/
 hs_err_pid*
 
 # Ignore Maven-specific files
-target/
+target/
+.flattened-pom.xml
diff --git a/isy-aufrufkontext/pom.xml b/isy-aufrufkontext/pom.xml
@@ -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>

diff --git a/isy-batchrahmen/pom.xml b/isy-batchrahmen/pom.xml
@@ -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>

diff --git a/isy-datetime/pom.xml b/isy-datetime/pom.xml
@@ -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>

diff --git a/isy-exception-core/pom.xml b/isy-exception-core/pom.xml
@@ -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>

diff --git a/isy-exception-sst/pom.xml b/isy-exception-sst/pom.xml
@@ -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>

diff --git a/isy-konfiguration/pom.xml b/isy-konfiguration/pom.xml
@@ -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>

diff --git a/isy-logging/pom.xml b/isy-logging/pom.xml
@@ -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>

diff --git a/isy-persistence/pom.xml b/isy-persistence/pom.xml
@@ -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>

diff --git a/isy-polling/pom.xml b/isy-polling/pom.xml
@@ -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>

diff --git a/isy-service-rest/pom.xml b/isy-service-rest/pom.xml
@@ -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>

diff --git a/isy-service-rest/src/docs/asciidoc/konzept/inhalt.adoc b/isy-service-rest/src/docs/asciidoc/konzept/inhalt.adoc
@@ -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"
     }
 ]

diff --git a/isy-serviceapi-core/pom.xml b/isy-serviceapi-core/pom.xml
@@ -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>

diff --git a/isy-serviceapi-sst/pom.xml b/isy-serviceapi-sst/pom.xml
@@ -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>

diff --git a/isy-sicherheit/pom.xml b/isy-sicherheit/pom.xml
@@ -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>

diff --git a/isy-sonderzeichen/pom.xml b/isy-sonderzeichen/pom.xml
@@ -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>

diff --git a/isy-sst-bridge/bridge-documentation/pom.xml b/isy-sst-bridge/bridge-documentation/pom.xml
@@ -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>

diff --git a/isy-sst-bridge/isy-exception-sst-bridge/pom.xml b/isy-sst-bridge/isy-exception-sst-bridge/pom.xml
@@ -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>

diff --git a/isy-sst-bridge/isy-serviceapi-core-bridge/pom.xml b/isy-sst-bridge/isy-serviceapi-core-bridge/pom.xml
@@ -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>
@@ -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>

diff --git a/isy-sst-bridge/isy-serviceapi-sst-bridge/pom.xml b/isy-sst-bridge/isy-serviceapi-sst-bridge/pom.xml
@@ -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>

diff --git a/isy-sst-bridge/pom.xml b/isy-sst-bridge/pom.xml
@@ -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>

diff --git a/isy-task/pom.xml b/isy-task/pom.xml
@@ -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>

diff --git a/isy-ueberwachung/pom.xml b/isy-ueberwachung/pom.xml
@@ -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>

diff --git a/isy-util/pom.xml b/isy-util/pom.xml
@@ -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>

diff --git a/isyfact-products-bom/pom.xml b/isyfact-products-bom/pom.xml
@@ -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>

diff --git a/isyfact-standards-bom/pom.xml b/isyfact-standards-bom/pom.xml
@@ -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>

diff --git a/pom.xml b/pom.xml
@@ -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>
@@ -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>