fix: Only webapp depends on Spring.

nielsbasjes · Mar 6, 2023 · 3b3e4bf · 3b3e4bf
1 parent 5ec8f47
commit 3b3e4bf
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 18 deletions.
diff --git a/analyzer/src/it/Logging/pom.xml b/analyzer/src/it/Logging/pom.xml
@@ -43,7 +43,6 @@
     <yauaa.version>@yauaa.version@</yauaa.version>
 
     <log4j2.version>@log4j2.version@</log4j2.version>
-    <spring.version>@spring.version@</spring.version>
     <maven-jar-plugin.version>@maven-jar-plugin.version@</maven-jar-plugin.version>
     <kryo4.version>@kryo4.version@</kryo4.version>
     <kryo5.version>@kryo5.version@</kryo5.version>

diff --git a/analyzer/src/it/Serialization/pom.xml b/analyzer/src/it/Serialization/pom.xml
@@ -43,7 +43,6 @@
     <yauaa.version>@yauaa.version@</yauaa.version>
 
     <log4j2.version>@log4j2.version@</log4j2.version>
-    <spring.version>@spring.version@</spring.version>
     <maven-jar-plugin.version>@maven-jar-plugin.version@</maven-jar-plugin.version>
     <kryo4.version>@kryo4.version@</kryo4.version>
     <kryo5.version>@kryo5.version@</kryo5.version>

diff --git a/pom.xml b/pom.xml
@@ -159,8 +159,7 @@
 
     <docker-maven-plugin.version>0.42.0</docker-maven-plugin.version>
 
-    <spring.version>5.3.25</spring.version>
-    <spring-boot.version>2.7.9</spring-boot.version>
+    <spring-boot.version>3.0.4</spring-boot.version>
     <spring-boot-legacy.version>2.1.0.RELEASE</spring-boot-legacy.version>
 
     <springdoc.version>1.6.14</springdoc.version>

diff --git a/renovate.json b/renovate.json
@@ -31,20 +31,6 @@
       "matchUpdateTypes": ["major"],
       "enabled": false
     },
-    {
-      "description": "Disable major updates for Spring Framework 5.x to 6 (because 6 requires Java 17)",
-      "matchPackagePrefixes": ["org.springframework"],
-      "matchCurrentVersion": "[5.0.0,6.0.0)",
-      "matchUpdateTypes": ["major"],
-      "enabled": false
-    },
-    {
-      "description": "Disable major updates for Spring Boot 2.x to 3 (because 3 requires Spring 6 which requires Java 17)",
-      "matchPackagePrefixes": ["org.springframework.boot"],
-      "matchCurrentVersion": "[2.0.0,3.0.0)",
-      "matchUpdateTypes": ["major"],
-      "enabled": false
-    },
     {
       "description": "Disable strange versions of graphql-java",
       "matchPackageNames": ["com.graphql-java:graphql-java"],

diff --git a/webapp/pom.xml b/webapp/pom.xml
@@ -103,6 +103,12 @@
       <version>${spring-boot-legacy.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>javax.annotation-api</artifactId>
+      <version>1.3.2</version>
+    </dependency>
+
     <dependency>
       <groupId>org.springdoc</groupId>
       <artifactId>springdoc-openapi-ui</artifactId>