Merge branch 'release/0.9' into main

.github/workflows/build.yml

@@ -8,6 +8,7 @@ on:
   pull_request:
     branches:
       - develop
+      - talos-testing/fake-develop
 
 jobs:
   build:
@@ -18,6 +19,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
+          lfs: true
 
       - name: Prepare directories
         run: mkdir -p /home/runner/work/_temp/_github_home/talos-m2-repository
@@ -31,31 +33,33 @@ jobs:
       - name: Build
         uses: docker://incub8softwarelabs/talos:latest
         env:
-          # Talos-specific variables
-          TALOS_MAVEN_DEBUG: ${{ secrets.TALOS_MAVEN_DEBUG }}
-          TALOS_PARAMETERS: ${{ secrets.TALOS_PARAMETERS }}
-          TALOS_RELEASE_REPO_ENABLED: ${{ secrets.TALOS_RELEASE_REPO_ENABLED }}
-          TALOS_RELEASE_REPO_ID: ${{ secrets.TALOS_RELEASE_REPO_ID }}
-          TALOS_RELEASE_REPO_URL: ${{ secrets.TALOS_RELEASE_REPO_URL }}
-          TALOS_SERVER1_ID: ${{ secrets.TALOS_SERVER1_ID }}
+          # Talos-specific secrets
           TALOS_SERVER1_PASSWORD: ${{ secrets.TALOS_SERVER1_PASSWORD }}
-          TALOS_SERVER1_USERNAME: ${{ secrets.TALOS_SERVER1_USERNAME }}
-          TALOS_SERVER2_ID: ${{ secrets.TALOS_SERVER2_ID }}
           TALOS_SERVER2_PASSWORD: ${{ secrets.TALOS_SERVER2_PASSWORD }}
-          TALOS_SERVER2_USERNAME: ${{ secrets.TALOS_SERVER2_USERNAME }}
-          TALOS_SERVER3_ID: ${{ secrets.TALOS_SERVER3_ID }}
           TALOS_SERVER3_PASSWORD: ${{ secrets.TALOS_SERVER3_PASSWORD }}
-          TALOS_SERVER3_USERNAME: ${{ secrets.TALOS_SERVER3_USERNAME }}
-          TALOS_SIGNING_ENABLED: ${{ secrets.TALOS_SIGNING_ENABLED }}
           TALOS_SIGNING_KEY: ${{ secrets.TALOS_SIGNING_KEY }}
-          TALOS_SIGNING_PROFILE: ${{ secrets.TALOS_SIGNING_PROFILE }}
-          TALOS_SNAPSHOT_REPO_ENABLED: ${{ secrets.TALOS_SNAPSHOT_REPO_ENABLED }}
-          TALOS_SNAPSHOT_REPO_ID: ${{ secrets.TALOS_SNAPSHOT_REPO_ID }}
-          TALOS_SNAPSHOT_REPO_URL: ${{ secrets.TALOS_SNAPSHOT_REPO_URL }}
-          TALOS_SONAR_ENABLED: ${{ secrets.TALOS_SONAR_ENABLED }}
-          TALOS_SONAR_HOST: ${{ secrets.TALOS_SONAR_HOST }}
           TALOS_SONAR_LOGIN: ${{ secrets.TALOS_SONAR_LOGIN }}
