From 0ca12874dd986a9438d50a9b88efd03a26774d46 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/client/VaultClients.java | 3 - spring-vault-distribution/pom.xml | 6 +- .../src/assembly/docs.xml | 11 - src/main/resources/changelog.txt | 507 ------------------ 5 files changed, 5 insertions(+), 526 deletions(-) delete mode 100644 src/main/resources/changelog.txt diff --git a/pom.xml b/pom.xml index c6ef3edd..758baf17 100644 --- a/pom.xml +++ b/pom.xml @@ -556,7 +556,7 @@ org.asciidoctor asciidoctor-maven-plugin - 1.5.7.1 + 2.2.2 @@ -592,7 +592,7 @@ org.jfrog.buildinfo artifactory-maven-plugin - 3.3.0 + 3.4.0 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 bc74cdf8..9d3c843f 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 @@ -61,7 +61,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) { @@ -82,7 +81,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 */ @@ -107,7 +105,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 0f1847b9..49ffa0c1 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 - 2.7.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 -