Merge branch 'main' into dependabot/github_actions/actions/checkout-4

java-operator-sdk · Nov 16, 2023 · 69666ad · 69666ad
2 parents 6c64088 + 6ad5494
commit 69666ad
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/core/src/main/java/io/javaoperatorsdk/jenvtest/KubeAPIServerConfig.java b/core/src/main/java/io/javaoperatorsdk/jenvtest/KubeAPIServerConfig.java
@@ -18,7 +18,7 @@ public class KubeAPIServerConfig {
   private final String apiServerVersion;
 
   /**
-   * If true, tries to download binaries. If the apiServerVersion is not set and some local binaries
+   * If true, does not download binaries. If the apiServerVersion is not set and some local binaries
    * found won't try to download them again.
    */
   private final boolean offlineMode;

diff --git a/pom.xml b/pom.xml
@@ -41,22 +41,22 @@
         <assertj.version>3.24.2</assertj.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <commons-compress.version>1.23.0</commons-compress.version>
+        <commons-compress.version>1.24.0</commons-compress.version>
         <google.cloud.libraries.version>26.12.0</google.cloud.libraries.version>
         <commons-io.version>2.13.0</commons-io.version>
         <bouncycastle.version>1.75</bouncycastle.version>
         <mokito.version>5.5.0</mokito.version>
         <maven.compiler.target>11</maven.compiler.target>
         <maven.compiler.source>11</maven.compiler.source>
         <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
-        <maven-surefire-plugin.version>3.1.0</maven-surefire-plugin.version>
+        <maven-surefire-plugin.version>3.2.2</maven-surefire-plugin.version>
         <impsort-maven-plugin.version>1.9.0</impsort-maven-plugin.version>
         <formatter-maven-plugin.version>2.22.0</formatter-maven-plugin.version>
         <directory-maven-plugin.version>1.0</directory-maven-plugin.version>
         <jetty.version>11.0.15</jetty.version>
         <kubernetes.webhooks.framework.version>1.0.0</kubernetes.webhooks.framework.version>
         <nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
-        <maven-javadoc-plugin.version>3.5.0</maven-javadoc-plugin.version>
+        <maven-javadoc-plugin.version>3.6.2</maven-javadoc-plugin.version>
         <jackson.version>2.14.2</jackson.version>
 
         <sonar.organization>java-operator-sdk</sonar.organization>
@@ -226,11 +226,12 @@
                 <configuration>
                     <properties>
                         <configurationParameters>
-                            junit.jupiter.execution.parallel.enabled = true
-                            junit.jupiter.execution.parallel.mode.default = concurrent
-                            junit.jupiter.execution.parallel.mode.classes.default = concurrent
-                            junit.jupiter.execution.parallel.config.strategy = fixed
-                            junit.jupiter.execution.parallel.config.fixed.parallelism = 5
+<!--                            Uncomment for parallel build -->
+<!--                            junit.jupiter.execution.parallel.enabled = true-->
+<!--                            junit.jupiter.execution.parallel.mode.default = concurrent-->
+<!--                            junit.jupiter.execution.parallel.mode.classes.default = concurrent-->
+<!--                            junit.jupiter.execution.parallel.config.strategy = fixed-->
+<!--                            junit.jupiter.execution.parallel.config.fixed.parallelism = 5-->
                         </configurationParameters>
                     </properties>
                 </configuration>