Skip to content

Commit ee67f6a

Browse files
janvondejanvonde
committed
Merge branch 'develop'
2 parents 5c99266 + 37d3b3d commit ee67f6a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+2581
-2182
lines changed

‎Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM maven:3.6-jdk-11 AS BUILD
1+
FROM maven:3-eclipse-temurin-17 AS BUILD
22

33
LABEL org.opencontainers.image.authors="Matthias Geerdsen <matthias.geerdsen@intranda.com>"
44
LABEL org.opencontainers.image.source="https://github.com/intranda/goobi-viewer-indexer"
@@ -13,7 +13,7 @@ RUN echo $build; if [ "$build" = "true" ]; then mvn -f goobi-viewer-indexer clea
1313

1414

1515
# start assembling the final image
16-
FROM openjdk:11-jdk AS ASSEMBLE
16+
FROM eclipse-temurin:17-jre-jammy AS ASSEMBLE
1717
LABEL org.opencontainers.image.authors="Matthias Geerdsen <matthias.geerdsen@intranda.com>"
1818

1919

‎Jenkinsfile

Lines changed: 39 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,38 @@ pipeline {
88
}
99

1010
stages {
11-
stage('build') {
11+
stage('build develop') {
12+
when {
13+
not {
14+
anyOf {
15+
branch 'master';
16+
tag "v*"
17+
}
18+
}
19+
}
20+
agent {
21+
docker {
22+
label 'controller'
23+
image 'nexus.intranda.com:4443/goobi-viewer-testing-index:latest'
24+
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'
25+
registryUrl 'https://nexus.intranda.com:4443/'
26+
registryCredentialsId 'jenkins-docker'
27+
}
28+
}
29+
steps {
30+
sh 'git clean -fdx'
31+
sh 'mvn -f goobi-viewer-indexer/pom.xml -DskipTests=false -DskipDependencyCheck=true -DskipCheckstyle=false clean verify -U'
32+
stash includes: '**/target/*.jar, */src/main/resources/*.xml, */src/main/resources/other/schema.xml', name: 'app'
33+
}
34+
}
35+
36+
stage('build release') {
37+
when {
38+
anyOf {
39+
branch 'master';
40+
tag "v*"
41+
}
42+
}
1243
agent {
1344
docker {
1445
label 'controller'
@@ -20,12 +51,13 @@ pipeline {
2051
}
2152
steps {
2253
sh 'git clean -fdx'
23-
sh 'mvn -f goobi-viewer-indexer/pom.xml -DskipTests=false clean verify -U'
24-
recordIssues enabledForFailure: true, aggregatingResults: true, tools: [java(), javaDoc()]
54+
sh 'mvn -f goobi-viewer-indexer/pom.xml -DskipTests=false -DskipDependencyCheck=false -DskipCheckstyle=false -DfailOnSnapshot=true clean verify -U'
2555
dependencyCheckPublisher pattern: '**/target/dependency-check-report.xml'
2656
stash includes: '**/target/*.jar, */src/main/resources/*.xml, */src/main/resources/other/schema.xml', name: 'app'
2757
}
2858
}
59+
60+
2961
stage('sonarcloud') {
3062
when {
3163
anyOf {
@@ -179,6 +211,10 @@ pipeline {
179211
sourcePattern : 'goobi-viewer-indexer/src/main/java',
180212
exclusionPattern : '**/*Test.class'
181213
])
214+
recordIssues (
215+
enabledForFailure: true, aggregatingResults: false,
216+
tools: [checkStyle(pattern: '**/target/checkstyle-result.xml', reportEncoding: 'UTF-8')]
217+
)
182218
}
183219
}
184220
success {

‎goobi-viewer-indexer/.classpath

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
</classpathentry>
2929
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
3030
<attributes>
31-
<attribute name="module" value="true"/>
3231
<attribute name="maven.pomderived" value="true"/>
3332
</attributes>
3433
</classpathentry>

‎goobi-viewer-indexer/.project

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,5 @@
2929
<natures>
3030
<nature>org.eclipse.m2e.core.maven2Nature</nature>
3131
<nature>org.eclipse.jdt.core.javanature</nature>
32-
<nature>org.openmrs.generatetestcases.bddNature</nature>
3332
</natures>
3433
</projectDescription>

‎goobi-viewer-indexer/checkstyle.xml

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
3+
4+
<module name="Checker">
5+
<module name="LineLength">
6+
<property name="max" value="150"/>
7+
<property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
8+
<property name="fileExtensions" value="java"/>
9+
</module>
10+
<property name="severity" value="warning"/>
11+
<module name="TreeWalker">
12+
<module name="SuppressionCommentFilter"/>
13+
<module name="JavadocMethod">
14+
<!--<property name="accessModifiers" value="public"/>-->
15+
<!--<property name="allowMissingJavadoc" value="true"/>-->
16+
<!--<property name="logLoadErrors" value="true"/>-->
17+
<!--<property name="suppressLoadErrors" value="true"/>-->
18+
</module>
19+
<module name="JavadocStyle">
20+
<property name="severity" value="info"/>
21+
<property name="scope" value="public"/>
22+
</module>
23+
<module name="JavadocType">
24+
<property name="scope" value="public"/>
25+
</module>
26+
<module name="ConstantName">
27+
<property name="format" value="^log(ger)?$|^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$"/>
28+
</module>
29+
<module name="LocalFinalVariableName"/>
30+
<module name="LocalVariableName"/>
31+
<module name="MemberName"/>
32+
<module name="MethodName"/>
33+
<module name="PackageName"/>
34+
<module name="ParameterName"/>
35+
<module name="StaticVariableName"/>
36+
<module name="TypeName"/>
37+
<module name="AvoidStarImport"/>
38+
<module name="IllegalImport"/>
39+
<module name="RedundantImport"/>
40+
<module name="MethodLength">
41+
<property name="severity" value="info"/>
42+
</module>
43+
<module name="ParameterNumber">
44+
<property name="severity" value="info"/>
45+
</module>
46+
<module name="MethodParamPad"/>
47+
<module name="NoWhitespaceAfter">
48+
<property name="tokens" value="BNOT,DEC,DOT,INC,LNOT,UNARY_MINUS,UNARY_PLUS"/>
49+
</module>
50+
<module name="NoWhitespaceBefore"/>
51+
<module name="OperatorWrap"/>
52+
<module name="ParenPad"/>
53+
<module name="TypecastParenPad">
54+
<property name="tokens" value="RPAREN"/>
55+
</module>
56+
<module name="WhitespaceAfter"/>
57+
<module name="WhitespaceAround"/>
58+
<module name="EmptyForIteratorPad"/>
59+
<module name="AvoidNestedBlocks"/>
60+
<module name="EmptyBlock"/>
61+
<module name="NeedBraces"/>
62+
<module name="EmptyStatement"/>
63+
<module name="IllegalInstantiation"/>
64+
<module name="InnerAssignment"/>
65+
<module name="MissingSwitchDefault"/>
66+
<module name="SimplifyBooleanExpression"/>
67+
<module name="FallThrough"/>
68+
<module name="IllegalCatch"/>
69+
<module name="ModifiedControlVariable"/>
70+
<module name="StringLiteralEquality"/>
71+
<module name="EqualsHashCode"/>
72+
<module name="FinalClass"/>
73+
<module name="HideUtilityClassConstructor"/>
74+
<module name="InterfaceIsType">
75+
<property name="severity" value="info"/>
76+
</module>
77+
<module name="VisibilityModifier">
78+
<property name="protectedAllowed" value="true"/>
79+
</module>
80+
<module name="ArrayTypeStyle"/>
81+
<module name="UpperEll"/>
82+
<module name="RedundantModifier">
83+
<property name="severity" value="info"/>
84+
</module>
85+
<module name="ParameterAssignment"/>
86+
<module name="ModifierOrder"/>
87+
</module>
88+
</module>

‎goobi-viewer-indexer/pom.xml

Lines changed: 63 additions & 20 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.01.3</version>
9+
<version>24.02-SNAPSHOT</version>
1010

1111

1212
<name>Goobi viewer - Indexer</name>
@@ -20,7 +20,9 @@
2020
<properties>
2121
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2222
<maven.compiler.release>17</maven.compiler.release>
23-
<skipTests>true</skipTests>
23+
<skipTests>true</skipTests>
24+
<skipDependencyCheck>true</skipDependencyCheck>
25+
<failOnSnapshot>false</failOnSnapshot>
2426

2527
<!-- Sonar -->
2628
<sonar.projectKey>intranda_goobi-viewer-indexer</sonar.projectKey>
@@ -29,19 +31,23 @@
2931
<sonar.java.source>17</sonar.java.source>
3032
<sonar.java.target>17</sonar.java.target>
3133

34+
<!-- Checkstyle -->
35+
<checkstyle.max.violations>400</checkstyle.max.violations>
36+
<skipCheckstyle>true</skipCheckstyle>
37+
3238
<!-- Manifest information -->
3339
<maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
3440
<buildDate>${maven.build.timestamp}</buildDate>
3541

3642
<!-- intranda libraries -->
37-
<alto.version>1.5.12</alto.version>
38-
<iiif-api-model.version>2.6.1</iiif-api-model.version>
39-
<normdataimporter.version>1.10.6</normdataimporter.version>
43+
<alto.version>1.5.13</alto.version>
44+
<iiif-api-model.version>2.6.2</iiif-api-model.version>
45+
<normdataimporter.version>1.10.9</normdataimporter.version>
4046

4147
<!-- other libraries -->
42-
<angus-mail.version>2.0.2</angus-mail.version>
48+
<angus-mail.version>2.0.3</angus-mail.version>
4349
<commons-beanutils.version>1.9.4</commons-beanutils.version>
44-
<commons-configuration2.version>2.9.0</commons-configuration2.version>
50+
<commons-configuration2.version>2.10.0</commons-configuration2.version>
4551
<commons-io.version>2.15.1</commons-io.version>
4652
<commons-jxpath.version>1.3</commons-jxpath.version>
4753
<commons-lang3.version>3.14.0</commons-lang3.version>
@@ -50,17 +56,17 @@
5056
<httpcore.version>4.4.16</httpcore.version>
5157
<icu.version>74.2</icu.version>
5258
<imageio-openjpeg.version>0.6.7</imageio-openjpeg.version>
53-
<log4j.version>2.22.1</log4j.version>
54-
<jackson.version>2.16.1</jackson.version>
59+
<log4j.version>2.23.1</log4j.version>
60+
<jackson.version>2.17.0</jackson.version>
5561
<jaxen.version>2.0.0</jaxen.version>
5662
<jai.version>1.4.0</jai.version>
57-
<jakarta.mail-api.version>2.1.2</jakarta.mail-api.version>
63+
<jakarta.mail-api.version>2.1.3</jakarta.mail-api.version>
5864
<jdom2.version>2.0.6.1</jdom2.version>
5965
<jsoup.version>1.17.2</jsoup.version>
60-
<json.version>20231013</json.version>
61-
<junit.version>5.10.1</junit.version>
66+
<json.version>20240303</json.version>
67+
<junit.version>5.10.2</junit.version>
6268
<metadata-extractor.version>2.19.0</metadata-extractor.version>
63-
<solr.version>8.11.2</solr.version>
69+
<solr.version>9.5.0</solr.version>
6470
<sf-geojson.version>3.3.2</sf-geojson.version>
6571
</properties>
6672

@@ -281,24 +287,29 @@
281287
<configuration>
282288
<rules>
283289
<requireMavenVersion>
284-
<version>3.3.9</version>
285-
</requireMavenVersion>
290+
<version>3.8.8</version>
291+
</requireMavenVersion>
292+
<requireReleaseDeps>
293+
<message>No Snapshots Allowed!</message>
294+
</requireReleaseDeps>
286295
</rules>
296+
<fail>${failOnSnapshot}</fail>
287297
</configuration>
288298
</execution>
289299
</executions>
290300
</plugin>
291301
<plugin>
292302
<artifactId>maven-compiler-plugin</artifactId>
293-
<version>3.11.0</version>
303+
<version>3.12.1</version>
294304
<configuration>
295305
<compilerArgument>-Xlint:deprecation</compilerArgument>
306+
<compilerArgument>-Xlint:unchecked</compilerArgument>
296307
</configuration>
297308
</plugin>
298309
<plugin>
299310
<groupId>org.apache.maven.plugins</groupId>
300311
<artifactId>maven-surefire-plugin</artifactId>
301-
<version>3.2.2</version>
312+
<version>3.2.5</version>
302313
<configuration>
303314
<skipTests>${skipTests}</skipTests>
304315
</configuration>
@@ -363,7 +374,7 @@
363374
<plugin>
364375
<groupId>org.codehaus.mojo</groupId>
365376
<artifactId>buildnumber-maven-plugin</artifactId>
366-
<version>3.0.0</version>
377+
<version>3.2.0</version>
367378
<configuration>
368379
<shortRevisionLength>7</shortRevisionLength>
369380
<doCheck>false</doCheck>
@@ -378,7 +389,8 @@
378389
</executions>
379390
</plugin>
380391
<plugin>
381-
<artifactId>maven-assembly-plugin</artifactId>
392+
<artifactId>maven-assembly-plugin</artifactId>
393+
<version>3.7.0</version>
382394
<executions>
383395
<execution>
384396
<phase>package</phase>
@@ -429,7 +441,7 @@
429441
<plugin>
430442
<groupId>org.codehaus.mojo</groupId>
431443
<artifactId>versions-maven-plugin</artifactId>
432-
<version>2.16.1</version>
444+
<version>2.16.2</version>
433445
<configuration>
434446
<rulesUri>file://${basedir}/version-number-rules.xml</rulesUri>
435447
</configuration>
@@ -443,6 +455,7 @@
443455
<skipProvidedScope>true</skipProvidedScope>
444456
<assemblyAnalyzerEnabled>false</assemblyAnalyzerEnabled>
445457
<skipTestScope>true</skipTestScope>
458+
<skip>${skipDependencyCheck}</skip>
446459
<suppressionFiles>
447460
<suppressionFile>file://${basedir}/dependency-suppression.xml</suppressionFile>
448461
</suppressionFiles>
@@ -455,6 +468,36 @@
455468
</goals>
456469
</execution>
457470
</executions>
471+
</plugin>
472+
<plugin>
473+
<groupId>org.apache.maven.plugins</groupId>
474+
<artifactId>maven-checkstyle-plugin</artifactId>
475+
<version>3.3.1</version>
476+
<dependencies>
477+
<dependency>
478+
<groupId>com.puppycrawl.tools</groupId>
479+
<artifactId>checkstyle</artifactId>
480+
<version>10.14.1</version>
481+
</dependency>
482+
</dependencies>
483+
<executions>
484+
<execution>
485+
<id>checkstyle-check</id>
486+
<phase>verify</phase>
487+
<configuration>
488+
<skip>${skipCheckstyle}</skip>
489+
<failOnViolation>true</failOnViolation>
490+
<failsOnError>false</failsOnError>
491+
<logViolationsToConsole>true</logViolationsToConsole>
492+
<maxAllowedViolations>${checkstyle.max.violations}</maxAllowedViolations>
493+
<violationSeverity>warning</violationSeverity>
494+
<configLocation>checkstyle.xml</configLocation>
495+
</configuration>
496+
<goals>
497+
<goal>check</goal>
498+
</goals>
499+
</execution>
500+
</executions>
458501
</plugin>
459502
</plugins>
460503
</build>

0 commit comments

Comments
 (0)