This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch 1.2-RC in repository https://gitbox.apache.org/repos/asf/sis.git
commit 493e6437490030617da0da025a2bf73655cf21d0 Author: Martin Desruisseaux <[email protected]> AuthorDate: Tue May 10 14:19:57 2022 +0200 Fix compilation errors caused by mismatched versions. --- ide-project/NetBeans/nbproject/project.properties | 2 +- pom.xml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ide-project/NetBeans/nbproject/project.properties b/ide-project/NetBeans/nbproject/project.properties index 69e4277c3a..94a34844d4 100644 --- a/ide-project/NetBeans/nbproject/project.properties +++ b/ide-project/NetBeans/nbproject/project.properties @@ -110,7 +110,7 @@ httpclient.version = 4.5.13 httpcore.version = 4.4.13 cm-logging.version = 1.2 slf4j.version = 1.7.28 -junit.version = 4.13.2 +junit.version = 4.12 hamcrest.version = 1.3 derby.version = 10.14.2.0 hsqldb.version = 2.6.1 diff --git a/pom.xml b/pom.xml index 047a3b9f2b..f556f8c95d 100644 --- a/pom.xml +++ b/pom.xml @@ -859,7 +859,6 @@ <artifactId>maven-javadoc-plugin</artifactId> <version>3.4.0</version> <configuration> - <release>17</release> <source>${maven.compiler.source}</source> <!-- Enables javadoc to handle language constructs present in target JDK. --> <encoding>${project.build.sourceEncoding}</encoding> <!-- Encoding of Java source file. --> <docencoding>${website.encoding}</docencoding> <!-- Encoding of the generated HTML files. -->
