Merge remote-tracking branch 'origin/develop'

# Conflicts: # keycloak-storage-provider/pom.xml # pom.xml # sts-client-example/package-lock.json # sts-client-example/package.json # sts-common/pom.xml # sts-example/pom.xml # sts-keymanagement/pom.xml # sts-keymanagement/sts-keymanagement-api/pom.xml # sts-keymanagement/sts-keymanagement-impl/pom.xml # sts-persistence-jpa/pom.xml # sts-persistence-jpa/src/main/java/de/adorsys/sts/persistence/jpa/entity/JpaSecret.java # sts-persistence-mongo/pom.xml # sts-pop/pom.xml # sts-resource-server/pom.xml # sts-secret-server/pom.xml # sts-secret/pom.xml # sts-server-info/pom.xml # sts-service-component-example/pom.xml # sts-simple-encryption/pom.xml # sts-spring/pom.xml # sts-token-auth/pom.xml # sts-token/pom.xml
adorsys · Feb 13, 2024 · d2b1960 · d2b1960
2 parents ea876d1 + 4f8d412
commit d2b1960
Show file tree

Hide file tree

Showing 22 changed files with 22 additions and 23 deletions.
diff --git a/keycloak-storage-provider/pom.xml b/keycloak-storage-provider/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>de.adorsys.sts</groupId>
         <artifactId>secure-token-service</artifactId>
-        <version>1.1.20</version>
+        <version>1.1.21</version>
     </parent>
 
     <artifactId>keycloak-storage-provider</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>de.adorsys.sts</groupId>
     <artifactId>secure-token-service</artifactId>
-    <version>1.1.20</version>
+    <version>1.1.21</version>
     <packaging>pom</packaging>
 
     <name>SecureTokenService</name>

diff --git a/sts-client-example/package-lock.json b/sts-client-example/package-lock.json
diff --git a/sts-client-example/package.json b/sts-client-example/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sts-client-example",
-  "version": "1.1.20",
+  "version": "1.1.21",
   "license": "MIT",
   "scripts": {
     "ng": "npx ng ",

diff --git a/sts-common/pom.xml b/sts-common/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>de.adorsys.sts</groupId>
 		<artifactId>secure-token-service</artifactId>
-		<version>1.1.20</version>
+		<version>1.1.21</version>
 	</parent>
 
 	<artifactId>sts-common</artifactId>

diff --git a/sts-example/pom.xml b/sts-example/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>secure-token-service</artifactId>
         <groupId>de.adorsys.sts</groupId>
-        <version>1.1.20</version>
+        <version>1.1.21</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sts-keymanagement/pom.xml b/sts-keymanagement/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>secure-token-service</artifactId>
         <groupId>de.adorsys.sts</groupId>
-        <version>1.1.20</version>
+        <version>1.1.21</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sts-keymanagement/sts-keymanagement-api/pom.xml b/sts-keymanagement/sts-keymanagement-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sts-keymanagement</artifactId>
         <groupId>de.adorsys.sts</groupId>
-        <version>1.1.20</version>
+        <version>1.1.21</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sts-keymanagement/sts-keymanagement-impl/pom.xml b/sts-keymanagement/sts-keymanagement-impl/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sts-keymanagement</artifactId>
         <groupId>de.adorsys.sts</groupId>
-        <version>1.1.20</version>
+        <version>1.1.21</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sts-persistence-jpa/pom.xml b/sts-persistence-jpa/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>secure-token-service</artifactId>
         <groupId>de.adorsys.sts</groupId>
-        <version>1.1.20</version>
+        <version>1.1.21</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sts-persistence-jpa/src/main/java/de/adorsys/sts/persistence/jpa/entity/JpaSecret.java b/sts-persistence-jpa/src/main/java/de/adorsys/sts/persistence/jpa/entity/JpaSecret.java
@@ -12,8 +12,7 @@
 public class JpaSecret {
 
     @Id
-    @SequenceGenerator(name = "secret_seq", sequenceName = "secret_id_seq", allocationSize = 1)
-    @GeneratedValue(strategy = GenerationType.IDENTITY, generator = "secret_seq")
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
     private String subject;

diff --git a/sts-persistence-mongo/pom.xml b/sts-persistence-mongo/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>secure-token-service</artifactId>
         <groupId>de.adorsys.sts</groupId>
-        <version>1.1.20</version>
+        <version>1.1.21</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sts-pop/pom.xml b/sts-pop/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>secure-token-service</artifactId>
         <groupId>de.adorsys.sts</groupId>
-        <version>1.1.20</version>
+        <version>1.1.21</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sts-resource-server/pom.xml b/sts-resource-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>secure-token-service</artifactId>
         <groupId>de.adorsys.sts</groupId>
-        <version>1.1.20</version>
+        <version>1.1.21</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sts-secret-server/pom.xml b/sts-secret-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>secure-token-service</artifactId>
         <groupId>de.adorsys.sts</groupId>
-        <version>1.1.20</version>
+        <version>1.1.21</version>
     </parent>
 
 

diff --git a/sts-secret/pom.xml b/sts-secret/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>secure-token-service</artifactId>
         <groupId>de.adorsys.sts</groupId>
-        <version>1.1.20</version>
+        <version>1.1.21</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sts-server-info/pom.xml b/sts-server-info/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>secure-token-service</artifactId>
         <groupId>de.adorsys.sts</groupId>
-        <version>1.1.20</version>
+        <version>1.1.21</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sts-service-component-example/pom.xml b/sts-service-component-example/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>secure-token-service</artifactId>
         <groupId>de.adorsys.sts</groupId>
-        <version>1.1.20</version>
+        <version>1.1.21</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sts-simple-encryption/pom.xml b/sts-simple-encryption/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>secure-token-service</artifactId>
         <groupId>de.adorsys.sts</groupId>
-        <version>1.1.20</version>
+        <version>1.1.21</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sts-spring/pom.xml b/sts-spring/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>secure-token-service</artifactId>
         <groupId>de.adorsys.sts</groupId>
-        <version>1.1.20</version>
+        <version>1.1.21</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sts-token-auth/pom.xml b/sts-token-auth/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>secure-token-service</artifactId>
         <groupId>de.adorsys.sts</groupId>
-        <version>1.1.20</version>
+        <version>1.1.21</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sts-token/pom.xml b/sts-token/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>secure-token-service</artifactId>
         <groupId>de.adorsys.sts</groupId>
-        <version>1.1.20</version>
+        <version>1.1.21</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>