diff --git a/CHANGELOG.md b/CHANGELOG.md index 949fc484..66e7747d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ ## Release Notes +`1.3.2` + +- Added `Strings.nonBlankOrDefault(String, String)` to return a default when the value is blank. +- Added `Strings.nonBlankOrGet(String, Supplier)` to return a supplied default when the value is blank. +- Changed `Headers.of` to use `CaseInsensitiveLinkedHashMap` from MorphiX. +- Updated `ApacheHC5ExchangeClient` to use `CaseInsensitiveLinkedHashMap` from MorphiX. +- Updated `OkHttpExchangeClient` to use `CaseInsensitiveLinkedHashMap` from MorphiX. +- Upgraded `oauth2-oidc-sdk` to `11.39`. +- Upgraded OkHttp to `5.5.1`, Maven users now resolve the JVM artifact as `okhttp-jvm`. +- Upgraded `morphix-all` to `1.1.0`. + +--- + `1.3.1` - Preserved header insertion order in `Headers.of()`. diff --git a/README.md b/README.md index f5e33fd5..2b53316d 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ Support is being developed for other HTTP clients like Netty, Jersey, etc. If yo ### Releases -Current release `1.3.1` +Current release `1.3.2` ### Getting Started @@ -62,7 +62,7 @@ Maven: add this dependency to your `pom.xml` io.github.raduking apiphany - 1.3.1 + 1.3.2 ``` @@ -146,7 +146,7 @@ By default Apiphany uses the JDK `java.net.http` client. You can switch to anoth #### Apache HttpClient5 -Add the `apiphany-httpclient5` dependency, then: +Add the `apiphany-httpclient5` and `org.apache.httpcomponents.client5:httpclient5` dependencies, then: ```java import org.apiphany.client.http.ApacheHC5HttpExchangeClient; @@ -162,7 +162,7 @@ String name = http(client) #### OkHttp -Add the `apiphany-okhttp` dependency, then: +Add the `apiphany-okhttp` and `com.squareup.okhttp3:okhttp-jvm` dependencies, then: ```java import org.apiphany.client.http.OkHttpExchangeClient; @@ -176,6 +176,8 @@ String name = http(client) .orRethrow(); ``` +If you want to use the most used OkHttp version `4.12.x` you need to add `com.squareup.okhttp3:okhttp` dependency. + #### Spring `RestClient` Add the `apiphany-spring` dependency, then: diff --git a/apiphany-core/pom.xml b/apiphany-core/pom.xml index 8f7a035f..401b4494 100644 --- a/apiphany-core/pom.xml +++ b/apiphany-core/pom.xml @@ -8,7 +8,7 @@ io.github.raduking apiphany-parent - 1.3.1 + 1.3.2 apiphany diff --git a/apiphany-core/src/main/java/org/apiphany/header/Headers.java b/apiphany-core/src/main/java/org/apiphany/header/Headers.java index d760e2f8..f4c65bba 100644 --- a/apiphany-core/src/main/java/org/apiphany/header/Headers.java +++ b/apiphany-core/src/main/java/org/apiphany/header/Headers.java @@ -3,7 +3,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.function.BiPredicate; @@ -12,6 +11,7 @@ import org.apiphany.lang.Strings; import org.morphix.lang.Nullables; +import org.morphix.lang.collections.CaseInsensitiveLinkedHashMap; import org.morphix.lang.collections.Lists; import org.morphix.lang.collections.Maps; @@ -39,8 +39,7 @@ static Map> of(final HeaderFunction... headerFunctions) { if (null == headerFunctions || 0 == headerFunctions.length) { return Collections.emptyMap(); } - // TODO: implement a case insensitive linked hash map - var map = new LinkedHashMap>(); + var map = new CaseInsensitiveLinkedHashMap>(); for (HeaderFunction headerFunction : headerFunctions) { headerFunction.addTo(map); } diff --git a/apiphany-core/src/main/java/org/apiphany/lang/Strings.java b/apiphany-core/src/main/java/org/apiphany/lang/Strings.java index 1fa23e3b..a9f609b5 100644 --- a/apiphany-core/src/main/java/org/apiphany/lang/Strings.java +++ b/apiphany-core/src/main/java/org/apiphany/lang/Strings.java @@ -7,6 +7,7 @@ import java.util.Collection; import java.util.Objects; import java.util.function.Consumer; +import java.util.function.Supplier; import org.apiphany.io.IOStreams; import org.apiphany.io.ResourceLocation; @@ -543,4 +544,26 @@ static boolean equalsIgnoreCase(final String a, final String b) { } return null != a && a.equalsIgnoreCase(b); } + + /** + * Returns the given string if it is not blank, otherwise the default value. + * + * @param value a string + * @param defaultValue default value if value is blank + * @return the given string if it is not blank, otherwise the default value + */ + static String nonBlankOrDefault(final String value, final String defaultValue) { + return isNotBlank(value) ? value : defaultValue; + } + + /** + * Returns the given string if it is not blank, otherwise the supplied default value. + * + * @param value a string + * @param defaultValue default value if value is blank + * @return the given string if it is not blank, otherwise the supplied default value + */ + static String nonBlankOrGet(final String value, final Supplier defaultValue) { + return isNotBlank(value) ? value : defaultValue.get(); + } } diff --git a/apiphany-core/src/test/java/org/apiphany/header/HeadersTest.java b/apiphany-core/src/test/java/org/apiphany/header/HeadersTest.java index 19a7465a..f85fe983 100644 --- a/apiphany-core/src/test/java/org/apiphany/header/HeadersTest.java +++ b/apiphany-core/src/test/java/org/apiphany/header/HeadersTest.java @@ -472,6 +472,17 @@ void shouldPreserveHeaderInsertionOrder() { assertThat(List.copyOf(resultHeaders.keySet()), equalTo(List.of("first", "second", "third"))); } + @Test + void shouldTreatHeaderNamesAsCaseInsensitive() { + Map> resultHeaders = Headers.of( + HeaderFunction.header("Content-Type", "application/json"), + HeaderFunction.header("content-type", "text/plain")); + + assertThat(resultHeaders.size(), equalTo(1)); + assertThat(resultHeaders.get("CONTENT-TYPE"), equalTo(List.of("application/json", "text/plain"))); + assertThat(List.copyOf(resultHeaders.keySet()), equalTo(List.of("Content-Type"))); + } + @Test void shouldCreateHeadersMapWithNoHeaders() { Map> resultHeaders = Headers.of(); diff --git a/apiphany-core/src/test/java/org/apiphany/lang/StringsTest.java b/apiphany-core/src/test/java/org/apiphany/lang/StringsTest.java index 4109c948..0b6112fa 100644 --- a/apiphany-core/src/test/java/org/apiphany/lang/StringsTest.java +++ b/apiphany-core/src/test/java/org/apiphany/lang/StringsTest.java @@ -7,7 +7,9 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -19,6 +21,7 @@ import java.util.Arrays; import java.util.List; import java.util.function.Consumer; +import java.util.function.Supplier; import java.util.stream.Stream; import org.junit.jupiter.api.Nested; @@ -794,6 +797,74 @@ private static Stream provideUnequalIgnoreCasePairs() { } } + /** + * Tests for: + *
    + *
  • {@link Strings#nonBlankOrDefault(String, String)}
  • + *
+ */ + @Nested + class NonBlankOrDefaultTests { + + @Test + void shouldReturnValueWhenNotBlank() { + assertThat(Strings.nonBlankOrDefault(TEST_STRING, "default"), equalTo(TEST_STRING)); + assertThat(Strings.nonBlankOrDefault(NOT_BLANK_STRING, "default"), equalTo(NOT_BLANK_STRING)); + } + + @ParameterizedTest + @MethodSource("provideBlankValues") + void shouldReturnDefaultWhenValueIsBlank(final String blankValue) { + assertThat(Strings.nonBlankOrDefault(blankValue, "default"), equalTo("default")); + } + + private static Stream provideBlankValues() { + return Stream.of( + Arguments.of((String) null), + Arguments.of(""), + Arguments.of(BLANK_STRING)); + } + } + + /** + * Tests for: + *
    + *
  • {@link Strings#nonBlankOrGet(String, Supplier)}
  • + *
+ */ + @Nested + class NonBlankOrGetTests { + + @Test + void shouldReturnValueWhenNotBlankWithoutCallingSupplier() { + @SuppressWarnings("unchecked") + Supplier defaultValue = mock(Supplier.class); + + assertThat(Strings.nonBlankOrGet(TEST_STRING, defaultValue), equalTo(TEST_STRING)); + + verify(defaultValue, never()).get(); + } + + @ParameterizedTest + @MethodSource("provideBlankValues") + void shouldReturnSuppliedDefaultWhenValueIsBlank(final String blankValue) { + @SuppressWarnings("unchecked") + Supplier defaultValue = mock(Supplier.class); + when(defaultValue.get()).thenReturn("default"); + + assertThat(Strings.nonBlankOrGet(blankValue, defaultValue), equalTo("default")); + + verify(defaultValue).get(); + } + + private static Stream provideBlankValues() { + return Stream.of( + Arguments.of((String) null), + Arguments.of(""), + Arguments.of(BLANK_STRING)); + } + } + @Nested class EndsWithAnyTests { diff --git a/apiphany-httpclient5/pom.xml b/apiphany-httpclient5/pom.xml index a3f7a50f..0bf01a48 100644 --- a/apiphany-httpclient5/pom.xml +++ b/apiphany-httpclient5/pom.xml @@ -8,7 +8,7 @@ io.github.raduking apiphany-parent - 1.3.1 + 1.3.2 apiphany-httpclient5 diff --git a/apiphany-httpclient5/src/main/java/org/apiphany/client/http/ApacheHC5HttpExchangeClient.java b/apiphany-httpclient5/src/main/java/org/apiphany/client/http/ApacheHC5HttpExchangeClient.java index 58195e5c..8e05ce62 100644 --- a/apiphany-httpclient5/src/main/java/org/apiphany/client/http/ApacheHC5HttpExchangeClient.java +++ b/apiphany-httpclient5/src/main/java/org/apiphany/client/http/ApacheHC5HttpExchangeClient.java @@ -5,7 +5,6 @@ import java.io.Serializable; import java.net.URI; import java.nio.file.Path; -import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.function.Predicate; @@ -51,6 +50,7 @@ import org.apiphany.io.InputStreamSupplier; import org.morphix.lang.JavaObjects; import org.morphix.lang.Nullables; +import org.morphix.lang.collections.CaseInsensitiveLinkedHashMap; import org.morphix.lang.collections.Lists; import org.morphix.lang.collections.Maps; import org.morphix.lang.function.Predicates; @@ -380,7 +380,7 @@ public static HttpUriRequest toHttpUriRequest(final URI uri, final String httpMe * @return HTTP headers */ public static Map> toHttpHeadersMap(final Header[] headers) { - var httpHeaders = new LinkedHashMap>(); + var httpHeaders = new CaseInsensitiveLinkedHashMap>(); for (Header header : headers) { Headers.addTo(httpHeaders, header.getName(), header.getValue()); } diff --git a/apiphany-httpclient5/src/test/java/org/apiphany/client/http/ApacheHC5HttpExchangeClientTest.java b/apiphany-httpclient5/src/test/java/org/apiphany/client/http/ApacheHC5HttpExchangeClientTest.java index e32d5384..97ce2cdd 100644 --- a/apiphany-httpclient5/src/test/java/org/apiphany/client/http/ApacheHC5HttpExchangeClientTest.java +++ b/apiphany-httpclient5/src/test/java/org/apiphany/client/http/ApacheHC5HttpExchangeClientTest.java @@ -246,6 +246,20 @@ void shouldAccumulateMultipleValuesForSameHeader() { assertThat(result.get("Accept"), equalTo(List.of("text/html", "application/json"))); } + + @Test + void shouldTreatHeaderNamesAsCaseInsensitive() { + Header[] headers = new Header[] { + new BasicHeader("Content-Type", "application/json"), + new BasicHeader("content-type", "text/plain") + }; + + Map> result = ApacheHC5HttpExchangeClient.toHttpHeadersMap(headers); + + assertThat(result.size(), equalTo(1)); + assertThat(result.get("CONTENT-TYPE"), equalTo(List.of("application/json", "text/plain"))); + assertThat(result.keySet().iterator().next(), equalTo("Content-Type")); + } } @Nested diff --git a/apiphany-integration-tests/pom.xml b/apiphany-integration-tests/pom.xml index 2ee2cb41..b9e52eeb 100644 --- a/apiphany-integration-tests/pom.xml +++ b/apiphany-integration-tests/pom.xml @@ -8,7 +8,7 @@ io.github.raduking apiphany-parent - 1.3.1 + 1.3.2 apiphany-integration-tests diff --git a/apiphany-okhttp/pom.xml b/apiphany-okhttp/pom.xml index 194636cd..cacfcfaa 100644 --- a/apiphany-okhttp/pom.xml +++ b/apiphany-okhttp/pom.xml @@ -8,7 +8,7 @@ io.github.raduking apiphany-parent - 1.3.1 + 1.3.2 apiphany-okhttp @@ -65,7 +65,7 @@ com.squareup.okhttp3 - okhttp + ${okhttp.artifact.id} provided diff --git a/apiphany-okhttp/src/main/java/org/apiphany/client/http/OkHttpExchangeClient.java b/apiphany-okhttp/src/main/java/org/apiphany/client/http/OkHttpExchangeClient.java index 94b35d97..9b05f153 100644 --- a/apiphany-okhttp/src/main/java/org/apiphany/client/http/OkHttpExchangeClient.java +++ b/apiphany-okhttp/src/main/java/org/apiphany/client/http/OkHttpExchangeClient.java @@ -2,14 +2,12 @@ import java.io.File; import java.io.InputStream; -import java.io.Serial; import java.io.Serializable; import java.net.URI; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.nio.file.Path; import java.util.ArrayList; -import java.util.LinkedHashMap; import java.util.List; import java.util.Locale; import java.util.Map; @@ -36,6 +34,7 @@ import org.apiphany.security.ssl.SSLProperties; import org.morphix.lang.JavaObjects; import org.morphix.lang.Nullables; +import org.morphix.lang.collections.CaseInsensitiveLinkedHashMap; import org.morphix.lang.collections.Lists; import org.morphix.lang.collections.Maps; import org.morphix.lang.function.Predicates; @@ -308,78 +307,15 @@ protected ApiResponse buildResponse(final ApiRequest apiRequest, fi * @return HTTP headers in their first-seen order */ static Map> toHttpHeadersMap(final Headers headers) { - Map> result = new CaseInsensitiveStringLinkedHashMap<>(); + Map> result = new CaseInsensitiveLinkedHashMap<>(); for (int i = 0; i < headers.size(); ++i) { - String name = headers.name(i).toLowerCase(Locale.US); - result.computeIfAbsent(name, key -> new ArrayList<>(2)).add(headers.value(i)); + String name = headers.name(i); + String value = headers.value(i); + result.computeIfAbsent(name, key -> new ArrayList<>(2)).add(value); } return result; } - /** - * Insertion-ordered map used for OkHttp response headers. Header names are stored in lowercase and can be retrieved - * case-insensitively. - * - * @author Radu Sebastian LAZIN - */ - private static final class CaseInsensitiveStringLinkedHashMap extends LinkedHashMap { - - /** - * Serial version UID for serialization. - */ - @Serial - private static final long serialVersionUID = -1595053084733211507L; - - /** - * Constructs a new, empty map with insertion order. - */ - public CaseInsensitiveStringLinkedHashMap() { - // empty - } - - /** - * @see LinkedHashMap#get(Object) - */ - @Override - public V get(final Object key) { - return super.get(normalize(key)); - } - - /** - * @see LinkedHashMap#put(String, Object) - */ - @Override - public boolean containsKey(final Object key) { - return super.containsKey(normalize(key)); - } - - /** - * @see LinkedHashMap#put(String, Object) - */ - @Override - public V remove(final Object key) { - return super.remove(normalize(key)); - } - - /** - * @see LinkedHashMap#put(String, Object) - */ - @Override - public V getOrDefault(final Object key, final V defaultValue) { - return super.getOrDefault(normalize(key), defaultValue); - } - - /** - * Normalizes the given key to a lowercase string using {@link Locale#US}. Returns null if the key is not a string. - * - * @param key the key to normalize - * @return the normalized key, or null if the key is not a string - */ - private static String normalize(final Object key) { - return key instanceof String string ? string.toLowerCase(Locale.US) : null; - } - } - /** * Returns the response body converted to the target type. If the request is a stream, the response body is returned as * an input stream, otherwise it is returned as a byte array. diff --git a/apiphany-okhttp/src/main/java/org/apiphany/http/OkHttpLibrary.java b/apiphany-okhttp/src/main/java/org/apiphany/http/OkHttpLibrary.java index 6698338d..87c32973 100644 --- a/apiphany-okhttp/src/main/java/org/apiphany/http/OkHttpLibrary.java +++ b/apiphany-okhttp/src/main/java/org/apiphany/http/OkHttpLibrary.java @@ -21,34 +21,30 @@ public class OkHttpLibrary { public static final String CLIENT_NAME = "okhttp"; /** - * The minimum OkHttp version this module was built against and requires at runtime: 4.9.0. + * The minimum OkHttp version this module was built against and requires at runtime: 4.12.1. */ - private static final LibraryVersion MINIMUM_VERSION = LibraryVersion.of(CLIENT_NAME, 4, 9, 0); + private static final LibraryVersion MINIMUM_VERSION = LibraryVersion.of(CLIENT_NAME, 4, 12, 1); /** - * The maximum OkHttp version this module supports, i.e. the highest version it was tested against: 4.12.1. + * The maximum OkHttp version this module supports, i.e. the highest version it was tested against: 5.5.1. *

* A newer runtime version is outside the tested range and is rejected by {@link #verifyVersion()}. */ - private static final LibraryVersion MAXIMUM_VERSION = LibraryVersion.of(CLIENT_NAME, 4, 12, 1); + private static final LibraryVersion MAXIMUM_VERSION = LibraryVersion.of(CLIENT_NAME, 5, 5, 1); /** - * The OkHttp OkHttpClient class name. + * The OkHttp client class name, used as the version anchor because the OkHttp jar does not carry an + * {@code Implementation-Version} manifest entry. This is a public class so the check remains compatible with OkHttp's + * Java module boundaries. */ private static final String OKHTTP_CLIENT_CLASS_NAME = "okhttp3.OkHttpClient"; - /** - * The OkHttp {@code Platform} class name, used as the version anchor because the OkHttp jar does not carry an - * {@code Implementation-Version} manifest entry. - */ - private static final String OKHTTP_PLATFORM_CLASS_NAME = "okhttp3.internal.platform.Platform"; - /** * The runtime version of the OkHttp library. OkHttp jars do not declare an {@code Implementation-Version} manifest * entry, so the version cannot be detected at runtime and this is always {@code null}; use {@link #isPresent()} to - * check for the library instead. + * check for the library instead. The public {@code OkHttpClient} class is used as the package version anchor. */ - private static final LibraryVersion VERSION = LibraryVersion.of(CLIENT_NAME, Classes.Safe.getOne(OKHTTP_PLATFORM_CLASS_NAME)); + private static final LibraryVersion VERSION = LibraryVersion.of(CLIENT_NAME, Classes.Safe.getOne(OKHTTP_CLIENT_CLASS_NAME)); /** * Checks if the OkHttp library is present in the classpath. diff --git a/apiphany-okhttp/src/test/java/org/apiphany/client/http/OkHttpExchangeClientTest.java b/apiphany-okhttp/src/test/java/org/apiphany/client/http/OkHttpExchangeClientTest.java index b4883625..7683a284 100644 --- a/apiphany-okhttp/src/test/java/org/apiphany/client/http/OkHttpExchangeClientTest.java +++ b/apiphany-okhttp/src/test/java/org/apiphany/client/http/OkHttpExchangeClientTest.java @@ -28,8 +28,9 @@ void shouldConvertHeadersToAnInsertionOrderedMap() { Map> result = OkHttpExchangeClient.toHttpHeadersMap(headers); - assertThat(new ArrayList<>(result.keySet()), equalTo(List.of("z-header", "a-header"))); + assertThat(new ArrayList<>(result.keySet()), equalTo(List.of("Z-Header", "A-Header"))); assertThat(result.get("z-header"), equalTo(List.of("value1", "value3"))); assertThat(result.get("a-header"), equalTo(List.of("value2"))); + assertThat(result.get("Z-Header"), equalTo(List.of("value1", "value3"))); } } diff --git a/apiphany-okhttp/src/test/java/org/apiphany/http/OkHttpLibraryTest.java b/apiphany-okhttp/src/test/java/org/apiphany/http/OkHttpLibraryTest.java index fb97fef3..64fa08a8 100644 --- a/apiphany-okhttp/src/test/java/org/apiphany/http/OkHttpLibraryTest.java +++ b/apiphany-okhttp/src/test/java/org/apiphany/http/OkHttpLibraryTest.java @@ -19,8 +19,8 @@ */ class OkHttpLibraryTest { - private static final String MIN_SUPPORTED_VERSION = "4.9.0"; - private static final String MAX_SUPPORTED_VERSION = "4.12.1"; + private static final String MIN_SUPPORTED_VERSION = "4.12.1"; + private static final String MAX_SUPPORTED_VERSION = "5.5.1"; @Nested class IsPresentTests { @@ -51,7 +51,7 @@ void shouldNotThrowForRuntimeVersion() { @Test void shouldThrowWhenRuntimeVersionIsOlderThanMinimum() { - LibraryVersion oldVersion = LibraryVersion.of(OkHttpLibrary.CLIENT_NAME, "4.8.1"); + LibraryVersion oldVersion = LibraryVersion.of(OkHttpLibrary.CLIENT_NAME, "4.12.0"); LibraryVersion minimumVersion = OkHttpLibrary.minimumVersion(); assertThrows(IllegalStateException.class, () -> oldVersion.verifyAtLeast(minimumVersion)); @@ -59,7 +59,7 @@ void shouldThrowWhenRuntimeVersionIsOlderThanMinimum() { @Test void shouldThrowWhenRuntimeVersionIsNewerThanMaximum() { - LibraryVersion newVersion = LibraryVersion.of(OkHttpLibrary.CLIENT_NAME, "5.0.0"); + LibraryVersion newVersion = LibraryVersion.of(OkHttpLibrary.CLIENT_NAME, "5.5.2"); LibraryVersion maximumVersion = OkHttpLibrary.maximumVersion(); assertThrows(IllegalStateException.class, () -> newVersion.verifyAtMost(maximumVersion)); diff --git a/apiphany-spring/pom.xml b/apiphany-spring/pom.xml index b2474320..9bbd9140 100644 --- a/apiphany-spring/pom.xml +++ b/apiphany-spring/pom.xml @@ -7,7 +7,7 @@ io.github.raduking apiphany-parent - 1.3.1 + 1.3.2 apiphany-spring @@ -103,7 +103,14 @@ com.squareup.okhttp3 - okhttp + ${okhttp.artifact.id} + provided + + + + org.jetbrains.kotlin + kotlin-stdlib + ${kotlin.stdlib.version} provided @@ -126,7 +133,7 @@ com.fasterxml.jackson.core jackson-core - ${jackson2.version} + ${jackson2.version} provided true @@ -134,7 +141,7 @@ com.fasterxml.jackson.core jackson-databind - ${jackson2.version} + ${jackson2.version} provided true @@ -142,7 +149,7 @@ com.fasterxml.jackson.datatype jackson-datatype-jsr310 - ${jackson2.version} + ${jackson2.version} provided true @@ -150,7 +157,7 @@ com.fasterxml.jackson.datatype jackson-datatype-jdk8 - ${jackson2.version} + ${jackson2.version} provided true @@ -158,7 +165,7 @@ com.fasterxml.jackson.dataformat jackson-dataformat-xml - ${jackson2.version} + ${jackson2.version} provided true @@ -166,7 +173,7 @@ tools.jackson.core jackson-core - ${jackson3.version} + ${jackson3.version} provided true @@ -174,7 +181,7 @@ tools.jackson.core jackson-databind - ${jackson3.version} + ${jackson3.version} provided true @@ -182,16 +189,23 @@ tools.jackson.dataformat jackson-dataformat-xml - ${jackson3.version} + ${jackson3.version} provided true + + ch.qos.logback + logback-core + ${logback.version} + test + + ch.qos.logback logback-classic - ${logback.version} + ${logback.version} test diff --git a/apiphany-test/pom.xml b/apiphany-test/pom.xml index 947c9527..df2f5dfb 100644 --- a/apiphany-test/pom.xml +++ b/apiphany-test/pom.xml @@ -8,7 +8,7 @@ io.github.raduking apiphany-parent - 1.3.1 + 1.3.2 apiphany-test diff --git a/integration/apiphany-httpclient5-tests/pom.xml b/integration/apiphany-httpclient5-tests/pom.xml index 121c6eef..d131d492 100644 --- a/integration/apiphany-httpclient5-tests/pom.xml +++ b/integration/apiphany-httpclient5-tests/pom.xml @@ -8,7 +8,7 @@ io.github.raduking apiphany-parent - 1.3.1 + 1.3.2 ../../pom.xml diff --git a/integration/apiphany-json-jackson2-tests/pom.xml b/integration/apiphany-json-jackson2-tests/pom.xml index a52e5a18..0336b8ee 100644 --- a/integration/apiphany-json-jackson2-tests/pom.xml +++ b/integration/apiphany-json-jackson2-tests/pom.xml @@ -8,7 +8,7 @@ io.github.raduking apiphany-parent - 1.3.1 + 1.3.2 ../../pom.xml diff --git a/integration/apiphany-json-jackson3-tests/pom.xml b/integration/apiphany-json-jackson3-tests/pom.xml index 214d2a49..f9707b76 100644 --- a/integration/apiphany-json-jackson3-tests/pom.xml +++ b/integration/apiphany-json-jackson3-tests/pom.xml @@ -8,7 +8,7 @@ io.github.raduking apiphany-parent - 1.3.1 + 1.3.2 ../../pom.xml diff --git a/integration/apiphany-json-no-dependency-tests/pom.xml b/integration/apiphany-json-no-dependency-tests/pom.xml index 70d05d00..5e0803a9 100644 --- a/integration/apiphany-json-no-dependency-tests/pom.xml +++ b/integration/apiphany-json-no-dependency-tests/pom.xml @@ -8,7 +8,7 @@ io.github.raduking apiphany-parent - 1.3.1 + 1.3.2 ../../pom.xml diff --git a/integration/apiphany-okhttp-tests/pom.xml b/integration/apiphany-okhttp-tests/pom.xml index 5ac0a941..90b6acb7 100644 --- a/integration/apiphany-okhttp-tests/pom.xml +++ b/integration/apiphany-okhttp-tests/pom.xml @@ -8,7 +8,7 @@ io.github.raduking apiphany-parent - 1.3.1 + 1.3.2 ../../pom.xml @@ -49,7 +49,7 @@ com.squareup.okhttp3 - okhttp + ${okhttp.artifact.id} diff --git a/integration/apiphany-spring-no-client-tests/pom.xml b/integration/apiphany-spring-no-client-tests/pom.xml index 173b090e..72f85be2 100644 --- a/integration/apiphany-spring-no-client-tests/pom.xml +++ b/integration/apiphany-spring-no-client-tests/pom.xml @@ -8,7 +8,7 @@ io.github.raduking apiphany-parent - 1.3.1 + 1.3.2 ../../pom.xml diff --git a/integration/apiphany-spring-tests/pom.xml b/integration/apiphany-spring-tests/pom.xml index d4140ad4..19c7a847 100644 --- a/integration/apiphany-spring-tests/pom.xml +++ b/integration/apiphany-spring-tests/pom.xml @@ -8,7 +8,7 @@ io.github.raduking apiphany-parent - 1.3.1 + 1.3.2 ../../pom.xml @@ -73,7 +73,7 @@ com.squareup.okhttp3 - okhttp + ${okhttp.artifact.id} diff --git a/pom.xml b/pom.xml index 12cf2a4c..9e73ecdc 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ io.github.raduking apiphany-parent - 1.3.1 + 1.3.2 pom ${project.groupId}:${project.artifactId} @@ -62,13 +62,15 @@ - 1.0.48 + 1.1.0 1.17.2 2.21.8 3.1.8 2.0.20 5.6.5 - 4.12.1 + 5.5.1 + okhttp-jvm + 2.4.21 7.0.10 4.1.2 @@ -90,7 +92,7 @@ 2.0.5 4.4.0 10.10 - 11.38.2 + 11.39 3.13.2 3.0.0 @@ -150,7 +152,7 @@ com.squareup.okhttp3 - okhttp + ${okhttp.artifact.id} ${okhttp.version} @@ -457,26 +459,28 @@ httpclient5-max - 5.6.4 + 5.6.5 okhttp-min - 4.9.0 + 4.12.1 + okhttp okhttp-current - 4.12.0 + 5.5.1 + okhttp-jvm