Skip to content

Commit 9c3c6b2

Browse files
KeelhaulKeelhaul
committed
Merge branch 'develop' into feature_xpath_refactoring
2 parents f853027 + d9f8344 commit 9c3c6b2

39 files changed

+1571
-1226
lines changed

‎.github/workflows/default.yml

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎.github/workflows/develop-build.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Build develop branch
2+
3+
on:
4+
push:
5+
branches:
6+
- develop
7+
8+
jobs:
9+
build:
10+
11+
runs-on: ubuntu-24.04
12+
13+
steps:
14+
- name: Check out source code
15+
uses: actions/checkout@v4
16+
- name: Set up Java 21
17+
uses: actions/setup-java@v4
18+
with:
19+
distribution: 'temurin'
20+
java-version: '21'
21+
- name: Set up Maven cache
22+
uses: actions/cache@v4
23+
with:
24+
path: ~/.m2/repository
25+
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
26+
restore-keys: |
27+
${{ runner.os }}-maven-
28+
- name: Compile Goobi viewer Indexer
29+
run: mvn -f goobi-viewer-indexer/pom.xml clean package -U -B
30+

‎.github/workflows/release-build.yml

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
name: Create Release
2+
3+
on:
4+
push:
5+
tags:
6+
- v*
7+
8+
jobs:
9+
build:
10+
11+
runs-on: ubuntu-24.04
12+
13+
steps:
14+
- name: Check out source code
15+
uses: actions/checkout@v4
16+
- name: Set up Java 21
17+
uses: actions/setup-java@v4
18+
with:
19+
distribution: 'temurin'
20+
java-version: '21'
21+
- name: Set up Maven cache
22+
uses: actions/cache@v4
23+
with:
24+
path: ~/.m2/repository
25+
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
26+
restore-keys: |
27+
${{ runner.os }}-maven-
28+
- name: Compile Goobi viewer Indexer
29+
run: mvn -f goobi-viewer-indexer/pom.xml clean package -U -B
30+
- name: Create a Github release
31+
uses: actions/create-release@v1
32+
id: create_release
33+
env:
34+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
35+
with:
36+
tag_name: ${{ github.ref }}
37+
release_name: Release ${{ github.ref }}
38+
draft: false
39+
prerelease: false
40+
- name: Upload solrIndexer.jar to Github Release
41+
uses: actions/upload-release-asset@v1.0.1
42+
id: upload-release-asset
43+
env:
44+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
45+
with:
46+
upload_url: ${{ steps.create_release.outputs.upload_url }}
47+
asset_path: ./goobi-viewer-indexer/target/solr-Indexer.jar
48+
asset_name: solrIndexer.jar
49+
asset_content_type: application/x-java-archive
50+

‎.github/workflows/release.yml

Lines changed: 0 additions & 55 deletions
This file was deleted.

