Skip to content

MCR-3585 update dependencies #1255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yagee-de wants to merge 3 commits into
base: main
Choose a base branch
from
Open

MCR-3585 update dependencies #1255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d79473e
MCR-3585 update dependencies
yagee-de Jan 14, 2026
075f262
MCR-3585 update Docker versions
yagee-de Jan 20, 2026
5066328
MCR-3585 update Tomcat and SOLR again
yagee-de Jan 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
export FIREFOX_BIN=$(which firefox)
export SELENIUM_BROWSER=firefox

mvn -B -P!standard-with-extra-repos -U -Djetty -e clean install
mvn -B -P!standard-with-extra-repos -U -Dtomcat -e clean install
mvn -P!standard-with-extra-repos -B javadoc:javadoc javadoc:test-javadoc -T1C
- name: Login to Docker Hub
if: contains('refs/heads/2022.06.x refs/heads/2023.06.x refs/heads/2024.06.x refs/heads/2025.06.x refs/heads/2025.12.x refs/heads/main', github.ref) && github.event_name=='push' && success()
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM tomcat:10-jdk21-temurin-jammy
FROM tomcat:11-jdk21-temurin-jammy
RUN groupadd -r mcr -g 501 && \
useradd -d /home/mcr -u 501 -m -s /bin/bash -g mcr mcr
WORKDIR /usr/local/tomcat/
Expand Down
1 change: 1 addition & 0 deletions mir-it/src/test/integration/mycore.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
MCR.Solr.ServerURL=http\://localhost\:${solr.port}/
MCR.Solr.DelayIndexing_inMS=200
MCR.Solr.SolrClient.SocketTimeout=70000

MCR.Solr.Server.Auth.Admin.Class=org.mycore.solr.auth.MCRSolrPropertyBasicAuthenticator
MCR.Solr.Server.Auth.Admin.Password=alleswirdgut
Expand Down
2 changes: 1 addition & 1 deletion mir-webapp/src/main/solr/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM solr:9.7
FROM solr:9.10
USER root
RUN apt-get update && \
apt-get -y install sudo
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.mycore</groupId>
<artifactId>mycore-parent</artifactId>
<version>58</version>
<version>59-SNAPSHOT</version>
</parent>
<groupId>org.mycore.mir</groupId>
<artifactId>mir-parent</artifactId>
Expand Down Expand Up @@ -41,18 +41,18 @@
<!-- until snapshot matches released version (required for 'mvn changes:changes-check') -->
<changes.version>2025.02</changes.version>
<java.target.version>21</java.target.version>
<jetty.version>12.0.14</jetty.version>
<jetty.version>12.1.6</jetty.version>
<maven.compiler.arg>-Werror</maven.compiler.arg>
<mycore.version>2026.06.0-SNAPSHOT</mycore.version>
<pmd.failOnViolation>true</pmd.failOnViolation>
<pmd.version>7.11.0</pmd.version>
<selenium.version>4.23.0</selenium.version>
<site.suffix />
<solr-runner.solrVersionString>9.7.0</solr-runner.solrVersionString>
<solr-runner.solrVersionString>9.10.1</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.31</tomcat.version>
<tomcat.version>11.0.18</tomcat.version>
</properties>
<build>
<pluginManagement>
Expand Down