Commit e0fa0651 authored by Noel Alonso's avatar Noel Alonso
Browse files

Merge branch 'dev' into 'master' 

Dev

See merge request redmic-project/server/vessel/vessels!6
parents 7930837e 3fc1f98e

.gitignore

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

**/target

*/dist

pom.xml.*

.gitlab-ci.yml

+28 −340
Original line number Diff line number Diff line 
include:

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

    ref: master

    file: '/maven-building-functional-unit.yml'

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

    ref: master

    file: '/license-listing.yml'

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

    ref: master

    file: '/packaging.yml'

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

    ref: master

    file: '/deployment-functional-unit.yml'



stages:

  - build-lib

  - build-services

  - build-service

  - license-list

  - package

  - test-package

  - deploy



maven-build-lib:

  stage: build-lib

  image: registry.gitlab.com/redmic-project/docker/maven:${MAVEN_IMAGE_TAG}

variables:

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

    SPRING_PROFILES_ACTIVE: test

  DOCKER_BUILD_ARGS: --build-arg PARENT_IMAGE_NAME=${REDMIC_SERVER_IMAGE_NAME} --build-arg PARENT_IMAGE_TAG=${REDMIC_SERVER_IMAGE_TAG}

  STACK: vessel

  LOGGING_LEVEL_ROOT: error

  LOGGING_LEVEL_ORG_SPRINGFRAMEWORK: error

  only:

    - branches

  cache:

    paths:

      - .m2/repository/

  script:

    - mvn -pl :${CI_PROJECT_NAME}-lib -U clean deploy -B

    - "COVERAGE=$(xmllint --html --xpath '//table[@id=\"coveragetable\"]/tfoot//td[@class=\"ctr2\"][1]/text()' ${CI_PROJECT_NAME}-lib/target/site/jacoco/index.html)"

    - 'echo "Coverage: ${COVERAGE}"'

  after_script:

    - rm -r .m2/repository/es

  artifacts:

    name: "${CI_PROJECT_NAME}-lib-${CI_COMMIT_REF_NAME}"

    expire_in: '6 months'

    paths:

      - "${CI_PROJECT_NAME}-lib/target/*.jar"



maven-build-commands:

  stage: build-services

  image: registry.gitlab.com/redmic-project/docker/maven:${MAVEN_IMAGE_TAG}

  variables:

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

    SPRING_PROFILES_ACTIVE: test

    LOGGING_LEVEL_ROOT: "off"

    LOGGING_LEVEL_ORG_SPRINGFRAMEWORK: error

  LOGGING_LEVEL_ES_REDMIC: error

    OAUTH_CLIENT_ID: ${DEV_OAUTH_CLIENT_ID}

    OAUTH_CLIENT_SECRET: ${DEV_OAUTH_CLIENT_SECRET}

    TEST_USER_PASSWORD: ${TEST_USER_PASSWORD}

  only:

    - branches

  cache:

    paths:

      - .m2/repository/

  script:

    - mvn -pl :${CI_PROJECT_NAME}-commands -U clean verify spring-boot:repackage -B

    - "COVERAGE=$(xmllint --html --xpath '//table[@id=\"coveragetable\"]/tfoot//td[@class=\"ctr2\"][1]/text()' ${CI_PROJECT_NAME}-commands/target/site/jacoco/index.html)"

    - 'echo "Coverage: ${COVERAGE}"'

  after_script:

    - rm -r .m2/repository/es

  artifacts:

    name: "${CI_PROJECT_NAME}-commands-${CI_COMMIT_REF_NAME}"

    expire_in: '6 months'

    paths:

      - "${CI_PROJECT_NAME}-commands/dist/*.jar"

      - "${CI_PROJECT_NAME}-commands/target/generated-docs"



