Merge remote-tracking branch 'origin/develop' into develop

oboehm · Jan 1, 2025 · 79a11a5 · 79a11a5
2 parents 5979405 + ec3f8ac
commit 79a11a5
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 25 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,7 +9,7 @@ genauso wie an [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 Aus Gründen der Übersichtlichkeit sind bei älteren Versionen die einzelnen Patch-Versionen nicht extra aufgeführt, sondern in der Minor-Version.
 
 
-## [Unreleased]
+## [7.2.3] - 2024-12-09
 
 ### [Fixed]
 

diff --git a/README.md b/README.md
@@ -1,7 +1,6 @@
 [![Maven Central](https://img.shields.io/maven-central/v/com.github.oboehm/gdv-xport.svg)](https://central.sonatype.com/artifact/com.github.oboehm/gdv-xport)
 [![Issues](https://img.shields.io/github/issues/oboehm/gdv.xport.svg)](https://github.com/oboehm/gdv.xport/issues)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0.html)
-[![Umfrage](https://img.shields.io/badge/zur%20Umfrage-FFCC00)](https://nuudel.digitalcourage.de/CqLHF4HX5SfKZ24I)
 
 # Was ist gdv.xport?
 
@@ -65,8 +64,3 @@ Weitere Infos wie z.B. die [JavaDocs](http://www.aosd.de/gdv.xport/apidocs/index
 * die eigentliche [gdv-xport-lib](lib/README.adoc)-Bibliothek
 * [Hello-World](doc/manual/hello.adoc) und andere [Anleitungen](doc/manual/README.adoc)
 * [GDV Online-Handbuch](http://www.gdv-online.de/vuvm/bestand/rel2023/samenue.html) zu den verschiedene Satzarten
-
-
-### Umfragen
-
-* Umfrage zu [Bezeichner-Konstanten](https://nuudel.digitalcourage.de/CqLHF4HX5SfKZ24I)
diff --git a/doc/delivery.adoc b/doc/delivery.adoc
@@ -57,8 +57,8 @@ Kopiere `/tmp/gdv-xport` anschließend auf die Web-Seite.
 
 |D-Day
 |Label setzen
-|`git tag gdv-xport-7.2.2` (lokal)
-`git push [email protected]:oboehm/gdv.xport.git tag gdv-xport-7.2.2` (remote)
+|`git tag gdv-xport-7.2.3` (lokal)
+`git push [email protected]:oboehm/gdv.xport.git tag gdv-xport-7.2.3` (remote)
 
 |nachher
 |Tickets schließen
@@ -71,7 +71,7 @@ in pom.xml Version hochzählen, "-SNAPSHOT" anhängen
 
 |nachher
 |Auslieferung bekanntmachen
-|Nachricht auf https://twitter.com/search?q=gdv.xport&src=typed_query&f=live[Twitter]
+|https://github.com/oboehm/gdv.xport/releases[Releases] aktualisieren
 
 |nachher
 |Maven Central prüfen
@@ -87,8 +87,9 @@ Um ein Docker-Image auf https://hub.docker.com/r/oboehm/gdv.xport zu bringen, si
 
 * Docker-Image bauen: `docker build -t gdv.xport -f Dockerfile .`
 * Image-ID ermitteln: `docker images`
-* Docker-Image taggen: `docker tag <Image-ID> oboehm/gdv.xport:7.2.2`
-* Docker-Image pushen: `docker push oboehm/gdv.xport:7.2.2`
+* Docker-Image taggen: `docker tag <Image-ID> oboehm/gdv.xport:7.2.3`
+* Docker-Hub anmelden: `docker login`
+* Docker-Image pushen: `docker push oboehm/gdv.xport:7.2.3`
 
 
 

diff --git a/lib/pom.xml b/lib/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>com.github.oboehm</groupId>
     <artifactId>gdv-xport</artifactId>
-    <version>7.2.3-SNAPSHOT</version>
+    <version>7.2.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>gdv-xport-lib</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
   <groupId>com.github.oboehm</groupId>
   <artifactId>gdv-xport</artifactId>
   <packaging>pom</packaging>
-  <version>7.2.3-SNAPSHOT</version>
+  <version>7.2.4-SNAPSHOT</version>
   <name>GDV.XPort</name>
 
   <modules>
@@ -421,37 +421,37 @@
       <dependency>
         <groupId>org.junit.jupiter</groupId>
         <artifactId>junit-jupiter</artifactId>
-        <version>5.11.1</version>
+        <version>5.11.3</version>
       </dependency>
       <dependency>
         <groupId>org.junit.jupiter</groupId>
         <artifactId>junit-jupiter-api</artifactId>
-        <version>5.11.1</version>
+        <version>5.11.3</version>
       </dependency>
       <dependency>
         <groupId>org.junit.jupiter</groupId>
         <artifactId>junit-jupiter-params</artifactId>
-        <version>5.11.1</version>
+        <version>5.11.3</version>
       </dependency>
       <dependency>
         <groupId>org.junit.jupiter</groupId>
         <artifactId>junit-jupiter-engine</artifactId>
-        <version>5.11.1</version>
+        <version>5.11.3</version>
       </dependency>
       <dependency>
         <groupId>org.junit.vintage</groupId>
         <artifactId>junit-vintage-engine</artifactId>
-        <version>5.11.1</version>
+        <version>5.11.3</version>
       </dependency>
       <dependency>
         <groupId>org.junit.platform</groupId>
         <artifactId>junit-platform-commons</artifactId>
-        <version>1.11.1</version>
+        <version>1.11.3</version>
       </dependency>
       <dependency>
         <groupId>org.junit.platform</groupId>
         <artifactId>junit-platform-engine</artifactId>
-        <version>1.11.1</version>
+        <version>1.11.3</version>
       </dependency>
       <dependency>
         <groupId>junit</groupId>
@@ -478,12 +478,12 @@
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-api</artifactId>
-        <version>2.24.1</version>
+        <version>2.24.2</version>
       </dependency>
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-core</artifactId>
-        <version>2.24.1</version>
+        <version>2.24.2</version>
       </dependency>
       <dependency>
         <groupId>org.hsqldb</groupId>

diff --git a/service/pom.xml b/service/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.github.oboehm</groupId>
     <artifactId>gdv-xport</artifactId>
-    <version>7.2.3-SNAPSHOT</version>
+    <version>7.2.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>gdv-xport-service</artifactId>

diff --git a/src/script/deploy.sh b/src/script/deploy.sh
@@ -8,7 +8,7 @@
 
 # set up some constants
 URL=https://oss.sonatype.org/service/local/staging/deploy/maven2/
-VERSION=7.2.2
+VERSION=7.2.3
 options="gpg:sign-and-deploy-file -Durl=$URL -DrepositoryId=sonatype-nexus-staging"
 
 # passphrase is needed for signing