fix jackson conflict with spring

adorsys · Apr 20, 2024 · f99687c · f99687c
1 parent 570d5ea
commit f99687c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 26 deletions.
diff --git a/datasafe-encryption/datasafe-encryption-impl/pom.xml b/datasafe-encryption/datasafe-encryption-impl/pom.xml
@@ -98,24 +98,29 @@
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
+        <!-- Avoiding declaring that in parent POM due to issues with Spring -->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
+            <version>${jackson.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-yaml</artifactId>
+            <version>${jackson.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
+            <version>${jackson.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
+            <version>${jackson.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/datasafe-rest-impl/src/test/resources/jwt-config.properties b/datasafe-rest-impl/src/test/resources/jwt-config.properties
@@ -1,5 +1,4 @@
-jwt_secret=${JWT_SECRET}
-default_user=${DEFAULT_USER}
-default_password=${DEFAULT_PASSWORD}
-#10 Days in ms
-token_expiration=${TOKEN_EXPIRATION:864000000}
+jwt_secret=n2r5u8x/A%D*G-KaPdSgVkYp3s6v9y$B&E(H+MbQeThWmZq4t7w!z%C*F-J@NcRf
+default_user=username
+default_password=password
+token_expiration=864000000
diff --git a/pom.xml b/pom.xml
@@ -333,27 +333,6 @@
                 <artifactId>jaxb-api</artifactId>
                 <version>${jaxb-api.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.fasterxml.jackson.core</groupId>
-                <artifactId>jackson-core</artifactId>
-                <version>${jackson.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.fasterxml.jackson.core</groupId>
-                <artifactId>jackson-databind</artifactId>
-                <version>${jackson.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.fasterxml.jackson.core</groupId>
-                <artifactId>jackson-annotations</artifactId>
-                <version>${jackson.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.fasterxml.jackson.dataformat</groupId>
-                <artifactId>jackson-dataformat-yaml</artifactId>
-                <version>${jackson.version}</version>
-                <scope>test</scope>
-            </dependency>
 	    </dependencies>
 	</dependencyManagement>