maven-build-view:

  stage: build-services

  image: registry.gitlab.com/redmic-project/docker/maven:${MAVEN_IMAGE_TAG}

  variables:

    GIT_SUBMODULE_STRATEGY: normal

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

    SPRING_PROFILES_ACTIVE: test

    LOGGING_LEVEL_ROOT: error

    LOGGING_LEVEL_ORG_SPRINGFRAMEWORK: error

    OAUTH_CLIENT_ID: ${DEV_OAUTH_CLIENT_ID}

    OAUTH_CLIENT_SECRET: ${DEV_OAUTH_CLIENT_SECRET}

    TEST_USER_PASSWORD: ${TEST_USER_PASSWORD}

    ELASTIC_CLUSTERNAME: ${DEV_ELASTIC_CLUSTERNAME}

  only:

    - branches

  cache:

    paths:

      - .m2/repository/

  script:

    - mvn -f elasticsearch-cluster-runner compile

    - mvn -f elasticsearch-cluster-runner exec:java -Dexec.args="-numOfNode 1 -clusterName ${ELASTIC_CLUSTERNAME}" > elasticsearch-cluster-runner-out.txt &

    - mvn -pl :${CI_PROJECT_NAME}-view -U clean verify spring-boot:repackage -B

    - "COVERAGE=$(xmllint --html --xpath '//table[@id=\"coveragetable\"]/tfoot//td[@class=\"ctr2\"][1]/text()' ${CI_PROJECT_NAME}-view/target/site/jacoco/index.html)"

    - 'echo "Coverage: ${COVERAGE}"'

  after_script:

    - rm -r .m2/repository/es

  artifacts:

    name: "${CI_PROJECT_NAME}-view-${CI_COMMIT_REF_NAME}"

    expire_in: '6 months'

    paths:

      - "${CI_PROJECT_NAME}-view/dist/*.jar"

      - "${CI_PROJECT_NAME}-view/target/generated-docs"

      - "elasticsearch-cluster-runner-out.txt"

    when: always



docker-build-commit-non-master-branches:

  stage: package

  image: docker:stable

  variables:

    DOCKER_DRIVER: overlay2

    PARENT_IMAGE_NAME: registry.gitlab.com/redmic-project/docker/redmic-server

    PARENT_IMAGE_TAG: latest

  services:

    - docker:dind

  only:

    - branches

  except:

    - master

  script:

    - docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}

    - >

      docker build --build-arg PARENT_IMAGE_NAME=${PARENT_IMAGE_NAME} --build-arg PARENT_IMAGE_TAG=${PARENT_IMAGE_TAG}

      -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_NAME}-latest .

    - docker push ${CI_REGISTRY_IMAGE}



docker-build-commit-master-branch:

  stage: package

  image: docker:stable

  variables:

    DOCKER_DRIVER: overlay2

    PARENT_IMAGE_NAME: registry.gitlab.com/redmic-project/docker/redmic-server

    PARENT_IMAGE_TAG: latest

  services:

    - docker:dind

  only:

    - master

  script:

    - docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}

    - >

      docker build --build-arg PARENT_IMAGE_NAME=${PARENT_IMAGE_NAME} --build-arg PARENT_IMAGE_TAG=${PARENT_IMAGE_TAG}

      -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} -t ${CI_REGISTRY_IMAGE}:latest .

    - docker push ${CI_REGISTRY_IMAGE}

  before_script:

    - mvn -f elasticsearch-cluster-runner compile exec:java -Dexec.args="-numOfNode 1 -clusterName ${ELASTIC_CLUSTERNAME}" &



docker-tag-already-built-image:

  stage: package

  image: docker:stable

  variables:

    DOCKER_DRIVER: overlay2

  services:

    - docker:dind

  only:

    - tags

  script:

    - docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}

    - docker pull ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA}

    - docker tag ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} ${CI_REGISTRY_IMAGE}:${CI_COMMIT_TAG}

    - docker push ${CI_REGISTRY_IMAGE}