-          TALOS_SONAR_ORGANIZATION: ${{ secrets.TALOS_SONAR_ORGANIZATION }}
+
+          # Talos-specific variables
+          TALOS_MAVEN_DEBUG: ${{ vars.TALOS_MAVEN_DEBUG }}
+          TALOS_PARAMETERS: ${{ vars.TALOS_PARAMETERS }}
+          TALOS_RELEASE_REPO_ENABLED: ${{ vars.TALOS_RELEASE_REPO_ENABLED }}
+          TALOS_RELEASE_REPO_ID: ${{ vars.TALOS_RELEASE_REPO_ID }}
+          TALOS_RELEASE_REPO_URL: ${{ vars.TALOS_RELEASE_REPO_URL }}
+          TALOS_SERVER1_ID: ${{ vars.TALOS_SERVER1_ID }}
+          TALOS_SERVER1_USERNAME: ${{ vars.TALOS_SERVER1_USERNAME }}
+          TALOS_SERVER2_ID: ${{ vars.TALOS_SERVER2_ID }}
+          TALOS_SERVER2_USERNAME: ${{ vars.TALOS_SERVER2_USERNAME }}
+          TALOS_SERVER3_ID: ${{ vars.TALOS_SERVER3_ID }}
+          TALOS_SERVER3_USERNAME: ${{ vars.TALOS_SERVER3_USERNAME }}
+          TALOS_SIGNING_ENABLED: ${{ vars.TALOS_SIGNING_ENABLED }}
+          TALOS_SIGNING_PROFILE: ${{ vars.TALOS_SIGNING_PROFILE }}
+          TALOS_SNAPSHOT_REPO_ENABLED: ${{ vars.TALOS_SNAPSHOT_REPO_ENABLED }}
+          TALOS_SNAPSHOT_REPO_ID: ${{ vars.TALOS_SNAPSHOT_REPO_ID }}
+          TALOS_SNAPSHOT_REPO_URL: ${{ vars.TALOS_SNAPSHOT_REPO_URL }}
+          TALOS_SONAR_ENABLED: ${{ vars.TALOS_SONAR_ENABLED }}
+          TALOS_SONAR_HOST: ${{ vars.TALOS_SONAR_HOST }}
+          TALOS_SONAR_ORGANIZATION: ${{ vars.TALOS_SONAR_ORGANIZATION }}
 
           # Token to use when SonarScanner invokes Github APIs
           # https://docs.github.com/en/actions/reference/authentication-in-a-workflow#about-the-github_token-secret

pom.xml

@@ -3,14 +3,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>com.github.bannmann</groupId>
+        <groupId>dev.bannmann</groupId>
         <artifactId>base</artifactId>
-        <version>1.3</version>
+        <version>1.5</version>
     </parent>
 
-    <groupId>com.github.bannmann.restflow</groupId>
+    <groupId>dev.bannmann.restflow</groupId>
     <artifactId>restflow</artifactId>
-    <version>0.8</version>
+    <version>0.9</version>
 
     <name>${project.groupId}:${project.artifactId}</name>
     <description>Fluent API for Java 11 HTTP Client with JSON-B support</description>
@@ -124,25 +124,6 @@
 
     <build>
         <defaultGoal>install</defaultGoal>
-
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>com.amashchenko.maven.plugin</groupId>
-                    <artifactId>gitflow-maven-plugin</artifactId>
-                    <configuration>
-                        <gitFlowConfig>
-                            <productionBranch>main</productionBranch>
-                        </gitFlowConfig>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.sonatype.plugins</groupId>
-                    <artifactId>nexus-staging-maven-plugin</artifactId>
-                    <version>1.6.13</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
     </build>
 
     <profiles>

src/main/java/com/github/bannmann/restflow/AbstractRequester.java → src/main/java/dev/bannmann/restflow/AbstractRequester.java

@@ -1,4 +1,4 @@
-package com.github.bannmann.restflow;
+package dev.bannmann.restflow;
 
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;

src/main/java/com/github/bannmann/restflow/BasicRestClient.java → src/main/java/dev/bannmann/restflow/BasicRestClient.java

@@ -1,4 +1,4 @@
-package com.github.bannmann.restflow;
+package dev.bannmann.restflow;
 
 import java.net.http.HttpRequest;
 

src/main/java/com/github/bannmann/restflow/ClientConfig.java → src/main/java/dev/bannmann/restflow/ClientConfig.java

@@ -1,4 +1,4 @@
-package com.github.bannmann.restflow;
+package dev.bannmann.restflow;
 
 import java.net.http.HttpClient;
 import java.net.http.HttpResponse;

