Skip to content

Commit 76a79a0

Browse files
committed
Fix asciidoctor-maven-plugin incompatibility with spring restdocs.
1 parent e56d57b commit 76a79a0

File tree

3 files changed

+13
-7
lines changed

3 files changed

+13
-7
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ MAINTAINER [email protected]
44
EXPOSE 8080
55
RUN mkdir -p /app/
66
RUN mkdir -p /app/logs/
7-
ADD target/reactive-talk-202012-1.1.1.jar /app/app.jar
7+
ADD target/reactive-talk-202012-1.1.5.jar /app/app.jar
88
ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Dspring.profiles.active=docker", "-jar", "/app/app.jar"]

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ services:
2323
expose:
2424
- 8080
2525
ports:
26-
- 8080:8080
26+
- "8080:8080"
2727
restart: unless-stopped
2828
depends_on:
2929
- postgres

pom.xml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,19 @@
99
</parent>
1010
<groupId>de.ksbrwsk</groupId>
1111
<artifactId>reactive-people-postgresql</artifactId>
12-
<version>1.1.4-SNAPSHOT</version>
12+
<version>1.1.5-SNAPSHOT</version>
1313
<name>reactive-people-postgresql</name>
1414
<description>Reactive example Webflux, R2DBC, Testcontainers</description>
1515

1616
<properties>
1717
<java.version>21</java.version>
1818
<springdoc-openapi-starter-webflux-ui.version>2.6.0</springdoc-openapi-starter-webflux-ui.version>
19+
20+
<!-- NOTE: asciidoctor-maven-plugin version gt 3.0.0 incompatible with spring restdocs! -->
21+
<asciidoctor-maven-plugin.version>3.0.0</asciidoctor-maven-plugin.version>
22+
<springdoc-openapi-maven-plugin.version>1.4</springdoc-openapi-maven-plugin.version>
23+
<spring-restdocs-asciidoctor.version>3.0.2</spring-restdocs-asciidoctor.version>
24+
<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
1925
</properties>
2026
<scm>
2127
<developerConnection>scm:git:https://github.com/ksbrwsk/reactive-people-postgresql.git</developerConnection>
@@ -161,7 +167,7 @@
161167
<plugin>
162168
<groupId>org.springdoc</groupId>
163169
<artifactId>springdoc-openapi-maven-plugin</artifactId>
164-
<version>1.4</version>
170+
<version>${springdoc-openapi-maven-plugin.version}</version>
165171
<executions>
166172
<execution>
167173
<phase>integration-test</phase>
@@ -174,7 +180,7 @@
174180
<plugin>
175181
<groupId>org.asciidoctor</groupId>
176182
<artifactId>asciidoctor-maven-plugin</artifactId>
177-
<version>3.1.1</version>
183+
<version>${asciidoctor-maven-plugin.version}</version>
178184
<executions>
179185
<execution>
180186
<id>generate-docs</id>
@@ -192,13 +198,13 @@
192198
<dependency>
193199
<groupId>org.springframework.restdocs</groupId>
194200
<artifactId>spring-restdocs-asciidoctor</artifactId>
195-
<version>3.0.2</version>
201+
<version>${spring-restdocs-asciidoctor.version}</version>
196202
</dependency>
197203
</dependencies>
198204
</plugin>
199205
<plugin>
200206
<artifactId>maven-resources-plugin</artifactId>
201-
<version>3.3.1</version>
207+
<version>${maven-resources-plugin.version}</version>
202208
<executions>
203209
<execution>
204210
<id>copy-resources</id>

0 commit comments

Comments
 (0)