Skip to content

Merge release 4.15 into dev #458

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

Merged
radudoros merged 8 commits into from
Oct 8, 2026
Merged

Merge release 4.15 into dev #458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3eebb12
Migrate to actions and remove travis
Sep 1, 2026
104f586
dependencies updated
twagoo Sep 21, 2026
031c131
Merge remote-tracking branch 'origin/gh_actions_w_release' into relea…
twagoo Sep 21, 2026
68d1007
Fix solr warnings (#450)
radudoros Sep 22, 2026
ff79d28
Add version changes details (#452)
radudoros Sep 22, 2026
4ded516
Fix loading schema issue
Sep 22, 2026
219edd9
Fix all metadata rendering (#453)
radudoros Sep 24, 2026
e0d76a9
Merge remote-tracking branch 'origin/release-4.15.0' into merge_relea…
Oct 8, 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
32 changes: 17 additions & 15 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,25 +42,27 @@

<!-- Common runtime dependency versions -->
<solr.version>9.10.1</solr.version>
<slf4j.version>2.0.17</slf4j.version>
<slf4j.version>2.0.18</slf4j.version>
<logback.version>1.5.36</logback.version>
<log4j2.version>2.26.0</log4j2.version>
<log4j2.version>2.26.1</log4j2.version>
<saxon.version>9.8.0-15</saxon.version>
<spring.boot.version>3.5.15</spring.boot.version>
<spring.boot.version>3.5.16</spring.boot.version>
<spring.version>6.2.19</spring.version>
<spring.data.version>3.5.12</spring.data.version>
<netty.version>4.1.137.Final</netty.version>
<zookeeper.version>3.9.5</zookeeper.version>
<jackson.version>2.18.9</jackson.version>
<spring.data.version>3.5.13</spring.data.version>
<netty.version>4.2.18.Final</netty.version>
<zookeeper.version>3.9.6</zookeeper.version>
<jackson.version>2.22.3</jackson.version>
<jackson-annotations.version>2.22</jackson-annotations.version>
<caffeine.version>3.2.4</caffeine.version>
<micrometer.version>1.15.11</micrometer.version>



<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<netbeans.hint.license>gpl30</netbeans.hint.license>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<wicket.version>10.11.0</wicket.version>
<junit.version>5.13.4</junit.version>
<junit.version>5.14.4</junit.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -94,18 +96,18 @@
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>4.0.6</version>
<version>4.0.9</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.eclipse</groupId>
<artifactId>yasson</artifactId>
<version>3.0.4</version>
<version>3.0.5</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>33.5.0-jre</version>
<version>33.7.1-jre</version>
</dependency>
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
Expand All @@ -127,13 +129,13 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.21.0</version>
<version>1.22.1</version>
</dependency>
<!-- Security: override transitive versions pulled in via solr-solrj and linkchecker-persistence-->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version>
<version>${jackson-annotations.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand All @@ -148,7 +150,7 @@
<dependency>
<groupId>org.eclipse.parsson</groupId>
<artifactId>parsson</artifactId>
<version>1.1.8</version>
<version>1.1.9</version>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
Expand Down
2 changes: 1 addition & 1 deletion vlo-commons/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.21.0</version>
<version>2.22.0</version>
</dependency>

<dependency>
Expand Down
4 changes: 2 additions & 2 deletions vlo-importer/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
<version>3.5.9</version>
<version>3.5.10</version>
<scope>runtime</scope>
</dependency>

Expand Down Expand Up @@ -308,7 +308,7 @@
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>2.4.240</version>
<version>2.5.250</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
9 changes: 7 additions & 2 deletions vlo-solr/solr-home/vlo-index/solrconfig.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,12 @@
that you fully re-index after changing this setting as it can
affect both how text is indexed and queried.
-->
<luceneMatchVersion>9.10.1</luceneMatchVersion>
<luceneMatchVersion>8.11.0</luceneMatchVersion>
<schemaFactory class="ManagedIndexSchemaFactory">
<bool name="mutable">true</bool>
<str name="managedSchemaResourceName">managed-schema.xml</str>
</schemaFactory>


<!-- Data Directory

Expand Down Expand Up @@ -532,7 +537,7 @@
These settings indicate how Solr Requests may be parsed, and
what restrictions may be placed on the ContentStreams from
those requests

multipartUploadLimitInKB - specifies the max size (in KiB) of
Multipart File Uploads that Solr will allow in a Request.

Expand Down
7 changes: 6 additions & 1 deletion vlo-solr/solr-home/vlo-morgue/solrconfig.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
<?xml version="1.0" encoding="UTF-8" ?>
<config>
<luceneMatchVersion>9.10.1</luceneMatchVersion>
<luceneMatchVersion>8.11.0</luceneMatchVersion>
<schemaFactory class="ManagedIndexSchemaFactory">
<bool name="mutable">true</bool>
<str name="managedSchemaResourceName">managed-schema.xml</str>
</schemaFactory>


<dataDir>${solr.data.dir:}</dataDir>

Expand Down
13 changes: 6 additions & 7 deletions vlo-web-app/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<bootstrap.version>5.3.8</bootstrap.version>
<bootstrap.unpack.dir>${project.build.directory}/generated-sources/bootstrap5</bootstrap.unpack.dir>
<bootstrap.webjar.dir>${bootstrap.unpack.dir}/META-INF/resources/webjars/bootstrap/${bootstrap.version}</bootstrap.webjar.dir>
<jersey.version>3.1.11</jersey.version>
<jersey.version>3.1.12</jersey.version>

<!-- selects the appender for the log4j root logger -->
<log4j.appender>File</log4j.appender>
Expand All @@ -37,7 +37,7 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.7.10</version>
<version>42.7.13</version>
<scope>test</scope>
</dependency>

Expand All @@ -57,7 +57,7 @@
<dependency>
<groupId>de.agilecoders.wicket</groupId>
<artifactId>wicket-bootstrap-core</artifactId>
<version>7.0.14</version>
<version>7.0.15</version>
<exclusions>
<exclusion>
<groupId>org.apache.wicket</groupId>
Expand Down Expand Up @@ -143,7 +143,7 @@
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>2.0.0</version>
<version>2.1.1</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -191,7 +191,7 @@
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
<version>1.5.4</version>
<version>1.5.7</version>
<type>jar</type>
</dependency>

Expand All @@ -203,7 +203,7 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.13.2</version>
<version>2.14.0</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -252,7 +252,6 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.21</version>
</dependency>

<!-- TESTING -->
Expand Down
10 changes: 5 additions & 5 deletions vlo-web-app/src/main/resources/cmdi2xhtml.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,16 @@
<xsl:otherwise>
<!-- parent -->
<xsl:variable name="collapseId" select="generate-id()"/>
<xsl:attribute name="class">node parent panel panel-default</xsl:attribute>
<div class="panel-heading node_title">
<a role="button" data-toggle="collapse">
<xsl:attribute name="class">node parent card</xsl:attribute>
<div class="card-header node_title">
<a role="button" data-bs-toggle="collapse">
<xsl:attribute name="href" select="concat('#', $collapseId)"/>
<xsl:value-of select="local-name()"/>
</a>
<xsl:apply-templates select="@cmd1:ref|@ref"/>
<xsl:apply-templates mode="attributes" select="."/>
</div>
<div class="panel-body collapse in node_content">
<div class="card-body collapse show node_content">
<xsl:attribute name="id" select="$collapseId"/>
<xsl:if test="child::node()">
<div class="node_children">
Expand All @@ -67,7 +67,7 @@
<a>
<xsl:attribute name="href"
select="replace($resourceRef, '^hdl:', 'http://hdl.handle.net/')"/>
<span class="glyphicon glyphicon-file">
<span class="fa fa-file-o">
<xsl:attribute name="title" select="$resourceRef"/>
</span>
<xsl:text> </xsl:text>
Expand Down
Loading