Commit 001e42fd 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/api!18
parents 41ecb245 45616321

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -5,3 +5,4 @@ 
!.env

target

dist

pom.xml.*

.gitlab-ci.yml

+2 −4
Original line number Diff line number Diff line
@@ -33,15 +33,13 @@ variables: 
      OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} AWS_ACCESS_KEY=${AWS_ACCESS_KEY} AWS_SECRET_KEY=${AWS_SECRET_KEY}

      ELASTIC_XPACKSECURITYUSER=${ELASTIC_XPACKSECURITYUSER} AWS_REGION=${AWS_REGION} S3_BUCKET="${S3_BUCKET}"

      PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    url: https://${PUBLIC_HOSTNAME}/${CI_PROJECT_NAME}



.deploy-development:

  variables:

    SPRING_PROFILES_ACTIVE: pre

  environment:

    url: https://${PUBLIC_HOSTNAME}/${CI_PROJECT_NAME}



.deploy-production:

  variables:

    SPRING_PROFILES_ACTIVE: prod
 
  environment:

    url: https://${PUBLIC_HOSTNAME}/${CI_PROJECT_NAME}

pom.xml

+19 −18
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
	<groupId>es.redmic</groupId>

	<artifactId>api</artifactId>

	<packaging>jar</packaging>

	<version>0.7.1</version>

	<version>0.7.1-feature-updateCI</version>

	<name>API</name>

	<description>RESTful web services</description>
@@ -45,9 +45,6 @@ 
		<!-- 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>
@@ -176,19 +173,23 @@ 
			<scope>test</scope>

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

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

	<build>

		<plugins>

			<plugin>