src/main/java/com/github/bannmann/restflow/ExecuteHandle.java → src/main/java/dev/bannmann/restflow/ExecuteHandle.java

@@ -1,4 +1,4 @@
-package com.github.bannmann.restflow;
+package dev.bannmann.restflow;
 
 import java.util.concurrent.CompletableFuture;
 

src/main/java/com/github/bannmann/restflow/FetchHandle.java → src/main/java/dev/bannmann/restflow/FetchHandle.java

@@ -1,4 +1,4 @@
-package com.github.bannmann.restflow;
+package dev.bannmann.restflow;
 
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;

src/main/java/com/github/bannmann/restflow/OptionalRequester.java → src/main/java/dev/bannmann/restflow/OptionalRequester.java

@@ -1,4 +1,4 @@
-package com.github.bannmann.restflow;
+package dev.bannmann.restflow;
 
 import java.net.http.HttpResponse;
 import java.util.Optional;

src/main/java/com/github/bannmann/restflow/RegularRequester.java → src/main/java/dev/bannmann/restflow/RegularRequester.java

@@ -1,4 +1,4 @@
-package com.github.bannmann.restflow;
+package dev.bannmann.restflow;
 
 import java.net.http.HttpResponse;
 

src/main/java/com/github/bannmann/restflow/RequestBodyHandle.java → src/main/java/dev/bannmann/restflow/RequestBodyHandle.java

@@ -1,4 +1,4 @@
-package com.github.bannmann.restflow;
+package dev.bannmann.restflow;
 
 import java.net.http.HttpRequest;
 

src/main/java/com/github/bannmann/restflow/RequestCustomizer.java → src/main/java/dev/bannmann/restflow/RequestCustomizer.java

@@ -1,4 +1,4 @@
-package com.github.bannmann.restflow;
+package dev.bannmann.restflow;
 
 import java.net.http.HttpRequest;
 

src/main/java/com/github/bannmann/restflow/RequestException.java → src/main/java/dev/bannmann/restflow/RequestException.java

@@ -1,4 +1,4 @@
-package com.github.bannmann.restflow;
+package dev.bannmann.restflow;
 
 import java.net.http.HttpRequest;
 import java.util.Map;

src/main/java/com/github/bannmann/restflow/RequestFailureException.java → src/main/java/dev/bannmann/restflow/RequestFailureException.java

@@ -1,4 +1,4 @@
-package com.github.bannmann.restflow;
+package dev.bannmann.restflow;
 
 import java.net.http.HttpRequest;
 import java.util.Map;

src/main/java/com/github/bannmann/restflow/RequestHandle.java → src/main/java/dev/bannmann/restflow/RequestHandle.java

@@ -1,4 +1,4 @@
-package com.github.bannmann.restflow;
+package dev.bannmann.restflow;
 
 import java.io.InputStream;
 import java.lang.reflect.Type;
@@ -12,7 +12,7 @@
 import lombok.AccessLevel;
 import lombok.RequiredArgsConstructor;
 
-import com.github.bannmann.restflow.util.Types;
+import dev.bannmann.restflow.util.Types;
 
 @RequiredArgsConstructor(access = AccessLevel.PACKAGE)
 public final class RequestHandle

src/main/java/com/github/bannmann/restflow/RequestSpecification.java → src/main/java/dev/bannmann/restflow/RequestSpecification.java

@@ -1,4 +1,4 @@
-package com.github.bannmann.restflow;
+package dev.bannmann.restflow;
 
 import java.net.http.HttpRequest;
 
@@ -7,7 +7,7 @@
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
-import com.github.bannmann.restflow.util.HttpRequests;
+import dev.bannmann.restflow.util.HttpRequests;
 
 @Builder(toBuilder = true)
 @RequiredArgsConstructor(access = AccessLevel.PACKAGE)

src/main/java/com/github/bannmann/restflow/RequestStatusException.java → src/main/java/dev/bannmann/restflow/RequestStatusException.java

