This is an automated email from the ASF dual-hosted git repository. jamesbognar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/juneau-petstore.git
commit b846a9ee7056e6504129580d0e174d7841b608c5 Author: rasa <[email protected]> AuthorDate: Mon Oct 14 16:34:08 2019 +0300 conflict solving --- juneau-petstore-server/pom.xml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/juneau-petstore-server/pom.xml b/juneau-petstore-server/pom.xml index 8ec5361..0d5f382 100644 --- a/juneau-petstore-server/pom.xml +++ b/juneau-petstore-server/pom.xml @@ -95,11 +95,7 @@ <artifactId>xml-apis</artifactId> <version>${xml.apis.version}</version> </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-data-jpa</artifactId> - <version>${springframework.version}</version> - </dependency> + </dependencies> <build>
