minor updates to runtime (#1077)

* minor updates to docker files
MyCoRe-Org · Oct 30, 2024 · 5ec0cbf · 5ec0cbf
1 parent f0642ae
commit 5ec0cbf
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.1'
 services:
   db:
     container_name: ${NAME}-db
-    image: postgres:16
+    image: postgres:17
     restart: unless-stopped
     environment:
       - POSTGRES_USER=${DB_USER}

diff --git a/mir-module/src/main/resources/META-INF/resources/js/mir/select-doctype.js b/mir-module/src/main/resources/META-INF/resources/js/mir/select-doctype.js
@@ -95,7 +95,7 @@ $(document).ready( function() {
     $('#genre').change(function (){changeHostOptions();});
 	$.ajax({
 		method: "GET",
-		url: webApplicationBaseURL+"api/v1/classifications/mir_genres",
+		url: webApplicationBaseURL+"api/v2/classifications/mir_genres",
 		dataType: "xml"
 	}) .done(function( xml ) {
 		GenreXML=xml;

diff --git a/mir-webapp/pom.xml b/mir-webapp/pom.xml
@@ -327,6 +327,10 @@
           <groupId>ch.qos.logback</groupId>
           <artifactId>logback-classic</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.mycore</groupId>
+          <artifactId>mycore-neo4j</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
   </dependencies>

diff --git a/mir-webapp/src/main/solr/Dockerfile b/mir-webapp/src/main/solr/Dockerfile
@@ -1,4 +1,4 @@
-FROM solr:9.6
+FROM solr:9.7
 USER root
 RUN apt-get update && \
     apt-get -y install sudo

diff --git a/pom.xml b/pom.xml
@@ -36,22 +36,22 @@
     <cargo.start.jvmargs />
     <cargo.tomcat.ajp.port>8292</cargo.tomcat.ajp.port>
     <cargo.tomcat.connector.maxHttpHeaderSize>8192</cargo.tomcat.connector.maxHttpHeaderSize>
-    <cargo.version>1.10.9</cargo.version>
+    <cargo.version>1.10.15</cargo.version>
     <changelog.since>2024-06-14</changelog.since>
     <!-- until snapshot matches released version (required for 'mvn changes:changes-check') -->
     <changes.version>2024.06.0</changes.version>
     <java.target.version>21</java.target.version>
-    <jetty.version>12.0.12</jetty.version>
+    <jetty.version>12.0.14</jetty.version>
     <maven.compiler.arg>-Werror</maven.compiler.arg>
     <mycore.version>2024.06.0-SNAPSHOT</mycore.version>
     <pmd.version>7.0.0</pmd.version>
     <selenium.version>4.23.0</selenium.version>
     <site.suffix />
-    <solr-runner.solrVersionString>9.6.1</solr-runner.solrVersionString>
+    <solr-runner.solrVersionString>9.7.0</solr-runner.solrVersionString>
     <sortpom.sortDeps>scope,groupId,artifactId</sortpom.sortDeps>
     <sortpom.sortFile>https://gist.githubusercontent.com/yagee-de/dfd3698c1b49173dbf251f74eb6a9297/raw/406460c088ff3cb6354e4ae6b40535e6f841607d/mycore_sort.xml</sortpom.sortFile>
     <sortpom.sortProps>true</sortpom.sortProps>
-    <tomcat.version>10.1.28</tomcat.version>
+    <tomcat.version>10.1.31</tomcat.version>
   </properties>
   <build>
     <pluginManagement>