Commit 6a5f6ad5 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/mediastorage!2
parents b57f31cf 11bbce94

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

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

    - 'echo "Coverage: $COVERAGE"'

  after_script:

    - rm -r .m2/repository/es

  artifacts:

    name: "$CI_PROJECT_NAME"

    expire_in: '6 months'

    paths:

      - target/*.jar
 
  - license-list

mvnw

deleted100755 → 0
+0 −233
Original line number Diff line number Diff line 
#!/bin/sh

# ----------------------------------------------------------------------------

# Licensed to the Apache Software Foundation (ASF) under one

# or more contributor license agreements.  See the NOTICE file

# distributed with this work for additional information

# regarding copyright ownership.  The ASF licenses this file

# to you under the Apache License, Version 2.0 (the

# "License"); you may not use this file except in compliance

# with the License.  You may obtain a copy of the License at

#

#    http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing,

# software distributed under the License is distributed on an

# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

# KIND, either express or implied.  See the License for the

# specific language governing permissions and limitations

# under the License.

# ----------------------------------------------------------------------------



# ----------------------------------------------------------------------------

# Maven2 Start Up Batch script

#

# Required ENV vars:

# ------------------

#   JAVA_HOME - location of a JDK home dir

#

# Optional ENV vars

# -----------------

#   M2_HOME - location of maven2's installed home dir

#   MAVEN_OPTS - parameters passed to the Java VM when running Maven

#     e.g. to debug Maven itself, use

#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000

#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files

# ----------------------------------------------------------------------------



if [ -z "$MAVEN_SKIP_RC" ] ; then



  if [ -f /etc/mavenrc ] ; then

    . /etc/mavenrc

  fi



  if [ -f "$HOME/.mavenrc" ] ; then

    . "$HOME/.mavenrc"

  fi



fi



# OS specific support.  $var _must_ be set to either true or false.

cygwin=false;

darwin=false;

mingw=false

case "`uname`" in

  CYGWIN*) cygwin=true ;;

  MINGW*) mingw=true;;

  Darwin*) darwin=true

           #

           # Look for the Apple JDKs first to preserve the existing behaviour, and then look

           # for the new JDKs provided by Oracle.

           #

           if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK ] ; then

             #

             # Apple JDKs

             #

             export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home

           fi



           if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ] ; then

             #

             # Apple JDKs

             #

             export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home

           fi



           if [ -z "$JAVA_HOME" ] && [ -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ] ; then

             #

             # Oracle JDKs

             #

             export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home

           fi



           if [ -z "$JAVA_HOME" ] && [ -x "/usr/libexec/java_home" ]; then

             #

             # Apple JDKs

             #

             export JAVA_HOME=`/usr/libexec/java_home`

           fi

           ;;

esac



if [ -z "$JAVA_HOME" ] ; then

  if [ -r /etc/gentoo-release ] ; then

    JAVA_HOME=`java-config --jre-home`

  fi

fi



if [ -z "$M2_HOME" ] ; then

  ## resolve links - $0 may be a link to maven's home

  PRG="$0"



  # need this for relative symlinks

  while [ -h "$PRG" ] ; do

    ls=`ls -ld "$PRG"`

    link=`expr "$ls" : '.*-> \(.*\)$'`

    if expr "$link" : '/.*' > /dev/null; then

      PRG="$link"

    else

      PRG="`dirname "$PRG"`/$link"

    fi

  done



  saveddir=`pwd`



  M2_HOME=`dirname "$PRG"`/..



  # make it fully qualified

  M2_HOME=`cd "$M2_HOME" && pwd`



  cd "$saveddir"

  # echo Using m2 at $M2_HOME

fi



# For Cygwin, ensure paths are in UNIX format before anything is touched

if $cygwin ; then

  [ -n "$M2_HOME" ] &&

    M2_HOME=`cygpath --unix "$M2_HOME"`

  [ -n "$JAVA_HOME" ] &&

    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`

  [ -n "$CLASSPATH" ] &&

    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`

fi



# For Migwn, ensure paths are in UNIX format before anything is touched

if $mingw ; then

  [ -n "$M2_HOME" ] &&

    M2_HOME="`(cd "$M2_HOME"; pwd)`"

  [ -n "$JAVA_HOME" ] &&

    JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"

  # TODO classpath?

fi



if [ -z "$JAVA_HOME" ]; then

  javaExecutable="`which javac`"

  if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then

    # readlink(1) is not available as standard on Solaris 10.

    readLink=`which readlink`

    if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then

      if $darwin ; then

        javaHome="`dirname \"$javaExecutable\"`"

        javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"

      else

        javaExecutable="`readlink -f \"$javaExecutable\"`"

      fi

      javaHome="`dirname \"$javaExecutable\"`"

      javaHome=`expr "$javaHome" : '\(.*\)/bin'`

      JAVA_HOME="$javaHome"

      export JAVA_HOME

    fi

  fi

fi



if [ -z "$JAVACMD" ] ; then

  if [ -n "$JAVA_HOME"  ] ; then

    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then

      # IBM's JDK on AIX uses strange locations for the executables

      JAVACMD="$JAVA_HOME/jre/sh/java"

    else

      JAVACMD="$JAVA_HOME/bin/java"

    fi

  else

    JAVACMD="`which java`"

  fi

fi



if [ ! -x "$JAVACMD" ] ; then

  echo "Error: JAVA_HOME is not defined correctly." >&2

  echo "  We cannot execute $JAVACMD" >&2

  exit 1

fi



if [ -z "$JAVA_HOME" ] ; then

  echo "Warning: JAVA_HOME environment variable is not set."

fi



CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher



# For Cygwin, switch paths to Windows format before running java

if $cygwin; then

  [ -n "$M2_HOME" ] &&

    M2_HOME=`cygpath --path --windows "$M2_HOME"`

  [ -n "$JAVA_HOME" ] &&

    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`

  [ -n "$CLASSPATH" ] &&

    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`

fi



# traverses directory structure from process work directory to filesystem root

# first directory with .mvn subdirectory is considered project base directory

find_maven_basedir() {

  local basedir=$(pwd)

  local wdir=$(pwd)

  while [ "$wdir" != '/' ] ; do

    if [ -d "$wdir"/.mvn ] ; then

      basedir=$wdir

      break

    fi

    wdir=$(cd "$wdir/.."; pwd)

  done

  echo "${basedir}"

}



# concatenates all lines of a file

concat_lines() {

  if [ -f "$1" ]; then

    echo "$(tr -s '\n' ' ' < "$1")"

  fi

}



export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-$(find_maven_basedir)}

MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"



# Provide a "standardized" way to retrieve the CLI args that will

# work with both Windows and non-Windows executions.

MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"

export MAVEN_CMD_LINE_ARGS



WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain



exec "$JAVACMD" \

  $MAVEN_OPTS \

  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \

  "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \

  ${WRAPPER_LAUNCHER} "$@"

mvnw.cmd

deleted100644 → 0
+0 −145
Original line number Diff line number Diff line 
@REM ----------------------------------------------------------------------------

@REM Licensed to the Apache Software Foundation (ASF) under one

@REM or more contributor license agreements.  See the NOTICE file

@REM distributed with this work for additional information

@REM regarding copyright ownership.  The ASF licenses this file

@REM to you under the Apache License, Version 2.0 (the

@REM "License"); you may not use this file except in compliance

@REM with the License.  You may obtain a copy of the License at

@REM

@REM    http://www.apache.org/licenses/LICENSE-2.0

@REM

@REM Unless required by applicable law or agreed to in writing,

@REM software distributed under the License is distributed on an

@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

@REM KIND, either express or implied.  See the License for the

@REM specific language governing permissions and limitations

@REM under the License.

@REM ----------------------------------------------------------------------------



@REM ----------------------------------------------------------------------------

@REM Maven2 Start Up Batch script

@REM

@REM Required ENV vars:

@REM JAVA_HOME - location of a JDK home dir

@REM

@REM Optional ENV vars

@REM M2_HOME - location of maven2's installed home dir

@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands

@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending

@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven

@REM     e.g. to debug Maven itself, use

@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000

@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files

@REM ----------------------------------------------------------------------------



@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'

@echo off

@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'

@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%



@REM set %HOME% to equivalent of $HOME

if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")



@REM Execute a user defined script before this one

if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre

@REM check for pre script, once with legacy .bat ending and once with .cmd ending

if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"

if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"

:skipRcPre



@setlocal



set ERROR_CODE=0



@REM To isolate internal variables from possible post scripts, we use another setlocal

@setlocal



@REM ==== START VALIDATION ====

if not "%JAVA_HOME%" == "" goto OkJHome



echo.

echo Error: JAVA_HOME not found in your environment. >&2

echo Please set the JAVA_HOME variable in your environment to match the >&2

echo location of your Java installation. >&2

echo.

goto error



:OkJHome

if exist "%JAVA_HOME%\bin\java.exe" goto init



echo.

echo Error: JAVA_HOME is set to an invalid directory. >&2

echo JAVA_HOME = "%JAVA_HOME%" >&2

echo Please set the JAVA_HOME variable in your environment to match the >&2

echo location of your Java installation. >&2

echo.

goto error



@REM ==== END VALIDATION ====



:init



set MAVEN_CMD_LINE_ARGS=%*



@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".

@REM Fallback to current working directory if not found.



set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%

IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir



set EXEC_DIR=%CD%

set WDIR=%EXEC_DIR%

:findBaseDir

IF EXIST "%WDIR%"\.mvn goto baseDirFound

cd ..

IF "%WDIR%"=="%CD%" goto baseDirNotFound

set WDIR=%CD%

goto findBaseDir



:baseDirFound

set MAVEN_PROJECTBASEDIR=%WDIR%

cd "%EXEC_DIR%"

goto endDetectBaseDir



:baseDirNotFound

set MAVEN_PROJECTBASEDIR=%EXEC_DIR%

cd "%EXEC_DIR%"



:endDetectBaseDir



IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig



@setlocal EnableExtensions EnableDelayedExpansion

for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a

@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%



:endReadAdditionalConfig



SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"



set WRAPPER_JAR="".\.mvn\wrapper\maven-wrapper.jar""

set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain



%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CMD_LINE_ARGS%

if ERRORLEVEL 1 goto error

goto end



:error

set ERROR_CODE=1



:end

@endlocal & set ERROR_CODE=%ERROR_CODE%



if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost

@REM check for post script, once with legacy .bat ending and once with .cmd ending

if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"

if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"

:skipRcPost



@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'

if "%MAVEN_BATCH_PAUSE%" == "on" pause



if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%



exit /B %ERROR_CODE%
 
 No newline at end of file

pom.xml

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

	<artifactId>mediastorage</artifactId>

	<packaging>jar</packaging>

	<version>0.6.0</version>

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

	<name>Mediastorage</name>

	<description>MediaStorage utils and management</description>
@@ -34,9 +34,6 @@ 
		

		<!-- Version plugins -->

		<jacoco.version>0.8.1</jacoco.version>



		<!-- Environment variables -->

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

	</properties>

	

	<dependencies>
@@ -99,19 +96,23 @@ 
			</dependency>

		</dependencies>

	</dependencyManagement>

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