Commit 81257a36 authored by Noel Alonso's avatar Noel Alonso
Browse files

Merge

parent 30dad69c

pom.xml

+72 −27
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

<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">



	<parent>

		<groupId>es.redmic</groupId>

		<artifactId>redmic</artifactId>

		<version>0.6.0</version>

		<groupId>org.springframework.boot</groupId>

		<artifactId>spring-boot-starter-parent</artifactId>

		<version>2.0.0.RELEASE</version>

		<relativePath />

	</parent>



	<modelVersion>4.0.0</modelVersion>

	<groupId>es.redmic</groupId>

	<artifactId>user</artifactId>

	<packaging>jar</packaging>

	<version>0.6.0</version>

	<name>User</name>

	<description>Gestión de cuentas y servicios de usuarios</description>

	<description>Account management and user services</description>

	

	<properties>

		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

		<maven.compiler.source>1.8</maven.compiler.source>

		<maven.compiler.target>1.8</maven.compiler.target>

		<java.version>1.8</java.version>

		<tomcat.version>8.5.28</tomcat.version>



		<!-- REDMIC -->

		<redmic.db-commons.version>0.6.0</redmic.db-commons.version>

		<redmic.exceptions.version>0.6.0</redmic.exceptions.version>

		<redmic.models.version>0.6.0</redmic.models.version>

		<redmic.utils.version>0.6.0</redmic.utils.version>

		

		<!-- OTHERS -->

		<hibernate-validator.version>6.0.8.Final</hibernate-validator.version>

		<org.mockito.version>1.10.19</org.mockito.version>



		<!-- Plugins -->

		<jacoco.version>0.8.1</jacoco.version>

		<com.mysema.maven.version>1.1.3</com.mysema.maven.version>

		<com.mysema.querydsl.version>4.1.4</com.mysema.querydsl.version>

	</properties>



	<dependencies>

		<!-- redmic -->
@@ -20,25 +48,25 @@ 
		<dependency>

			<groupId>es.redmic.lib</groupId>

			<artifactId>db-commons</artifactId>

			<version>${redmic.version}</version>

			<version>${redmic.db-commons.version}</version>

		</dependency>



		<dependency>

			<groupId>es.redmic.lib</groupId>

			<artifactId>exceptions</artifactId>

			<version>${redmic.version}</version>

			<version>${redmic.exceptions.version}</version>

		</dependency>



		<dependency>

			<groupId>es.redmic.lib</groupId>

			<artifactId>models</artifactId>

			<version>${redmic.version}</version>

			<version>${redmic.models.version}</version>

		</dependency>



		<dependency>

			<groupId>es.redmic.lib</groupId>

			<artifactId>utils</artifactId>

			<version>${redmic.version}</version>

			<version>${redmic.utils.version}</version>

		</dependency>



		<!-- SpringBoot -->
@@ -46,7 +74,6 @@ 
		<dependency>

			<groupId>org.springframework.boot</groupId>

			<artifactId>spring-boot-starter-tomcat</artifactId>

			<scope>provided</scope>

		</dependency>



		<dependency>
@@ -65,7 +92,6 @@ 
			<groupId>org.hibernate</groupId>

			<artifactId>hibernate-validator</artifactId>

			<version>${hibernate-validator.version}</version>

			<scope>provided</scope>

		</dependency>



		<!-- tests -->
@@ -75,17 +101,17 @@ 
			<artifactId>spring-boot-starter-test</artifactId>

			<scope>test</scope>

		</dependency>

		

		<dependency>

			<groupId>org.mockito</groupId>

			<artifactId>mockito-all</artifactId>

			<version>${org.mockito.version}</version>

			<scope>test</scope>

		</dependency>

	</dependencies>



	<build>

		<plugins>

			<plugin>

				<groupId>org.apache.maven.plugins</groupId>

				<artifactId>maven-install-plugin</artifactId>

				<configuration>

					<skip>true</skip>

				</configuration>

			</plugin>

			<plugin>

				<groupId>org.springframework.boot</groupId>

				<artifactId>spring-boot-maven-plugin</artifactId>
@@ -105,7 +131,7 @@ 
			<plugin>

				<groupId>com.mysema.maven</groupId>

				<artifactId>apt-maven-plugin</artifactId>

				<version>${com.mysema.maven}</version>

				<version>${com.mysema.maven.version}</version>

				<executions>

					<execution>

						<goals>
@@ -122,11 +148,30 @@ 
					<dependency>

						<groupId>com.querydsl</groupId>

						<artifactId>querydsl-apt</artifactId>

						<version>${com.mysema.querydsl}</version>

						<version>${com.mysema.querydsl.version}</version>

					</dependency>

				</dependencies>

			</plugin>



			<plugin>

				<groupId>org.jacoco</groupId>

				<artifactId>jacoco-maven-plugin</artifactId>

				<version>${jacoco.version}</version>

				<executions>

					<execution>

						<id>pre-unit-test</id>

						<goals>

							<goal>prepare-agent</goal>

						</goals>

					</execution>

					<execution>

						<id>post-unit-test</id>

						<phase>test</phase>

						<goals>

							<goal>report</goal>

						</goals>

					</execution>

				</executions>

			</plugin>

		</plugins>

	</build>

</project>