From 3eebb12d65ea392a39de965f3703c44005d43af2 Mon Sep 17 00:00:00 2001 From: radud Date: Tue, 1 Sep 2026 14:45:01 +0200 Subject: [PATCH 1/6] Migrate to actions and remove travis --- .github/workflows/ci.yml | 43 ++++++++++++++++++++++++++++++++++++++++ .travis.yml | 36 --------------------------------- 2 files changed, 43 insertions(+), 36 deletions(-) create mode 100644 .github/workflows/ci.yml delete mode 100644 .travis.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 000000000..13eafd5e2 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,43 @@ +name: CI + +on: + push: + branches: ['**'] + tags: ['*'] + pull_request: + +jobs: + build: + runs-on: ubuntu-latest + permissions: + contents: write # required to create the release on a tag build + env: + MAVEN_OPTS: -Xmx2g + steps: + - uses: actions/checkout@v7 + + - uses: actions/setup-java@v6 + with: + distribution: temurin + java-version: '21' + cache: maven + + - name: Set version from tag + if: startsWith(github.ref, 'refs/tags/') + run: mvn versions:set -DnewVersion=${{ github.ref_name }} versions:commit + + - name: Build + run: mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V + + - name: Test + run: mvn test -B + + - name: Package distribution + run: mvn clean install -DskipTests=true -Pdocker + + - name: Publish release + if: startsWith(github.ref, 'refs/tags/') + uses: softprops/action-gh-release@v3 + with: + prerelease: true + files: vlo-distribution/target/vlo-${{ github.ref_name }}-docker.tar.gz diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 3deb83b39..000000000 --- a/.travis.yml +++ /dev/null @@ -1,36 +0,0 @@ -language: java -jdk: -- openjdk21 - -before_install: -- echo "MAVEN_OPTS='-Xmx2g'" > ~/.mavenrc -script: -- bash -c 'if [ "${TRAVIS_TAG}" ]; then mvn versions:set -DnewVersion=${TRAVIS_TAG} versions:commit; fi' -- mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V -- mvn test -B -- mvn clean install -DskipTests=true -Pdocker - -before_deploy: - - yes | gem update --system --force - - gem install bundler - - gem install faraday-net_http -v '3.3.0' # Fix faraday version - - gem install uri - - gem install logger -deploy: - provider: releases - prerelease: true - api_key: "${VLO_DEPLOY_TOKEN}" - file: "vlo-distribution/target/vlo-${TRAVIS_TAG}-docker.tar.gz" - skip_cleanup: true - on: - tags: true - -notifications: - email: - on_success: change - on_failure: always - slack: - rooms: - secure: "${SLACK_INTEGRATION_KEY}" - on_success: change # default: always - on_failure: always # default: always From 104f58686a827ffeeef9ad9949e201cece028c56 Mon Sep 17 00:00:00 2001 From: Twan Goosen Date: Mon, 21 Sep 2026 13:53:43 +0200 Subject: [PATCH 2/6] dependencies updated --- pom.xml | 29 +++++++++++++++-------------- vlo-commons/pom.xml | 2 +- vlo-importer/pom.xml | 4 ++-- vlo-web-app/pom.xml | 13 ++++++------- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pom.xml b/pom.xml index c7a0e64b3..ad718b904 100644 --- a/pom.xml +++ b/pom.xml @@ -42,23 +42,24 @@ 9.10.1 - 2.0.17 + 2.0.18 1.5.36 - 2.26.0 + 2.26.1 9.8.0-15 - 3.5.15 + 3.5.16 6.2.19 - 3.5.12 - 4.1.137.Final - 3.9.5 - 2.18.9 + 3.5.13 + 4.2.18.Final + 3.9.6 + 2.22.2 + 2.22 UTF-8 gpl30 21 21 10.11.0 - 5.13.4 + 5.14.4 @@ -92,18 +93,18 @@ com.sun.xml.bind jaxb-impl - 4.0.6 + 4.0.9 runtime org.eclipse yasson - 3.0.4 + 3.0.5 com.google.guava guava - 33.5.0-jre + 33.7.1-jre org.apache.commons @@ -113,13 +114,13 @@ commons-codec commons-codec - 1.21.0 + 1.22.1 com.fasterxml.jackson.core jackson-annotations - ${jackson.version} + ${jackson-annotations.version} com.fasterxml.jackson.core @@ -134,7 +135,7 @@ org.eclipse.parsson parsson - 1.1.8 + 1.1.9 org.apache.zookeeper diff --git a/vlo-commons/pom.xml b/vlo-commons/pom.xml index 4c99d748f..f489a75b5 100644 --- a/vlo-commons/pom.xml +++ b/vlo-commons/pom.xml @@ -217,7 +217,7 @@ commons-io commons-io - 2.21.0 + 2.22.0 diff --git a/vlo-importer/pom.xml b/vlo-importer/pom.xml index 3c239aa81..295a721d2 100644 --- a/vlo-importer/pom.xml +++ b/vlo-importer/pom.xml @@ -231,7 +231,7 @@ org.mariadb.jdbc mariadb-java-client - 3.5.9 + 3.5.10 runtime @@ -308,7 +308,7 @@ com.h2database h2 - 2.4.240 + 2.5.250 test diff --git a/vlo-web-app/pom.xml b/vlo-web-app/pom.xml index ba7e50372..541546cfa 100644 --- a/vlo-web-app/pom.xml +++ b/vlo-web-app/pom.xml @@ -20,7 +20,7 @@ 5.3.8 ${project.build.directory}/generated-sources/bootstrap5 ${bootstrap.unpack.dir}/META-INF/resources/webjars/bootstrap/${bootstrap.version} - 3.1.11 + 3.1.12 File @@ -37,7 +37,7 @@ org.postgresql postgresql - 42.7.10 + 42.7.13 test @@ -57,7 +57,7 @@ de.agilecoders.wicket wicket-bootstrap-core - 7.0.14 + 7.0.15 org.apache.wicket @@ -125,7 +125,7 @@ jakarta.annotation jakarta.annotation-api - 2.0.0 + 2.1.1 @@ -173,7 +173,7 @@ org.codehaus.jettison jettison - 1.5.4 + 1.5.7 jar @@ -185,7 +185,7 @@ com.google.code.gson gson - 2.13.2 + 2.14.0 @@ -234,7 +234,6 @@ com.fasterxml.jackson.core jackson-annotations - 2.21 From 68d100767375f0baa09f8be4ebbcb4e8d236dd90 Mon Sep 17 00:00:00 2001 From: radudoros Date: Tue, 22 Sep 2026 16:38:13 +0200 Subject: [PATCH 3/6] Fix solr warnings (#450) Fix warnings: update pinned lucene version & remove obsolete configurations seen in the warning --- pom.xml | 5 + .../{managed-schema => managed-schema.xml} | 0 vlo-solr/solr-home/vlo-index/solrconfig.xml | 114 +----------------- .../{managed-schema => managed-schema.xml} | 0 vlo-solr/solr-home/vlo-morgue/solrconfig.xml | 2 +- .../clarin/cmdi/vlo/solr/SolrQueryTest.java | 5 +- vlo-web-app/pom.xml | 9 ++ .../solr/impl/SearchResultsDaoImplTest.java | 11 +- 8 files changed, 32 insertions(+), 114 deletions(-) rename vlo-solr/solr-home/vlo-index/conf/{managed-schema => managed-schema.xml} (100%) rename vlo-solr/solr-home/vlo-morgue/conf/{managed-schema => managed-schema.xml} (100%) diff --git a/pom.xml b/pom.xml index ad718b904..df8fe723b 100644 --- a/pom.xml +++ b/pom.xml @@ -245,6 +245,11 @@ maven-resources-plugin 3.4.0 + + org.codehaus.mojo + build-helper-maven-plugin + 3.6.2 + diff --git a/vlo-solr/solr-home/vlo-index/conf/managed-schema b/vlo-solr/solr-home/vlo-index/conf/managed-schema.xml similarity index 100% rename from vlo-solr/solr-home/vlo-index/conf/managed-schema rename to vlo-solr/solr-home/vlo-index/conf/managed-schema.xml diff --git a/vlo-solr/solr-home/vlo-index/solrconfig.xml b/vlo-solr/solr-home/vlo-index/solrconfig.xml index 04d8a2cdf..64eed3519 100644 --- a/vlo-solr/solr-home/vlo-index/solrconfig.xml +++ b/vlo-solr/solr-home/vlo-index/solrconfig.xml @@ -35,63 +35,7 @@ that you fully re-index after changing this setting as it can affect both how text is indexed and queried. --> - 7.6.0 - - - - - - - - - - - - - - - - - - - + 9.10.1 - - - - - - - - @@ -608,9 +533,6 @@ what restrictions may be placed on the ContentStreams from those requests - enableRemoteStreaming - enables use of the stream.file - and stream.url parameters for specifying remote streams. - multipartUploadLimitInKB - specifies the max size (in KiB) of Multipart File Uploads that Solr will allow in a Request. @@ -625,15 +547,8 @@ key "httpRequest". It will not be used by any of the existing Solr components, but may be useful when developing custom plugins. - - *** WARNING *** - The settings below authorize Solr to fetch remote files, You - should make sure your system has some authentication before - using enableRemoteStreaming="true" - --> - @@ -913,11 +828,7 @@ - - - - - + text @@ -929,22 +840,6 @@ - - - - /xhtml:html/xhtml:body/descendant:node() - content - attr_meta_ - attr_ - true - - - - ${velocity.template.base.dir:} - diff --git a/vlo-solr/solr-home/vlo-morgue/conf/managed-schema b/vlo-solr/solr-home/vlo-morgue/conf/managed-schema.xml similarity index 100% rename from vlo-solr/solr-home/vlo-morgue/conf/managed-schema rename to vlo-solr/solr-home/vlo-morgue/conf/managed-schema.xml diff --git a/vlo-solr/solr-home/vlo-morgue/solrconfig.xml b/vlo-solr/solr-home/vlo-morgue/solrconfig.xml index 11ed4e7d3..1ab9afdf1 100644 --- a/vlo-solr/solr-home/vlo-morgue/solrconfig.xml +++ b/vlo-solr/solr-home/vlo-morgue/solrconfig.xml @@ -1,6 +1,6 @@ - 7.6.0 + 9.10.1 ${solr.data.dir:} diff --git a/vlo-solr/src/test/java/eu/clarin/cmdi/vlo/solr/SolrQueryTest.java b/vlo-solr/src/test/java/eu/clarin/cmdi/vlo/solr/SolrQueryTest.java index 409e952bc..9f3f6992a 100644 --- a/vlo-solr/src/test/java/eu/clarin/cmdi/vlo/solr/SolrQueryTest.java +++ b/vlo-solr/src/test/java/eu/clarin/cmdi/vlo/solr/SolrQueryTest.java @@ -62,7 +62,10 @@ public static void setUpClass() throws Exception { //config getResourcePath("/solr/vlo-index/solrconfig.xml"), //schema - getResourcePath("/solr/vlo-index/conf/managed-schema"), + // The "classic" (non-managed) schema name, which is what Solr + // itself defaults to. We have no classic schema and the managed + // conf/managed-schema.xml will be loaded by convention anyway + "schema.xml", //solr home getResourcePath("/solr"), //core name diff --git a/vlo-web-app/pom.xml b/vlo-web-app/pom.xml index 541546cfa..eb8f4076a 100644 --- a/vlo-web-app/pom.xml +++ b/vlo-web-app/pom.xml @@ -286,6 +286,15 @@ 1.15.0 + + + org.junit.vintage + junit-vintage-engine + test + + org.jmock diff --git a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/solr/impl/SearchResultsDaoImplTest.java b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/solr/impl/SearchResultsDaoImplTest.java index 25e45a8de..e87915bfc 100644 --- a/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/solr/impl/SearchResultsDaoImplTest.java +++ b/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/solr/impl/SearchResultsDaoImplTest.java @@ -57,11 +57,20 @@ public class SearchResultsDaoImplTest extends SolrTestCaseJ4 { @BeforeClass public static void setUpClass() throws Exception { + // Solr 9: SolrTestCaseJ4 defaults to RAMDirectoryFactory, but UpdateLog asks for + // 'none' lock which is incompatible with RAMDirectoryFactory. + // Use NRTCachingDirectoryFactory (the production default) which can do + // all lock types (but it's a bit heavier). + useFactory("solr.NRTCachingDirectoryFactory"); + SolrTestCaseJ4.initCore( //config getResourcePath("/solr/vlo-index/solrconfig.xml"), //schema - getResourcePath("/solr/vlo-index/conf/managed-schema"), + // The "classic" (non-managed) schema name, which is what Solr + //itself defaults to. We have no classic schema and the managed + //conf/managed-schema.xml will be loaded by convention anyway + "schema.xml", //solr home getResourcePath("/solr"), //core name From ff79d28d85ca6d5a968b37416718b23eba5a2299 Mon Sep 17 00:00:00 2001 From: radudoros Date: Tue, 22 Sep 2026 17:03:41 +0200 Subject: [PATCH 4/6] Add version changes details (#452) --- CHANGES.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGES.txt b/CHANGES.txt index 6234062a1..b5ce76ca4 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,6 +1,14 @@ Bug fixes and new features -------------------------- +VLO 4.15.0 (September 2026) +* UI migrated from Bootstrap 3 to Bootstrap 5: stylesheets are compiled with Sass instead of LESS, Font Awesome was upgraded and Glyphicons removed + +* Solr configuration brought up to date with Solr 9 + +* Continuous integration migrated from Travis CI to GitHub Actions +* Various dependency and security updates + VLO 4.14.0 (July 2026) * Tombstone records: minimal information is retained for removed records From 4ded516686d1350ef665d9e1ac9dd75d3031bf98 Mon Sep 17 00:00:00 2001 From: radud Date: Tue, 22 Sep 2026 20:24:47 +0200 Subject: [PATCH 5/6] Fix loading schema issue --- vlo-solr/solr-home/vlo-index/solrconfig.xml | 7 ++++++- vlo-solr/solr-home/vlo-morgue/solrconfig.xml | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/vlo-solr/solr-home/vlo-index/solrconfig.xml b/vlo-solr/solr-home/vlo-index/solrconfig.xml index 64eed3519..d3f15f9e4 100644 --- a/vlo-solr/solr-home/vlo-index/solrconfig.xml +++ b/vlo-solr/solr-home/vlo-index/solrconfig.xml @@ -35,7 +35,12 @@ that you fully re-index after changing this setting as it can affect both how text is indexed and queried. --> - 9.10.1 + 8.11.0 + + true + managed-schema.xml + + - node parent panel panel-default -
- + node parent card +
+
-
+
@@ -67,7 +67,7 @@ - +