This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch jdo in repository https://gitbox.apache.org/repos/asf/causeway-app-simpleapp.git
commit 0810817befe099f0b4902bde6fb6da9e260826f7 Merge: 86811cd 0b76fa1 Author: danhaywood <[email protected]> AuthorDate: Fri Apr 7 11:00:41 2023 +0200 Merge branch 'jpa' into jdo # Conflicts: # webapp/pom.xml webapp/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --cc webapp/pom.xml index 9e6adfc,9f5a477..546bc06 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@@ -49,6 -49,15 +49,12 @@@ <artifactId>spring-boot-maven-plugin</artifactId> <configuration> <classifier>exec</classifier> - <agents> - <agent>${env.HOME}/.m2/repository/org/springframework/spring-instrument/${spring-framework.version}/spring-instrument-${spring-framework.version}.jar</agent> - </agents> + <requiresUnpack> + <dependency> + <groupId>org.asciidoctor</groupId> + <artifactId>asciidoctorj</artifactId> + </dependency> + </requiresUnpack> </configuration> </plugin> </plugins>
