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 b78304a13949726819f6f8cd2dad2b8f10388f6b Merge: b846a9e 8a547cd Author: rasa <[email protected]> AuthorDate: Mon Oct 14 16:47:58 2019 +0300 pom conflict solved juneau-petstore-server/Dockerfile | 5 ++ juneau-petstore-server/pom.xml | 122 +++++++++++++++++++++++++------------- 2 files changed, 87 insertions(+), 40 deletions(-) diff --cc juneau-petstore-server/pom.xml index 0d5f382,f629098..3f80536 --- a/juneau-petstore-server/pom.xml +++ b/juneau-petstore-server/pom.xml @@@ -53,49 -61,32 +61,37 @@@ <artifactId>juneau-rest-server-springboot</artifactId> <version>${juneau.version}</version> </dependency> - - <!-- Spring Boot dependencies--> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-web</artifactId> - <version>${springframework.version}</version> - <exclusions> - <exclusion> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-logging</artifactId> - </exclusion> - </exclusions> - </dependency> + - <!-- Needed for @Inject support --> - <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> - <version>${javax.inject.version}</version> - </dependency> + + <!-- Needed for @Inject support --> + <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + <version>${javax.inject.version}</version> + </dependency> - <!-- Needed for JPA persistence of PetStore beans --> - <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derby</artifactId> - <version>${derby.version}</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - <version>${hibernate.version}</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-entitymanager</artifactId> - <version>${hibernate.version}</version> - </dependency> - <dependency> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - <version>${xml.apis.version}</version> - </dependency> - + <!-- Needed for JPA persistence of PetStore beans --> + <dependency> + <groupId>org.apache.derby</groupId> + <artifactId>derby</artifactId> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-entitymanager</artifactId> + </dependency> + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </dependency> ++ <dependency> ++ <groupId>org.springframework.boot</groupId> ++ <artifactId>spring-boot-starter-data-jpa</artifactId> ++ </dependency> + </dependencies> <build>
