Advertisement
Guest User

Untitled

a guest
Jan 18th, 2018
118
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 8.33 KB | None | 0 0
  1. <<<<<<< HEAD
  2. <?xml version="1.0" encoding="UTF-8"?>
  3. <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  4.  
  5. <modelVersion>4.0.0</modelVersion>
  6.  
  7. <parent>
  8. <artifactId>cast</artifactId>
  9. <groupId>com.nterra.cast</groupId>
  10. <version>0.0.2-HOTFIX-DEFECT-22</version>
  11. </parent>
  12.  
  13. <artifactId>cast-backend</artifactId>
  14. <name>Cast Backend</name>
  15.  
  16. <properties>
  17. <cast.root>${basedir}/..</cast.root>
  18. </properties>
  19.  
  20. <dependencies>
  21. <!-- CAST -->
  22.  
  23. <!-- Security -->
  24. <dependency>
  25. <groupId>org.springframework.boot</groupId>
  26. <artifactId>spring-boot-starter-security</artifactId>
  27. </dependency>
  28.  
  29. <!-- REST -->
  30. <dependency>
  31. <groupId>org.springframework.boot</groupId>
  32. <artifactId>spring-boot-starter-web</artifactId>
  33. </dependency>
  34.  
  35. <!-- DB -->
  36. <dependency>
  37. <groupId>org.springframework.boot</groupId>
  38. <artifactId>spring-boot-starter-data-jpa</artifactId>
  39. </dependency>
  40. <dependency>
  41. <groupId>org.hibernate</groupId>
  42. <artifactId>hibernate-jpamodelgen</artifactId>
  43. <scope>provided</scope>
  44. </dependency>
  45. <dependency>
  46. <groupId>org.liquibase</groupId>
  47. <artifactId>liquibase-core</artifactId>
  48. </dependency>
  49. <dependency>
  50. <groupId>com.h2database</groupId>
  51. <artifactId>h2</artifactId>
  52. <scope>runtime</scope>
  53. </dependency>
  54. <dependency>
  55. <groupId>org.postgresql</groupId>
  56. <artifactId>postgresql</artifactId>
  57. <scope>runtime</scope>
  58. </dependency>
  59.  
  60. <!-- Utils -->
  61. <dependency>
  62. <groupId>com.fasterxml.jackson.datatype</groupId>
  63. <artifactId>jackson-datatype-jsr310</artifactId>
  64. </dependency>
  65. <dependency>
  66. <groupId>org.springframework.boot</groupId>
  67. <artifactId>spring-boot-starter-validation</artifactId>
  68. </dependency>
  69. <dependency>
  70. <groupId>org.mapstruct</groupId>
  71. <artifactId>mapstruct-jdk8</artifactId>
  72. </dependency>
  73. <dependency>
  74. <groupId>org.mapstruct</groupId>
  75. <artifactId>mapstruct-processor</artifactId>
  76. <scope>provided</scope>
  77. </dependency>
  78. <dependency>
  79. <groupId>com.google.guava</groupId>
  80. <artifactId>guava</artifactId>
  81. </dependency>
  82. <dependency>
  83. <groupId>org.projectlombok</groupId>
  84. <artifactId>lombok</artifactId>
  85. <optional>true</optional>
  86. </dependency>
  87.  
  88. <!-- Dev-Tools -->
  89. <dependency>
  90. <groupId>org.springframework.boot</groupId>
  91. <artifactId>spring-boot-devtools</artifactId>
  92. <scope>runtime</scope>
  93. </dependency>
  94. <dependency>
  95. <groupId>org.springframework.boot</groupId>
  96. <artifactId>spring-boot-configuration-processor</artifactId>
  97. <optional>true</optional>
  98. </dependency>
  99.  
  100. <!-- Test -->
  101. <dependency>
  102. <groupId>org.springframework.boot</groupId>
  103. <artifactId>spring-boot-starter-test</artifactId>
  104. <scope>test</scope>
  105. </dependency>
  106. <dependency>
  107. <groupId>org.springframework.security</groupId>
  108. <artifactId>spring-security-test</artifactId>
  109. <scope>test</scope>
  110. </dependency>
  111. </dependencies>
  112.  
  113. <build>
  114. <plugins>
  115. <plugin>
  116. <groupId>org.springframework.boot</groupId>
  117. <artifactId>spring-boot-maven-plugin</artifactId>
  118. <executions>
  119. <execution>
  120. <goals>
  121. <goal>build-info</goal>
  122. </goals>
  123. </execution>
  124. </executions>
  125. </plugin>
  126. <plugin>
  127. <groupId>com.spotify</groupId>
  128. <artifactId>dockerfile-maven-plugin</artifactId>
  129. <version>${dockerfile-maven-plugin.version}</version>
  130. <configuration>
  131. <repository>${docker.image.prefix}/${project.artifactId}</repository>
  132. <tag>${project.version}</tag>
  133. <buildArgs>
  134. <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
  135. </buildArgs>
  136. </configuration>
  137. </plugin>
  138. </plugins>
  139. </build>
  140.  
  141. =======
  142. <?xml version="1.0" encoding="UTF-8"?>
  143. <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  144.  
  145. <modelVersion>4.0.0</modelVersion>
  146.  
  147. <parent>
  148. <artifactId>cast</artifactId>
  149. <groupId>com.nterra.cast</groupId>
  150. <version>0.0.2-HOTFIX-DEFECT-23</version>
  151. </parent>
  152.  
  153. <artifactId>cast-backend</artifactId>
  154. <name>Cast Backend</name>
  155.  
  156. <properties>
  157. <cast.root>${basedir}/..</cast.root>
  158. </properties>
  159.  
  160. <dependencies>
  161. <!-- CAST -->
  162.  
  163. <!-- Security -->
  164. <dependency>
  165. <groupId>org.springframework.boot</groupId>
  166. <artifactId>spring-boot-starter-security</artifactId>
  167. </dependency>
  168.  
  169. <!-- REST -->
  170. <dependency>
  171. <groupId>org.springframework.boot</groupId>
  172. <artifactId>spring-boot-starter-web</artifactId>
  173. </dependency>
  174.  
  175. <!-- DB -->
  176. <dependency>
  177. <groupId>org.springframework.boot</groupId>
  178. <artifactId>spring-boot-starter-data-jpa</artifactId>
  179. </dependency>
  180. <dependency>
  181. <groupId>org.hibernate</groupId>
  182. <artifactId>hibernate-jpamodelgen</artifactId>
  183. <scope>provided</scope>
  184. </dependency>
  185. <dependency>
  186. <groupId>org.liquibase</groupId>
  187. <artifactId>liquibase-core</artifactId>
  188. </dependency>
  189. <dependency>
  190. <groupId>com.h2database</groupId>
  191. <artifactId>h2</artifactId>
  192. <scope>runtime</scope>
  193. </dependency>
  194. <dependency>
  195. <groupId>org.postgresql</groupId>
  196. <artifactId>postgresql</artifactId>
  197. <version>42.1.4</version>
  198. </dependency>
  199.  
  200. <!-- Utils -->
  201. <dependency>
  202. <groupId>com.fasterxml.jackson.datatype</groupId>
  203. <artifactId>jackson-datatype-jsr310</artifactId>
  204. </dependency>
  205. <dependency>
  206. <groupId>org.springframework.boot</groupId>
  207. <artifactId>spring-boot-starter-validation</artifactId>
  208. </dependency>
  209. <dependency>
  210. <groupId>org.mapstruct</groupId>
  211. <artifactId>mapstruct-jdk8</artifactId>
  212. </dependency>
  213. <dependency>
  214. <groupId>org.mapstruct</groupId>
  215. <artifactId>mapstruct-processor</artifactId>
  216. <scope>provided</scope>
  217. </dependency>
  218. <dependency>
  219. <groupId>com.google.guava</groupId>
  220. <artifactId>guava</artifactId>
  221. </dependency>
  222. <dependency>
  223. <groupId>org.projectlombok</groupId>
  224. <artifactId>lombok</artifactId>
  225. <optional>true</optional>
  226. </dependency>
  227.  
  228. <!-- Dev-Tools -->
  229. <dependency>
  230. <groupId>org.springframework.boot</groupId>
  231. <artifactId>spring-boot-devtools</artifactId>
  232. <scope>runtime</scope>
  233. </dependency>
  234. <dependency>
  235. <groupId>org.springframework.boot</groupId>
  236. <artifactId>spring-boot-configuration-processor</artifactId>
  237. <optional>true</optional>
  238. </dependency>
  239.  
  240. <!-- Test -->
  241. <dependency>
  242. <groupId>org.springframework.boot</groupId>
  243. <artifactId>spring-boot-starter-test</artifactId>
  244. <scope>test</scope>
  245. </dependency>
  246. <dependency>
  247. <groupId>org.springframework.security</groupId>
  248. <artifactId>spring-security-test</artifactId>
  249. <scope>test</scope>
  250. </dependency>
  251. </dependencies>
  252.  
  253. <build>
  254. <plugins>
  255. <plugin>
  256. <groupId>org.springframework.boot</groupId>
  257. <artifactId>spring-boot-maven-plugin</artifactId>
  258. <executions>
  259. <execution>
  260. <goals>
  261. <goal>build-info</goal>
  262. </goals>
  263. </execution>
  264. </executions>
  265. </plugin>
  266. <plugin>
  267. <groupId>com.spotify</groupId>
  268. <artifactId>dockerfile-maven-plugin</artifactId>
  269. <version>${dockerfile-maven-plugin.version}</version>
  270. <configuration>
  271. <repository>${docker.image.prefix}/${project.artifactId}</repository>
  272. <tag>${project.version}</tag>
  273. <buildArgs>
  274. <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
  275. </buildArgs>
  276. </configuration>
  277. </plugin>
  278. </plugins>
  279. </build>
  280.  
  281. >>>>>>> refs/heads/hotfix-0.0.2-HOTFIX-DEFECT-23
  282. </project>
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement