Merge branch 'develop' into 'main'

Update dependencies and site

See merge request bot-by/ijhttp-maven-plugin!17

.gitlab-ci.yml

@@ -35,7 +35,6 @@ test:
     reports:
       junit:
         - command-line/target/surefire-reports/TEST-*.xml
-        - command-line/target/failsafe-reports/TEST-*.xml
         - maven-plugin/target/surefire-reports/TEST-*.xml
         - maven-plugin/target/failsafe-reports/TEST-*.xml
         - spring-boot-test/target/surefire-reports/TEST-*.xml

.mvn/wrapper/maven-wrapper.properties

@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.4/apache-maven-3.9.4-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2023 bot-by
+   Copyright 2023-2024 bot-by
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

changelog.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 1.2.1 - 2024-01-18
+### Fixed
+- Deprecated methods in `commons-exec`.
+### Updated
+- Update dependencies
+
 ## 1.2.0 - 2023-12-30
 ### Added
 - Directories

command-line/pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-	Copyright 2023 Vitalij Berdinskih
+	Copyright 2023-2024 bot-by
 
 	Licensed under the Apache License, Version 2.0 (the "License");
 	you may not use this file except in compliance with the License.

command-line/src/main/java/uk/bot_by/ijhttp_tools/command_line/HttpClientCommandLine.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Vitalij Berdinskih
+ * Copyright 2023-2024 bot-by
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,6 +48,7 @@
  * value. The component implements it by two methods: {@link #report(boolean)} and
  * {@link #reportPath(Path)}.
  *
+ * @author Vitalij Berdinskih
  * @since 1.1.0
  */
 public class HttpClientCommandLine {
@@ -316,8 +317,7 @@ private void logLevel(CommandLine commandLine) {
 
   private void privateEnvironment(CommandLine commandLine) throws IOException {
     if (nonNull(privateEnvironmentFile)) {
-      commandLine.addArgument(PRIVATE_ENV_FILE)
-          .addArgument(privateEnvironmentFile.toString());
+      commandLine.addArgument(PRIVATE_ENV_FILE).addArgument(privateEnvironmentFile.toString());
     }
     if (nonNull(privateEnvironmentVariables)) {
       privateEnvironmentVariables.forEach(

command-line/src/main/java/uk/bot_by/ijhttp_tools/command_line/LogLevel.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Vitalij Berdinskih
+ * Copyright 2023-2024 bot-by
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
 /**
  * Logging levels.
  *
+ * @author Vitalij Berdinskih
  * @since 1.1.0
  */
 public enum LogLevel {

maven-plugin/pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-	Copyright 2023 Vitalij Berdinskih
+	Copyright 2023-2024 bot-by
 
 	Licensed under the Apache License, Version 2.0 (the "License");
 	you may not use this file except in compliance with the License.
@@ -184,7 +184,7 @@
     </profile>
   </profiles>
   <properties>
-    <plugin-annotations.version>3.10.2</plugin-annotations.version>
+    <plugin-annotations.version>3.11.0</plugin-annotations.version>
     <plugin-api.version>3.9.4</plugin-api.version>
   </properties>
   <version>${revision}${changelist}${sha1}</version>

maven-plugin/src/main/java/uk/bot_by/ijhttp_tools/maven_plugin/RunMojo.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Vitalij Berdinskih
+ * Copyright 2023-2024 bot-by
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.time.Duration;
 import java.util.List;
 import org.apache.commons.exec.CommandLine;
 import org.apache.commons.exec.DefaultExecutor;
@@ -156,7 +157,6 @@ public void execute() throws MojoExecutionException, MojoFailureException {
    * Number of milliseconds for connection. Defaults to <em>3000</em>.
    */
   @Parameter(property = "ijhttp.connect-timeout")
-
   public void setConnectTimeout(Integer connectTimeout) {
     this.connectTimeout = connectTimeout;
   }
@@ -463,17 +463,20 @@ private void timeouts(HttpClientCommandLine httpClientCommandLine) {
 
   @VisibleForTesting
   Executor getExecutor() throws IOException, MojoExecutionException {
-    var executor = new DefaultExecutor();
+    var builder = DefaultExecutor.builder();
+
+    handleWorkingDirectory(builder);
+
+    var executor = builder.get();
 
     handleWatchdog(executor);
-    handleWorkingDirectory(executor);
 
     return executor;
   }
 
   private void handleWatchdog(DefaultExecutor executor) {
     if (nonNull(timeout)) {
-      var watchdog = new ExecuteWatchdog(timeout);
+      var watchdog = ExecuteWatchdog.builder().setTimeout(Duration.ofMillis(timeout)).get();
 
       executor.setWatchdog(watchdog);
       if (getLog().isDebugEnabled()) {
@@ -482,7 +485,8 @@ private void handleWatchdog(DefaultExecutor executor) {
     }
   }
 
-  private void handleWorkingDirectory(DefaultExecutor executor)
+  @SuppressWarnings("rawtypes")
+  private void handleWorkingDirectory(DefaultExecutor.Builder builder)
       throws IOException, MojoExecutionException {
     if (nonNull(workingDirectory)) {
       if (!workingDirectory.exists()) {
@@ -491,10 +495,10 @@ private void handleWorkingDirectory(DefaultExecutor executor)
         throw new MojoExecutionException(
             "the working directory is a file: " + workingDirectory.getPath());
       }
-      executor.setWorkingDirectory(workingDirectory);
-    }
-    if (getLog().isDebugEnabled()) {
-      getLog().debug("Working directory: " + executor.getWorkingDirectory());
+      builder.setWorkingDirectory(workingDirectory);
+      if (getLog().isDebugEnabled()) {
+        getLog().debug("Working directory: " + workingDirectory);
+      }
     }
   }
 

maven-plugin/src/test/java/uk/bot_by/ijhttp_tools/maven_plugin/RunMojoSlowTest.java

@@ -212,7 +212,7 @@ void stderr(int exitCode) throws IOException, MojoExecutionException {
     when(file.toPath()).thenReturn(path);
     when(path.toString()).thenReturn(Integer.toString(exitCode));
     when(mojo.getExecutor()).thenAnswer(invocationOnMock -> {
-      var executor = new DefaultExecutor();
+      var executor = DefaultExecutor.builder().get();
 
       executor.setExitValue(exitCode);
 

pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2023 Vitalij Berdinskih
+  Copyright 2023-2024 bot-by
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -52,7 +52,7 @@
             </properties>
           </configuration>
           <groupId>org.apache.maven.plugins</groupId>
-          <version>3.2.3</version>
+          <version>3.2.5</version>
         </plugin>
         <plugin>
           <artifactId>maven-jar-plugin</artifactId>
@@ -87,7 +87,7 @@
             </execution>
           </executions>
           <groupId>org.apache.maven.plugins</groupId>
-          <version>3.2.3</version>
+          <version>3.2.5</version>
         </plugin>
         <plugin>
           <artifactId>maven-invoker-plugin</artifactId>
@@ -257,7 +257,7 @@
           </execution>
         </executions>
         <groupId>org.codehaus.mojo</groupId>
-        <version>1.5.0</version>
+        <version>1.6.0</version>
       </plugin>
     </plugins>
   </build>
@@ -317,7 +317,7 @@
       </dependency>
     </dependencies>
   </dependencyManagement>
-  <description>Run HTTP requests of integration tests</description>
+  <description>Maven plugin and Spring Boot Test autoconfiguration for IntelliJ HTTP Client</description>
   <developers>
     <developer>
       <email>vitalij_r2@outlook.com</email>
@@ -518,7 +518,7 @@
   </profiles>
   <properties>
     <changelist>-SNAPSHOT</changelist>
-    <commons-exec.version>1.3</commons-exec.version>
+    <commons-exec.version>1.4.0</commons-exec.version>
     <docs-maven-skin.version>2.3.2</docs-maven-skin.version>
     <github.release.url>https://github.com/bot-by/ijhttp-maven-plugin/releases</github.release.url>
     <gitlab.release.url>https://gitlab.com/bot-by/ijhttp-maven-plugin/-/releases
@@ -528,10 +528,10 @@
     <jetbrains-annotations.version>24.1.0</jetbrains-annotations.version>
     <junit-jupiter.version>5.10.1</junit-jupiter.version>
     <maven-minimal.version>3.8.5</maven-minimal.version>
-    <mockito.version>5.8.0</mockito.version>
+    <mockito.version>5.9.0</mockito.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <revision>1.2.0</revision>
+    <revision>1.2.1</revision>
     <sha1/>
   </properties>
   <scm>

readme.md

@@ -175,7 +175,7 @@ See [Changelog](changelog.md)
 
 ## License
 
-Copyright 2023 Vitalij Berdinskih
+Copyright 2023-2024 bot-by
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

spring-boot-test/pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-	Copyright 2023 Vitalij Berdinskih
+	Copyright 2023-2024 bot-by
 
 	Licensed under the Apache License, Version 2.0 (the "License");
 	you may not use this file except in compliance with the License.
@@ -99,7 +99,7 @@
     <dependency>
       <artifactId>slf4j-api</artifactId>
       <groupId>org.slf4j</groupId>
-      <version>2.0.9</version>
+      <version>2.0.11</version>
     </dependency>
     <!-- test -->
     <dependency>

spring-boot-test/src/main/java/uk/bot_by/ijhttp_tools/spring_boot_test/AutoConfigureHttpClientCommandLine.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Vitalij Berdinskih
+ * Copyright 2023-2024 bot-by
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,6 +27,7 @@
 /**
  * HTTP Client Command Line autoconfiguration.
  *
+ * @author Vitalij Berdinskih
  * @since 1.1.0
  */
 @Target(ElementType.TYPE)

spring-boot-test/src/main/java/uk/bot_by/ijhttp_tools/spring_boot_test/HttpClientCommandLineConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Vitalij Berdinskih
+ * Copyright 2023-2024 bot-by
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
 import static java.util.Objects.nonNull;
 
 import java.nio.file.Path;
+import java.time.Duration;
 import org.apache.commons.exec.DefaultExecutor;
 import org.apache.commons.exec.ExecuteWatchdog;
 import org.apache.commons.exec.Executor;
@@ -35,6 +36,7 @@
  * HTTP Client configuration provides {@linkplain org.apache.commons.exec.Executor executor} and
  * {@linkplain uk.bot_by.ijhttp_tools.command_line.HttpClientCommandLine command line} beans.
  *
+ * @author Vitalij Berdinskih
  * @since 1.1.0
  */
 @ConditionalOnWebApplication(type = Type.SERVLET)
@@ -113,10 +115,10 @@ private static void handleTimeout(HttpClientCommandLineParameters parameters,
   @Bean
   @ConditionalOnMissingBean
   Executor executor(@Value("${ijhttp.timeout:-1}") int timeout) {
-    var executor = new DefaultExecutor();
+    var executor = DefaultExecutor.builder().get();
 
     if (timeout > 0) {
-      executor.setWatchdog(new ExecuteWatchdog(timeout));
+      executor.setWatchdog(ExecuteWatchdog.builder().setTimeout(Duration.ofMillis(timeout)).get());
       if (logger.isDebugEnabled()) {
         logger.debug(String.format("Set the watchdog (%s) ms", timeout));
       }

spring-boot-test/src/main/java/uk/bot_by/ijhttp_tools/spring_boot_test/HttpClientCommandLineParameters.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Vitalij Berdinskih
+ * Copyright 2023-2024 bot-by
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@
 /**
  * HTTP Client parameters.
  *
+ * @author Vitalij Berdinskih
  * @see <a href="https://www.jetbrains.com/help/idea/http-client-cli.html">HTTP Client CLI</a>
  * @since 1.1.0
  */

spring-boot-test/src/main/java/uk/bot_by/ijhttp_tools/spring_boot_test/package-info.java

@@ -11,5 +11,8 @@
  *   <dt>{@link uk.bot_by.ijhttp_tools.spring_boot_test.HttpClientCommandLineParameters}</dt>
  *   <dd>HTTP Client parameters from Spring Boot properties.</dd>
  * </dl>
+ *
+ * @author Vitalij Berdinskih
+ * @since 1.1.0
  */
 package uk.bot_by.ijhttp_tools.spring_boot_test;

src/site/markdown/autoconfiguration.md

@@ -1,4 +1,4 @@
-# Srping Boot Test autoconfiguration
+# Usage of the Srping Boot Test autoconfiguration
 
 **Important!** The autoconfiguration does not contain the HTTP client: you need to install it
 by yourself then add to `PATH`. You can also set the full path to the ijhttp