Merge pull request #38 from swisspost/develop

Release PR

Author: MonsieurBon

.github/workflows/publish.yml

@@ -5,8 +5,8 @@ on:
       - master
 
 env:
-  RELEASE_VERSION: "0.5.0"
-  DEVELOP_VERSION: "0.5.1-SNAPSHOT"
+  RELEASE_VERSION: "0.6.0"
+  DEVELOP_VERSION: "0.6.1-SNAPSHOT"
   GIT_AUTHOR_NAME: "@swisspost-devs"
   GIT_AUTHOR_EMAIL: "[email protected]"
   GIT_COMMITTER_NAME: "swisspost-devs"
@@ -44,8 +44,8 @@ jobs:
 
     - name: Merge back to develop
       run: |
-        git fetch --depth 2 origin develop
+        git fetch --depth 10 origin develop
         git checkout develop
-        git fetch --shallow-since="$(git show -s --format=%ci develop~1)" origin master develop
+        git fetch --shallow-since="$(git show -s --format=%ci develop~2)" origin master develop
         git merge master --no-edit
         git push origin develop

apikana-maven-plugin/pom.xml

@@ -26,8 +26,8 @@
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>3.6.1</version>
                     <configuration>
-                        <source>1.8</source>
-                        <target>1.8</target>
+                        <source>21</source>
+                        <target>21</target>
                     </configuration>
                 </plugin>
             </plugins>

apikana-parent/pom.xml

@@ -22,6 +22,7 @@
                 <configuration>
                     <sourceDirectory>${basedir}/target/node/dist/model/json-schema-v3</sourceDirectory>
                     <includeJsr303Annotations>true</includeJsr303Annotations>
+                    <useJakartaValidation>true</useJakartaValidation>
                     <useJodaDates>true</useJodaDates>
                     <useJodaLocalDates>true</useJodaLocalDates>
                     <useJodaLocalTimes>true</useJodaLocalTimes>

pom.xml

@@ -157,7 +157,7 @@
                 <plugin>
                     <groupId>org.jsonschema2pojo</groupId>
                     <artifactId>jsonschema2pojo-maven-plugin</artifactId>
-                    <version>0.4.37</version>
+                    <version>1.2.2</version>
                 </plugin>
                 <plugin>
                     <groupId>org.sonatype.plugins</groupId>