From fbae01b781d9e84c0e909c77cccd83e30e26066a Mon Sep 17 00:00:00 2001 From: Jens Bannmann Date: Sun, 19 Nov 2023 15:09:23 +0100 Subject: [PATCH 1/6] =?UTF-8?q?[gitflow]=C2=A0Update=20for=20next=20develo?= =?UTF-8?q?pment=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a5f613c..624017d 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ com.github.bannmann.restflow restflow - 0.8-SNAPSHOT + 0.9-SNAPSHOT ${project.groupId}:${project.artifactId} Fluent API for Java 11 HTTP Client with JSON-B support From ebb6c099a379691603a68d3b3f355d7dfcffe77e Mon Sep 17 00:00:00 2001 From: Jens Bannmann Date: Sun, 19 Nov 2023 15:10:33 +0100 Subject: [PATCH 2/6] =?UTF-8?q?[gitflow]=C2=A0Update=20develop=20to=20prod?= =?UTF-8?q?uction=20version=20to=20avoid=20merge=20conflicts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 624017d..d579ac2 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ com.github.bannmann.restflow restflow - 0.9-SNAPSHOT + 0.8 ${project.groupId}:${project.artifactId} Fluent API for Java 11 HTTP Client with JSON-B support From 763fbc0f4079d71e57db0f70c0d20a549910435a Mon Sep 17 00:00:00 2001 From: Jens Bannmann Date: Sun, 19 Nov 2023 15:10:37 +0100 Subject: [PATCH 3/6] =?UTF-8?q?[gitflow]=C2=A0Update=20develop=20version?= =?UTF-8?q?=20back=20to=20pre-merge=20state?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d579ac2..624017d 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ com.github.bannmann.restflow restflow - 0.8 + 0.9-SNAPSHOT ${project.groupId}:${project.artifactId} Fluent API for Java 11 HTTP Client with JSON-B support From faa31b8a15d060106d75e54bf5e443e5e7287dfb Mon Sep 17 00:00:00 2001 From: Jens Bannmann Date: Wed, 22 Nov 2023 19:15:59 +0100 Subject: [PATCH 4/6] Switch to new group ID, upgrade to new base POM --- pom.xml | 25 +++---------------- .../bannmann/restflow/AbstractRequester.java | 2 +- .../bannmann/restflow/BasicRestClient.java | 2 +- .../bannmann/restflow/ClientConfig.java | 2 +- .../bannmann/restflow/ExecuteHandle.java | 2 +- .../bannmann/restflow/FetchHandle.java | 2 +- .../bannmann/restflow/OptionalRequester.java | 2 +- .../bannmann/restflow/RegularRequester.java | 2 +- .../bannmann/restflow/RequestBodyHandle.java | 2 +- .../bannmann/restflow/RequestCustomizer.java | 2 +- .../bannmann/restflow/RequestException.java | 2 +- .../restflow/RequestFailureException.java | 2 +- .../bannmann/restflow/RequestHandle.java | 4 +-- .../restflow/RequestSpecification.java | 4 +-- .../restflow/RequestStatusException.java | 2 +- .../bannmann/restflow/RequestTemplate.java | 2 +- .../bannmann/restflow/Requester.java | 2 +- .../bannmann/restflow/ResponseBodyConfig.java | 2 +- .../bannmann/restflow/StandardRestClient.java | 2 +- .../bannmann/restflow/util/HttpRequests.java | 2 +- .../bannmann/restflow/util/Types.java | 2 +- .../restflow/AbstractNameableTest.java | 2 +- .../restflow/TestBasicRestClient.java | 2 +- .../bannmann/restflow/TestData.java | 2 +- .../restflow/TestStandardRestClient.java | 2 +- .../bannmann/restflow/UseAsTestName.java | 2 +- .../bannmann/restflow/util/TestTypes.java | 2 +- 27 files changed, 31 insertions(+), 50 deletions(-) rename src/main/java/{com/github => dev}/bannmann/restflow/AbstractRequester.java (98%) rename src/main/java/{com/github => dev}/bannmann/restflow/BasicRestClient.java (88%) rename src/main/java/{com/github => dev}/bannmann/restflow/ClientConfig.java (95%) rename src/main/java/{com/github => dev}/bannmann/restflow/ExecuteHandle.java (93%) rename src/main/java/{com/github => dev}/bannmann/restflow/FetchHandle.java (94%) rename src/main/java/{com/github => dev}/bannmann/restflow/OptionalRequester.java (97%) rename src/main/java/{com/github => dev}/bannmann/restflow/RegularRequester.java (96%) rename src/main/java/{com/github => dev}/bannmann/restflow/RequestBodyHandle.java (95%) rename src/main/java/{com/github => dev}/bannmann/restflow/RequestCustomizer.java (93%) rename src/main/java/{com/github => dev}/bannmann/restflow/RequestException.java (94%) rename src/main/java/{com/github => dev}/bannmann/restflow/RequestFailureException.java (91%) rename src/main/java/{com/github => dev}/bannmann/restflow/RequestHandle.java (96%) rename src/main/java/{com/github => dev}/bannmann/restflow/RequestSpecification.java (92%) rename src/main/java/{com/github => dev}/bannmann/restflow/RequestStatusException.java (95%) rename src/main/java/{com/github => dev}/bannmann/restflow/RequestTemplate.java (96%) rename src/main/java/{com/github => dev}/bannmann/restflow/Requester.java (74%) rename src/main/java/{com/github => dev}/bannmann/restflow/ResponseBodyConfig.java (89%) rename src/main/java/{com/github => dev}/bannmann/restflow/StandardRestClient.java (99%) rename src/main/java/{com/github => dev}/bannmann/restflow/util/HttpRequests.java (97%) rename src/main/java/{com/github => dev}/bannmann/restflow/util/Types.java (97%) rename src/test/java/{com/github => dev}/bannmann/restflow/AbstractNameableTest.java (96%) rename src/test/java/{com/github => dev}/bannmann/restflow/TestBasicRestClient.java (99%) rename src/test/java/{com/github => dev}/bannmann/restflow/TestData.java (98%) rename src/test/java/{com/github => dev}/bannmann/restflow/TestStandardRestClient.java (89%) rename src/test/java/{com/github => dev}/bannmann/restflow/UseAsTestName.java (87%) rename src/test/java/{com/github => dev}/bannmann/restflow/util/TestTypes.java (91%) diff --git a/pom.xml b/pom.xml index 624017d..9bdc631 100644 --- a/pom.xml +++ b/pom.xml @@ -3,12 +3,12 @@ 4.0.0 - com.github.bannmann + dev.bannmann base - 1.3 + 1.5 - com.github.bannmann.restflow + dev.bannmann.restflow restflow 0.9-SNAPSHOT @@ -124,25 +124,6 @@ install - - - - - com.amashchenko.maven.plugin - gitflow-maven-plugin - - - main - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.13 - - - diff --git a/src/main/java/com/github/bannmann/restflow/AbstractRequester.java b/src/main/java/dev/bannmann/restflow/AbstractRequester.java similarity index 98% rename from src/main/java/com/github/bannmann/restflow/AbstractRequester.java rename to src/main/java/dev/bannmann/restflow/AbstractRequester.java index e3f53a9..9dcb1b7 100644 --- a/src/main/java/com/github/bannmann/restflow/AbstractRequester.java +++ b/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; diff --git a/src/main/java/com/github/bannmann/restflow/BasicRestClient.java b/src/main/java/dev/bannmann/restflow/BasicRestClient.java similarity index 88% rename from src/main/java/com/github/bannmann/restflow/BasicRestClient.java rename to src/main/java/dev/bannmann/restflow/BasicRestClient.java index e0dc41a..64ea27a 100644 --- a/src/main/java/com/github/bannmann/restflow/BasicRestClient.java +++ b/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; diff --git a/src/main/java/com/github/bannmann/restflow/ClientConfig.java b/src/main/java/dev/bannmann/restflow/ClientConfig.java similarity index 95% rename from src/main/java/com/github/bannmann/restflow/ClientConfig.java rename to src/main/java/dev/bannmann/restflow/ClientConfig.java index 17a0a3a..506bcf9 100644 --- a/src/main/java/com/github/bannmann/restflow/ClientConfig.java +++ b/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; diff --git a/src/main/java/com/github/bannmann/restflow/ExecuteHandle.java b/src/main/java/dev/bannmann/restflow/ExecuteHandle.java similarity index 93% rename from src/main/java/com/github/bannmann/restflow/ExecuteHandle.java rename to src/main/java/dev/bannmann/restflow/ExecuteHandle.java index daa1f5f..6c17ae4 100644 --- a/src/main/java/com/github/bannmann/restflow/ExecuteHandle.java +++ b/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; diff --git a/src/main/java/com/github/bannmann/restflow/FetchHandle.java b/src/main/java/dev/bannmann/restflow/FetchHandle.java similarity index 94% rename from src/main/java/com/github/bannmann/restflow/FetchHandle.java rename to src/main/java/dev/bannmann/restflow/FetchHandle.java index 79d8aa2..fe5f47c 100644 --- a/src/main/java/com/github/bannmann/restflow/FetchHandle.java +++ b/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; diff --git a/src/main/java/com/github/bannmann/restflow/OptionalRequester.java b/src/main/java/dev/bannmann/restflow/OptionalRequester.java similarity index 97% rename from src/main/java/com/github/bannmann/restflow/OptionalRequester.java rename to src/main/java/dev/bannmann/restflow/OptionalRequester.java index eb69597..a4b3087 100644 --- a/src/main/java/com/github/bannmann/restflow/OptionalRequester.java +++ b/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; diff --git a/src/main/java/com/github/bannmann/restflow/RegularRequester.java b/src/main/java/dev/bannmann/restflow/RegularRequester.java similarity index 96% rename from src/main/java/com/github/bannmann/restflow/RegularRequester.java rename to src/main/java/dev/bannmann/restflow/RegularRequester.java index 07b4349..587fbf9 100644 --- a/src/main/java/com/github/bannmann/restflow/RegularRequester.java +++ b/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; diff --git a/src/main/java/com/github/bannmann/restflow/RequestBodyHandle.java b/src/main/java/dev/bannmann/restflow/RequestBodyHandle.java similarity index 95% rename from src/main/java/com/github/bannmann/restflow/RequestBodyHandle.java rename to src/main/java/dev/bannmann/restflow/RequestBodyHandle.java index 9a0eb0c..8b2aaf9 100644 --- a/src/main/java/com/github/bannmann/restflow/RequestBodyHandle.java +++ b/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; diff --git a/src/main/java/com/github/bannmann/restflow/RequestCustomizer.java b/src/main/java/dev/bannmann/restflow/RequestCustomizer.java similarity index 93% rename from src/main/java/com/github/bannmann/restflow/RequestCustomizer.java rename to src/main/java/dev/bannmann/restflow/RequestCustomizer.java index a456eb7..cb1f91b 100644 --- a/src/main/java/com/github/bannmann/restflow/RequestCustomizer.java +++ b/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; diff --git a/src/main/java/com/github/bannmann/restflow/RequestException.java b/src/main/java/dev/bannmann/restflow/RequestException.java similarity index 94% rename from src/main/java/com/github/bannmann/restflow/RequestException.java rename to src/main/java/dev/bannmann/restflow/RequestException.java index 5dd6a2f..b0b690e 100644 --- a/src/main/java/com/github/bannmann/restflow/RequestException.java +++ b/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; diff --git a/src/main/java/com/github/bannmann/restflow/RequestFailureException.java b/src/main/java/dev/bannmann/restflow/RequestFailureException.java similarity index 91% rename from src/main/java/com/github/bannmann/restflow/RequestFailureException.java rename to src/main/java/dev/bannmann/restflow/RequestFailureException.java index 158724e..96a3ddb 100644 --- a/src/main/java/com/github/bannmann/restflow/RequestFailureException.java +++ b/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; diff --git a/src/main/java/com/github/bannmann/restflow/RequestHandle.java b/src/main/java/dev/bannmann/restflow/RequestHandle.java similarity index 96% rename from src/main/java/com/github/bannmann/restflow/RequestHandle.java rename to src/main/java/dev/bannmann/restflow/RequestHandle.java index 4c52464..910fd96 100644 --- a/src/main/java/com/github/bannmann/restflow/RequestHandle.java +++ b/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 diff --git a/src/main/java/com/github/bannmann/restflow/RequestSpecification.java b/src/main/java/dev/bannmann/restflow/RequestSpecification.java similarity index 92% rename from src/main/java/com/github/bannmann/restflow/RequestSpecification.java rename to src/main/java/dev/bannmann/restflow/RequestSpecification.java index bab90b3..36fb936 100644 --- a/src/main/java/com/github/bannmann/restflow/RequestSpecification.java +++ b/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) diff --git a/src/main/java/com/github/bannmann/restflow/RequestStatusException.java b/src/main/java/dev/bannmann/restflow/RequestStatusException.java similarity index 95% rename from src/main/java/com/github/bannmann/restflow/RequestStatusException.java rename to src/main/java/dev/bannmann/restflow/RequestStatusException.java index c255530..0eadbde 100644 --- a/src/main/java/com/github/bannmann/restflow/RequestStatusException.java +++ b/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; diff --git a/src/main/java/com/github/bannmann/restflow/RequestTemplate.java b/src/main/java/dev/bannmann/restflow/RequestTemplate.java similarity index 96% rename from src/main/java/com/github/bannmann/restflow/RequestTemplate.java rename to src/main/java/dev/bannmann/restflow/RequestTemplate.java index b3591c4..1c7e77f 100644 --- a/src/main/java/com/github/bannmann/restflow/RequestTemplate.java +++ b/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; diff --git a/src/main/java/com/github/bannmann/restflow/Requester.java b/src/main/java/dev/bannmann/restflow/Requester.java similarity index 74% rename from src/main/java/com/github/bannmann/restflow/Requester.java rename to src/main/java/dev/bannmann/restflow/Requester.java index 90b477c..56a8be3 100644 --- a/src/main/java/com/github/bannmann/restflow/Requester.java +++ b/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; diff --git a/src/main/java/com/github/bannmann/restflow/ResponseBodyConfig.java b/src/main/java/dev/bannmann/restflow/ResponseBodyConfig.java similarity index 89% rename from src/main/java/com/github/bannmann/restflow/ResponseBodyConfig.java rename to src/main/java/dev/bannmann/restflow/ResponseBodyConfig.java index e91c876..efa75c5 100644 --- a/src/main/java/com/github/bannmann/restflow/ResponseBodyConfig.java +++ b/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; diff --git a/src/main/java/com/github/bannmann/restflow/StandardRestClient.java b/src/main/java/dev/bannmann/restflow/StandardRestClient.java similarity index 99% rename from src/main/java/com/github/bannmann/restflow/StandardRestClient.java rename to src/main/java/dev/bannmann/restflow/StandardRestClient.java index ab7bd76..798399e 100644 --- a/src/main/java/com/github/bannmann/restflow/StandardRestClient.java +++ b/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; diff --git a/src/main/java/com/github/bannmann/restflow/util/HttpRequests.java b/src/main/java/dev/bannmann/restflow/util/HttpRequests.java similarity index 97% rename from src/main/java/com/github/bannmann/restflow/util/HttpRequests.java rename to src/main/java/dev/bannmann/restflow/util/HttpRequests.java index 0193468..afab706 100644 --- a/src/main/java/com/github/bannmann/restflow/util/HttpRequests.java +++ b/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; diff --git a/src/main/java/com/github/bannmann/restflow/util/Types.java b/src/main/java/dev/bannmann/restflow/util/Types.java similarity index 97% rename from src/main/java/com/github/bannmann/restflow/util/Types.java rename to src/main/java/dev/bannmann/restflow/util/Types.java index d979064..b2904d0 100644 --- a/src/main/java/com/github/bannmann/restflow/util/Types.java +++ b/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; diff --git a/src/test/java/com/github/bannmann/restflow/AbstractNameableTest.java b/src/test/java/dev/bannmann/restflow/AbstractNameableTest.java similarity index 96% rename from src/test/java/com/github/bannmann/restflow/AbstractNameableTest.java rename to src/test/java/dev/bannmann/restflow/AbstractNameableTest.java index 1dd556c..646a0f8 100644 --- a/src/test/java/com/github/bannmann/restflow/AbstractNameableTest.java +++ b/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; diff --git a/src/test/java/com/github/bannmann/restflow/TestBasicRestClient.java b/src/test/java/dev/bannmann/restflow/TestBasicRestClient.java similarity index 99% rename from src/test/java/com/github/bannmann/restflow/TestBasicRestClient.java rename to src/test/java/dev/bannmann/restflow/TestBasicRestClient.java index e4e0f1e..6aa1ae1 100644 --- a/src/test/java/com/github/bannmann/restflow/TestBasicRestClient.java +++ b/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; diff --git a/src/test/java/com/github/bannmann/restflow/TestData.java b/src/test/java/dev/bannmann/restflow/TestData.java similarity index 98% rename from src/test/java/com/github/bannmann/restflow/TestData.java rename to src/test/java/dev/bannmann/restflow/TestData.java index d54bbf2..f641fa7 100644 --- a/src/test/java/com/github/bannmann/restflow/TestData.java +++ b/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; diff --git a/src/test/java/com/github/bannmann/restflow/TestStandardRestClient.java b/src/test/java/dev/bannmann/restflow/TestStandardRestClient.java similarity index 89% rename from src/test/java/com/github/bannmann/restflow/TestStandardRestClient.java rename to src/test/java/dev/bannmann/restflow/TestStandardRestClient.java index ab3c61f..65ee25f 100644 --- a/src/test/java/com/github/bannmann/restflow/TestStandardRestClient.java +++ b/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; diff --git a/src/test/java/com/github/bannmann/restflow/UseAsTestName.java b/src/test/java/dev/bannmann/restflow/UseAsTestName.java similarity index 87% rename from src/test/java/com/github/bannmann/restflow/UseAsTestName.java rename to src/test/java/dev/bannmann/restflow/UseAsTestName.java index c60131a..4dc5a99 100644 --- a/src/test/java/com/github/bannmann/restflow/UseAsTestName.java +++ b/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; diff --git a/src/test/java/com/github/bannmann/restflow/util/TestTypes.java b/src/test/java/dev/bannmann/restflow/util/TestTypes.java similarity index 91% rename from src/test/java/com/github/bannmann/restflow/util/TestTypes.java rename to src/test/java/dev/bannmann/restflow/util/TestTypes.java index 8fae454..4921187 100644 --- a/src/test/java/com/github/bannmann/restflow/util/TestTypes.java +++ b/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; From df0f2fc299223b57373195e768bd6e8c5f226526 Mon Sep 17 00:00:00 2001 From: Jens Bannmann Date: Wed, 22 Nov 2023 19:43:39 +0100 Subject: [PATCH 5/6] Upgrade Talos and start using Actions variables --- .github/workflows/build.yml | 44 ++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 782aeeb..666e18f 100644 --- a/.github/workflows/build.yml +++ b/.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 From fcb408554262bac4d57dbd106839aba8ea96e041 Mon Sep 17 00:00:00 2001 From: Jens Bannmann Date: Wed, 22 Nov 2023 19:46:31 +0100 Subject: [PATCH 6/6] =?UTF-8?q?[gitflow]=C2=A0Update=20for=20next=20develo?= =?UTF-8?q?pment=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9bdc631..36da872 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ dev.bannmann.restflow restflow - 0.9-SNAPSHOT + 0.9 ${project.groupId}:${project.artifactId} Fluent API for Java 11 HTTP Client with JSON-B support