|
@@ -1,4 +1,5 @@
|
1
|
1
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
|
+<<<<<<< HEAD
|
2
|
3
|
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
3
|
4
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
4
|
5
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
@@ -56,6 +57,80 @@
|
56
|
57
|
<version>1</version>
|
57
|
58
|
</dependency>
|
58
|
59
|
</dependencies>
|
|
60
|
+=======
|
|
61
|
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
62
|
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
63
|
+ <modelVersion>4.0.0</modelVersion>
|
|
64
|
+
|
|
65
|
+ <groupId>com.zipcodewilmington</groupId>
|
|
66
|
+ <artifactId>bakery</artifactId>
|
|
67
|
+ <version>0.0.1-SNAPSHOT</version>
|
|
68
|
+ <packaging>jar</packaging>
|
|
69
|
+
|
|
70
|
+ <name>bakery</name>
|
|
71
|
+ <description>Demo project for Spring Boot</description>
|
|
72
|
+
|
|
73
|
+ <parent>
|
|
74
|
+ <groupId>org.springframework.boot</groupId>
|
|
75
|
+ <artifactId>spring-boot-starter-parent</artifactId>
|
|
76
|
+ <version>2.0.4.RELEASE</version>
|
|
77
|
+ <relativePath/> <!-- lookup parent from repository -->
|
|
78
|
+ </parent>
|
|
79
|
+
|
|
80
|
+ <properties>
|
|
81
|
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
|
82
|
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
|
83
|
+ <java.version>1.8</java.version>
|
|
84
|
+ </properties>
|
|
85
|
+
|
|
86
|
+ <dependencies>
|
|
87
|
+ <dependency>
|
|
88
|
+ <groupId>org.springframework.boot</groupId>
|
|
89
|
+ <artifactId>spring-boot-starter</artifactId>
|
|
90
|
+ </dependency>
|
|
91
|
+
|
|
92
|
+ <dependency>
|
|
93
|
+ <groupId>org.springframework.boot</groupId>
|
|
94
|
+ <artifactId>spring-boot-starter-data-rest</artifactId>
|
|
95
|
+ </dependency>
|
|
96
|
+
|
|
97
|
+ <dependency>
|
|
98
|
+ <groupId>org.springframework.boot</groupId>
|
|
99
|
+ <artifactId>spring-boot-starter-web</artifactId>
|
|
100
|
+ </dependency>
|
|
101
|
+
|
|
102
|
+ <dependency>
|
|
103
|
+ <groupId>org.springframework.boot</groupId>
|
|
104
|
+ <artifactId>spring-boot-starter-test</artifactId>
|
|
105
|
+ <scope>test</scope>
|
|
106
|
+ </dependency>
|
|
107
|
+ <dependency>
|
|
108
|
+ <groupId>org.springframework.data</groupId>
|
|
109
|
+ <artifactId>spring-data-commons</artifactId>
|
|
110
|
+ </dependency>
|
|
111
|
+ <dependency>
|
|
112
|
+ <groupId>org.springframework.boot</groupId>
|
|
113
|
+ <artifactId>spring-boot-starter-data-jpa</artifactId>
|
|
114
|
+ </dependency>
|
|
115
|
+ <dependency>
|
|
116
|
+ <groupId>com.h2database</groupId>
|
|
117
|
+ <artifactId>h2</artifactId>
|
|
118
|
+ </dependency>
|
|
119
|
+ <dependency>
|
|
120
|
+ <groupId>org.springframework.boot</groupId>
|
|
121
|
+ <artifactId>spring-boot-starter-data-jpa</artifactId>
|
|
122
|
+ </dependency>
|
|
123
|
+ </dependencies>
|
|
124
|
+
|
|
125
|
+ <build>
|
|
126
|
+ <plugins>
|
|
127
|
+ <plugin>
|
|
128
|
+ <groupId>org.springframework.boot</groupId>
|
|
129
|
+ <artifactId>spring-boot-maven-plugin</artifactId>
|
|
130
|
+ </plugin>
|
|
131
|
+ </plugins>
|
|
132
|
+ </build>
|
|
133
|
+>>>>>>> 1356254de500f16124e3fe66a4b3ab488374a38d
|
59
|
134
|
|
60
|
135
|
|
61
|
136
|
</project>
|