@@ -1,4 +1,4 @@
-package com.github.bannmann.restflow;
+package dev.bannmann.restflow;
 
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;

src/main/java/com/github/bannmann/restflow/RequestTemplate.java → src/main/java/dev/bannmann/restflow/RequestTemplate.java

@@ -1,4 +1,4 @@
-package com.github.bannmann.restflow;
+package dev.bannmann.restflow;
 
 import java.net.http.HttpRequest;
 

src/main/java/com/github/bannmann/restflow/Requester.java → src/main/java/dev/bannmann/restflow/Requester.java

@@ -1,4 +1,4 @@
-package com.github.bannmann.restflow;
+package dev.bannmann.restflow;
 
 import java.util.concurrent.CompletableFuture;
 

src/main/java/com/github/bannmann/restflow/ResponseBodyConfig.java → src/main/java/dev/bannmann/restflow/ResponseBodyConfig.java

@@ -1,4 +1,4 @@
-package com.github.bannmann.restflow;
+package dev.bannmann.restflow;
 
 import java.net.http.HttpResponse;
 import java.util.function.Function;

src/main/java/com/github/bannmann/restflow/StandardRestClient.java → src/main/java/dev/bannmann/restflow/StandardRestClient.java

@@ -1,4 +1,4 @@
-package com.github.bannmann.restflow;
+package dev.bannmann.restflow;
 
 import java.net.http.HttpRequest;
 import java.nio.charset.StandardCharsets;

src/main/java/com/github/bannmann/restflow/util/HttpRequests.java → src/main/java/dev/bannmann/restflow/util/HttpRequests.java

@@ -1,4 +1,4 @@
-package com.github.bannmann.restflow.util;
+package dev.bannmann.restflow.util;
 
 import java.net.http.HttpRequest;
 import java.util.List;

src/main/java/com/github/bannmann/restflow/util/Types.java → src/main/java/dev/bannmann/restflow/util/Types.java

@@ -1,4 +1,4 @@
-package com.github.bannmann.restflow.util;
+package dev.bannmann.restflow.util;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;

src/test/java/com/github/bannmann/restflow/AbstractNameableTest.java → src/test/java/dev/bannmann/restflow/AbstractNameableTest.java

@@ -1,4 +1,4 @@
-package com.github.bannmann.restflow;
+package dev.bannmann.restflow;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Parameter;

src/test/java/com/github/bannmann/restflow/TestBasicRestClient.java → src/test/java/dev/bannmann/restflow/TestBasicRestClient.java

@@ -1,4 +1,4 @@
-package com.github.bannmann.restflow;
+package dev.bannmann.restflow;
 
 import static org.assertj.core.api.Assertions.as;
 import static org.assertj.core.api.Assertions.assertThat;

src/test/java/com/github/bannmann/restflow/TestData.java → src/test/java/dev/bannmann/restflow/TestData.java

@@ -1,4 +1,4 @@
-package com.github.bannmann.restflow;
+package dev.bannmann.restflow;
 
 import static java.net.http.HttpRequest.BodyPublishers.noBody;
 import static org.mockserver.model.HttpRequest.request;

src/test/java/com/github/bannmann/restflow/TestStandardRestClient.java → src/test/java/dev/bannmann/restflow/TestStandardRestClient.java

@@ -1,4 +1,4 @@
-package com.github.bannmann.restflow;
+package dev.bannmann.restflow;
 
 import org.testng.annotations.Test;
 

src/test/java/com/github/bannmann/restflow/UseAsTestName.java → src/test/java/dev/bannmann/restflow/UseAsTestName.java

@@ -1,4 +1,4 @@
-package com.github.bannmann.restflow;
+package dev.bannmann.restflow;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/test/java/com/github/bannmann/restflow/util/TestTypes.java → src/test/java/dev/bannmann/restflow/util/TestTypes.java

@@ -1,4 +1,4 @@
-package com.github.bannmann.restflow.util;
+package dev.bannmann.restflow.util;
 
 import static org.assertj.core.api.Assertions.assertThat;