Commit 59d25a67 authored by Noel Alonso's avatar Noel Alonso
Browse files

Merge branch 'dev' into 'master' 

Actualiza imagen de compilación

See merge request redmic-project/server/library/utils!1
parents e9de10c5 04a4943d

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ stages: 


maven-build:

  stage: build

  image: redmic/maven-gitlab

  image: registry.gitlab.com/redmic-project/docker/maven

  variables:

    MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository"

  only:

pom.xml

+109 −16
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.lib</groupId>

		<artifactId>libs</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.lib</groupId>

	<artifactId>utils</artifactId>

	<packaging>jar</packaging>

	<version>0.6.0</version>

	<name>Utils</name>

	<description>Server utils library</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>



		<!-- REDMIC -->

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

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

		<redmic.sitemapgen4j.version>0.6.0</redmic.sitemapgen4j.version>



		<!-- OTHERS -->

		<language-detector.version>0.5</language-detector.version>

		<super-csv.version>2.4.0</super-csv.version>

		<geotools.version>19.0</geotools.version>

		<commons-io.version>2.6</commons-io.version>

		

		<powermock.version>1.7.3</powermock.version>



		<!-- Version plugins -->

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



		<!-- Environment variables -->

		<env.MAVEN_REPO_URL>https://artifactory.redmic.net/artifactory</env.MAVEN_REPO_URL>

	</properties>



	<dependencies>
@@ -20,14 +52,14 @@ 
		<dependency>

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

			<artifactId>models</artifactId>

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

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

			<scope>provided</scope>

		</dependency>



		<dependency>

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

			<artifactId>exceptions</artifactId>

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

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

			<scope>provided</scope>

		</dependency>
@@ -35,7 +67,7 @@ 
		<dependency>

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

			<artifactId>sitemapgen4j</artifactId>

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

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

			<scope>provided</scope>

		</dependency>
@@ -107,12 +139,73 @@ 
			<artifactId>httpclient</artifactId>

		</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.powermock</groupId>

			<artifactId>powermock-api-easymock</artifactId>

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

			<scope>test</scope>

		</dependency>

		<dependency>

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

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

			<scope>test</scope>

		</dependency>



	</dependencies>



	<distributionManagement>

		<repository>

			<id>central</id>

			<name>redmic-releases</name>

			<url>${env.MAVEN_REPO_URL}/libs-release-local</url>

		</repository>

		<snapshotRepository>

			<id>snapshots</id>

			<name>redmic-snapshots</name>

			<url>${env.MAVEN_REPO_URL}/libs-snapshot-local</url>

			<uniqueVersion>false</uniqueVersion>

		</snapshotRepository>

	</distributionManagement>

	<repositories>

		<repository>

			<id>osgeo</id>

			<name>Open Source Geospatial Foundation Repository</name>

			<url>http://download.osgeo.org/webdav/geotools/</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>

</project>
 
 No newline at end of file