Commit c6724ab6 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'feature-updateCI' into 'dev' 

Feature update ci

See merge request redmic-project/server/library/test-utils!4
parents f97b0ae5 85740770

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -2,3 +2,4 @@ 
!.gitignore

!.gitlab-ci.yml

target

pom.xml.*

.gitlab-ci.yml

+9 −18
Original line number Diff line number Diff line 
include:

  - project: 'redmic-project/gitlab-ci-templates'

    ref: master

    file: '/maven-building-library.yml'

  - project: 'redmic-project/gitlab-ci-templates'

    ref: master

    file: '/license-listing.yml'



stages:

  - build



maven-build:

  stage: build

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

  variables:

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

  only:

    - branches

  cache:

    paths:

      - .m2/repository/

  script:

    - mvn deploy -B

  artifacts:

    name: "$CI_PROJECT_NAME"

    expire_in: '6 months'

    paths:

      - target/*.jar
 
  - license-list

pom.xml

+16 −17
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
	<groupId>es.redmic.lib</groupId>

	<artifactId>test-utils</artifactId>

	<packaging>jar</packaging>

	<version>0.8.0</version>

	<version>0.8.0-feature-updateCI</version>

	<name>Test utils</name>

	<description>Utilidades y servicios comunes para los tests</description>
@@ -35,9 +35,6 @@ 
		<powermock.version>1.7.3</powermock.version>

		<confluent.version>5.0.1</confluent.version>

		<jersey-guava.version>2.26-b03</jersey-guava.version>



		<!-- Environment variables -->

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

	</properties>



	<dependencies>
@@ -134,24 +131,26 @@ 
			<artifactId>spring-restdocs-mockmvc</artifactId>

		</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>confluent</id>

			<name>Confluent</name>

			<url>https://packages.confluent.io/maven/</url>

		</repository>

		<repository>

			<id>central</id>

			<name>libs-release</name>

			<url>https://artifactory.redmic.net/artifactory/libs-release</url>

		</repository>

		<repository>

			<id>snapshots</id>

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

	</repositories>

</project>
 
 No newline at end of file