Merge branch 'develop'

intranda · Aug 13, 2024 · c21727f · c21727f
2 parents 4a54d8c + 26fa12a
commit c21727f
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 11 deletions.
diff --git a/goobi-viewer-connector/pom.xml b/goobi-viewer-connector/pom.xml
@@ -6,7 +6,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>io.goobi.viewer</groupId>
 	<artifactId>viewer-connector</artifactId>
-	<version>24.06</version>
+	<version>24.07-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 
@@ -59,12 +59,12 @@
 		<maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
 		<buildDate>${maven.build.timestamp}</buildDate>
 
-		<viewer-core.version>24.06</viewer-core.version>
+		<viewer-core.version>24.07-SNAPSHOT</viewer-core.version>
 
 		<commons-configuration2.version>2.11.0</commons-configuration2.version>
 		<commons-io.version>2.16.1</commons-io.version>
 		<commons-jxpath.version>1.3</commons-jxpath.version>
-		<commons-lang3.version>3.14.0</commons-lang3.version>
+		<commons-lang3.version>3.16.0</commons-lang3.version>
 		<httpclient.version>4.5.14</httpclient.version>
 		<httpcore.version>4.4.16</httpcore.version>
 		<jakarta.servlet-api.version>4.0.4</jakarta.servlet-api.version>
@@ -235,7 +235,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>3.3.0</version>
+				<version>3.3.1</version>
 				<configuration>
 					<skipTests>${skipTests}</skipTests>
 					<excludes>
@@ -313,17 +313,33 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.7.0</version>
+				<version>3.8.0</version>
 				<configuration>
-					<doclint>none</doclint>
+                    <doclint>none</doclint>
+                    <failOnWarnings>true</failOnWarnings>
+                    <!-- Specifies the tags to be fixed automatically when running the mvn javadox:fix command, see:
+                         https://maven.apache.org/plugins/maven-javadoc-plugin/fix-mojo.html#fixTags
+                    -->
 					<fixTags>link,throws,return,param</fixTags>
 					<tags>
-						<tag>
+                        <tag>
+                            <!-- Disables custom @should tag in Javadoc see:
+                                 https://maven.apache.org/plugins/maven-javadoc-plugin/javadoc-mojo.html#tags
+                            -->
 							<name>should</name>
 							<placement>X</placement>
 						</tag>
 					</tags>
-				</configuration>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>check-javadoc</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                 </executions>
 			</plugin>
 			<!-- used for test coverage report in Jenkins -->
 			<plugin>
@@ -349,7 +365,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>versions-maven-plugin</artifactId>
-				<version>2.17.0</version>
+				<version>2.17.1</version>
 				<configuration>
 					<rulesUri>file://${basedir}/version-number-rules.xml</rulesUri>
 				</configuration>
@@ -409,6 +425,33 @@
 				</executions>
 			</plugin>
 		</plugins>
-	</build>
+    </build>
 
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>3.7.0</version>
+                <configuration>
+                    <doclint>none</doclint>
+                    <failOnWarnings>true</failOnWarnings>
+                    <fixTags>link,throws,return,param</fixTags>
+                    <tags>
+                        <tag>
+                            <name>should</name>
+                            <placement>X</placement>
+                        </tag>
+                    </tags>
+                </configuration>
+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <report>javadoc</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+        </plugins>
+    </reporting>
 </project>
diff --git a/goobi-viewer-connector/src/main/java/io/goobi/viewer/connector/utils/SolrSearchIndex.java b/goobi-viewer-connector/src/main/java/io/goobi/viewer/connector/utils/SolrSearchIndex.java
@@ -76,7 +76,7 @@ public class SolrSearchIndex {
      * Constructor for SolrSearchIndex.
      * </p>
      *
-     * @param client a {@link org.apache.solr.client.solrj.SolrServer} object.
+     * @param client a {@link org.apache.solr.client.solrj.SolrClient} object.
      * @param testMode a boolean.
      */
     public SolrSearchIndex(SolrClient client, boolean testMode) {