‎Jenkinsfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ pipeline {
4444
agent {
4545
docker {
4646
label 'controller'
47-
image 'nexus.intranda.com:4443/goobi-viewer-testing-index:latest'
47+
image 'nexus.intranda.com:4443/goobi-viewer-testing-index:latest21'
4848
args '-v $HOME/.m2:/var/maven/.m2:z -v $HOME/.config:/var/maven/.config -v $HOME/.sonar:/var/maven/.sonar -u 1000 -ti -e _JAVA_OPTIONS=-Duser.home=/var/maven -e MAVEN_CONFIG=/var/maven/.m2'
4949
registryUrl 'https://nexus.intranda.com:4443/'
5050
registryCredentialsId 'jenkins-docker'
@@ -69,7 +69,7 @@ pipeline {
6969
agent {
7070
docker {
7171
label 'controller'
72-
image 'nexus.intranda.com:4443/goobi-viewer-testing-index:latest'
72+
image 'nexus.intranda.com:4443/goobi-viewer-testing-index:latest21'
7373
args '-v $HOME/.m2:/var/maven/.m2:z -v $HOME/.config:/var/maven/.config -v $HOME/.sonar:/var/maven/.sonar -u 1000 -ti -e _JAVA_OPTIONS=-Duser.home=/var/maven -e MAVEN_CONFIG=/var/maven/.m2'
7474
registryUrl 'https://nexus.intranda.com:4443/'
7575
registryCredentialsId 'jenkins-docker'
@@ -85,7 +85,7 @@ pipeline {
8585
agent {
8686
docker {
8787
label 'controller'
88-
image 'nexus.intranda.com:4443/goobi-viewer-testing-index:latest'
88+
image 'nexus.intranda.com:4443/goobi-viewer-testing-index:latest21'
8989
args '-v $HOME/.m2:/var/maven/.m2:z -v $HOME/.config:/var/maven/.config -v $HOME/.sonar:/var/maven/.sonar -u 1000 -ti -e _JAVA_OPTIONS=-Duser.home=/var/maven -e MAVEN_CONFIG=/var/maven/.m2'
9090
registryUrl 'https://nexus.intranda.com:4443/'
9191
registryCredentialsId 'jenkins-docker'

‎goobi-viewer-indexer/.classpath

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<attribute name="optional" value="true"/>
2727
</attributes>
2828
</classpathentry>
29-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
29+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
3030
<attributes>
3131
<attribute name="maven.pomderived" value="true"/>
3232
</attributes>

‎goobi-viewer-indexer/pom.xml

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<modelVersion>4.0.0</modelVersion>
77
<groupId>io.goobi.viewer</groupId>
88
<artifactId>viewer-indexer</artifactId>
9-
<version>24.12-SNAPSHOT</version>
9+
<version>25.01-SNAPSHOT</version>
1010

1111

1212
<name>Goobi viewer - Indexer</name>
@@ -19,7 +19,7 @@
1919

2020
<properties>
2121
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
22-
<maven.compiler.release>17</maven.compiler.release>
22+
<maven.compiler.release>21</maven.compiler.release>
2323
<skipTests>true</skipTests>
2424
<skipDependencyCheck>true</skipDependencyCheck>
2525
<failOnSnapshot>false</failOnSnapshot>
@@ -28,11 +28,11 @@
2828
<sonar.projectKey>intranda_goobi-viewer-indexer</sonar.projectKey>
2929
<sonar.organization>intranda</sonar.organization>
3030
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
31-
<sonar.java.source>17</sonar.java.source>
32-
<sonar.java.target>17</sonar.java.target>
31+
<sonar.java.source>21</sonar.java.source>
32+
<sonar.java.target>21</sonar.java.target>
3333

3434
<!-- Checkstyle -->
35-
<checkstyle.max.violations>140</checkstyle.max.violations>
35+
<checkstyle.max.violations>115</checkstyle.max.violations>
3636
<skipCheckstyle>true</skipCheckstyle>
3737

3838
<!-- Manifest information -->
@@ -42,29 +42,29 @@
4242
<!-- intranda libraries -->
4343
<alto.version>1.6.2</alto.version>
4444
<iiif-api-model.version>2.6.5</iiif-api-model.version>
45-
<normdataimporter.version>1.11.3</normdataimporter.version>
45+
<normdataimporter.version>2.0.0-SNAPSHOT</normdataimporter.version>
4646

4747
<!-- other libraries -->
4848
<angus-mail.version>2.0.3</angus-mail.version>
49-
<commons-beanutils.version>1.9.4</commons-beanutils.version>
49+
<commons-beanutils.version>1.10.0</commons-beanutils.version>
5050
<commons-configuration2.version>2.11.0</commons-configuration2.version>
5151
<commons-io.version>2.18.0</commons-io.version>
5252
<commons-jxpath.version>1.3</commons-jxpath.version>
5353
<commons-lang3.version>3.17.0</commons-lang3.version>
54-
<commons-text.version>1.12.0</commons-text.version>
54+
<commons-text.version>1.13.0</commons-text.version>
5555
<httpclient.version>4.5.14</httpclient.version>
5656
<httpcore.version>4.4.16</httpcore.version>
5757
<icu.version>76.1</icu.version>
5858
<imageio-openjpeg.version>0.6.8</imageio-openjpeg.version>
59-
<log4j.version>2.24.2</log4j.version>
59+
<log4j.version>2.24.3</log4j.version>
6060
<jackson.version>2.18.2</jackson.version>
6161
<jaxen.version>2.0.0</jaxen.version>
6262
<jai.version>1.4.0</jai.version>
6363
<jakarta.mail-api.version>2.1.3</jakarta.mail-api.version>
6464
<jdom2.version>2.0.6.1</jdom2.version>
6565
<jsoup.version>1.18.3</jsoup.version>
66-
<json.version>20240303</json.version>
67-
<junit.version>5.11.3</junit.version>
66+
<json.version>20250107</json.version>
67+
<junit.version>5.11.4</junit.version>
6868
<metadata-extractor.version>2.19.0</metadata-extractor.version>
6969
<solr.version>9.7.0</solr.version>
7070
<sf-geojson.version>3.3.3</sf-geojson.version>
@@ -302,7 +302,9 @@
302302
<artifactId>maven-compiler-plugin</artifactId>
303303
<version>3.13.0</version>
304304
<configuration>
305-
<compilerArgs>
305+
<compilerArgs>
306+
<!-- Explicitly enable annotation processing -->
307+
<arg>-proc:full</arg>
306308
<arg>-Xlint:deprecation</arg>
307309
<arg>-Xlint:unchecked</arg>
308310
</compilerArgs>
@@ -311,15 +313,15 @@
311313
<plugin>
312314
<groupId>org.apache.maven.plugins</groupId>
313315
<artifactId>maven-surefire-plugin</artifactId>
314-
<version>3.5.0</version>
316+
<version>3.5.2</version>
315317
<configuration>
316318
<skipTests>${skipTests}</skipTests>
317319
</configuration>
318320
</plugin>
319321
<plugin>
320322
<groupId>org.apache.maven.plugins</groupId>
321323
<artifactId>maven-dependency-plugin</artifactId>
322-
<version>3.8.0</version>
324+
<version>3.8.1</version>
323325
<executions>
324326
<execution>
325327
<id>analyze</id>
@@ -443,7 +445,7 @@
443445
<plugin>
444446
<groupId>org.codehaus.mojo</groupId>
445447
<artifactId>versions-maven-plugin</artifactId>
446-
<version>2.17.1</version>
448+
<version>2.18.0</version>
447449
<configuration>
448450
<rulesUri>file://${basedir}/version-number-rules.xml</rulesUri>
449451
</configuration>
@@ -475,12 +477,12 @@
475477
<plugin>
476478
<groupId>org.apache.maven.plugins</groupId>
477479
<artifactId>maven-checkstyle-plugin</artifactId>
478-
<version>3.5.0</version>
480+
<version>3.6.0</version>
479481
<dependencies>
480482
<dependency>
481483
<groupId>com.puppycrawl.tools</groupId>
482484
<artifactId>checkstyle</artifactId>
483-
<version>10.20.2</version>
485+
<version>10.21.1</version>
484486
</dependency>
485487
</dependencies>
486488
<executions>
@@ -505,7 +507,7 @@
505507
<plugin>
506508
<groupId>org.apache.maven.plugins</groupId>
507509
<artifactId>maven-javadoc-plugin</artifactId>
508-
<version>3.10.1</version>
510+
<version>3.11.2</version>
509511
<configuration>
510512
<doclint>none</doclint>
511513
<failOnWarnings>true</failOnWarnings>

0 commit comments

Comments
 (0)