From fa4b6557d15993432f2b851afb6b54aeb0aa08e6 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 27 May 2022 15:45:25 +0200 Subject: [PATCH] Polishing Refine docs setup, remove changelog in favor of GitHub releases. See gh-706 --- pom.xml | 4 +- .../vault/authentication/GoogleJsonUtil.java | 6 +- .../vault/client/VaultClients.java | 3 - spring-vault-distribution/pom.xml | 6 +- .../src/assembly/docs.xml | 11 - src/main/resources/changelog.txt | 507 ------------------ 6 files changed, 8 insertions(+), 529 deletions(-) delete mode 100644 src/main/resources/changelog.txt diff --git a/pom.xml b/pom.xml index f29b1478..8ab5a9c6 100644 --- a/pom.xml +++ b/pom.xml @@ -531,13 +531,13 @@ org.asciidoctor asciidoctor-maven-plugin - 2.2.1 + 2.2.2 org.jfrog.buildinfo artifactory-maven-plugin - 3.3.0 + 3.4.0 diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/GoogleJsonUtil.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/GoogleJsonUtil.java index 3442444c..ed229fb4 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/GoogleJsonUtil.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/GoogleJsonUtil.java @@ -46,9 +46,9 @@ class GoogleJsonUtil { } } catch (ClassNotFoundException e) { - throw new IllegalStateException( - String.format("No com.google.api.client.json.JsonFactory implementation available. Make sure to include either %s or %s on your classpath.", JACKSON, GSON), - e); + throw new IllegalStateException(String.format( + "No com.google.api.client.json.JsonFactory implementation available. Make sure to include either %s or %s on your classpath.", + JACKSON, GSON), e); } } diff --git a/spring-vault-core/src/main/java/org/springframework/vault/client/VaultClients.java b/spring-vault-core/src/main/java/org/springframework/vault/client/VaultClients.java index b4999621..de1f4c81 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/client/VaultClients.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/client/VaultClients.java @@ -59,7 +59,6 @@ public class VaultClients { * @param endpoint must not be {@literal null}. * @param requestFactory must not be {@literal null}. * @return the {@link RestTemplate}. - * @see org.springframework.http.client.Netty4ClientHttpRequestFactory * @see MappingJackson2HttpMessageConverter */ public static RestTemplate createRestTemplate(VaultEndpoint endpoint, ClientHttpRequestFactory requestFactory) { @@ -80,7 +79,6 @@ public class VaultClients { * @param endpointProvider must not be {@literal null}. * @param requestFactory must not be {@literal null}. * @return the {@link RestTemplate}. - * @see org.springframework.http.client.Netty4ClientHttpRequestFactory * @see MappingJackson2HttpMessageConverter * @since 1.1 */ @@ -105,7 +103,6 @@ public class VaultClients { *

* Requires Jackson 2 for Object-to-JSON mapping. * @return the {@link RestTemplate}. - * @see org.springframework.http.client.Netty4ClientHttpRequestFactory * @see MappingJackson2HttpMessageConverter */ public static RestTemplate createRestTemplate() { diff --git a/spring-vault-distribution/pom.xml b/spring-vault-distribution/pom.xml index cd3483c2..a99e598f 100644 --- a/spring-vault-distribution/pom.xml +++ b/spring-vault-distribution/pom.xml @@ -266,12 +266,12 @@ org.asciidoctor asciidoctorj-pdf - 1.5.0-alpha.16 + 2.0.3 org.asciidoctor asciidoctorj-epub3 - 1.5.0-alpha.8.1 + 1.5.1 @@ -405,7 +405,7 @@ org.jfrog.buildinfo artifactory-maven-plugin - 3.3.0 + 3.4.0 deploy-docs diff --git a/spring-vault-distribution/src/assembly/docs.xml b/spring-vault-distribution/src/assembly/docs.xml index 30bbfd09..fa6ef425 100644 --- a/spring-vault-distribution/src/assembly/docs.xml +++ b/spring-vault-distribution/src/assembly/docs.xml @@ -7,17 +7,6 @@ false - - - ${project.root}/src/main/resources - - changelog.txt - - - dos -