Make CLI builder as a test-ready component.

.gitlab-ci.yml

@@ -9,7 +9,8 @@ include:
 cache:
   paths:
     - .m2/repository
-    - target
+    - cli-builder/target
+    - maven-plugin/target
 
 stages:
   - build
@@ -49,7 +50,7 @@ spotbugs-sast:
 coverage:
   stage: verify
   script:
-    - awk -F"," '{ instructions += $4 + $5; covered += $5 } END { print covered, "/", instructions, "instructions covered"; print 100*covered/instructions, "% covered" }' target/site/jacoco/jacoco.csv
+    - awk -F"," '{ instructions += $4 + $5; covered += $5 } END { print covered, "/", instructions, "instructions covered"; print 100*covered/instructions, "% covered" }' cli-builder/target/site/jacoco/jacoco.csv maven-plugin/target/site/jacoco/jacoco.csv
   coverage: '/(\d+\.?\d*) \% covered/'
   rules:
     - if: $CI_DEFAULT_BRANCH == $CI_COMMIT_BRANCH && $CI_COMMIT_TAG == null

changelog.md

@@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - The proxy feature
 - The report path
-- Split Maven plugin and core module
+- Split Maven plugin and CLI builder modules
 
 ## 1.0.1 - 2023-11-08
 ### Fixed

core/pom.xml → cli-builder/pom.xml

@@ -17,7 +17,7 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns="http://maven.apache.org/POM/4.0.0"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <artifactId>ijhttp-core</artifactId>
+  <artifactId>ijhttp-cli-builder</artifactId>
   <build>
     <plugins>
       <plugin>

core/src/main/java/uk/bot_by/ijhttp_core/core/CommandLineBuilder.java → cli-builder/src/main/java/uk/bot_by/ijhttp_tools/cli_builder/CommandLineBuilder.java

@@ -1,4 +1,4 @@
-package uk.bot_by.ijhttp_core.core;
+package uk.bot_by.ijhttp_tools.cli_builder;
 
 import static java.util.Objects.isNull;
 import static java.util.Objects.nonNull;

core/src/main/java/uk/bot_by/ijhttp_core/core/LogLevel.java → cli-builder/src/main/java/uk/bot_by/ijhttp_tools/cli_builder/LogLevel.java

@@ -1,4 +1,4 @@
-package uk.bot_by.ijhttp_core.core;
+package uk.bot_by.ijhttp_tools.cli_builder;
 
 /**
  * Logging levels.

core/src/test/java/uk/bot_by/ijhttp_core/core/CommandLineBuilderFastTest.java → cli-builder/src/test/java/uk/bot_by/ijhttp_core/core/CommandLineBuilderFastTest.java

@@ -1,4 +1,4 @@
-package uk.bot_by.ijhttp_core.core;
+package uk.bot_by.ijhttp_tools.cli_builder;
 
 import static java.util.Objects.isNull;
 import static java.util.Objects.nonNull;

core/src/test/java/uk/bot_by/ijhttp_core/core/CommandLineBuilderSmokeTest.java → cli-builder/src/test/java/uk/bot_by/ijhttp_core/core/CommandLineBuilderSmokeTest.java

@@ -1,4 +1,4 @@
-package uk.bot_by.ijhttp_core.core;
+package uk.bot_by.ijhttp_tools.cli_builder;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;

maven-plugin/pom.xml

@@ -85,7 +85,7 @@
   </build>
   <dependencies>
     <dependency>
-      <artifactId>ijhttp-core</artifactId>
+      <artifactId>ijhttp-cli-builder</artifactId>
       <groupId>uk.bot-by.ijhttp-tools</groupId>
       <version>${revision}${changelist}${sha1}</version>
     </dependency>

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

@@ -38,8 +38,8 @@
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.jetbrains.annotations.VisibleForTesting;
-import uk.bot_by.ijhttp_core.core.CommandLineBuilder;
-import uk.bot_by.ijhttp_core.core.LogLevel;
+import uk.bot_by.ijhttp_tools.cli_builder.CommandLineBuilder;
+import uk.bot_by.ijhttp_tools.cli_builder.LogLevel;
 
 /**
  * Run integration tests using IntelliJ HTTP Client.

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

@@ -48,7 +48,7 @@
 import org.mockito.Mock;
 import org.mockito.Spy;
 import org.mockito.junit.jupiter.MockitoExtension;
-import uk.bot_by.ijhttp_core.core.LogLevel;
+import uk.bot_by.ijhttp_tools.cli_builder.LogLevel;
 
 @ExtendWith(MockitoExtension.class)
 @Tag("fast")

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

@@ -33,7 +33,7 @@
 import org.mockito.Mock;
 import org.mockito.Spy;
 import org.mockito.junit.jupiter.MockitoExtension;
-import uk.bot_by.ijhttp_core.core.LogLevel;
+import uk.bot_by.ijhttp_tools.cli_builder.LogLevel;
 
 @ExtendWith(MockitoExtension.class)
 @Tag("slow")

maven-plugin/test-exit-code.sh

@@ -1,3 +1,5 @@
 #!/bin/bash
 
+[ ${1:-0} -gt 0 ] && echo "error output" >&2 || echo "standard output"
+
 exit "${1:-0}"

pom.xml

@@ -296,7 +296,7 @@
   </licenses>
   <modelVersion>4.0.0</modelVersion>
   <modules>
-    <module>core</module>
+    <module>cli-builder</module>
     <module>maven-plugin</module>
   </modules>
   <name>IntelliJ HTTP Client Tools</name>