Merge branch 'release/24.0.0'

wink-travel · Apr 3, 2023 · 87e1b10 · 87e1b10
2 parents 0548d80 + 9c1f53b
commit 87e1b10
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 21 deletions.
diff --git a/oauth2-web-client/pom.xml b/oauth2-web-client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>travel.wink</groupId>
         <artifactId>iam-sdk-java</artifactId>
-        <version>23.1.0</version>
+        <version>24.0.0</version>
     </parent>
     <artifactId>oauth2-web-client</artifactId>
     <packaging>jar</packaging>

diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <groupId>travel.wink</groupId>
     <artifactId>iam-sdk-java</artifactId>
-    <version>23.1.0</version>
+    <version>24.0.0</version>
     <packaging>pom</packaging>
     <name>wink.travel OAuth2 support library for our Java SDKs</name>
     <description>Java libraries for all wink APIs.</description>
@@ -36,35 +36,35 @@
 
     <properties>
         <java.version>17</java.version>
-        <buildnumber.maven.plugin.version>1.4</buildnumber.maven.plugin.version>
+        <buildnumber.maven.plugin.version>3.0.0</buildnumber.maven.plugin.version>
         <conventional-commits-maven-plugin.version>1.92</conventional-commits-maven-plugin.version>
         <git.commit.plugin.version>5.0.0</git.commit.plugin.version>
-        <gitflow.maven.plugin>1.18.0</gitflow.maven.plugin>
+        <gitflow.maven.plugin>1.19.0</gitflow.maven.plugin>
         <github.release.maven.plugin.version>1.0.4</github.release.maven.plugin.version>
-        <hibernate.validator.version>6.2.3.Final</hibernate.validator.version>
-        <jackson.version>2.13.3</jackson.version>
-        <jackson.databind.nullable.version>0.2.0</jackson.databind.nullable.version>
+        <hibernate.validator.version>8.0.0.Final</hibernate.validator.version>
+        <jackson.version>2.14.2</jackson.version>
+        <jackson.databind.nullable.version>0.2.6</jackson.databind.nullable.version>
         <jackson.threetenbp.version>2.12.2</jackson.threetenbp.version>
-        <javax.annotation.api.version>1.3.2</javax.annotation.api.version>
+        <jakarta.annotation.version>2.1.0</jakarta.annotation.version>
         <jsr305.version>3.0.2</jsr305.version>
         <lombok.version>1.18.24</lombok.version>
-        <maven.assembly.plugin.vebuirsion>3.3.0</maven.assembly.plugin.vebuirsion>
+        <maven.assembly.plugin.version>3.3.0</maven.assembly.plugin.version>
         <maven.clean.plugin.version>3.1.0</maven.clean.plugin.version>
-        <maven.compiler.plugin.version>3.10.1</maven.compiler.plugin.version>
+        <maven.compiler.plugin.version>3.11.0</maven.compiler.plugin.version>
         <maven.dependency.plugin.version>3.2.0</maven.dependency.plugin.version>
-        <maven.deploy.plugin.version>3.0.0-M2</maven.deploy.plugin.version>
-        <maven.gpg.version>1.6</maven.gpg.version>
+        <maven.deploy.plugin.version>3.1.1</maven.deploy.plugin.version>
+        <maven.gpg.version>3.0.1</maven.gpg.version>
         <maven.javadoc.plugin.version>3.3.1</maven.javadoc.plugin.version>
-        <maven.release.plugin.version>3.0.0-M5</maven.release.plugin.version>
-        <maven.resources.plugin.version>3.2.0</maven.resources.plugin.version>
+        <maven.release.plugin.version>3.0.0</maven.release.plugin.version>
+        <maven.resources.plugin.version>3.3.1</maven.resources.plugin.version>
         <maven.scm.plugin.version>1.12.0</maven.scm.plugin.version>
         <maven.source.plugin.version>3.0.1</maven.source.plugin.version>
         <maven.surefire.plugin.version>3.0.0-M5</maven.surefire.plugin.version>
         <nexus.staging.maven.plugin>1.6.13</nexus.staging.maven.plugin>
         <openapi.generator.version>6.0.1</openapi.generator.version>
         <sonatypeOssDistMgmtSnapshotsUrl>https://s01.oss.sonatype.org/</sonatypeOssDistMgmtSnapshotsUrl>
-        <spring.version>5.3.20</spring.version>
-        <spring.security.version>5.7.1</spring.security.version>
+        <spring.version>6.0.7</spring.version>
+        <spring.security.version>6.0.2</spring.security.version>
         <swagger.annotations.version>1.6.2</swagger.annotations.version>
         <swagger3.annotations.version>2.1.10</swagger3.annotations.version>
         <threeten.version>1.7.0</threeten.version>
@@ -386,9 +386,8 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
-            <version>${javax.annotation.api.version}</version>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
     </dependencies>
 
@@ -415,6 +414,11 @@
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
+            <dependency>
+                <groupId>jakarta.annotation</groupId>
+                <artifactId>jakarta.annotation-api</artifactId>
+                <version>${jakarta.annotation.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

diff --git a/releaseToMaster.bash b/releaseToMaster.bash
@@ -13,8 +13,7 @@ git pull
 git checkout develop
 
 echo "Retrieving next version number..."
-#newVersion=`npx git-changelog-command-line --print-next-version --major-version-pattern BREAKING --minor-version-pattern feat`
-newVersion=23.1.0
+newVersion=`npx git-changelog-command-line --print-next-version --major-version-pattern BREAKING --minor-version-pattern feat`
 
 read -p "Do you want to proceed with version $newVersion? (y/n) " yn