container-scanning:

  stage: test-package

  image: docker:stable

  variables:

    DOCKER_DRIVER: overlay2

  allow_failure: true

  services:

    - docker:stable-dind

  only:

    - branches

  script:

    - docker run -d --name db arminc/clair-db:latest

    - docker run -p 6060:6060 --link db:postgres -d --name clair arminc/clair-local-scan:v2.0.1

    - apk add -U wget ca-certificates

    - docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}

    - docker pull ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA}

    - wget https://github.com/arminc/clair-scanner/releases/download/v8/clair-scanner_linux_amd64

    - mv clair-scanner_linux_amd64 clair-scanner

    - chmod +x clair-scanner

    - touch clair-whitelist.yml

    - >

      ./clair-scanner -c http://docker:6060 --ip $(hostname -i) -r gl-sast-container-report.json -l clair.log

      -w clair-whitelist.yml ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} || true

  artifacts:

    paths: [gl-sast-container-report.json]



deploy-commands-dev:

  stage: deploy

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:${DOCKER_DEPLOY_IMAGE_TAG}

  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    STACK: vessel

    SERVICES_TO_CHECK: vessel_${CI_PROJECT_NAME}-commands

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.${CI_PROJECT_NAME}-commands.tmpl.yml:docker-compose.${CI_PROJECT_NAME}-commands.dev.yml

    SPRING_PROFILES_ACTIVE: pre

    OAUTH_CLIENT_ID: ${DEV_OAUTH_CLIENT_ID}

    OAUTH_CLIENT_SECRET: ${DEV_OAUTH_CLIENT_SECRET}

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

  services:

    - docker:dind

.deploy-commands:

  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE} OAUTH_CLIENT_ID=${OAUTH_CLIENT_ID}

      OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: dev/${CI_PROJECT_NAME}-commands

    url: https://${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}/commands

  only:

    - dev

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



deploy-view-dev:

  stage: deploy

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:${DOCKER_DEPLOY_IMAGE_TAG}

  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    STACK: vessel

    SERVICES_TO_CHECK: vessel_${CI_PROJECT_NAME}-view

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.${CI_PROJECT_NAME}-view.tmpl.yml:docker-compose.${CI_PROJECT_NAME}-view.dev.yml

    SPRING_PROFILES_ACTIVE: pre

    OAUTH_CLIENT_ID: ${DEV_OAUTH_CLIENT_ID}

    OAUTH_CLIENT_SECRET: ${DEV_OAUTH_CLIENT_SECRET}

    ELASTIC_CLUSTERNAME: ${DEV_ELASTIC_CLUSTERNAME}

    ELASTIC_USER: ${DEV_ELASTIC_USER}

    ELASTIC_PASSWORD: ${DEV_ELASTIC_PASSWORD}

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

  services:

    - docker:dind

  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE} OAUTH_CLIENT_ID=${OAUTH_CLIENT_ID}

      OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} ELASTIC_CLUSTERNAME=${ELASTIC_CLUSTERNAME}

      ELASTIC_USER=${ELASTIC_USER} ELASTIC_PASSWORD=${ELASTIC_PASSWORD} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: dev/${CI_PROJECT_NAME}-view

    url: https://${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}/view

  only:

    - dev



deploy-commands-supporting-branch:

  stage: deploy

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:${DOCKER_DEPLOY_IMAGE_TAG}

  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    STACK: vessel

    SERVICES_TO_CHECK: vessel_${CI_PROJECT_NAME}-commands

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.${CI_PROJECT_NAME}-commands.tmpl.yml:docker-compose.${CI_PROJECT_NAME}-commands.dev.yml

    SPRING_PROFILES_ACTIVE: pre

    OAUTH_CLIENT_ID: ${DEV_OAUTH_CLIENT_ID}

    OAUTH_CLIENT_SECRET: ${DEV_OAUTH_CLIENT_SECRET}

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

  services:

    - docker:dind

  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE} OAUTH_CLIENT_ID=${OAUTH_CLIENT_ID}

      OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: dev/${CI_PROJECT_NAME}-commands

    url: https://${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}/commands

  only:

    - branches

  except:

    - master

    - dev

  when: manual



