Commit 0a738048 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/db-commons!2
parents a96ff3a9 c8cdd9aa

.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 −20
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

  after_script:

    - rm -r .m2/repository/es

  artifacts:

    name: "$CI_PROJECT_NAME"

    expire_in: '6 months'

    paths:

      - target/*.jar
 
  - license-list

pom.xml

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

	<artifactId>db-commons</artifactId>

	<packaging>jar</packaging>

	<version>0.6.0</version>

	<version>0.6.0-feature-updateCI</version>

	<name>DB Commons</name>

	<description>Database common JPA management</description>
@@ -34,9 +34,6 @@ 
		<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>

		

		<!-- Environment variables -->

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

	</properties>



	<dependencies>
@@ -102,19 +99,6 @@ 
			<version>${ma.glasnost.orika.core}</version>

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

	<build>

		<plugins>

			<plugin>