Commit 7f4602e0 authored by Noel Alonso's avatar Noel Alonso
Browse files

Añade parent pom + plugin de licencias

parent ee54f3b9
Loading
Loading
Loading
Loading
+16 −62
Original line number Diff line number Diff line
@@ -3,9 +3,9 @@
	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>org.springframework.boot</groupId>
		<artifactId>spring-boot-starter-parent</artifactId>
		<version>2.1.0.RELEASE</version>
		<groupId>es.redmic</groupId>
		<artifactId>server-parent</artifactId>
		<version>0.3.0</version>
		<relativePath />
	</parent>

@@ -13,17 +13,10 @@
	<groupId>es.redmic.vessels</groupId>
	<artifactId>vessels</artifactId>
	<packaging>pom</packaging>
	<version>0.8.0</version>
	<version>0.8.0-feature-applyLicense</version>
	<name>vessels</name>

	<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.broker-lib.version>0.8.0</redmic.broker-lib.version>
		<redmic.vessels-lib.version>0.8.0</redmic.vessels-lib.version>
@@ -35,11 +28,7 @@
		<kafka.version>2.0.1</kafka.version>

		<!-- Plugins -->
		<jacoco.version>0.8.1</jacoco.version>
		<asciidoctor.maven.plugin.version>1.5.6</asciidoctor.maven.plugin.version>

		<!-- Environment variables -->
		<env.MAVEN_REPO_URL>https://artifactory.redmic.net/artifactory</env.MAVEN_REPO_URL>
	</properties>

	<dependencies>
@@ -50,18 +39,6 @@
			<scope>runtime</scope>
		</dependency>

		<!-- Logs -->
		<dependency>
			<groupId>org.apache.logging.log4j</groupId>
			<artifactId>log4j-api</artifactId>
			<scope>provided</scope>
		</dependency>
		<dependency>
			<groupId>org.apache.logging.log4j</groupId>
			<artifactId>log4j-core</artifactId>
			<scope>provided</scope>
		</dependency>

		<!-- Test -->
		<dependency>
			<groupId>org.springframework.boot</groupId>
@@ -106,51 +83,28 @@
		</dependency>
		<!-- -->
	</dependencies>
	<distributionManagement>
	<repositories>
		<repository>
			<id>central</id>
			<name>redmic-releases</name>
			<url>${env.MAVEN_REPO_URL}/libs-release-local</url>
			<name>libs-release</name>
			<url>https://artifactory.redmic.net/artifactory/libs-release</url>
		</repository>
		<snapshotRepository>
		<repository>
			<id>snapshots</id>
			<name>redmic-snapshots</name>
			<url>${env.MAVEN_REPO_URL}/libs-snapshot-local</url>
			<uniqueVersion>false</uniqueVersion>
		</snapshotRepository>
	</distributionManagement>
	<repositories>
			<name>libs-snapshot</name>
			<url>https://artifactory.redmic.net/artifactory/libs-snapshot</url>
		</repository>
		<repository>
			<id>osgeo</id>
			<name>Open Source Geospatial Foundation Repository</name>
			<url>http://download.osgeo.org/webdav/geotools/</url>
		</repository>
		<repository>
			<id>confluent</id>
			<name>Confluent</name>
			<url>https://packages.confluent.io/maven/</url>
		</repository>
	</repositories>
	<build>
		<plugins>
			<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>

	<modules>
		<module>vessels-commands</module>
		<module>vessels-view</module>
+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@
	<parent>
		<groupId>es.redmic.vessels</groupId>
		<artifactId>vessels</artifactId>
		<version>0.8.0</version>
		<version>0.8.0-feature-applyLicense</version>
	</parent>

	<modelVersion>4.0.0</modelVersion>
+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@
	<parent>
		<groupId>es.redmic.vessels</groupId>
		<artifactId>vessels</artifactId>
		<version>0.8.0</version>
		<version>0.8.0-feature-applyLicense</version>
	</parent>

	<modelVersion>4.0.0</modelVersion>
+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@
	<parent>
		<groupId>es.redmic.vessels</groupId>
		<artifactId>vessels</artifactId>
		<version>0.8.0</version>
		<version>0.8.0-feature-applyLicense</version>
	</parent>

	<modelVersion>4.0.0</modelVersion>