deploy-view-supporting-branch:

  stage: deploy

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:${DOCKER_DEPLOY_IMAGE_TAG}

  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    STACK: vessel

    SERVICES_TO_CHECK: vessel_${CI_PROJECT_NAME}-view

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.${CI_PROJECT_NAME}-view.tmpl.yml:docker-compose.${CI_PROJECT_NAME}-view.dev.yml

    SPRING_PROFILES_ACTIVE: pre

    OAUTH_CLIENT_ID: ${DEV_OAUTH_CLIENT_ID}

    OAUTH_CLIENT_SECRET: ${DEV_OAUTH_CLIENT_SECRET}

    ELASTIC_CLUSTERNAME: ${DEV_ELASTIC_CLUSTERNAME}

    ELASTIC_USER: ${DEV_ELASTIC_USER}

    ELASTIC_PASSWORD: ${DEV_ELASTIC_PASSWORD}

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

  services:

    - docker:dind

  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE} OAUTH_CLIENT_ID=${OAUTH_CLIENT_ID}

      OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} ELASTIC_CLUSTERNAME=${ELASTIC_CLUSTERNAME}

      ELASTIC_USER=${ELASTIC_USER} ELASTIC_PASSWORD=${ELASTIC_PASSWORD} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: dev/${CI_PROJECT_NAME}-view

    url: https://${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}/view

  only:

    - branches

  except:

    - master

    - dev

  when: manual



deploy-commands-pro:

  stage: deploy

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:${DOCKER_DEPLOY_IMAGE_TAG}

  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    STACK: vessel

    SERVICES_TO_CHECK: vessel_${CI_PROJECT_NAME}-commands

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.${CI_PROJECT_NAME}-commands.tmpl.yml:docker-compose.${CI_PROJECT_NAME}-commands.prod.yml

    SPRING_PROFILES_ACTIVE: prod

    OAUTH_CLIENT_ID: ${PRO_OAUTH_CLIENT_ID}

    OAUTH_CLIENT_SECRET: ${PRO_OAUTH_CLIENT_SECRET}

    PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}

  services:

    - docker:dind

  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE} OAUTH_CLIENT_ID=${OAUTH_CLIENT_ID}

      OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: pro/${CI_PROJECT_NAME}-commands

    url: https://${PRO_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}/commands

  only:

    - master

  when: manual



deploy-view-pro:

  stage: deploy

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:${DOCKER_DEPLOY_IMAGE_TAG}

  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    STACK: vessel

    SERVICES_TO_CHECK: vessel_${CI_PROJECT_NAME}-view

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.${CI_PROJECT_NAME}-view.tmpl.yml:docker-compose.${CI_PROJECT_NAME}-view.prod.yml

    SPRING_PROFILES_ACTIVE: prod

    OAUTH_CLIENT_ID: ${PRO_OAUTH_CLIENT_ID}

    OAUTH_CLIENT_SECRET: ${PRO_OAUTH_CLIENT_SECRET}

    ELASTIC_CLUSTERNAME: ${PRO_ELASTIC_CLUSTERNAME}

    ELASTIC_USER: ${PRO_ELASTIC_USER}

    ELASTIC_PASSWORD: ${PRO_ELASTIC_PASSWORD}

    PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}

  services:

    - docker:dind

.deploy-view:

  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}
@@ -358,8 +50,4 @@ deploy-view-pro: 
      OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} ELASTIC_CLUSTERNAME=${ELASTIC_CLUSTERNAME}

      ELASTIC_USER=${ELASTIC_USER} ELASTIC_PASSWORD=${ELASTIC_PASSWORD} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: pro/${CI_PROJECT_NAME}-view

    url: https://${PRO_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}/view

  only:

    - master

  when: manual
 
    url: https://${PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}/view

LICENSE

0 → 100644
+201 −0

File added.

Preview size limit exceeded, changes collapsed.

pom.xml

+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.9.0</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>

vessels-commands/pom.xml

+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.9.0</version>

	</parent>



	<modelVersion>4.0.0</modelVersion>