Skip to content

Commit fa4b655

Browse files
committed
Polishing
Refine docs setup, remove changelog in favor of GitHub releases. See gh-706
1 parent c7d496d commit fa4b655

File tree

6 files changed

+8
-529
lines changed

6 files changed

+8
-529
lines changed

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -531,13 +531,13 @@
531531
<plugin>
532532
<groupId>org.asciidoctor</groupId>
533533
<artifactId>asciidoctor-maven-plugin</artifactId>
534-
<version>2.2.1</version>
534+
<version>2.2.2</version>
535535
</plugin>
536536

537537
<plugin>
538538
<groupId>org.jfrog.buildinfo</groupId>
539539
<artifactId>artifactory-maven-plugin</artifactId>
540-
<version>3.3.0</version>
540+
<version>3.4.0</version>
541541
</plugin>
542542

543543
<plugin>

spring-vault-core/src/main/java/org/springframework/vault/authentication/GoogleJsonUtil.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ class GoogleJsonUtil {
4646
}
4747
}
4848
catch (ClassNotFoundException e) {
49-
throw new IllegalStateException(
50-
String.format("No com.google.api.client.json.JsonFactory implementation available. Make sure to include either %s or %s on your classpath.", JACKSON, GSON),
51-
e);
49+
throw new IllegalStateException(String.format(
50+
"No com.google.api.client.json.JsonFactory implementation available. Make sure to include either %s or %s on your classpath.",
51+
JACKSON, GSON), e);
5252
}
5353
}
5454

spring-vault-core/src/main/java/org/springframework/vault/client/VaultClients.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ public class VaultClients {
5959
* @param endpoint must not be {@literal null}.
6060
* @param requestFactory must not be {@literal null}.
6161
* @return the {@link RestTemplate}.
62-
* @see org.springframework.http.client.Netty4ClientHttpRequestFactory
6362
* @see MappingJackson2HttpMessageConverter
6463
*/
6564
public static RestTemplate createRestTemplate(VaultEndpoint endpoint, ClientHttpRequestFactory requestFactory) {
@@ -80,7 +79,6 @@ public static RestTemplate createRestTemplate(VaultEndpoint endpoint, ClientHttp
8079
* @param endpointProvider must not be {@literal null}.
8180
* @param requestFactory must not be {@literal null}.
8281
* @return the {@link RestTemplate}.
83-
* @see org.springframework.http.client.Netty4ClientHttpRequestFactory
8482
* @see MappingJackson2HttpMessageConverter
8583
* @since 1.1
8684
*/
@@ -105,7 +103,6 @@ public static RestTemplate createRestTemplate(VaultEndpointProvider endpointProv
105103
* <p>
106104
* Requires Jackson 2 for Object-to-JSON mapping.
107105
* @return the {@link RestTemplate}.
108-
* @see org.springframework.http.client.Netty4ClientHttpRequestFactory
109106
* @see MappingJackson2HttpMessageConverter
110107
*/
111108
public static RestTemplate createRestTemplate() {

spring-vault-distribution/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -266,12 +266,12 @@
266266
<dependency>
267267
<groupId>org.asciidoctor</groupId>
268268
<artifactId>asciidoctorj-pdf</artifactId>
269-
<version>1.5.0-alpha.16</version>
269+
<version>2.0.3</version>
270270
</dependency>
271271
<dependency>
272272
<groupId>org.asciidoctor</groupId>
273273
<artifactId>asciidoctorj-epub3</artifactId>
274-
<version>1.5.0-alpha.8.1</version>
274+
<version>1.5.1</version>
275275
</dependency>
276276
</dependencies>
277277
<executions>
@@ -405,7 +405,7 @@
405405
<plugin>
406406
<groupId>org.jfrog.buildinfo</groupId>
407407
<artifactId>artifactory-maven-plugin</artifactId>
408-
<version>3.3.0</version>
408+
<version>3.4.0</version>
409409
<executions>
410410
<execution>
411411
<id>deploy-docs</id>

spring-vault-distribution/src/assembly/docs.xml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,6 @@
77
</formats>
88
<includeBaseDirectory>false</includeBaseDirectory>
99
<fileSets>
10-
<fileSet>
11-
<!--
12-
Adds readme and other textfiles to the root of the distribution archive.
13-
-->
14-
<directory>${project.root}/src/main/resources</directory>
15-
<includes>
16-
<include>changelog.txt</include>
17-
</includes>
18-
<outputDirectory />
19-
<lineEnding>dos</lineEnding>
20-
</fileSet>
2110
<fileSet>
2211
<!--
2312
Adds reference manual (html and pdf) to the distribution archive

0 commit comments

Comments
 (0)