Use Java8/Spring Boot 1.4.4 compatible versions of klass-shared and k…

…lass-solr
statisticsnorway · Jan 3, 2024 · a62aecd · a62aecd
1 parent 7319089
commit a62aecd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -11,7 +11,7 @@ build-all:
 
 .PHONY: run-klass-forvaltning-local
 run-klass-forvaltning-local:
-	pushd klass-forvaltning && mvn spring-boot\:run -P nexus && popd
+	pushd klass-forvaltning && mvn spring-boot\:run --settings=../.maven.settings.xml -P nexus && popd
 
 .PHONY: run-klass-forvaltning-local-mariadb
 # Requires that a MariaDB instance is already running with a database called klass and a user called klass.

diff --git a/klass-forvaltning/pom.xml b/klass-forvaltning/pom.xml
@@ -19,6 +19,9 @@
         <vaadin.plugin.version>7.7.25</vaadin.plugin.version>
         <vaadin.testbench.api.version>7.7.14</vaadin.testbench.api.version>
         <vaadin.widgetset.mode>local</vaadin.widgetset.mode>
+        <!-- Klass dependencies are built with support for Java 8 and Spring Boot 1.4.4.
+             Newer versions are not supported -->
+        <klass-version>2.1.6</klass-version>
     </properties>
 
     <parent>
@@ -40,12 +43,12 @@
         <dependency>
             <groupId>no.ssb.klass</groupId>
             <artifactId>klass-shared</artifactId>
-            <version>${project.version}</version>
+            <version>${klass-version}</version>
         </dependency>
         <dependency>
             <groupId>no.ssb.klass</groupId>
             <artifactId>klass-solr</artifactId>
-            <version>${project.version}</version>
+            <version>${klass-version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.data</groupId>
@@ -117,15 +120,15 @@
             <artifactId>klass-shared</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
-            <version>${project.version}</version>
+            <version>${klass-version}</version>
         </dependency>
 
         <dependency>
             <groupId>no.ssb.klass</groupId>
             <artifactId>klass-solr</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
-            <version>${project.version}</version>
+            <version>${klass-version}</version>
         </dependency>
 
         <dependency>