Commit 4b0a3d90 authored by Noel Alonso's avatar Noel Alonso
Browse files

Merge branch 'dev' into 'master' 

Limpia ignore, lista licencias y corrige warning

See merge request redmic-project/server/server-parent!4
parents e3292733 672335a9

.gitignore

+0 −4
Original line number Diff line number Diff line 
.*

!.gitignore

!.gitlab-ci.yml

!.dockerignore

!.env

target

dist

pom.xml.*

.gitlab-ci.yml

+4 −0
Original line number Diff line number Diff line
@@ -2,9 +2,13 @@ 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

  - license-list



maven-build:

  artifacts:

pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ 
					<verbose>false</verbose>

					<licenseName>${licenseName}</licenseName>

					<organizationName>${organizationName}</organizationName>

					<inceptionYear>${inceptionYear}</inceptionYear>

					<inceptionYear>${project.inceptionYear}</inceptionYear>

					<roots>

						<root>src/main/java</root>

						<root>src/test/java</root>