From ea81472f716af2f23d5e17d8e2d6796467d2f607 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Tue, 14 Jan 2020 16:29:05 +0000 Subject: [PATCH 001/111] [CHR-1066] --- .circleci/config.yml | 33 + .circleci/settings.xml | 17 + .mvn/wrapper/MavenWrapperDownloader.java | 117 ++ .mvn/wrapper/maven-wrapper.jar | Bin 0 -> 50710 bytes .mvn/wrapper/maven-wrapper.properties | 2 + mvnw | 310 ++++ mvnw.cmd | 182 +++ pom.xml | 1848 +++++++++++----------- settings.xml | 19 +- 9 files changed, 1596 insertions(+), 932 deletions(-) create mode 100644 .circleci/config.yml create mode 100644 .circleci/settings.xml create mode 100644 .mvn/wrapper/MavenWrapperDownloader.java create mode 100644 .mvn/wrapper/maven-wrapper.jar create mode 100644 .mvn/wrapper/maven-wrapper.properties create mode 100755 mvnw create mode 100644 mvnw.cmd diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 00000000000..edbc29aa971 --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,33 @@ +version: 2 +workflows: + version: 2 + flow: + jobs: + - deploy: + context: babylon +# filters: +# branches: +# only: +# - 7.x +env: &env + working_directory: ~/project + resource_class: large + docker: + - image: docker:17.03.0-ce-git + +jobs: + deploy: + <<: *env + steps: + - checkout + - setup_remote_docker + - run: + name: Build prerequisites + command: | + echo "$CIRCLE_SHA1" > .commit-keyId + docker --version + docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" quay.io + apk add --no-cache make=4.2.1-r0 openjdk8 + - deploy: + name: Deploy + command: ./mvnw clean deploy diff --git a/.circleci/settings.xml b/.circleci/settings.xml new file mode 100644 index 00000000000..37b9facca7e --- /dev/null +++ b/.circleci/settings.xml @@ -0,0 +1,17 @@ + + + + + babylon-snapshots + ${env.ARTIFACTORY_USER} + ${env.ARTIFACTORY_PWD} + + + babylon-releases + ${env.ARTIFACTORY_USER} + ${env.ARTIFACTORY_PWD} + + + \ No newline at end of file diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java new file mode 100644 index 00000000000..b901097f2db --- /dev/null +++ b/.mvn/wrapper/MavenWrapperDownloader.java @@ -0,0 +1,117 @@ +/* + * Copyright 2007-present the original author or authors. + * + * Licensed 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. + */ +import java.net.*; +import java.io.*; +import java.nio.channels.*; +import java.util.Properties; + +public class MavenWrapperDownloader { + + private static final String WRAPPER_VERSION = "0.5.6"; + /** + * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. + */ + private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" + + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; + + /** + * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to + * use instead of the default one. + */ + private static final String MAVEN_WRAPPER_PROPERTIES_PATH = + ".mvn/wrapper/maven-wrapper.properties"; + + /** + * Path where the maven-wrapper.jar will be saved to. + */ + private static final String MAVEN_WRAPPER_JAR_PATH = + ".mvn/wrapper/maven-wrapper.jar"; + + /** + * Name of the property which should be used to override the default download url for the wrapper. + */ + private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; + + public static void main(String args[]) { + System.out.println("- Downloader started"); + File baseDirectory = new File(args[0]); + System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); + + // If the maven-wrapper.properties exists, read it and check if it contains a custom + // wrapperUrl parameter. + File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); + String url = DEFAULT_DOWNLOAD_URL; + if(mavenWrapperPropertyFile.exists()) { + FileInputStream mavenWrapperPropertyFileInputStream = null; + try { + mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); + Properties mavenWrapperProperties = new Properties(); + mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); + url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); + } catch (IOException e) { + System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); + } finally { + try { + if(mavenWrapperPropertyFileInputStream != null) { + mavenWrapperPropertyFileInputStream.close(); + } + } catch (IOException e) { + // Ignore ... + } + } + } + System.out.println("- Downloading from: " + url); + + File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); + if(!outputFile.getParentFile().exists()) { + if(!outputFile.getParentFile().mkdirs()) { + System.out.println( + "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); + } + } + System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); + try { + downloadFileFromURL(url, outputFile); + System.out.println("Done"); + System.exit(0); + } catch (Throwable e) { + System.out.println("- Error downloading"); + e.printStackTrace(); + System.exit(1); + } + } + + private static void downloadFileFromURL(String urlString, File destination) throws Exception { + if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { + String username = System.getenv("MVNW_USERNAME"); + char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); + Authenticator.setDefault(new Authenticator() { + @Override + protected PasswordAuthentication getPasswordAuthentication() { + return new PasswordAuthentication(username, password); + } + }); + } + URL website = new URL(urlString); + ReadableByteChannel rbc; + rbc = Channels.newChannel(website.openStream()); + FileOutputStream fos = new FileOutputStream(destination); + fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); + fos.close(); + rbc.close(); + } + +} diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..2cc7d4a55c0cd0092912bf49ae38b3a9e3fd0054 GIT binary patch literal 50710 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 EfAhh=DF6Tf literal 0 HcmV?d00001 diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 00000000000..642d572ce90 --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar diff --git a/mvnw b/mvnw new file mode 100755 index 00000000000..41c0f0c23db --- /dev/null +++ b/mvnw @@ -0,0 +1,310 @@ +#!/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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven 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 + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + 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 Mingw, 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)`" +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 + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# 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"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# 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} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 00000000000..86115719e53 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,182 @@ +@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 Maven 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 keystroke 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 set title of command window +title %0 +@REM enable echoing by 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 + +@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="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + +FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +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% diff --git a/pom.xml b/pom.xml index d3924ecf378..e2e4c0f657d 100644 --- a/pom.xml +++ b/pom.xml @@ -1,935 +1,935 @@ - 4.0.0 - com.b2international.snowowl - snowowl-parent - 7.3.0-SNAPSHOT - pom + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + 4.0.0 + com.b2international.snowowl + snowowl-parent + 7.3.0-SNAPSHOT + pom - - UTF-8 - UTF-8 - - - 2.9.10 - 2.9.10.1 - 4.1.16.Final - 1.7.25 - 1.2.3 - [1.2.3,1.2.4) - 21.0 - [21.0.0,22.0.0) - 1.9.3 - 2.4.17 - 3.2.2 - [3.2.2,3.3.0) - 1.2.71 - 5.0.4-b2i - 4.5.10 - 0.4.3 - 9.4.18.v20190429 - 4.8.43 - 0.4.1 - 0.6.1 - 2.1.10 - 1.2 - 1.10 - 8.2.2 - 2.3.0 - 1.2.0 - 2.6.0 - 2.3.1 - - 1.5.0 - 1.5.0 - 2.18.0 - 0.8.4 - - - yyyyMMddHHmm - ${maven.build.timestamp} - + + UTF-8 + UTF-8 - - commons - core - fhir - net4j - snomed - cis - tests - releng - dist - + + 2.9.10 + 2.9.10.1 + 4.1.16.Final + 1.7.25 + 1.2.3 + [1.2.3,1.2.4) + 21.0 + [21.0.0,22.0.0) + 1.9.3 + 2.4.17 + 3.2.2 + [3.2.2,3.3.0) + 1.2.71 + 5.0.4-b2i + 4.5.10 + 0.4.3 + 9.4.18.v20190429 + 4.8.43 + 0.4.1 + 0.6.1 + 2.1.10 + 1.2 + 1.10 + 8.2.2 + 2.3.0 + 1.2.0 + 2.6.0 + 2.3.1 + + 1.5.0 + 1.5.0 + 2.18.0 + 0.8.4 - - - protege-mvn-repo - https://b2ihealthcare.github.io/protege/ - - true - never - - - false - never - - - - snomed-international-releases - https://maven.ihtsdotools.org/content/repositories/releases/ - - true - never - - - false - never - - - + + yyyyMMddHHmm + ${maven.build.timestamp} + - - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - provided - - - com.fasterxml.jackson.core - jackson-annotations - ${jackson.version} - provided - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.databind.version} - provided - - - com.fasterxml.jackson.dataformat - jackson-dataformat-cbor - ${jackson.version} - provided - - - com.fasterxml.jackson.dataformat - jackson-dataformat-yaml - ${jackson.version} - provided - - - com.fasterxml.jackson.dataformat - jackson-dataformat-smile - ${jackson.version} - provided - - - com.fasterxml.jackson.dataformat - jackson-dataformat-csv - ${jackson.version} - provided - - - com.fasterxml.jackson.dataformat - jackson-dataformat-xml - ${jackson.version} - provided - - - com.fasterxml.jackson.module - jackson-module-afterburner - ${jackson.version} - provided - - - com.fasterxml.jackson.module - jackson-module-jaxb-annotations - ${jackson.version} - provided - - - com.thoughtworks.xstream - xstream - 1.4.7 - provided - - - org.eclipse.persistence - javax.persistence - 2.0.5 - provided - - - org.assertj - assertj-core - 1.7.1 - provided - - - org.yaml - snakeyaml - 1.25 - provided - - - io.reactivex.rxjava2 - rxjava - 2.0.7 - provided - - - org.reactivestreams - reactive-streams - 1.0.0 - provided - - - commons-collections - commons-collections - 3.2.2 - provided - - - com.google.guava - guava - ${guava.version} - provided - - - io.netty - netty-buffer - ${netty.version} - provided - - - io.netty - netty-codec - ${netty.version} - provided - - - io.netty - netty-codec-http - ${netty.version} - provided - - - io.netty - netty-common - ${netty.version} - provided - - - io.netty - netty-handler - ${netty.version} - provided - - - io.netty - netty-resolver - ${netty.version} - provided - - - io.netty - netty-transport - ${netty.version} - provided - - - org.jetbrains.kotlin - kotlin-osgi-bundle - ${kotlin.version} - provided - - - com.diffplug.osgi - com.diffplug.osgi.extension.sun.misc - 0.0.0 - provided - - - com.diffplug.osgi - com.diffplug.osgi.extension.sun.reflect - 0.0.0 - provided - - - ch.qos.logback - logback-classic - ${logback.version} - provided - - - ch.qos.logback - logback-core - ${logback.version} - provided - - - org.slf4j - slf4j-api - ${slf4j.version} - provided - - - org.slf4j - jcl-over-slf4j - ${slf4j.version} - provided - - - org.slf4j - jul-to-slf4j - ${slf4j.version} - provided - - - org.slf4j - log4j-over-slf4j - ${slf4j.version} - provided - - - io.github.classgraph - classgraph - ${classgraph.version} - provided - - - com.b2international.snowowl - protege-common - ${protege.version} - provided - - - - org.apache.felix - org.apache.felix.main - - - - - com.b2international.snowowl - protege-editor-core - ${protege.version} - provided - - - - org.eclipse.equinox - org.eclipse.equinox.common - - - org.eclipse.equinox - org.eclipse.equinox.registry - - - - - com.b2international.snowowl - protege-editor-owl - ${protege.version} - provided - - - - log4j - log4j - - - - - net.sourceforge.owlapi - owlapi-osgidistribution - ${owlapi.version} - provided - - - org.semanticweb.elk - elk-protege - ${elk.version} - provided - - - - log4j - log4j - - - - org.protege - protege-editor-core-application - - - org.protege - protege-editor-owl - - - - - org.eclipse.jetty - jetty-continuation - ${jetty.version} - provided - - - org.eclipse.jetty - jetty-deploy - ${jetty.version} - provided - - - org.eclipse.jetty - jetty-http - ${jetty.version} - provided - - - org.eclipse.jetty - jetty-io - ${jetty.version} - provided - - - org.eclipse.jetty.osgi - jetty-osgi-boot - ${jetty.version} - provided - - - - org.eclipse.osgi - org.eclipse.osgi - - - org.eclipse.osgi - org.eclipse.osgi.services - - - org.ow2.asm - asm - - - org.ow2.asm - asm-commons - - - - - org.eclipse.jetty - jetty-security - ${jetty.version} - provided - - - org.eclipse.jetty - jetty-servlet - ${jetty.version} - provided - - - org.eclipse.jetty - jetty-util - ${jetty.version} - provided - - - org.eclipse.jetty - jetty-webapp - ${jetty.version} - provided - - - org.eclipse.jetty - jetty-xml - ${jetty.version} - provided - - - net.bytebuddy - byte-buddy - ${net.bytebuddy.version} - provided - - - com.fasterxml - classmate - 1.3.4 - provided - - - org.mapstruct - mapstruct - 1.2.0.Final - provided - - - io.swagger - swagger-annotations - 1.5.23 - provided - - - io.swagger - swagger-models - 1.5.23 - provided - - - org.apache.httpcomponents - httpclient-osgi - 4.5.3 - provided - - - org.apache.httpcomponents - httpcore-osgi - 4.4.10 - provided - - - org.apache.httpcomponents - httpasyncclient-osgi - 4.1.4 - provided - - - de.svenkubiak - jBCrypt - ${jbcrypt.version} - provided - - - net.jodah - typetools - ${typetools.version} - provided - - - org.hdrhistogram - HdrHistogram - ${hdrhistogram.version} - provided - - - commons-codec - commons-codec - ${commons.codec.version} - provided - - - commons-logging - commons-logging - ${commons.logging.version} - provided - - - it.unimi.dsi - fastutil - ${fastutil.version} - provided - - - javax.activation - javax.activation-api - 1.2.0 - provided - - - javax.xml.bind - jaxb-api - ${jaxb.api.version} - provided - - - com.sun.xml.bind - jaxb-core - ${jaxb.api.version} - provided - - - com.sun.xml.bind - jaxb-impl - ${jaxb.api.version} - provided - - - com.sun.activation - javax.activation - ${javax.activation.version} - provided - - - org.snomed.otf - snomed-owl-toolkit - ${snomed.owl.toolkit.version} - bundle - provided - - - - com.google.inject - guice - - - com.google.inject.extensions - guice-assistedinject - - - com.google.inject.extensions - guice-multibindings - - - - - net.jodah - failsafe - ${failsafe.version} - provided - - + + commons + core + fhir + net4j + snomed + cis + tests + releng + dist + - - - - org.eclipse.tycho - tycho-maven-plugin - ${tycho.version} - true - - - org.eclipse.tycho - tycho-packaging-plugin - - false - false - - - - org.eclipse.tycho - tycho-source-plugin - ${tycho.version} - - - plugin-source - - plugin-source - - - - - - org.eclipse.tycho - target-platform-configuration - ${tycho.version} - - p2 - consider - - - ${project.groupId} - target-platform - ${project.version} - - - - - eclipse-plugin - org.eclipse.osgi - - [3.13.0,3.15.0] - - - - - - p2-installable-unit - org.eclipse.equinox.servletbridge.extensionbundle - - - - eclipse-plugin - org.codehaus.groovy - - ${groovy.version} - - - - eclipse-plugin - com.google.guava - - ${guava.versionRange} - - - - - p2-installable-unit - slf4j.api - - ${slf4j.version} - - - - p2-installable-unit - ch.qos.logback.classic - - ${logback.versionRange} - - - - p2-installable-unit - ch.qos.logback.core - - ${logback.versionRange} - - - - - p2-installable-unit - com.fasterxml.jackson.core.jackson-annotations - - ${jackson.version} - - - - p2-installable-unit - com.fasterxml.jackson.core.jackson-core - - ${jackson.version} - - - - p2-installable-unit - com.fasterxml.jackson.core.jackson-databind - - ${jackson.databind.version} - - - - p2-installable-unit - com.fasterxml.jackson.dataformat.jackson-dataformat-yaml - - ${jackson.version} - - - - p2-installable-unit - com.fasterxml.jackson.dataformat.jackson-dataformat-cbor - - ${jackson.version} - - - - p2-installable-unit - com.fasterxml.jackson.dataformat.jackson-dataformat-csv - - ${jackson.version} - - - - p2-installable-unit - com.fasterxml.jackson.dataformat.jackson-dataformat-xml - - ${jackson.version} - - - - p2-installable-unit - com.fasterxml.jackson.dataformat.jackson-dataformat-afterburner - - ${jackson.version} - - - - - p2-installable-unit - org.apache.commons.collections - - ${commons.collections.versionRange} - - - - p2-installable-unit - org.slf4j.api - - - - - - linux - gtk - x86_64 - - - win32 - win32 - x86_64 - - - - - - org.eclipse.tycho - tycho-p2-director-plugin - ${tycho.version} - - - org.codehaus.plexus - plexus-archiver - 2.4.4 - - - org.codehaus.plexus - plexus-component-api - - - org.codehaus.plexus - plexus-container-default - - - - - - - org.eclipse.tycho - tycho-p2-publisher-plugin - ${tycho.version} - - true - - - - org.eclipse.tycho - tycho-versions-plugin - ${tycho.version} - - - org.jacoco - jacoco-maven-plugin - ${jacoco.version} - - - - prepare-agent - - - - - - - - - org.eclipse.tycho - tycho-compiler-plugin - ${tycho.version} - - false - 11 - 11 - - **/*.groovy - **/*.xtend - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.0 - - 11 - 11 - - - - org.eclipse.tycho - tycho-surefire-plugin - ${tycho.version} - - false - - **/*Test*.java - - false - - - - org.eclipse.tycho - tycho-packaging-plugin - ${tycho.version} - - - org.eclipse.tycho.extras - tycho-buildtimestamp-jgit - ${tycho-extras.version} - - - - jgit - - pom.xml - - - - - org.eclipse.tycho - tycho-p2-repository-plugin - ${tycho.version} - - true - - - - org.apache.maven.plugins - maven-assembly-plugin - 2.3 - - - - + + + protege-mvn-repo + https://b2ihealthcare.github.io/protege/ + + true + never + + + false + never + + + + snomed-international-releases + https://maven.ihtsdotools.org/content/repositories/releases/ + + true + never + + + false + never + + + - - - docs - - - docs - true - - - - documentation - - - + + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + provided + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + provided + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.databind.version} + provided + + + com.fasterxml.jackson.dataformat + jackson-dataformat-cbor + ${jackson.version} + provided + + + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + ${jackson.version} + provided + + + com.fasterxml.jackson.dataformat + jackson-dataformat-smile + ${jackson.version} + provided + + + com.fasterxml.jackson.dataformat + jackson-dataformat-csv + ${jackson.version} + provided + + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + ${jackson.version} + provided + + + com.fasterxml.jackson.module + jackson-module-afterburner + ${jackson.version} + provided + + + com.fasterxml.jackson.module + jackson-module-jaxb-annotations + ${jackson.version} + provided + + + com.thoughtworks.xstream + xstream + 1.4.7 + provided + + + org.eclipse.persistence + javax.persistence + 2.0.5 + provided + + + org.assertj + assertj-core + 1.7.1 + provided + + + org.yaml + snakeyaml + 1.25 + provided + + + io.reactivex.rxjava2 + rxjava + 2.0.7 + provided + + + org.reactivestreams + reactive-streams + 1.0.0 + provided + + + commons-collections + commons-collections + 3.2.2 + provided + + + com.google.guava + guava + ${guava.version} + provided + + + io.netty + netty-buffer + ${netty.version} + provided + + + io.netty + netty-codec + ${netty.version} + provided + + + io.netty + netty-codec-http + ${netty.version} + provided + + + io.netty + netty-common + ${netty.version} + provided + + + io.netty + netty-handler + ${netty.version} + provided + + + io.netty + netty-resolver + ${netty.version} + provided + + + io.netty + netty-transport + ${netty.version} + provided + + + org.jetbrains.kotlin + kotlin-osgi-bundle + ${kotlin.version} + provided + + + com.diffplug.osgi + com.diffplug.osgi.extension.sun.misc + 0.0.0 + provided + + + com.diffplug.osgi + com.diffplug.osgi.extension.sun.reflect + 0.0.0 + provided + + + ch.qos.logback + logback-classic + ${logback.version} + provided + + + ch.qos.logback + logback-core + ${logback.version} + provided + + + org.slf4j + slf4j-api + ${slf4j.version} + provided + + + org.slf4j + jcl-over-slf4j + ${slf4j.version} + provided + + + org.slf4j + jul-to-slf4j + ${slf4j.version} + provided + + + org.slf4j + log4j-over-slf4j + ${slf4j.version} + provided + + + io.github.classgraph + classgraph + ${classgraph.version} + provided + + + com.b2international.snowowl + protege-common + ${protege.version} + provided + + + + org.apache.felix + org.apache.felix.main + + + + + com.b2international.snowowl + protege-editor-core + ${protege.version} + provided + + + + org.eclipse.equinox + org.eclipse.equinox.common + + + org.eclipse.equinox + org.eclipse.equinox.registry + + + + + com.b2international.snowowl + protege-editor-owl + ${protege.version} + provided + + + + log4j + log4j + + + + + net.sourceforge.owlapi + owlapi-osgidistribution + ${owlapi.version} + provided + + + org.semanticweb.elk + elk-protege + ${elk.version} + provided + + + + log4j + log4j + + + + org.protege + protege-editor-core-application + + + org.protege + protege-editor-owl + + + + + org.eclipse.jetty + jetty-continuation + ${jetty.version} + provided + + + org.eclipse.jetty + jetty-deploy + ${jetty.version} + provided + + + org.eclipse.jetty + jetty-http + ${jetty.version} + provided + + + org.eclipse.jetty + jetty-io + ${jetty.version} + provided + + + org.eclipse.jetty.osgi + jetty-osgi-boot + ${jetty.version} + provided + + + + org.eclipse.osgi + org.eclipse.osgi + + + org.eclipse.osgi + org.eclipse.osgi.services + + + org.ow2.asm + asm + + + org.ow2.asm + asm-commons + + + + + org.eclipse.jetty + jetty-security + ${jetty.version} + provided + + + org.eclipse.jetty + jetty-servlet + ${jetty.version} + provided + + + org.eclipse.jetty + jetty-util + ${jetty.version} + provided + + + org.eclipse.jetty + jetty-webapp + ${jetty.version} + provided + + + org.eclipse.jetty + jetty-xml + ${jetty.version} + provided + + + net.bytebuddy + byte-buddy + ${net.bytebuddy.version} + provided + + + com.fasterxml + classmate + 1.3.4 + provided + + + org.mapstruct + mapstruct + 1.2.0.Final + provided + + + io.swagger + swagger-annotations + 1.5.23 + provided + + + io.swagger + swagger-models + 1.5.23 + provided + + + org.apache.httpcomponents + httpclient-osgi + 4.5.3 + provided + + + org.apache.httpcomponents + httpcore-osgi + 4.4.10 + provided + + + org.apache.httpcomponents + httpasyncclient-osgi + 4.1.4 + provided + + + de.svenkubiak + jBCrypt + ${jbcrypt.version} + provided + + + net.jodah + typetools + ${typetools.version} + provided + + + org.hdrhistogram + HdrHistogram + ${hdrhistogram.version} + provided + + + commons-codec + commons-codec + ${commons.codec.version} + provided + + + commons-logging + commons-logging + ${commons.logging.version} + provided + + + it.unimi.dsi + fastutil + ${fastutil.version} + provided + + + javax.activation + javax.activation-api + 1.2.0 + provided + + + javax.xml.bind + jaxb-api + ${jaxb.api.version} + provided + + + com.sun.xml.bind + jaxb-core + ${jaxb.api.version} + provided + + + com.sun.xml.bind + jaxb-impl + ${jaxb.api.version} + provided + + + com.sun.activation + javax.activation + ${javax.activation.version} + provided + + + org.snomed.otf + snomed-owl-toolkit + ${snomed.owl.toolkit.version} + bundle + provided + + + + com.google.inject + guice + + + com.google.inject.extensions + guice-assistedinject + + + com.google.inject.extensions + guice-multibindings + + + + + net.jodah + failsafe + ${failsafe.version} + provided + + - - - ${maven.repository.id} - ${nexus.releases.url} - - - ${maven.repository.id} - ${nexus.snapshots.url} - - + + + + org.eclipse.tycho + tycho-maven-plugin + ${tycho.version} + true + + + org.eclipse.tycho + tycho-packaging-plugin + + false + false + + + + org.eclipse.tycho + tycho-source-plugin + ${tycho.version} + + + plugin-source + + plugin-source + + + + + + org.eclipse.tycho + target-platform-configuration + ${tycho.version} + + p2 + consider + + + ${project.groupId} + target-platform + ${project.version} + + + + + eclipse-plugin + org.eclipse.osgi + + [3.13.0,3.15.0] + + + + + + p2-installable-unit + org.eclipse.equinox.servletbridge.extensionbundle + + + + eclipse-plugin + org.codehaus.groovy + + ${groovy.version} + + + + eclipse-plugin + com.google.guava + + ${guava.versionRange} + + + + + p2-installable-unit + slf4j.api + + ${slf4j.version} + + + + p2-installable-unit + ch.qos.logback.classic + + ${logback.versionRange} + + + + p2-installable-unit + ch.qos.logback.core + + ${logback.versionRange} + + + + + p2-installable-unit + com.fasterxml.jackson.core.jackson-annotations + + ${jackson.version} + + + + p2-installable-unit + com.fasterxml.jackson.core.jackson-core + + ${jackson.version} + + + + p2-installable-unit + com.fasterxml.jackson.core.jackson-databind + + ${jackson.databind.version} + + + + p2-installable-unit + com.fasterxml.jackson.dataformat.jackson-dataformat-yaml + + ${jackson.version} + + + + p2-installable-unit + com.fasterxml.jackson.dataformat.jackson-dataformat-cbor + + ${jackson.version} + + + + p2-installable-unit + com.fasterxml.jackson.dataformat.jackson-dataformat-csv + + ${jackson.version} + + + + p2-installable-unit + com.fasterxml.jackson.dataformat.jackson-dataformat-xml + + ${jackson.version} + + + + p2-installable-unit + com.fasterxml.jackson.dataformat.jackson-dataformat-afterburner + + ${jackson.version} + + + + + p2-installable-unit + org.apache.commons.collections + + ${commons.collections.versionRange} + + + + p2-installable-unit + org.slf4j.api + + + + + + linux + gtk + x86_64 + + + win32 + win32 + x86_64 + + + + + + org.eclipse.tycho + tycho-p2-director-plugin + ${tycho.version} + + + org.codehaus.plexus + plexus-archiver + 2.4.4 + + + org.codehaus.plexus + plexus-component-api + + + org.codehaus.plexus + plexus-container-default + + + + + + + org.eclipse.tycho + tycho-p2-publisher-plugin + ${tycho.version} + + true + + + + org.eclipse.tycho + tycho-versions-plugin + ${tycho.version} + + + org.jacoco + jacoco-maven-plugin + ${jacoco.version} + + + + prepare-agent + + + + + + + + + org.eclipse.tycho + tycho-compiler-plugin + ${tycho.version} + + false + 11 + 11 + + **/*.groovy + **/*.xtend + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.0 + + 11 + 11 + + + + org.eclipse.tycho + tycho-surefire-plugin + ${tycho.version} + + false + + **/*Test*.java + + false + + + + org.eclipse.tycho + tycho-packaging-plugin + ${tycho.version} + + + org.eclipse.tycho.extras + tycho-buildtimestamp-jgit + ${tycho-extras.version} + + + + jgit + + pom.xml + + + + + org.eclipse.tycho + tycho-p2-repository-plugin + ${tycho.version} + + true + + + + org.apache.maven.plugins + maven-assembly-plugin + 2.3 + + + + + + + + docs + + + docs + true + + + + documentation + + + + + + + ${maven.repository.id} + ${artifactory.releases.url} + + + ${maven.repository.id} + ${artifactory.snapshots.url} + + + + + https://github.com/babylonhealth/snow-owl + scm:git:ssh://github.com/babylonhealth/snow-owl.git + scm:git:ssh@github.com:babylonhealth/snow-owl.git + - - https://github.com/b2ihealthcare/snow-owl - scm:git:ssh://github.com/b2ihealthcare/snow-owl.git - scm:git:ssh@github.com:b2ihealthcare/snow-owl.git - - \ No newline at end of file diff --git a/settings.xml b/settings.xml index 4a4b8adf9a2..e4d59e9a132 100644 --- a/settings.xml +++ b/settings.xml @@ -9,19 +9,22 @@ true - - url/to/local/nexus/instance - ${nexus.url}/content/repositories/snapshots - ${nexus.url}/content/repositories/releases + ${ARTIFACTORY_URL} + ${artifactory.url}/babylon-maven-snapshots + ${artifactory.url}/babylon-maven-releases - - nexus_deployment - nexus_deployment_user - nexus_deployment_pass + babylon-snapshots + ${env.ARTIFACTORY_USER} + ${env.ARTIFACTORY_PWD} + + + babylon-releases + ${env.ARTIFACTORY_USER} + ${env.ARTIFACTORY_PWD} From 15008ed6755632b0428ed0dbe367d65b7bccf35d Mon Sep 17 00:00:00 2001 From: mattecasu Date: Tue, 14 Jan 2020 16:48:20 +0000 Subject: [PATCH 002/111] [CHR-1066] --- pom.xml | 1842 +++++++++++++++++++++++++------------------------- settings.xml | 6 +- 2 files changed, 924 insertions(+), 924 deletions(-) diff --git a/pom.xml b/pom.xml index e2e4c0f657d..b09ae89a741 100644 --- a/pom.xml +++ b/pom.xml @@ -1,935 +1,935 @@ - 4.0.0 - com.b2international.snowowl - snowowl-parent - 7.3.0-SNAPSHOT - pom + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + 4.0.0 + com.b2international.snowowl + snowowl-parent + 7.3.0-SNAPSHOT + pom - - UTF-8 - UTF-8 + + UTF-8 + UTF-8 - - 2.9.10 - 2.9.10.1 - 4.1.16.Final - 1.7.25 - 1.2.3 - [1.2.3,1.2.4) - 21.0 - [21.0.0,22.0.0) - 1.9.3 - 2.4.17 - 3.2.2 - [3.2.2,3.3.0) - 1.2.71 - 5.0.4-b2i - 4.5.10 - 0.4.3 - 9.4.18.v20190429 - 4.8.43 - 0.4.1 - 0.6.1 - 2.1.10 - 1.2 - 1.10 - 8.2.2 - 2.3.0 - 1.2.0 - 2.6.0 - 2.3.1 - - 1.5.0 - 1.5.0 - 2.18.0 - 0.8.4 + + 2.9.10 + 2.9.10.1 + 4.1.16.Final + 1.7.25 + 1.2.3 + [1.2.3,1.2.4) + 21.0 + [21.0.0,22.0.0) + 1.9.3 + 2.4.17 + 3.2.2 + [3.2.2,3.3.0) + 1.2.71 + 5.0.4-b2i + 4.5.10 + 0.4.3 + 9.4.18.v20190429 + 4.8.43 + 0.4.1 + 0.6.1 + 2.1.10 + 1.2 + 1.10 + 8.2.2 + 2.3.0 + 1.2.0 + 2.6.0 + 2.3.1 + + 1.5.0 + 1.5.0 + 2.18.0 + 0.8.4 - - yyyyMMddHHmm - ${maven.build.timestamp} - + + yyyyMMddHHmm + ${maven.build.timestamp} + - - commons - core - fhir - net4j - snomed - cis - tests - releng - dist - + + commons + core + fhir + net4j + snomed + cis + tests + releng + dist + - - - protege-mvn-repo - https://b2ihealthcare.github.io/protege/ - - true - never - - - false - never - - - - snomed-international-releases - https://maven.ihtsdotools.org/content/repositories/releases/ - - true - never - - - false - never - - - + + + protege-mvn-repo + https://b2ihealthcare.github.io/protege/ + + true + never + + + false + never + + + + snomed-international-releases + https://maven.ihtsdotools.org/content/repositories/releases/ + + true + never + + + false + never + + + - - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - provided - - - com.fasterxml.jackson.core - jackson-annotations - ${jackson.version} - provided - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.databind.version} - provided - - - com.fasterxml.jackson.dataformat - jackson-dataformat-cbor - ${jackson.version} - provided - - - com.fasterxml.jackson.dataformat - jackson-dataformat-yaml - ${jackson.version} - provided - - - com.fasterxml.jackson.dataformat - jackson-dataformat-smile - ${jackson.version} - provided - - - com.fasterxml.jackson.dataformat - jackson-dataformat-csv - ${jackson.version} - provided - - - com.fasterxml.jackson.dataformat - jackson-dataformat-xml - ${jackson.version} - provided - - - com.fasterxml.jackson.module - jackson-module-afterburner - ${jackson.version} - provided - - - com.fasterxml.jackson.module - jackson-module-jaxb-annotations - ${jackson.version} - provided - - - com.thoughtworks.xstream - xstream - 1.4.7 - provided - - - org.eclipse.persistence - javax.persistence - 2.0.5 - provided - - - org.assertj - assertj-core - 1.7.1 - provided - - - org.yaml - snakeyaml - 1.25 - provided - - - io.reactivex.rxjava2 - rxjava - 2.0.7 - provided - - - org.reactivestreams - reactive-streams - 1.0.0 - provided - - - commons-collections - commons-collections - 3.2.2 - provided - - - com.google.guava - guava - ${guava.version} - provided - - - io.netty - netty-buffer - ${netty.version} - provided - - - io.netty - netty-codec - ${netty.version} - provided - - - io.netty - netty-codec-http - ${netty.version} - provided - - - io.netty - netty-common - ${netty.version} - provided - - - io.netty - netty-handler - ${netty.version} - provided - - - io.netty - netty-resolver - ${netty.version} - provided - - - io.netty - netty-transport - ${netty.version} - provided - - - org.jetbrains.kotlin - kotlin-osgi-bundle - ${kotlin.version} - provided - - - com.diffplug.osgi - com.diffplug.osgi.extension.sun.misc - 0.0.0 - provided - - - com.diffplug.osgi - com.diffplug.osgi.extension.sun.reflect - 0.0.0 - provided - - - ch.qos.logback - logback-classic - ${logback.version} - provided - - - ch.qos.logback - logback-core - ${logback.version} - provided - - - org.slf4j - slf4j-api - ${slf4j.version} - provided - - - org.slf4j - jcl-over-slf4j - ${slf4j.version} - provided - - - org.slf4j - jul-to-slf4j - ${slf4j.version} - provided - - - org.slf4j - log4j-over-slf4j - ${slf4j.version} - provided - - - io.github.classgraph - classgraph - ${classgraph.version} - provided - - - com.b2international.snowowl - protege-common - ${protege.version} - provided - - - - org.apache.felix - org.apache.felix.main - - - - - com.b2international.snowowl - protege-editor-core - ${protege.version} - provided - - - - org.eclipse.equinox - org.eclipse.equinox.common - - - org.eclipse.equinox - org.eclipse.equinox.registry - - - - - com.b2international.snowowl - protege-editor-owl - ${protege.version} - provided - - - - log4j - log4j - - - - - net.sourceforge.owlapi - owlapi-osgidistribution - ${owlapi.version} - provided - - - org.semanticweb.elk - elk-protege - ${elk.version} - provided - - - - log4j - log4j - - - - org.protege - protege-editor-core-application - - - org.protege - protege-editor-owl - - - - - org.eclipse.jetty - jetty-continuation - ${jetty.version} - provided - - - org.eclipse.jetty - jetty-deploy - ${jetty.version} - provided - - - org.eclipse.jetty - jetty-http - ${jetty.version} - provided - - - org.eclipse.jetty - jetty-io - ${jetty.version} - provided - - - org.eclipse.jetty.osgi - jetty-osgi-boot - ${jetty.version} - provided - - - - org.eclipse.osgi - org.eclipse.osgi - - - org.eclipse.osgi - org.eclipse.osgi.services - - - org.ow2.asm - asm - - - org.ow2.asm - asm-commons - - - - - org.eclipse.jetty - jetty-security - ${jetty.version} - provided - - - org.eclipse.jetty - jetty-servlet - ${jetty.version} - provided - - - org.eclipse.jetty - jetty-util - ${jetty.version} - provided - - - org.eclipse.jetty - jetty-webapp - ${jetty.version} - provided - - - org.eclipse.jetty - jetty-xml - ${jetty.version} - provided - - - net.bytebuddy - byte-buddy - ${net.bytebuddy.version} - provided - - - com.fasterxml - classmate - 1.3.4 - provided - - - org.mapstruct - mapstruct - 1.2.0.Final - provided - - - io.swagger - swagger-annotations - 1.5.23 - provided - - - io.swagger - swagger-models - 1.5.23 - provided - - - org.apache.httpcomponents - httpclient-osgi - 4.5.3 - provided - - - org.apache.httpcomponents - httpcore-osgi - 4.4.10 - provided - - - org.apache.httpcomponents - httpasyncclient-osgi - 4.1.4 - provided - - - de.svenkubiak - jBCrypt - ${jbcrypt.version} - provided - - - net.jodah - typetools - ${typetools.version} - provided - - - org.hdrhistogram - HdrHistogram - ${hdrhistogram.version} - provided - - - commons-codec - commons-codec - ${commons.codec.version} - provided - - - commons-logging - commons-logging - ${commons.logging.version} - provided - - - it.unimi.dsi - fastutil - ${fastutil.version} - provided - - - javax.activation - javax.activation-api - 1.2.0 - provided - - - javax.xml.bind - jaxb-api - ${jaxb.api.version} - provided - - - com.sun.xml.bind - jaxb-core - ${jaxb.api.version} - provided - - - com.sun.xml.bind - jaxb-impl - ${jaxb.api.version} - provided - - - com.sun.activation - javax.activation - ${javax.activation.version} - provided - - - org.snomed.otf - snomed-owl-toolkit - ${snomed.owl.toolkit.version} - bundle - provided - - - - com.google.inject - guice - - - com.google.inject.extensions - guice-assistedinject - - - com.google.inject.extensions - guice-multibindings - - - - - net.jodah - failsafe - ${failsafe.version} - provided - - + + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + provided + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + provided + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.databind.version} + provided + + + com.fasterxml.jackson.dataformat + jackson-dataformat-cbor + ${jackson.version} + provided + + + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + ${jackson.version} + provided + + + com.fasterxml.jackson.dataformat + jackson-dataformat-smile + ${jackson.version} + provided + + + com.fasterxml.jackson.dataformat + jackson-dataformat-csv + ${jackson.version} + provided + + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + ${jackson.version} + provided + + + com.fasterxml.jackson.module + jackson-module-afterburner + ${jackson.version} + provided + + + com.fasterxml.jackson.module + jackson-module-jaxb-annotations + ${jackson.version} + provided + + + com.thoughtworks.xstream + xstream + 1.4.7 + provided + + + org.eclipse.persistence + javax.persistence + 2.0.5 + provided + + + org.assertj + assertj-core + 1.7.1 + provided + + + org.yaml + snakeyaml + 1.25 + provided + + + io.reactivex.rxjava2 + rxjava + 2.0.7 + provided + + + org.reactivestreams + reactive-streams + 1.0.0 + provided + + + commons-collections + commons-collections + 3.2.2 + provided + + + com.google.guava + guava + ${guava.version} + provided + + + io.netty + netty-buffer + ${netty.version} + provided + + + io.netty + netty-codec + ${netty.version} + provided + + + io.netty + netty-codec-http + ${netty.version} + provided + + + io.netty + netty-common + ${netty.version} + provided + + + io.netty + netty-handler + ${netty.version} + provided + + + io.netty + netty-resolver + ${netty.version} + provided + + + io.netty + netty-transport + ${netty.version} + provided + + + org.jetbrains.kotlin + kotlin-osgi-bundle + ${kotlin.version} + provided + + + com.diffplug.osgi + com.diffplug.osgi.extension.sun.misc + 0.0.0 + provided + + + com.diffplug.osgi + com.diffplug.osgi.extension.sun.reflect + 0.0.0 + provided + + + ch.qos.logback + logback-classic + ${logback.version} + provided + + + ch.qos.logback + logback-core + ${logback.version} + provided + + + org.slf4j + slf4j-api + ${slf4j.version} + provided + + + org.slf4j + jcl-over-slf4j + ${slf4j.version} + provided + + + org.slf4j + jul-to-slf4j + ${slf4j.version} + provided + + + org.slf4j + log4j-over-slf4j + ${slf4j.version} + provided + + + io.github.classgraph + classgraph + ${classgraph.version} + provided + + + com.b2international.snowowl + protege-common + ${protege.version} + provided + + + + org.apache.felix + org.apache.felix.main + + + + + com.b2international.snowowl + protege-editor-core + ${protege.version} + provided + + + + org.eclipse.equinox + org.eclipse.equinox.common + + + org.eclipse.equinox + org.eclipse.equinox.registry + + + + + com.b2international.snowowl + protege-editor-owl + ${protege.version} + provided + + + + log4j + log4j + + + + + net.sourceforge.owlapi + owlapi-osgidistribution + ${owlapi.version} + provided + + + org.semanticweb.elk + elk-protege + ${elk.version} + provided + + + + log4j + log4j + + + + org.protege + protege-editor-core-application + + + org.protege + protege-editor-owl + + + + + org.eclipse.jetty + jetty-continuation + ${jetty.version} + provided + + + org.eclipse.jetty + jetty-deploy + ${jetty.version} + provided + + + org.eclipse.jetty + jetty-http + ${jetty.version} + provided + + + org.eclipse.jetty + jetty-io + ${jetty.version} + provided + + + org.eclipse.jetty.osgi + jetty-osgi-boot + ${jetty.version} + provided + + + + org.eclipse.osgi + org.eclipse.osgi + + + org.eclipse.osgi + org.eclipse.osgi.services + + + org.ow2.asm + asm + + + org.ow2.asm + asm-commons + + + + + org.eclipse.jetty + jetty-security + ${jetty.version} + provided + + + org.eclipse.jetty + jetty-servlet + ${jetty.version} + provided + + + org.eclipse.jetty + jetty-util + ${jetty.version} + provided + + + org.eclipse.jetty + jetty-webapp + ${jetty.version} + provided + + + org.eclipse.jetty + jetty-xml + ${jetty.version} + provided + + + net.bytebuddy + byte-buddy + ${net.bytebuddy.version} + provided + + + com.fasterxml + classmate + 1.3.4 + provided + + + org.mapstruct + mapstruct + 1.2.0.Final + provided + + + io.swagger + swagger-annotations + 1.5.23 + provided + + + io.swagger + swagger-models + 1.5.23 + provided + + + org.apache.httpcomponents + httpclient-osgi + 4.5.3 + provided + + + org.apache.httpcomponents + httpcore-osgi + 4.4.10 + provided + + + org.apache.httpcomponents + httpasyncclient-osgi + 4.1.4 + provided + + + de.svenkubiak + jBCrypt + ${jbcrypt.version} + provided + + + net.jodah + typetools + ${typetools.version} + provided + + + org.hdrhistogram + HdrHistogram + ${hdrhistogram.version} + provided + + + commons-codec + commons-codec + ${commons.codec.version} + provided + + + commons-logging + commons-logging + ${commons.logging.version} + provided + + + it.unimi.dsi + fastutil + ${fastutil.version} + provided + + + javax.activation + javax.activation-api + 1.2.0 + provided + + + javax.xml.bind + jaxb-api + ${jaxb.api.version} + provided + + + com.sun.xml.bind + jaxb-core + ${jaxb.api.version} + provided + + + com.sun.xml.bind + jaxb-impl + ${jaxb.api.version} + provided + + + com.sun.activation + javax.activation + ${javax.activation.version} + provided + + + org.snomed.otf + snomed-owl-toolkit + ${snomed.owl.toolkit.version} + bundle + provided + + + + com.google.inject + guice + + + com.google.inject.extensions + guice-assistedinject + + + com.google.inject.extensions + guice-multibindings + + + + + net.jodah + failsafe + ${failsafe.version} + provided + + - - - - org.eclipse.tycho - tycho-maven-plugin - ${tycho.version} - true - - - org.eclipse.tycho - tycho-packaging-plugin - - false - false - - - - org.eclipse.tycho - tycho-source-plugin - ${tycho.version} - - - plugin-source - - plugin-source - - - - - - org.eclipse.tycho - target-platform-configuration - ${tycho.version} - - p2 - consider - - - ${project.groupId} - target-platform - ${project.version} - - - - - eclipse-plugin - org.eclipse.osgi - - [3.13.0,3.15.0] - - - - - - p2-installable-unit - org.eclipse.equinox.servletbridge.extensionbundle - - - - eclipse-plugin - org.codehaus.groovy - - ${groovy.version} - - - - eclipse-plugin - com.google.guava - - ${guava.versionRange} - - - - - p2-installable-unit - slf4j.api - - ${slf4j.version} - - - - p2-installable-unit - ch.qos.logback.classic - - ${logback.versionRange} - - - - p2-installable-unit - ch.qos.logback.core - - ${logback.versionRange} - - - - - p2-installable-unit - com.fasterxml.jackson.core.jackson-annotations - - ${jackson.version} - - - - p2-installable-unit - com.fasterxml.jackson.core.jackson-core - - ${jackson.version} - - - - p2-installable-unit - com.fasterxml.jackson.core.jackson-databind - - ${jackson.databind.version} - - - - p2-installable-unit - com.fasterxml.jackson.dataformat.jackson-dataformat-yaml - - ${jackson.version} - - - - p2-installable-unit - com.fasterxml.jackson.dataformat.jackson-dataformat-cbor - - ${jackson.version} - - - - p2-installable-unit - com.fasterxml.jackson.dataformat.jackson-dataformat-csv - - ${jackson.version} - - - - p2-installable-unit - com.fasterxml.jackson.dataformat.jackson-dataformat-xml - - ${jackson.version} - - - - p2-installable-unit - com.fasterxml.jackson.dataformat.jackson-dataformat-afterburner - - ${jackson.version} - - - - - p2-installable-unit - org.apache.commons.collections - - ${commons.collections.versionRange} - - - - p2-installable-unit - org.slf4j.api - - - - - - linux - gtk - x86_64 - - - win32 - win32 - x86_64 - - - - - - org.eclipse.tycho - tycho-p2-director-plugin - ${tycho.version} - - - org.codehaus.plexus - plexus-archiver - 2.4.4 - - - org.codehaus.plexus - plexus-component-api - - - org.codehaus.plexus - plexus-container-default - - - - - - - org.eclipse.tycho - tycho-p2-publisher-plugin - ${tycho.version} - - true - - - - org.eclipse.tycho - tycho-versions-plugin - ${tycho.version} - - - org.jacoco - jacoco-maven-plugin - ${jacoco.version} - - - - prepare-agent - - - - - - - - - org.eclipse.tycho - tycho-compiler-plugin - ${tycho.version} - - false - 11 - 11 - - **/*.groovy - **/*.xtend - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.0 - - 11 - 11 - - - - org.eclipse.tycho - tycho-surefire-plugin - ${tycho.version} - - false - - **/*Test*.java - - false - - - - org.eclipse.tycho - tycho-packaging-plugin - ${tycho.version} - - - org.eclipse.tycho.extras - tycho-buildtimestamp-jgit - ${tycho-extras.version} - - - - jgit - - pom.xml - - - - - org.eclipse.tycho - tycho-p2-repository-plugin - ${tycho.version} - - true - - - - org.apache.maven.plugins - maven-assembly-plugin - 2.3 - - - - + + + + org.eclipse.tycho + tycho-maven-plugin + ${tycho.version} + true + + + org.eclipse.tycho + tycho-packaging-plugin + + false + false + + + + org.eclipse.tycho + tycho-source-plugin + ${tycho.version} + + + plugin-source + + plugin-source + + + + + + org.eclipse.tycho + target-platform-configuration + ${tycho.version} + + p2 + consider + + + ${project.groupId} + target-platform + ${project.version} + + + + + eclipse-plugin + org.eclipse.osgi + + [3.13.0,3.15.0] + + + + + + p2-installable-unit + org.eclipse.equinox.servletbridge.extensionbundle + + + + eclipse-plugin + org.codehaus.groovy + + ${groovy.version} + + + + eclipse-plugin + com.google.guava + + ${guava.versionRange} + + + + + p2-installable-unit + slf4j.api + + ${slf4j.version} + + + + p2-installable-unit + ch.qos.logback.classic + + ${logback.versionRange} + + + + p2-installable-unit + ch.qos.logback.core + + ${logback.versionRange} + + + + + p2-installable-unit + com.fasterxml.jackson.core.jackson-annotations + + ${jackson.version} + + + + p2-installable-unit + com.fasterxml.jackson.core.jackson-core + + ${jackson.version} + + + + p2-installable-unit + com.fasterxml.jackson.core.jackson-databind + + ${jackson.databind.version} + + + + p2-installable-unit + com.fasterxml.jackson.dataformat.jackson-dataformat-yaml + + ${jackson.version} + + + + p2-installable-unit + com.fasterxml.jackson.dataformat.jackson-dataformat-cbor + + ${jackson.version} + + + + p2-installable-unit + com.fasterxml.jackson.dataformat.jackson-dataformat-csv + + ${jackson.version} + + + + p2-installable-unit + com.fasterxml.jackson.dataformat.jackson-dataformat-xml + + ${jackson.version} + + + + p2-installable-unit + com.fasterxml.jackson.dataformat.jackson-dataformat-afterburner + + ${jackson.version} + + + + + p2-installable-unit + org.apache.commons.collections + + ${commons.collections.versionRange} + + + + p2-installable-unit + org.slf4j.api + + + + + + linux + gtk + x86_64 + + + win32 + win32 + x86_64 + + + + + + org.eclipse.tycho + tycho-p2-director-plugin + ${tycho.version} + + + org.codehaus.plexus + plexus-archiver + 2.4.4 + + + org.codehaus.plexus + plexus-component-api + + + org.codehaus.plexus + plexus-container-default + + + + + + + org.eclipse.tycho + tycho-p2-publisher-plugin + ${tycho.version} + + true + + + + org.eclipse.tycho + tycho-versions-plugin + ${tycho.version} + + + org.jacoco + jacoco-maven-plugin + ${jacoco.version} + + + + prepare-agent + + + + + + + + + org.eclipse.tycho + tycho-compiler-plugin + ${tycho.version} + + false + 11 + 11 + + **/*.groovy + **/*.xtend + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.0 + + 11 + 11 + + + + org.eclipse.tycho + tycho-surefire-plugin + ${tycho.version} + + false + + **/*Test*.java + + false + + + + org.eclipse.tycho + tycho-packaging-plugin + ${tycho.version} + + + org.eclipse.tycho.extras + tycho-buildtimestamp-jgit + ${tycho-extras.version} + + + + jgit + + pom.xml + + + + + org.eclipse.tycho + tycho-p2-repository-plugin + ${tycho.version} + + true + + + + org.apache.maven.plugins + maven-assembly-plugin + 2.3 + + + + - - - docs - - - docs - true - - - - documentation - - - + + + docs + + + docs + true + + + + documentation + + + - - - ${maven.repository.id} - ${artifactory.releases.url} - - - ${maven.repository.id} - ${artifactory.snapshots.url} - - + + + ${maven.repository.id} + ${artifactory.releases.url} + + + ${maven.repository.id} + ${artifactory.snapshots.url} + + - - https://github.com/babylonhealth/snow-owl - scm:git:ssh://github.com/babylonhealth/snow-owl.git - scm:git:ssh@github.com:babylonhealth/snow-owl.git - + + https://github.com/babylonhealth/snow-owl + scm:git:ssh://github.com/babylonhealth/snow-owl.git + scm:git:ssh@github.com:babylonhealth/snow-owl.git + \ No newline at end of file diff --git a/settings.xml b/settings.xml index e4d59e9a132..f218d8340fa 100644 --- a/settings.xml +++ b/settings.xml @@ -9,9 +9,9 @@ true - ${ARTIFACTORY_URL} - ${artifactory.url}/babylon-maven-snapshots - ${artifactory.url}/babylon-maven-releases + ${env.ARTIFACTORY_URL} + ${env.ARTIFACTORY_URL}/babylon-maven-snapshots + ${env.ARTIFACTORY_URL}/babylon-maven-releases From 419c913d435d238e902abd11fb1d1dc2ede50676 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Tue, 14 Jan 2020 16:53:52 +0000 Subject: [PATCH 003/111] [CHR-1066] --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index edbc29aa971..83d4725e6aa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -30,4 +30,4 @@ jobs: apk add --no-cache make=4.2.1-r0 openjdk8 - deploy: name: Deploy - command: ./mvnw clean deploy + command: ./mvnw clean install deploy From 459a401b692809104635eb3b758cf4ecbab447c2 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Tue, 14 Jan 2020 17:00:41 +0000 Subject: [PATCH 004/111] [CHR-1066] --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 83d4725e6aa..54b9e546b82 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -30,4 +30,4 @@ jobs: apk add --no-cache make=4.2.1-r0 openjdk8 - deploy: name: Deploy - command: ./mvnw clean install deploy + command: ./mvnw clean install deploy -P repositories From ac9bd4d54e35dd941b458da381bc934008d92ad4 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Tue, 14 Jan 2020 17:03:02 +0000 Subject: [PATCH 005/111] [CHR-1066] --- pom.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pom.xml b/pom.xml index b09ae89a741..8e79ce6598b 100644 --- a/pom.xml +++ b/pom.xml @@ -66,6 +66,14 @@ + + ${maven.repository.id} + ${artifactory.releases.url} + + + ${maven.repository.id} + ${artifactory.snapshots.url} + protege-mvn-repo https://b2ihealthcare.github.io/protege/ From 0720d85987b88f4afba2c386539efdccdb0bcc27 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Tue, 14 Jan 2020 17:10:51 +0000 Subject: [PATCH 006/111] [CHR-1066] --- pom.xml | 1867 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 938 insertions(+), 929 deletions(-) diff --git a/pom.xml b/pom.xml index 8e79ce6598b..5438f6264c7 100644 --- a/pom.xml +++ b/pom.xml @@ -1,943 +1,952 @@ - 4.0.0 - com.b2international.snowowl - snowowl-parent - 7.3.0-SNAPSHOT - pom + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + 4.0.0 + com.b2international.snowowl + snowowl-parent + 7.3.0-SNAPSHOT + pom - - UTF-8 - UTF-8 + + UTF-8 + UTF-8 - - 2.9.10 - 2.9.10.1 - 4.1.16.Final - 1.7.25 - 1.2.3 - [1.2.3,1.2.4) - 21.0 - [21.0.0,22.0.0) - 1.9.3 - 2.4.17 - 3.2.2 - [3.2.2,3.3.0) - 1.2.71 - 5.0.4-b2i - 4.5.10 - 0.4.3 - 9.4.18.v20190429 - 4.8.43 - 0.4.1 - 0.6.1 - 2.1.10 - 1.2 - 1.10 - 8.2.2 - 2.3.0 - 1.2.0 - 2.6.0 - 2.3.1 - - 1.5.0 - 1.5.0 - 2.18.0 - 0.8.4 + + 2.9.10 + 2.9.10.1 + 4.1.16.Final + 1.7.25 + 1.2.3 + [1.2.3,1.2.4) + 21.0 + [21.0.0,22.0.0) + 1.9.3 + 2.4.17 + 3.2.2 + [3.2.2,3.3.0) + 1.2.71 + 5.0.4-b2i + 4.5.10 + 0.4.3 + 9.4.18.v20190429 + 4.8.43 + 0.4.1 + 0.6.1 + 2.1.10 + 1.2 + 1.10 + 8.2.2 + 2.3.0 + 1.2.0 + 2.6.0 + 2.3.1 + + 1.5.0 + 1.5.0 + 2.18.0 + 0.8.4 - - yyyyMMddHHmm - ${maven.build.timestamp} - + + yyyyMMddHHmm + ${maven.build.timestamp} + - - commons - core - fhir - net4j - snomed - cis - tests - releng - dist - + + commons + core + fhir + net4j + snomed + cis + tests + releng + dist + - - - ${maven.repository.id} - ${artifactory.releases.url} - - - ${maven.repository.id} - ${artifactory.snapshots.url} - - - protege-mvn-repo - https://b2ihealthcare.github.io/protege/ - - true - never - - - false - never - - - - snomed-international-releases - https://maven.ihtsdotools.org/content/repositories/releases/ - - true - never - - - false - never - - - + + + artifactory-releases + ${artifactory.releases.url} + + true + never + + + + artifactory-snapshots + ${artifactory.snapshots.url} + + true + never + - - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - provided - - - com.fasterxml.jackson.core - jackson-annotations - ${jackson.version} - provided - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.databind.version} - provided - - - com.fasterxml.jackson.dataformat - jackson-dataformat-cbor - ${jackson.version} - provided - - - com.fasterxml.jackson.dataformat - jackson-dataformat-yaml - ${jackson.version} - provided - - - com.fasterxml.jackson.dataformat - jackson-dataformat-smile - ${jackson.version} - provided - - - com.fasterxml.jackson.dataformat - jackson-dataformat-csv - ${jackson.version} - provided - - - com.fasterxml.jackson.dataformat - jackson-dataformat-xml - ${jackson.version} - provided - - - com.fasterxml.jackson.module - jackson-module-afterburner - ${jackson.version} - provided - - - com.fasterxml.jackson.module - jackson-module-jaxb-annotations - ${jackson.version} - provided - - - com.thoughtworks.xstream - xstream - 1.4.7 - provided - - - org.eclipse.persistence - javax.persistence - 2.0.5 - provided - - - org.assertj - assertj-core - 1.7.1 - provided - - - org.yaml - snakeyaml - 1.25 - provided - - - io.reactivex.rxjava2 - rxjava - 2.0.7 - provided - - - org.reactivestreams - reactive-streams - 1.0.0 - provided - - - commons-collections - commons-collections - 3.2.2 - provided - - - com.google.guava - guava - ${guava.version} - provided - - - io.netty - netty-buffer - ${netty.version} - provided - - - io.netty - netty-codec - ${netty.version} - provided - - - io.netty - netty-codec-http - ${netty.version} - provided - - - io.netty - netty-common - ${netty.version} - provided - - - io.netty - netty-handler - ${netty.version} - provided - - - io.netty - netty-resolver - ${netty.version} - provided - - - io.netty - netty-transport - ${netty.version} - provided - - - org.jetbrains.kotlin - kotlin-osgi-bundle - ${kotlin.version} - provided - - - com.diffplug.osgi - com.diffplug.osgi.extension.sun.misc - 0.0.0 - provided - - - com.diffplug.osgi - com.diffplug.osgi.extension.sun.reflect - 0.0.0 - provided - - - ch.qos.logback - logback-classic - ${logback.version} - provided - - - ch.qos.logback - logback-core - ${logback.version} - provided - - - org.slf4j - slf4j-api - ${slf4j.version} - provided - - - org.slf4j - jcl-over-slf4j - ${slf4j.version} - provided - - - org.slf4j - jul-to-slf4j - ${slf4j.version} - provided - - - org.slf4j - log4j-over-slf4j - ${slf4j.version} - provided - - - io.github.classgraph - classgraph - ${classgraph.version} - provided - - - com.b2international.snowowl - protege-common - ${protege.version} - provided - - - - org.apache.felix - org.apache.felix.main - - - - - com.b2international.snowowl - protege-editor-core - ${protege.version} - provided - - - - org.eclipse.equinox - org.eclipse.equinox.common - - - org.eclipse.equinox - org.eclipse.equinox.registry - - - - - com.b2international.snowowl - protege-editor-owl - ${protege.version} - provided - - - - log4j - log4j - - - - - net.sourceforge.owlapi - owlapi-osgidistribution - ${owlapi.version} - provided - - - org.semanticweb.elk - elk-protege - ${elk.version} - provided - - - - log4j - log4j - - - - org.protege - protege-editor-core-application - - - org.protege - protege-editor-owl - - - - - org.eclipse.jetty - jetty-continuation - ${jetty.version} - provided - - - org.eclipse.jetty - jetty-deploy - ${jetty.version} - provided - - - org.eclipse.jetty - jetty-http - ${jetty.version} - provided - - - org.eclipse.jetty - jetty-io - ${jetty.version} - provided - - - org.eclipse.jetty.osgi - jetty-osgi-boot - ${jetty.version} - provided - - - - org.eclipse.osgi - org.eclipse.osgi - - - org.eclipse.osgi - org.eclipse.osgi.services - - - org.ow2.asm - asm - - - org.ow2.asm - asm-commons - - - - - org.eclipse.jetty - jetty-security - ${jetty.version} - provided - - - org.eclipse.jetty - jetty-servlet - ${jetty.version} - provided - - - org.eclipse.jetty - jetty-util - ${jetty.version} - provided - - - org.eclipse.jetty - jetty-webapp - ${jetty.version} - provided - - - org.eclipse.jetty - jetty-xml - ${jetty.version} - provided - - - net.bytebuddy - byte-buddy - ${net.bytebuddy.version} - provided - - - com.fasterxml - classmate - 1.3.4 - provided - - - org.mapstruct - mapstruct - 1.2.0.Final - provided - - - io.swagger - swagger-annotations - 1.5.23 - provided - - - io.swagger - swagger-models - 1.5.23 - provided - - - org.apache.httpcomponents - httpclient-osgi - 4.5.3 - provided - - - org.apache.httpcomponents - httpcore-osgi - 4.4.10 - provided - - - org.apache.httpcomponents - httpasyncclient-osgi - 4.1.4 - provided - - - de.svenkubiak - jBCrypt - ${jbcrypt.version} - provided - - - net.jodah - typetools - ${typetools.version} - provided - - - org.hdrhistogram - HdrHistogram - ${hdrhistogram.version} - provided - - - commons-codec - commons-codec - ${commons.codec.version} - provided - - - commons-logging - commons-logging - ${commons.logging.version} - provided - - - it.unimi.dsi - fastutil - ${fastutil.version} - provided - - - javax.activation - javax.activation-api - 1.2.0 - provided - - - javax.xml.bind - jaxb-api - ${jaxb.api.version} - provided - - - com.sun.xml.bind - jaxb-core - ${jaxb.api.version} - provided - - - com.sun.xml.bind - jaxb-impl - ${jaxb.api.version} - provided - - - com.sun.activation - javax.activation - ${javax.activation.version} - provided - - - org.snomed.otf - snomed-owl-toolkit - ${snomed.owl.toolkit.version} - bundle - provided - - - - com.google.inject - guice - - - com.google.inject.extensions - guice-assistedinject - - - com.google.inject.extensions - guice-multibindings - - - - - net.jodah - failsafe - ${failsafe.version} - provided - - + + + protege-mvn-repo + https://b2ihealthcare.github.io/protege/ + + true + never + + + false + never + + + + snomed-international-releases + https://maven.ihtsdotools.org/content/repositories/releases/ + + true + never + + + false + never + + + - - - - org.eclipse.tycho - tycho-maven-plugin - ${tycho.version} - true - - - org.eclipse.tycho - tycho-packaging-plugin - - false - false - - - - org.eclipse.tycho - tycho-source-plugin - ${tycho.version} - - - plugin-source - - plugin-source - - - - - - org.eclipse.tycho - target-platform-configuration - ${tycho.version} - - p2 - consider - - - ${project.groupId} - target-platform - ${project.version} - - - - - eclipse-plugin - org.eclipse.osgi - - [3.13.0,3.15.0] - - - - - - p2-installable-unit - org.eclipse.equinox.servletbridge.extensionbundle - - - - eclipse-plugin - org.codehaus.groovy - - ${groovy.version} - - - - eclipse-plugin - com.google.guava - - ${guava.versionRange} - - - - - p2-installable-unit - slf4j.api - - ${slf4j.version} - - - - p2-installable-unit - ch.qos.logback.classic - - ${logback.versionRange} - - - - p2-installable-unit - ch.qos.logback.core - - ${logback.versionRange} - - - - - p2-installable-unit - com.fasterxml.jackson.core.jackson-annotations - - ${jackson.version} - - - - p2-installable-unit - com.fasterxml.jackson.core.jackson-core - - ${jackson.version} - - - - p2-installable-unit - com.fasterxml.jackson.core.jackson-databind - - ${jackson.databind.version} - - - - p2-installable-unit - com.fasterxml.jackson.dataformat.jackson-dataformat-yaml - - ${jackson.version} - - - - p2-installable-unit - com.fasterxml.jackson.dataformat.jackson-dataformat-cbor - - ${jackson.version} - - - - p2-installable-unit - com.fasterxml.jackson.dataformat.jackson-dataformat-csv - - ${jackson.version} - - - - p2-installable-unit - com.fasterxml.jackson.dataformat.jackson-dataformat-xml - - ${jackson.version} - - - - p2-installable-unit - com.fasterxml.jackson.dataformat.jackson-dataformat-afterburner - - ${jackson.version} - - - - - p2-installable-unit - org.apache.commons.collections - - ${commons.collections.versionRange} - - - - p2-installable-unit - org.slf4j.api - - - - - - linux - gtk - x86_64 - - - win32 - win32 - x86_64 - - - - - - org.eclipse.tycho - tycho-p2-director-plugin - ${tycho.version} - - - org.codehaus.plexus - plexus-archiver - 2.4.4 - - - org.codehaus.plexus - plexus-component-api - - - org.codehaus.plexus - plexus-container-default - - - - - - - org.eclipse.tycho - tycho-p2-publisher-plugin - ${tycho.version} - - true - - - - org.eclipse.tycho - tycho-versions-plugin - ${tycho.version} - - - org.jacoco - jacoco-maven-plugin - ${jacoco.version} - - - - prepare-agent - - - - - - - - - org.eclipse.tycho - tycho-compiler-plugin - ${tycho.version} - - false - 11 - 11 - - **/*.groovy - **/*.xtend - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.0 - - 11 - 11 - - - - org.eclipse.tycho - tycho-surefire-plugin - ${tycho.version} - - false - - **/*Test*.java - - false - - - - org.eclipse.tycho - tycho-packaging-plugin - ${tycho.version} - - - org.eclipse.tycho.extras - tycho-buildtimestamp-jgit - ${tycho-extras.version} - - - - jgit - - pom.xml - - - - - org.eclipse.tycho - tycho-p2-repository-plugin - ${tycho.version} - - true - - - - org.apache.maven.plugins - maven-assembly-plugin - 2.3 - - - - + + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + provided + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + provided + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.databind.version} + provided + + + com.fasterxml.jackson.dataformat + jackson-dataformat-cbor + ${jackson.version} + provided + + + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + ${jackson.version} + provided + + + com.fasterxml.jackson.dataformat + jackson-dataformat-smile + ${jackson.version} + provided + + + com.fasterxml.jackson.dataformat + jackson-dataformat-csv + ${jackson.version} + provided + + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + ${jackson.version} + provided + + + com.fasterxml.jackson.module + jackson-module-afterburner + ${jackson.version} + provided + + + com.fasterxml.jackson.module + jackson-module-jaxb-annotations + ${jackson.version} + provided + + + com.thoughtworks.xstream + xstream + 1.4.7 + provided + + + org.eclipse.persistence + javax.persistence + 2.0.5 + provided + + + org.assertj + assertj-core + 1.7.1 + provided + + + org.yaml + snakeyaml + 1.25 + provided + + + io.reactivex.rxjava2 + rxjava + 2.0.7 + provided + + + org.reactivestreams + reactive-streams + 1.0.0 + provided + + + commons-collections + commons-collections + 3.2.2 + provided + + + com.google.guava + guava + ${guava.version} + provided + + + io.netty + netty-buffer + ${netty.version} + provided + + + io.netty + netty-codec + ${netty.version} + provided + + + io.netty + netty-codec-http + ${netty.version} + provided + + + io.netty + netty-common + ${netty.version} + provided + + + io.netty + netty-handler + ${netty.version} + provided + + + io.netty + netty-resolver + ${netty.version} + provided + + + io.netty + netty-transport + ${netty.version} + provided + + + org.jetbrains.kotlin + kotlin-osgi-bundle + ${kotlin.version} + provided + + + com.diffplug.osgi + com.diffplug.osgi.extension.sun.misc + 0.0.0 + provided + + + com.diffplug.osgi + com.diffplug.osgi.extension.sun.reflect + 0.0.0 + provided + + + ch.qos.logback + logback-classic + ${logback.version} + provided + + + ch.qos.logback + logback-core + ${logback.version} + provided + + + org.slf4j + slf4j-api + ${slf4j.version} + provided + + + org.slf4j + jcl-over-slf4j + ${slf4j.version} + provided + + + org.slf4j + jul-to-slf4j + ${slf4j.version} + provided + + + org.slf4j + log4j-over-slf4j + ${slf4j.version} + provided + + + io.github.classgraph + classgraph + ${classgraph.version} + provided + + + com.b2international.snowowl + protege-common + ${protege.version} + provided + + + + org.apache.felix + org.apache.felix.main + + + + + com.b2international.snowowl + protege-editor-core + ${protege.version} + provided + + + + org.eclipse.equinox + org.eclipse.equinox.common + + + org.eclipse.equinox + org.eclipse.equinox.registry + + + + + com.b2international.snowowl + protege-editor-owl + ${protege.version} + provided + + + + log4j + log4j + + + + + net.sourceforge.owlapi + owlapi-osgidistribution + ${owlapi.version} + provided + + + org.semanticweb.elk + elk-protege + ${elk.version} + provided + + + + log4j + log4j + + + + org.protege + protege-editor-core-application + + + org.protege + protege-editor-owl + + + + + org.eclipse.jetty + jetty-continuation + ${jetty.version} + provided + + + org.eclipse.jetty + jetty-deploy + ${jetty.version} + provided + + + org.eclipse.jetty + jetty-http + ${jetty.version} + provided + + + org.eclipse.jetty + jetty-io + ${jetty.version} + provided + + + org.eclipse.jetty.osgi + jetty-osgi-boot + ${jetty.version} + provided + + + + org.eclipse.osgi + org.eclipse.osgi + + + org.eclipse.osgi + org.eclipse.osgi.services + + + org.ow2.asm + asm + + + org.ow2.asm + asm-commons + + + + + org.eclipse.jetty + jetty-security + ${jetty.version} + provided + + + org.eclipse.jetty + jetty-servlet + ${jetty.version} + provided + + + org.eclipse.jetty + jetty-util + ${jetty.version} + provided + + + org.eclipse.jetty + jetty-webapp + ${jetty.version} + provided + + + org.eclipse.jetty + jetty-xml + ${jetty.version} + provided + + + net.bytebuddy + byte-buddy + ${net.bytebuddy.version} + provided + + + com.fasterxml + classmate + 1.3.4 + provided + + + org.mapstruct + mapstruct + 1.2.0.Final + provided + + + io.swagger + swagger-annotations + 1.5.23 + provided + + + io.swagger + swagger-models + 1.5.23 + provided + + + org.apache.httpcomponents + httpclient-osgi + 4.5.3 + provided + + + org.apache.httpcomponents + httpcore-osgi + 4.4.10 + provided + + + org.apache.httpcomponents + httpasyncclient-osgi + 4.1.4 + provided + + + de.svenkubiak + jBCrypt + ${jbcrypt.version} + provided + + + net.jodah + typetools + ${typetools.version} + provided + + + org.hdrhistogram + HdrHistogram + ${hdrhistogram.version} + provided + + + commons-codec + commons-codec + ${commons.codec.version} + provided + + + commons-logging + commons-logging + ${commons.logging.version} + provided + + + it.unimi.dsi + fastutil + ${fastutil.version} + provided + + + javax.activation + javax.activation-api + 1.2.0 + provided + + + javax.xml.bind + jaxb-api + ${jaxb.api.version} + provided + + + com.sun.xml.bind + jaxb-core + ${jaxb.api.version} + provided + + + com.sun.xml.bind + jaxb-impl + ${jaxb.api.version} + provided + + + com.sun.activation + javax.activation + ${javax.activation.version} + provided + + + org.snomed.otf + snomed-owl-toolkit + ${snomed.owl.toolkit.version} + bundle + provided + + + + com.google.inject + guice + + + com.google.inject.extensions + guice-assistedinject + + + com.google.inject.extensions + guice-multibindings + + + + + net.jodah + failsafe + ${failsafe.version} + provided + + - - - docs - - - docs - true - - - - documentation - - - + + + + org.eclipse.tycho + tycho-maven-plugin + ${tycho.version} + true + + + org.eclipse.tycho + tycho-packaging-plugin + + false + false + + + + org.eclipse.tycho + tycho-source-plugin + ${tycho.version} + + + plugin-source + + plugin-source + + + + + + org.eclipse.tycho + target-platform-configuration + ${tycho.version} + + p2 + consider + + + ${project.groupId} + target-platform + ${project.version} + + + + + eclipse-plugin + org.eclipse.osgi + + [3.13.0,3.15.0] + + + + + + p2-installable-unit + org.eclipse.equinox.servletbridge.extensionbundle + + + + eclipse-plugin + org.codehaus.groovy + + ${groovy.version} + + + + eclipse-plugin + com.google.guava + + ${guava.versionRange} + + + + + p2-installable-unit + slf4j.api + + ${slf4j.version} + + + + p2-installable-unit + ch.qos.logback.classic + + ${logback.versionRange} + + + + p2-installable-unit + ch.qos.logback.core + + ${logback.versionRange} + + + + + p2-installable-unit + com.fasterxml.jackson.core.jackson-annotations + + ${jackson.version} + + + + p2-installable-unit + com.fasterxml.jackson.core.jackson-core + + ${jackson.version} + + + + p2-installable-unit + com.fasterxml.jackson.core.jackson-databind + + ${jackson.databind.version} + + + + p2-installable-unit + com.fasterxml.jackson.dataformat.jackson-dataformat-yaml + + ${jackson.version} + + + + p2-installable-unit + com.fasterxml.jackson.dataformat.jackson-dataformat-cbor + + ${jackson.version} + + + + p2-installable-unit + com.fasterxml.jackson.dataformat.jackson-dataformat-csv + + ${jackson.version} + + + + p2-installable-unit + com.fasterxml.jackson.dataformat.jackson-dataformat-xml + + ${jackson.version} + + + + p2-installable-unit + com.fasterxml.jackson.dataformat.jackson-dataformat-afterburner + + ${jackson.version} + + + + + p2-installable-unit + org.apache.commons.collections + + ${commons.collections.versionRange} + + + + p2-installable-unit + org.slf4j.api + + + + + + linux + gtk + x86_64 + + + win32 + win32 + x86_64 + + + + + + org.eclipse.tycho + tycho-p2-director-plugin + ${tycho.version} + + + org.codehaus.plexus + plexus-archiver + 2.4.4 + + + org.codehaus.plexus + plexus-component-api + + + org.codehaus.plexus + plexus-container-default + + + + + + + org.eclipse.tycho + tycho-p2-publisher-plugin + ${tycho.version} + + true + + + + org.eclipse.tycho + tycho-versions-plugin + ${tycho.version} + + + org.jacoco + jacoco-maven-plugin + ${jacoco.version} + + + + prepare-agent + + + + + + + + + org.eclipse.tycho + tycho-compiler-plugin + ${tycho.version} + + false + 11 + 11 + + **/*.groovy + **/*.xtend + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.0 + + 11 + 11 + + + + org.eclipse.tycho + tycho-surefire-plugin + ${tycho.version} + + false + + **/*Test*.java + + false + + + + org.eclipse.tycho + tycho-packaging-plugin + ${tycho.version} + + + org.eclipse.tycho.extras + tycho-buildtimestamp-jgit + ${tycho-extras.version} + + + + jgit + + pom.xml + + + + + org.eclipse.tycho + tycho-p2-repository-plugin + ${tycho.version} + + true + + + + org.apache.maven.plugins + maven-assembly-plugin + 2.3 + + + + - - - ${maven.repository.id} - ${artifactory.releases.url} - - - ${maven.repository.id} - ${artifactory.snapshots.url} - - + + + docs + + + docs + true + + + + documentation + + + - - https://github.com/babylonhealth/snow-owl - scm:git:ssh://github.com/babylonhealth/snow-owl.git - scm:git:ssh@github.com:babylonhealth/snow-owl.git - + + + artifactory-releases + ${artifactory.releases.url} + + + artifactory-snapshots + ${artifactory.snapshots.url} + + + + + https://github.com/babylonhealth/snow-owl + scm:git:ssh://github.com/babylonhealth/snow-owl.git + scm:git:ssh@github.com:babylonhealth/snow-owl.git + \ No newline at end of file From 1b74e131d298b8f842e22b25467cc27037f535b6 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Tue, 14 Jan 2020 17:12:56 +0000 Subject: [PATCH 007/111] [CHR-1066] --- settings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/settings.xml b/settings.xml index f218d8340fa..61dde6806d7 100644 --- a/settings.xml +++ b/settings.xml @@ -17,12 +17,12 @@ - babylon-snapshots + artifactory-snapshots ${env.ARTIFACTORY_USER} ${env.ARTIFACTORY_PWD} - babylon-releases + artifactory-releases ${env.ARTIFACTORY_USER} ${env.ARTIFACTORY_PWD} From 092b6e0b07f99707d26ea0cc274b5f50bf22ebf7 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Tue, 14 Jan 2020 17:19:03 +0000 Subject: [PATCH 008/111] [CHR-1066] --- .circleci/settings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/settings.xml b/.circleci/settings.xml index 37b9facca7e..d7330ab453b 100644 --- a/.circleci/settings.xml +++ b/.circleci/settings.xml @@ -4,12 +4,12 @@ xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd"> - babylon-snapshots + artifactory-snapshots ${env.ARTIFACTORY_USER} ${env.ARTIFACTORY_PWD} - babylon-releases + artifactory-releases ${env.ARTIFACTORY_USER} ${env.ARTIFACTORY_PWD} From c5617ff6b79505bce36e99c1210486fa51054edf Mon Sep 17 00:00:00 2001 From: mattecasu Date: Tue, 14 Jan 2020 17:25:41 +0000 Subject: [PATCH 009/111] [CHR-1066] --- .circleci/settings.xml | 34 +++++++++++++++++----------------- pom.xml | 9 ++++----- settings.xml | 13 ------------- 3 files changed, 21 insertions(+), 35 deletions(-) diff --git a/.circleci/settings.xml b/.circleci/settings.xml index d7330ab453b..bc7a4cdb502 100644 --- a/.circleci/settings.xml +++ b/.circleci/settings.xml @@ -1,17 +1,17 @@ - - - - - artifactory-snapshots - ${env.ARTIFACTORY_USER} - ${env.ARTIFACTORY_PWD} - - - artifactory-releases - ${env.ARTIFACTORY_USER} - ${env.ARTIFACTORY_PWD} - - - \ No newline at end of file + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 5438f6264c7..e6081a4b05d 100644 --- a/pom.xml +++ b/pom.xml @@ -68,7 +68,7 @@ artifactory-releases - ${artifactory.releases.url} + ${env.ARTIFACTORY_URL}/babylon-maven-releases true never @@ -76,12 +76,11 @@ artifactory-snapshots - ${artifactory.snapshots.url} + ${env.ARTIFACTORY_URL}/babylon-maven-snapshots true never - protege-mvn-repo @@ -935,11 +934,11 @@ artifactory-releases - ${artifactory.releases.url} + ${env.ARTIFACTORY_URL}/babylon-maven-releases artifactory-snapshots - ${artifactory.snapshots.url} + ${env.ARTIFACTORY_URL}/babylon-maven-snapshots diff --git a/settings.xml b/settings.xml index 61dde6806d7..a3d145dc2ab 100644 --- a/settings.xml +++ b/settings.xml @@ -2,19 +2,6 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd"> - - - repositories - - true - - - ${env.ARTIFACTORY_URL} - ${env.ARTIFACTORY_URL}/babylon-maven-snapshots - ${env.ARTIFACTORY_URL}/babylon-maven-releases - - - artifactory-snapshots From 3a7bc13aa04e431c1ace941d2efa7b576271e867 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Tue, 14 Jan 2020 17:26:50 +0000 Subject: [PATCH 010/111] [CHR-1066] --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 54b9e546b82..83d4725e6aa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -30,4 +30,4 @@ jobs: apk add --no-cache make=4.2.1-r0 openjdk8 - deploy: name: Deploy - command: ./mvnw clean install deploy -P repositories + command: ./mvnw clean install deploy From 1173578c413d85291b480deac8fa1dc8e082803f Mon Sep 17 00:00:00 2001 From: mattecasu Date: Wed, 15 Jan 2020 16:38:36 +0000 Subject: [PATCH 011/111] CHR-1066 --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 83d4725e6aa..45ccfdc3aec 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -24,6 +24,8 @@ jobs: - run: name: Build prerequisites command: | + echo "${ARTIFACTORY_USER}" | shasum + echo "${ARTIFACTORY_USER}" | shasum echo "$CIRCLE_SHA1" > .commit-keyId docker --version docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" quay.io From 9f5717d85bebd206d89ba8abb70315f5ab5543e0 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Wed, 15 Jan 2020 16:39:25 +0000 Subject: [PATCH 012/111] CHR-1066 --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 45ccfdc3aec..45c77c176c4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -25,7 +25,8 @@ jobs: name: Build prerequisites command: | echo "${ARTIFACTORY_USER}" | shasum - echo "${ARTIFACTORY_USER}" | shasum + echo "${ARTIFACTORY_PWD}" | shasum + exit echo "$CIRCLE_SHA1" > .commit-keyId docker --version docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" quay.io From 85126311e00ae7eebe2a1e9aec4ea54d19ded051 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Wed, 15 Jan 2020 16:40:32 +0000 Subject: [PATCH 013/111] CHR-1066 --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 45c77c176c4..13436e8b793 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -24,8 +24,8 @@ jobs: - run: name: Build prerequisites command: | - echo "${ARTIFACTORY_USER}" | shasum - echo "${ARTIFACTORY_PWD}" | shasum + echo "${ARTIFACTORY_USER}" | sha512sum + echo "${ARTIFACTORY_PWD}" | sha512sum exit echo "$CIRCLE_SHA1" > .commit-keyId docker --version From e6e1403eac239f9eb0c9dc7d9191fc657250ae52 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Thu, 30 Jan 2020 17:47:22 +0000 Subject: [PATCH 014/111] CHR-1066 --- .circleci/config.yml | 4 ++-- settings.xml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 13436e8b793..8781504cb10 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -24,8 +24,8 @@ jobs: - run: name: Build prerequisites command: | - echo "${ARTIFACTORY_USER}" | sha512sum - echo "${ARTIFACTORY_PWD}" | sha512sum + echo "${ARTIFACTORY_USER_RW}" | sha512sum + echo "${ARTIFACTORY_PWD_RW}" | sha512sum exit echo "$CIRCLE_SHA1" > .commit-keyId docker --version diff --git a/settings.xml b/settings.xml index a3d145dc2ab..cc7842100b8 100644 --- a/settings.xml +++ b/settings.xml @@ -5,13 +5,13 @@ artifactory-snapshots - ${env.ARTIFACTORY_USER} - ${env.ARTIFACTORY_PWD} + ${env.ARTIFACTORY_USER_RW} + ${env.ARTIFACTORY_PWD_RW} artifactory-releases - ${env.ARTIFACTORY_USER} - ${env.ARTIFACTORY_PWD} + ${env.ARTIFACTORY_USER_RW} + ${env.ARTIFACTORY_PWD_RW} From 07ed4a69d90c9d3ce629b4ac62ea8b67c7ff9b20 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Thu, 30 Jan 2020 17:54:05 +0000 Subject: [PATCH 015/111] CHR-1066 --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8781504cb10..22992be36c3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -26,7 +26,6 @@ jobs: command: | echo "${ARTIFACTORY_USER_RW}" | sha512sum echo "${ARTIFACTORY_PWD_RW}" | sha512sum - exit echo "$CIRCLE_SHA1" > .commit-keyId docker --version docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" quay.io From 897b657e62f60292e689ef5b85fe677673ce83cf Mon Sep 17 00:00:00 2001 From: mattecasu Date: Thu, 30 Jan 2020 18:08:42 +0000 Subject: [PATCH 016/111] CHR-1066 --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 22992be36c3..d2da7b70de2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -24,6 +24,7 @@ jobs: - run: name: Build prerequisites command: | + echo "${ARTIFACTORY_URL}" echo "${ARTIFACTORY_USER_RW}" | sha512sum echo "${ARTIFACTORY_PWD_RW}" | sha512sum echo "$CIRCLE_SHA1" > .commit-keyId From 3423a0b39bee4d2e316d90d049981f4b8f671e94 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Thu, 30 Jan 2020 18:09:37 +0000 Subject: [PATCH 017/111] CHR-1066 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d2da7b70de2..b7ed16d966c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -24,7 +24,7 @@ jobs: - run: name: Build prerequisites command: | - echo "${ARTIFACTORY_URL}" + echo "${ARTIFACTORY_URL}" | sha512sum echo "${ARTIFACTORY_USER_RW}" | sha512sum echo "${ARTIFACTORY_PWD_RW}" | sha512sum echo "$CIRCLE_SHA1" > .commit-keyId From 80251ea69a6109c8fe008099403b5ff263109f31 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Fri, 31 Jan 2020 13:43:37 +0000 Subject: [PATCH 018/111] CHR-1066 --- .circleci/config.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index b7ed16d966c..d0fc377deee 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -21,6 +21,12 @@ jobs: steps: - checkout - setup_remote_docker + - restore_cache: + keys: + # when lock file changes, use increasingly general patterns to restore cache + - maven-repo-v1-{{ .Branch }}-{{ checksum "pom.xml" }} + - maven-repo-v1-{{ .Branch }}- + - maven-repo-v1- - run: name: Build prerequisites command: | @@ -31,6 +37,10 @@ jobs: docker --version docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" quay.io apk add --no-cache make=4.2.1-r0 openjdk8 + - save_cache: + paths: + - ~/.m2 + key: maven-repo-v1-{{ .Branch }}-{{ checksum "pom.xml" }} - deploy: name: Deploy command: ./mvnw clean install deploy From dee99099f287609a0a82b5d6c6673ff8d5ffe7c8 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Fri, 31 Jan 2020 14:36:52 +0000 Subject: [PATCH 019/111] CHR-1066 --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index e6081a4b05d..7a599d7d642 100644 --- a/pom.xml +++ b/pom.xml @@ -68,7 +68,7 @@ artifactory-releases - ${env.ARTIFACTORY_URL}/babylon-maven-releases + https://artifactory.ops.babylontech.co.uk/artifactory/babylon-maven-releases true never @@ -76,7 +76,7 @@ artifactory-snapshots - ${env.ARTIFACTORY_URL}/babylon-maven-snapshots + https://artifactory.ops.babylontech.co.uk/artifactory/babylon-maven-snapshots true never @@ -934,11 +934,11 @@ artifactory-releases - ${env.ARTIFACTORY_URL}/babylon-maven-releases + https://artifactory.ops.babylontech.co.uk/artifactory/babylon-maven-releases artifactory-snapshots - ${env.ARTIFACTORY_URL}/babylon-maven-snapshots + https://artifactory.ops.babylontech.co.uk/artifactory/babylon-maven-snapshots From 39a86ed19889dda229610c470fd890892f892801 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Fri, 31 Jan 2020 14:49:26 +0000 Subject: [PATCH 020/111] CHR-1066 --- .circleci/settings.xml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/.circleci/settings.xml b/.circleci/settings.xml index bc7a4cdb502..a430e86f891 100644 --- a/.circleci/settings.xml +++ b/.circleci/settings.xml @@ -1,17 +1,17 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + artifactory-snapshots + ${env.ARTIFACTORY_USER_RW} + ${env.ARTIFACTORY_PWD_RW} + + + artifactory-releases + ${env.ARTIFACTORY_USER_RW} + ${env.ARTIFACTORY_PWD_RW} + + + \ No newline at end of file From 0407f8136712cbf04476b2a9384d5cb812a4441c Mon Sep 17 00:00:00 2001 From: mattecasu Date: Fri, 31 Jan 2020 15:19:52 +0000 Subject: [PATCH 021/111] CHR-1066 --- pom.xml | 43 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 34 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 7a599d7d642..d8c9b32c38d 100644 --- a/pom.xml +++ b/pom.xml @@ -66,22 +66,47 @@ + - artifactory-releases + + false + + maven-central + remote-repos + https://repo.maven.apache.org/maven2 + + + + false + + babylon-central + remote-repos https://artifactory.ops.babylontech.co.uk/artifactory/babylon-maven-releases - - true - never - - artifactory-snapshots + + babylon-snapshots + remote-repos https://artifactory.ops.babylontech.co.uk/artifactory/babylon-maven-snapshots + + + + - true - never + false - + babylon-central + remote-repos + https://artifactory.ops.babylontech.co.uk/artifactory/babylon-maven-releases + + + + babylon-snapshots + remote-repos + https://artifactory.ops.babylontech.co.uk/artifactory/babylon-maven-snapshots + + + protege-mvn-repo https://b2ihealthcare.github.io/protege/ From f18495c23462b7064e2d77499a34d0a989639c3e Mon Sep 17 00:00:00 2001 From: mattecasu Date: Fri, 31 Jan 2020 15:21:43 +0000 Subject: [PATCH 022/111] CHR-1066 --- pom.xml | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/pom.xml b/pom.xml index d8c9b32c38d..db8e4dab648 100644 --- a/pom.xml +++ b/pom.xml @@ -84,28 +84,11 @@ https://artifactory.ops.babylontech.co.uk/artifactory/babylon-maven-releases - + babylon-snapshots remote-repos https://artifactory.ops.babylontech.co.uk/artifactory/babylon-maven-snapshots - - - - - false - - babylon-central - remote-repos - https://artifactory.ops.babylontech.co.uk/artifactory/babylon-maven-releases - - - - babylon-snapshots - remote-repos - https://artifactory.ops.babylontech.co.uk/artifactory/babylon-maven-snapshots - - protege-mvn-repo @@ -132,7 +115,22 @@ - + + + + false + + babylon-central + remote-repos + https://artifactory.ops.babylontech.co.uk/artifactory/babylon-maven-releases + + + + babylon-snapshots + remote-repos + https://artifactory.ops.babylontech.co.uk/artifactory/babylon-maven-snapshots + + From 7eae6a0ce9d0408463cf4b485a266e9fa4f5eecd Mon Sep 17 00:00:00 2001 From: mattecasu Date: Fri, 31 Jan 2020 15:31:00 +0000 Subject: [PATCH 023/111] CHR-1066 --- pom.xml | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/pom.xml b/pom.xml index db8e4dab648..6303e335800 100644 --- a/pom.xml +++ b/pom.xml @@ -939,31 +939,31 @@ - - - docs - - - docs - true - - - - documentation - - - + + + + + + + + + + + + + + - - - artifactory-releases - https://artifactory.ops.babylontech.co.uk/artifactory/babylon-maven-releases - - - artifactory-snapshots - https://artifactory.ops.babylontech.co.uk/artifactory/babylon-maven-snapshots - - + + + + + + + + + + https://github.com/babylonhealth/snow-owl From ad68ad9d95cd5d70bf58a471afdd7e00458d16ee Mon Sep 17 00:00:00 2001 From: mattecasu Date: Fri, 31 Jan 2020 15:51:48 +0000 Subject: [PATCH 024/111] CHR-1066 --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 6303e335800..10939e9e6f4 100644 --- a/pom.xml +++ b/pom.xml @@ -79,13 +79,13 @@ false - babylon-central + artifactory-releases remote-repos https://artifactory.ops.babylontech.co.uk/artifactory/babylon-maven-releases - babylon-snapshots + artifactory-snapshots remote-repos https://artifactory.ops.babylontech.co.uk/artifactory/babylon-maven-snapshots @@ -120,13 +120,13 @@ false - babylon-central + artifactory-releases remote-repos https://artifactory.ops.babylontech.co.uk/artifactory/babylon-maven-releases - babylon-snapshots + artifactory-snapshots remote-repos https://artifactory.ops.babylontech.co.uk/artifactory/babylon-maven-snapshots From fb2b3217bea98b4fba426d5bdd7b1ff5f0e949a3 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Fri, 31 Jan 2020 15:59:48 +0000 Subject: [PATCH 025/111] CHR-1066 --- pom.xml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 10939e9e6f4..fa4caddcb56 100644 --- a/pom.xml +++ b/pom.xml @@ -954,16 +954,16 @@ - - - - - - - - - - + + + artifactory-releases + https://artifactory.ops.babylontech.co.uk/artifactory/babylon-maven-releases + + + artifactory-snapshots + https://artifactory.ops.babylontech.co.uk/artifactory/babylon-maven-snapshots + + https://github.com/babylonhealth/snow-owl From e0b2be2e7c7d829eb703645c13302c8c2a035176 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Fri, 31 Jan 2020 16:10:47 +0000 Subject: [PATCH 026/111] CHR-1066 --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d0fc377deee..b44d7a02b2c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -37,10 +37,10 @@ jobs: docker --version docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" quay.io apk add --no-cache make=4.2.1-r0 openjdk8 + - deploy: + name: Deploy + command: ./mvnw clean install deploy - save_cache: paths: - ~/.m2 key: maven-repo-v1-{{ .Branch }}-{{ checksum "pom.xml" }} - - deploy: - name: Deploy - command: ./mvnw clean install deploy From 42f6b4bd48c8207d1e9e632a2298072c466ee4e1 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Fri, 31 Jan 2020 16:16:22 +0000 Subject: [PATCH 027/111] CHR-1066 --- pom.xml | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/pom.xml b/pom.xml index fa4caddcb56..8ed7fdb6fb7 100644 --- a/pom.xml +++ b/pom.xml @@ -840,14 +840,14 @@ - - org.eclipse.tycho - tycho-p2-publisher-plugin - ${tycho.version} - - true - - + + + + + + + + org.eclipse.tycho tycho-versions-plugin @@ -939,20 +939,20 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + From 68362efa9f283c7a5ddf71fd3734271f2de5a01f Mon Sep 17 00:00:00 2001 From: mattecasu Date: Fri, 31 Jan 2020 16:19:28 +0000 Subject: [PATCH 028/111] CHR-1066 --- .circleci/config.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b44d7a02b2c..a149b511595 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -37,10 +37,13 @@ jobs: docker --version docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" quay.io apk add --no-cache make=4.2.1-r0 openjdk8 - - deploy: - name: Deploy - command: ./mvnw clean install deploy + - run: + name: Build + command: ./mvnw clean install - save_cache: paths: - ~/.m2 key: maven-repo-v1-{{ .Branch }}-{{ checksum "pom.xml" }} + - deploy: + name: Deploy + command: ./mvnw deploy From 986c6f059a3cd8753d27f3e94b71548b1fa1cd50 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Fri, 31 Jan 2020 16:31:02 +0000 Subject: [PATCH 029/111] CHR-1066 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a149b511595..70037a268a8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -36,7 +36,7 @@ jobs: echo "$CIRCLE_SHA1" > .commit-keyId docker --version docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" quay.io - apk add --no-cache make=4.2.1-r0 openjdk8 + apk add --no-cache make=4.2.1-r0 openjdk11-jre - run: name: Build command: ./mvnw clean install From 4716572c1416fc7ef34f473e0a56adc0f7730e78 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Fri, 31 Jan 2020 16:32:11 +0000 Subject: [PATCH 030/111] CHR-1066 --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 70037a268a8..65cfb0673bb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -21,12 +21,6 @@ jobs: steps: - checkout - setup_remote_docker - - restore_cache: - keys: - # when lock file changes, use increasingly general patterns to restore cache - - maven-repo-v1-{{ .Branch }}-{{ checksum "pom.xml" }} - - maven-repo-v1-{{ .Branch }}- - - maven-repo-v1- - run: name: Build prerequisites command: | @@ -37,6 +31,12 @@ jobs: docker --version docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" quay.io apk add --no-cache make=4.2.1-r0 openjdk11-jre + - restore_cache: + keys: + # when lock file changes, use increasingly general patterns to restore cache + - maven-repo-v1-{{ .Branch }}-{{ checksum "pom.xml" }} + - maven-repo-v1-{{ .Branch }}- + - maven-repo-v1- - run: name: Build command: ./mvnw clean install From b71dc878f26e1f59d4c8241005a2d695e882fdb4 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Fri, 31 Jan 2020 16:34:35 +0000 Subject: [PATCH 031/111] CHR-1066 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 65cfb0673bb..ff0fd107ce9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -30,7 +30,7 @@ jobs: echo "$CIRCLE_SHA1" > .commit-keyId docker --version docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" quay.io - apk add --no-cache make=4.2.1-r0 openjdk11-jre + apk add --no-cache make=4.2.1-r0 openjdk11 - restore_cache: keys: # when lock file changes, use increasingly general patterns to restore cache From a5d16f36a190cc2380333867394898974eee419e Mon Sep 17 00:00:00 2001 From: mattecasu Date: Fri, 31 Jan 2020 16:37:19 +0000 Subject: [PATCH 032/111] CHR-1066 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ff0fd107ce9..30a74b06814 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -30,7 +30,7 @@ jobs: echo "$CIRCLE_SHA1" > .commit-keyId docker --version docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" quay.io - apk add --no-cache make=4.2.1-r0 openjdk11 + apk add --no-cache make=4.2.1-r0 openjdk11 --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community - restore_cache: keys: # when lock file changes, use increasingly general patterns to restore cache From d5130fecb6beef84f582ae7cf4bab86d9b2afb74 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Fri, 31 Jan 2020 16:50:47 +0000 Subject: [PATCH 033/111] CHR-1066 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 30a74b06814..7e0e14313e1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -30,7 +30,7 @@ jobs: echo "$CIRCLE_SHA1" > .commit-keyId docker --version docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" quay.io - apk add --no-cache make=4.2.1-r0 openjdk11 --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community + apk add --no-cache make=4.2.1-r0 nodejs nodejs-npm openjdk11 --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community - restore_cache: keys: # when lock file changes, use increasingly general patterns to restore cache From 0b60f5639729b6069f4d40b928232cc8edb5635e Mon Sep 17 00:00:00 2001 From: mattecasu Date: Fri, 31 Jan 2020 16:52:11 +0000 Subject: [PATCH 034/111] CHR-1066 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7e0e14313e1..a85d035dc04 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -30,7 +30,7 @@ jobs: echo "$CIRCLE_SHA1" > .commit-keyId docker --version docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" quay.io - apk add --no-cache make=4.2.1-r0 nodejs nodejs-npm openjdk11 --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community + apk add --no-cache make=4.2.1-r0 nodejs npm openjdk11 --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community - restore_cache: keys: # when lock file changes, use increasingly general patterns to restore cache From d9f875188f855858e0b0af1b0a3e9e6cf8daa6d6 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Fri, 31 Jan 2020 16:54:28 +0000 Subject: [PATCH 035/111] CHR-1066 --- .circleci/config.yml | 2 +- pom.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a85d035dc04..30a74b06814 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -30,7 +30,7 @@ jobs: echo "$CIRCLE_SHA1" > .commit-keyId docker --version docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" quay.io - apk add --no-cache make=4.2.1-r0 nodejs npm openjdk11 --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community + apk add --no-cache make=4.2.1-r0 openjdk11 --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community - restore_cache: keys: # when lock file changes, use increasingly general patterns to restore cache diff --git a/pom.xml b/pom.xml index 8ed7fdb6fb7..6326fc3d04f 100644 --- a/pom.xml +++ b/pom.xml @@ -898,9 +898,9 @@ ${tycho.version} false - - **/*Test*.java - + + + false From d7b93043e5933082a8d63301a189201487cfed32 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Fri, 31 Jan 2020 17:15:03 +0000 Subject: [PATCH 036/111] CHR-1066 --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 30a74b06814..28c6e7b06de 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -30,7 +30,8 @@ jobs: echo "$CIRCLE_SHA1" > .commit-keyId docker --version docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" quay.io - apk add --no-cache make=4.2.1-r0 openjdk11 --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community + apk add --no-cache make=4.2.1-r0 nodejs openjdk11 --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community + npm install -g npm@6.13.6 - restore_cache: keys: # when lock file changes, use increasingly general patterns to restore cache From 277bd3e9c33257f4acb024f74ef64f0795aa5456 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Fri, 31 Jan 2020 17:16:11 +0000 Subject: [PATCH 037/111] CHR-1066 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 28c6e7b06de..82a8e353165 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -31,7 +31,7 @@ jobs: docker --version docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" quay.io apk add --no-cache make=4.2.1-r0 nodejs openjdk11 --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community - npm install -g npm@6.13.6 + npm install -g npm - restore_cache: keys: # when lock file changes, use increasingly general patterns to restore cache From 5e9be745e188ac9f61a8b12c04c54d59e0fb211c Mon Sep 17 00:00:00 2001 From: mattecasu Date: Fri, 31 Jan 2020 17:28:21 +0000 Subject: [PATCH 038/111] CHR-1066 --- pom.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 6326fc3d04f..e16c0f2342b 100644 --- a/pom.xml +++ b/pom.xml @@ -57,12 +57,12 @@ commons core fhir - net4j + snomed - cis - tests - releng - dist + + + + @@ -898,9 +898,9 @@ ${tycho.version} false - - - + + + false From 5384c3f0bc2585f56f25a2c27273a71cae2e639e Mon Sep 17 00:00:00 2001 From: mattecasu Date: Fri, 31 Jan 2020 17:30:42 +0000 Subject: [PATCH 039/111] CHR-1066 --- pom.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index e16c0f2342b..6326fc3d04f 100644 --- a/pom.xml +++ b/pom.xml @@ -57,12 +57,12 @@ commons core fhir - + net4j snomed - - - - + cis + tests + releng + dist @@ -898,9 +898,9 @@ ${tycho.version} false - - - + + + false From b7b2829a6a0afdac4f6c2a69f255bc890bf7171d Mon Sep 17 00:00:00 2001 From: mattecasu Date: Fri, 31 Jan 2020 17:33:45 +0000 Subject: [PATCH 040/111] CHR-1066 --- pom.xml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index 6326fc3d04f..aca936f080c 100644 --- a/pom.xml +++ b/pom.xml @@ -939,20 +939,20 @@ - - - - - - - - - - - - - - + + + docs + + + docs + true + + + + documentation + + + From 0db6589872b8b99e59ea34cc1b8cea7465c8ff2a Mon Sep 17 00:00:00 2001 From: mattecasu Date: Fri, 31 Jan 2020 17:34:24 +0000 Subject: [PATCH 041/111] CHR-1066 --- pom.xml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/pom.xml b/pom.xml index aca936f080c..04bb29f36af 100644 --- a/pom.xml +++ b/pom.xml @@ -898,9 +898,9 @@ ${tycho.version} false - - - + + + false @@ -939,20 +939,20 @@ - - - docs - - - docs - true - - - - documentation - - - + + + docs + + + docs + true + + + + documentation + + + From e17c5d1a065165ac4327e8a679d19ea410ed5998 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Mon, 3 Feb 2020 10:15:58 +0000 Subject: [PATCH 042/111] CHR-1066 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 82a8e353165..47db02f3e0b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,7 +40,7 @@ jobs: - maven-repo-v1- - run: name: Build - command: ./mvnw clean install + command: ./mvnw --projects commons,core,fhir,snomed clean install - save_cache: paths: - ~/.m2 From cf0cefcf6a5f8446167bad2346378c0318b1cc29 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Mon, 3 Feb 2020 10:42:52 +0000 Subject: [PATCH 043/111] CHR-1066 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 04bb29f36af..6ccbed825ba 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.b2international.snowowl snowowl-parent 7.3.0-SNAPSHOT - pom + jar UTF-8 From 151ee6c83c210e139287fbe7d0dc7f24fd3fd3a7 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Mon, 3 Feb 2020 10:46:04 +0000 Subject: [PATCH 044/111] CHR-1066 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 6ccbed825ba..6d8b1bdaee6 100644 --- a/pom.xml +++ b/pom.xml @@ -6,8 +6,8 @@ 4.0.0 com.b2international.snowowl snowowl-parent - 7.3.0-SNAPSHOT - jar + 7.3.0-sn + pom UTF-8 From 3ddf318d3d87e6e9c7733ee300f6be156695c7dd Mon Sep 17 00:00:00 2001 From: mattecasu Date: Mon, 3 Feb 2020 10:49:40 +0000 Subject: [PATCH 045/111] CHR-1066 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6d8b1bdaee6..04bb29f36af 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 4.0.0 com.b2international.snowowl snowowl-parent - 7.3.0-sn + 7.3.0-SNAPSHOT pom From e5146e19862471bbc788aea1001493aedd4f9721 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Mon, 3 Feb 2020 10:51:07 +0000 Subject: [PATCH 046/111] CHR-1066 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 47db02f3e0b..54b15696e9e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,7 +40,7 @@ jobs: - maven-repo-v1- - run: name: Build - command: ./mvnw --projects commons,core,fhir,snomed clean install + command: ./mvnw --projects commons,core,fhir,snomed --also-make clean install - save_cache: paths: - ~/.m2 From a45e9c18e11dbc807b197cceb24bddbb5a638b4c Mon Sep 17 00:00:00 2001 From: mattecasu Date: Mon, 3 Feb 2020 10:59:07 +0000 Subject: [PATCH 047/111] CHR-1066 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 54b15696e9e..20990594931 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,7 +40,7 @@ jobs: - maven-repo-v1- - run: name: Build - command: ./mvnw --projects commons,core,fhir,snomed --also-make clean install + command: ./mvnw --projects commons,core,fhir,snomed --also-make-dependants clean install - save_cache: paths: - ~/.m2 From ae260bef64c552eedee905b67383829550bb0f85 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Mon, 3 Feb 2020 11:00:32 +0000 Subject: [PATCH 048/111] CHR-1066 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 20990594931..ee52c4de74b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,7 +40,7 @@ jobs: - maven-repo-v1- - run: name: Build - command: ./mvnw --projects commons,core,fhir,snomed --also-make-dependants clean install + command: ./mvnw --projects commons,core,fhir,snomed --also-make-dependents clean install - save_cache: paths: - ~/.m2 From 1a754c703451fb1adfb7708d84ab86fba79fc913 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Mon, 3 Feb 2020 11:01:41 +0000 Subject: [PATCH 049/111] CHR-1066 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ee52c4de74b..5d4de839fef 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,7 +40,7 @@ jobs: - maven-repo-v1- - run: name: Build - command: ./mvnw --projects commons,core,fhir,snomed --also-make-dependents clean install + command: ./mvnw --projects commons,core,fhir,snomed --also-make clean install release - save_cache: paths: - ~/.m2 From 784747d53816bd4d5c8ac4d2668e1ee5e54d288e Mon Sep 17 00:00:00 2001 From: mattecasu Date: Mon, 3 Feb 2020 11:06:43 +0000 Subject: [PATCH 050/111] CHR-1066 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5d4de839fef..061056183db 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,7 +40,7 @@ jobs: - maven-repo-v1- - run: name: Build - command: ./mvnw --projects commons,core,fhir,snomed --also-make clean install release + command: ./mvnw --projects commons,core,fhir,snomed --also-make clean package - save_cache: paths: - ~/.m2 From 339be8dd061f1f6abbe452c4f6fae98c56bd4b87 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Mon, 3 Feb 2020 11:15:17 +0000 Subject: [PATCH 051/111] CHR-1066 --- .circleci/settings.xml | 4 ++-- settings.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/settings.xml b/.circleci/settings.xml index a430e86f891..e1fc8f9e0b3 100644 --- a/.circleci/settings.xml +++ b/.circleci/settings.xml @@ -4,12 +4,12 @@ xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd"> - artifactory-snapshots + artifactory-releases ${env.ARTIFACTORY_USER_RW} ${env.ARTIFACTORY_PWD_RW} - artifactory-releases + artifactory-snapshots ${env.ARTIFACTORY_USER_RW} ${env.ARTIFACTORY_PWD_RW} diff --git a/settings.xml b/settings.xml index cc7842100b8..aa4bc11d82e 100644 --- a/settings.xml +++ b/settings.xml @@ -4,12 +4,12 @@ http://maven.apache.org/xsd/settings-1.0.0.xsd"> - artifactory-snapshots + artifactory-releases ${env.ARTIFACTORY_USER_RW} ${env.ARTIFACTORY_PWD_RW} - artifactory-releases + artifactory-snapshots ${env.ARTIFACTORY_USER_RW} ${env.ARTIFACTORY_PWD_RW} From a801a7d1e4f28a80fc025aa377dc4cbe3f7e8495 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Mon, 3 Feb 2020 11:19:47 +0000 Subject: [PATCH 052/111] CHR-1066 --- pom.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 04bb29f36af..d5223129307 100644 --- a/pom.xml +++ b/pom.xml @@ -840,14 +840,14 @@ - - - - - - - - + + org.eclipse.tycho + tycho-p2-publisher-plugin + ${tycho.version} + + true + + org.eclipse.tycho tycho-versions-plugin From e28dc8e16fdd5e6465fc8f9afa66b03557acb1db Mon Sep 17 00:00:00 2001 From: mattecasu Date: Mon, 3 Feb 2020 11:26:19 +0000 Subject: [PATCH 053/111] CHR-1066 --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index d5223129307..66dc66679a0 100644 --- a/pom.xml +++ b/pom.xml @@ -844,6 +844,7 @@ org.eclipse.tycho tycho-p2-publisher-plugin ${tycho.version} + true true From 5607cf75b568b4b6463ffb9ff97a98627f242aa7 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Mon, 3 Feb 2020 11:27:14 +0000 Subject: [PATCH 054/111] CHR-1066 --- pom.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 66dc66679a0..5b0f558985e 100644 --- a/pom.xml +++ b/pom.xml @@ -844,10 +844,9 @@ org.eclipse.tycho tycho-p2-publisher-plugin ${tycho.version} - true - - true - + + + org.eclipse.tycho From 0d37b9e476b212f9ec19a1b1cb84c52c734d4764 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Mon, 3 Feb 2020 13:11:01 +0000 Subject: [PATCH 055/111] CHR-1066 --- .circleci/config.yml | 2 +- .circleci/settings.xml | 17 ----------------- pom.xml | 34 +++++++++++++++++----------------- 3 files changed, 18 insertions(+), 35 deletions(-) delete mode 100644 .circleci/settings.xml diff --git a/.circleci/config.yml b/.circleci/config.yml index 061056183db..7ed06589def 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,7 +40,7 @@ jobs: - maven-repo-v1- - run: name: Build - command: ./mvnw --projects commons,core,fhir,snomed --also-make clean package + command: ./mvnw --projects commons,core,snomed --also-make clean package - save_cache: paths: - ~/.m2 diff --git a/.circleci/settings.xml b/.circleci/settings.xml deleted file mode 100644 index e1fc8f9e0b3..00000000000 --- a/.circleci/settings.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - artifactory-releases - ${env.ARTIFACTORY_USER_RW} - ${env.ARTIFACTORY_PWD_RW} - - - artifactory-snapshots - ${env.ARTIFACTORY_USER_RW} - ${env.ARTIFACTORY_PWD_RW} - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index 5b0f558985e..41c590b9b93 100644 --- a/pom.xml +++ b/pom.xml @@ -75,20 +75,20 @@ remote-repos https://repo.maven.apache.org/maven2 - - - false - - artifactory-releases - remote-repos - https://artifactory.ops.babylontech.co.uk/artifactory/babylon-maven-releases - - - - artifactory-snapshots - remote-repos - https://artifactory.ops.babylontech.co.uk/artifactory/babylon-maven-snapshots - + + + + + + + + + + + + + + protege-mvn-repo @@ -844,9 +844,9 @@ org.eclipse.tycho tycho-p2-publisher-plugin ${tycho.version} - - - + + true + org.eclipse.tycho From 93624931acbd9003904c925da60e8d842758b5ea Mon Sep 17 00:00:00 2001 From: mattecasu Date: Mon, 3 Feb 2020 13:24:09 +0000 Subject: [PATCH 056/111] CHR-1066 --- pom.xml | 60 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/pom.xml b/pom.xml index 41c590b9b93..ceb522a5242 100644 --- a/pom.xml +++ b/pom.xml @@ -75,20 +75,20 @@ remote-repos https://repo.maven.apache.org/maven2 - - - - - - - - - - - - - - + + + + + + + + + + + + + + protege-mvn-repo @@ -115,22 +115,22 @@ - - - - false - - artifactory-releases - remote-repos - https://artifactory.ops.babylontech.co.uk/artifactory/babylon-maven-releases - - - - artifactory-snapshots - remote-repos - https://artifactory.ops.babylontech.co.uk/artifactory/babylon-maven-snapshots - - + + + + + + + + + + + + + + + + From fe87f84897123418e6af95d7dcc93dbe5b05c996 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Mon, 3 Feb 2020 13:27:48 +0000 Subject: [PATCH 057/111] CHR-1066 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7ed06589def..8c7aae44e17 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,7 +40,7 @@ jobs: - maven-repo-v1- - run: name: Build - command: ./mvnw --projects commons,core,snomed --also-make clean package + command: ./mvnw --projects commons,core,snomed clean package - save_cache: paths: - ~/.m2 From 85c9768da1aa147a9fb89abc83c8bbf5e02e7176 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Mon, 3 Feb 2020 13:39:25 +0000 Subject: [PATCH 058/111] CHR-1066 --- pom.xml | 508 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 254 insertions(+), 254 deletions(-) diff --git a/pom.xml b/pom.xml index ceb522a5242..2a6218b26cf 100644 --- a/pom.xml +++ b/pom.xml @@ -639,220 +639,220 @@ - - org.eclipse.tycho - tycho-maven-plugin - ${tycho.version} - true - - - org.eclipse.tycho - tycho-packaging-plugin - - false - false - - - - org.eclipse.tycho - tycho-source-plugin - ${tycho.version} - - - plugin-source - - plugin-source - - - - - - org.eclipse.tycho - target-platform-configuration - ${tycho.version} - - p2 - consider - - - ${project.groupId} - target-platform - ${project.version} - - - - - eclipse-plugin - org.eclipse.osgi - - [3.13.0,3.15.0] - - - - - - p2-installable-unit - org.eclipse.equinox.servletbridge.extensionbundle - - - - eclipse-plugin - org.codehaus.groovy - - ${groovy.version} - - - - eclipse-plugin - com.google.guava - - ${guava.versionRange} - - - - - p2-installable-unit - slf4j.api - - ${slf4j.version} - - - - p2-installable-unit - ch.qos.logback.classic - - ${logback.versionRange} - - - - p2-installable-unit - ch.qos.logback.core - - ${logback.versionRange} - - - - - p2-installable-unit - com.fasterxml.jackson.core.jackson-annotations - - ${jackson.version} - - - - p2-installable-unit - com.fasterxml.jackson.core.jackson-core - - ${jackson.version} - - - - p2-installable-unit - com.fasterxml.jackson.core.jackson-databind - - ${jackson.databind.version} - - - - p2-installable-unit - com.fasterxml.jackson.dataformat.jackson-dataformat-yaml - - ${jackson.version} - - - - p2-installable-unit - com.fasterxml.jackson.dataformat.jackson-dataformat-cbor - - ${jackson.version} - - - - p2-installable-unit - com.fasterxml.jackson.dataformat.jackson-dataformat-csv - - ${jackson.version} - - - - p2-installable-unit - com.fasterxml.jackson.dataformat.jackson-dataformat-xml - - ${jackson.version} - - - - p2-installable-unit - com.fasterxml.jackson.dataformat.jackson-dataformat-afterburner - - ${jackson.version} - - - - - p2-installable-unit - org.apache.commons.collections - - ${commons.collections.versionRange} - - - - p2-installable-unit - org.slf4j.api - - - - - - linux - gtk - x86_64 - - - win32 - win32 - x86_64 - - - - - - org.eclipse.tycho - tycho-p2-director-plugin - ${tycho.version} - - - org.codehaus.plexus - plexus-archiver - 2.4.4 - - - org.codehaus.plexus - plexus-component-api - - - org.codehaus.plexus - plexus-container-default - - - - - - - org.eclipse.tycho - tycho-p2-publisher-plugin - ${tycho.version} - - true - - - - org.eclipse.tycho - tycho-versions-plugin - ${tycho.version} - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + org.jacoco jacoco-maven-plugin @@ -868,20 +868,20 @@ - - org.eclipse.tycho - tycho-compiler-plugin - ${tycho.version} - - false - 11 - 11 - - **/*.groovy - **/*.xtend - - - + + + + + + + + + + + + + + org.apache.maven.plugins @@ -904,32 +904,32 @@ false - - org.eclipse.tycho - tycho-packaging-plugin - ${tycho.version} - - - org.eclipse.tycho.extras - tycho-buildtimestamp-jgit - ${tycho-extras.version} - - - - jgit - - pom.xml - - - - - org.eclipse.tycho - tycho-p2-repository-plugin - ${tycho.version} - - true - - + + + + + + + + + + + + + + + + + + + + + + + + + + org.apache.maven.plugins maven-assembly-plugin From 274717f249027b24acf29b91dcd23201b9f3f993 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Mon, 3 Feb 2020 13:41:14 +0000 Subject: [PATCH 059/111] CHR-1066 --- pom.xml | 508 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 254 insertions(+), 254 deletions(-) diff --git a/pom.xml b/pom.xml index 2a6218b26cf..b8138a94688 100644 --- a/pom.xml +++ b/pom.xml @@ -639,220 +639,220 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + org.jacoco jacoco-maven-plugin @@ -868,20 +868,20 @@ - - - - - - - - - - - - - - + + org.eclipse.tycho + tycho-compiler-plugin + ${tycho.version} + + false + 11 + 11 + + **/*.groovy + **/*.xtend + + + org.apache.maven.plugins @@ -904,32 +904,32 @@ false - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + org.apache.maven.plugins maven-assembly-plugin From cb495bb44c22975777cb1c1742aed142b05f56f2 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Mon, 3 Feb 2020 13:45:02 +0000 Subject: [PATCH 060/111] CHR-1066 --- pom.xml | 72 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/pom.xml b/pom.xml index b8138a94688..56c50003c35 100644 --- a/pom.xml +++ b/pom.xml @@ -639,12 +639,12 @@ - - - - - - + + org.eclipse.tycho + tycho-maven-plugin + ${tycho.version} + true + @@ -818,28 +818,28 @@ - - - - - - - - - - - - - - - - - - - - - - + + org.eclipse.tycho + tycho-p2-director-plugin + ${tycho.version} + + + org.codehaus.plexus + plexus-archiver + 2.4.4 + + + org.codehaus.plexus + plexus-component-api + + + org.codehaus.plexus + plexus-container-default + + + + + @@ -922,14 +922,14 @@ - - - - - - - - + + org.eclipse.tycho + tycho-p2-repository-plugin + ${tycho.version} + + true + + org.apache.maven.plugins maven-assembly-plugin From 4e686ae50097bfb21d91ce1480c56ad44381cfb5 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Mon, 3 Feb 2020 13:47:42 +0000 Subject: [PATCH 061/111] CHR-1066 --- pom.xml | 304 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 152 insertions(+), 152 deletions(-) diff --git a/pom.xml b/pom.xml index 56c50003c35..2c4c59ef736 100644 --- a/pom.xml +++ b/pom.xml @@ -666,158 +666,158 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + org.eclipse.tycho + target-platform-configuration + ${tycho.version} + + p2 + consider + + + ${project.groupId} + target-platform + ${project.version} + + + + + eclipse-plugin + org.eclipse.osgi + + [3.13.0,3.15.0] + + + + + + p2-installable-unit + org.eclipse.equinox.servletbridge.extensionbundle + + + + eclipse-plugin + org.codehaus.groovy + + ${groovy.version} + + + + eclipse-plugin + com.google.guava + + ${guava.versionRange} + + + + + p2-installable-unit + slf4j.api + + ${slf4j.version} + + + + p2-installable-unit + ch.qos.logback.classic + + ${logback.versionRange} + + + + p2-installable-unit + ch.qos.logback.core + + ${logback.versionRange} + + + + + p2-installable-unit + com.fasterxml.jackson.core.jackson-annotations + + ${jackson.version} + + + + p2-installable-unit + com.fasterxml.jackson.core.jackson-core + + ${jackson.version} + + + + p2-installable-unit + com.fasterxml.jackson.core.jackson-databind + + ${jackson.databind.version} + + + + p2-installable-unit + com.fasterxml.jackson.dataformat.jackson-dataformat-yaml + + ${jackson.version} + + + + p2-installable-unit + com.fasterxml.jackson.dataformat.jackson-dataformat-cbor + + ${jackson.version} + + + + p2-installable-unit + com.fasterxml.jackson.dataformat.jackson-dataformat-csv + + ${jackson.version} + + + + p2-installable-unit + com.fasterxml.jackson.dataformat.jackson-dataformat-xml + + ${jackson.version} + + + + p2-installable-unit + com.fasterxml.jackson.dataformat.jackson-dataformat-afterburner + + ${jackson.version} + + + + + p2-installable-unit + org.apache.commons.collections + + ${commons.collections.versionRange} + + + + p2-installable-unit + org.slf4j.api + + + + + + linux + gtk + x86_64 + + + win32 + win32 + x86_64 + + + + org.eclipse.tycho tycho-p2-director-plugin From 404a45bd763202d158afd43d4b77c10a69686d56 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Mon, 3 Feb 2020 14:03:11 +0000 Subject: [PATCH 062/111] CHR-1066 --- .circleci/config.yml | 2 +- pom.xml | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8c7aae44e17..c4da46a4c1a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -47,4 +47,4 @@ jobs: key: maven-repo-v1-{{ .Branch }}-{{ checksum "pom.xml" }} - deploy: name: Deploy - command: ./mvnw deploy + command: ./mvnw deploy:deploy diff --git a/pom.xml b/pom.xml index 2c4c59ef736..2584c75cc41 100644 --- a/pom.xml +++ b/pom.xml @@ -635,6 +635,12 @@ ${failsafe.version} provided + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0-M1 + maven-plugin + From 41859ffdca5c5205b426edd02a11be338a028397 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Mon, 3 Feb 2020 14:08:11 +0000 Subject: [PATCH 063/111] CHR-1066 --- pom.xml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 2584c75cc41..9891e3fcfbe 100644 --- a/pom.xml +++ b/pom.xml @@ -635,12 +635,6 @@ ${failsafe.version} provided - - org.apache.maven.plugins - maven-deploy-plugin - 3.0.0-M1 - maven-plugin - @@ -941,6 +935,11 @@ maven-assembly-plugin 2.3 + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0-M1 + From 10c187c6b5495ababeda31129bbbddef79352b9d Mon Sep 17 00:00:00 2001 From: mattecasu Date: Mon, 3 Feb 2020 14:12:31 +0000 Subject: [PATCH 064/111] CHR-1066 --- pom.xml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/pom.xml b/pom.xml index 9891e3fcfbe..cb7ab4558e5 100644 --- a/pom.xml +++ b/pom.xml @@ -940,6 +940,29 @@ maven-deploy-plugin 3.0.0-M1 + + org.jfrog.buildinfo + artifactory-maven-plugin + 2.6.1 + false + + + build-info + + publish + + + + https://artifactory.ops.babylontech.co.uk/artifactory + {env.ARTIFACTORY_USER_RW} + {env.ARTIFACTORY_PWD_RW} + artifactory-releases + artifactory-snapshots + + + + + From 72899814e021ce97884488d5b77157d72654081f Mon Sep 17 00:00:00 2001 From: mattecasu Date: Mon, 3 Feb 2020 14:17:35 +0000 Subject: [PATCH 065/111] CHR-1066 --- .circleci/.circleci.settings.xml | 18 +++++++++++++ .circleci/config.yml | 2 +- pom.xml | 46 ++++++++++++++++---------------- 3 files changed, 42 insertions(+), 24 deletions(-) create mode 100644 .circleci/.circleci.settings.xml diff --git a/.circleci/.circleci.settings.xml b/.circleci/.circleci.settings.xml new file mode 100644 index 00000000000..232b744684e --- /dev/null +++ b/.circleci/.circleci.settings.xml @@ -0,0 +1,18 @@ + + + + artifactory-releases + ${env.ARTIFACTORY_USER_RW} + ${env.ARTIFACTORY_PWD_RW} + + + artifactory-snapshots + ${env.ARTIFACTORY_USER_RW} + ${env.ARTIFACTORY_PWD_RW} + + + + \ No newline at end of file diff --git a/.circleci/config.yml b/.circleci/config.yml index c4da46a4c1a..b11cee8ed5e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -47,4 +47,4 @@ jobs: key: maven-repo-v1-{{ .Branch }}-{{ checksum "pom.xml" }} - deploy: name: Deploy - command: ./mvnw deploy:deploy + command: ./mvnw -s .circleci.settings.xml deploy diff --git a/pom.xml b/pom.xml index cb7ab4558e5..8fab7139056 100644 --- a/pom.xml +++ b/pom.xml @@ -940,29 +940,29 @@ maven-deploy-plugin 3.0.0-M1 - - org.jfrog.buildinfo - artifactory-maven-plugin - 2.6.1 - false - - - build-info - - publish - - - - https://artifactory.ops.babylontech.co.uk/artifactory - {env.ARTIFACTORY_USER_RW} - {env.ARTIFACTORY_PWD_RW} - artifactory-releases - artifactory-snapshots - - - - - + + + + + + + + + + + + + + + + + + + + + + + From af3e945c1b538280933d1373b8941d70c3503bfc Mon Sep 17 00:00:00 2001 From: mattecasu Date: Mon, 3 Feb 2020 14:19:50 +0000 Subject: [PATCH 066/111] CHR-1066 --- .circleci/config.yml | 2 +- .circleci/{.circleci.settings.xml => settings.xml} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename .circleci/{.circleci.settings.xml => settings.xml} (100%) diff --git a/.circleci/config.yml b/.circleci/config.yml index b11cee8ed5e..c193fd302f5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -47,4 +47,4 @@ jobs: key: maven-repo-v1-{{ .Branch }}-{{ checksum "pom.xml" }} - deploy: name: Deploy - command: ./mvnw -s .circleci.settings.xml deploy + command: ./mvnw -s .circle/settings.xml deploy diff --git a/.circleci/.circleci.settings.xml b/.circleci/settings.xml similarity index 100% rename from .circleci/.circleci.settings.xml rename to .circleci/settings.xml From 1c19f8495b18d3d92fc3c05ce3b68c8475e5bfe0 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Mon, 3 Feb 2020 14:21:41 +0000 Subject: [PATCH 067/111] CHR-1066 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c193fd302f5..383f73fb9e8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -47,4 +47,4 @@ jobs: key: maven-repo-v1-{{ .Branch }}-{{ checksum "pom.xml" }} - deploy: name: Deploy - command: ./mvnw -s .circle/settings.xml deploy + command: ./mvnw -s .circleci/settings.xml deploy From 46d9c23b094bb4a64d3a562e983643a37b7d493f Mon Sep 17 00:00:00 2001 From: mattecasu Date: Mon, 3 Feb 2020 15:20:59 +0000 Subject: [PATCH 068/111] CHR-1066 --- pom.xml | 183 ++++++++++++++++++-------------------------------------- 1 file changed, 58 insertions(+), 125 deletions(-) diff --git a/pom.xml b/pom.xml index 8fab7139056..06ed7cf7559 100644 --- a/pom.xml +++ b/pom.xml @@ -66,30 +66,6 @@ - - - - false - - maven-central - remote-repos - https://repo.maven.apache.org/maven2 - - - - - - - - - - - - - - - - protege-mvn-repo https://b2ihealthcare.github.io/protege/ @@ -115,22 +91,7 @@ - - - - - - - - - - - - - - - - + @@ -645,27 +606,27 @@ ${tycho.version} true - - - - - - - - - - - - - - - - - - - - - + + org.eclipse.tycho + tycho-packaging-plugin + + false + false + + + + org.eclipse.tycho + tycho-source-plugin + ${tycho.version} + + + plugin-source + + plugin-source + + + + org.eclipse.tycho target-platform-configuration @@ -694,7 +655,7 @@ p2-installable-unit org.eclipse.equinox.servletbridge.extensionbundle - + eclipse-plugin @@ -801,7 +762,7 @@ p2-installable-unit org.slf4j.api - + @@ -840,19 +801,19 @@ - - - - - - - - - - - - - + + org.eclipse.tycho + tycho-p2-publisher-plugin + ${tycho.version} + + true + + + + org.eclipse.tycho + tycho-versions-plugin + ${tycho.version} + org.jacoco jacoco-maven-plugin @@ -898,30 +859,30 @@ ${tycho.version} false - - - + + **/*Test*.java + false - - - - - - - - - - - - - - - - - - + + org.eclipse.tycho + tycho-packaging-plugin + ${tycho.version} + + + org.eclipse.tycho.extras + tycho-buildtimestamp-jgit + ${tycho-extras.version} + + + + jgit + + pom.xml + + + org.eclipse.tycho tycho-p2-repository-plugin @@ -935,34 +896,6 @@ maven-assembly-plugin 2.3 - - org.apache.maven.plugins - maven-deploy-plugin - 3.0.0-M1 - - - - - - - - - - - - - - - - - - - - - - - - From 3948e26d5898da43121d4a4543d36f934b359c5f Mon Sep 17 00:00:00 2001 From: mattecasu Date: Mon, 3 Feb 2020 15:33:04 +0000 Subject: [PATCH 069/111] CHR-1066 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 06ed7cf7559..13a26d4f9d9 100644 --- a/pom.xml +++ b/pom.xml @@ -859,9 +859,9 @@ ${tycho.version} false - - **/*Test*.java - + + + false From a278f57592585ef0b564c828514dfe701401d494 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Mon, 3 Feb 2020 15:58:46 +0000 Subject: [PATCH 070/111] CHR-1066 --- pom.xml | 183 ++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 125 insertions(+), 58 deletions(-) diff --git a/pom.xml b/pom.xml index 13a26d4f9d9..8fab7139056 100644 --- a/pom.xml +++ b/pom.xml @@ -66,6 +66,30 @@ + + + + false + + maven-central + remote-repos + https://repo.maven.apache.org/maven2 + + + + + + + + + + + + + + + + protege-mvn-repo https://b2ihealthcare.github.io/protege/ @@ -91,7 +115,22 @@ - + + + + + + + + + + + + + + + + @@ -606,27 +645,27 @@ ${tycho.version} true - - org.eclipse.tycho - tycho-packaging-plugin - - false - false - - - - org.eclipse.tycho - tycho-source-plugin - ${tycho.version} - - - plugin-source - - plugin-source - - - - + + + + + + + + + + + + + + + + + + + + + org.eclipse.tycho target-platform-configuration @@ -655,7 +694,7 @@ p2-installable-unit org.eclipse.equinox.servletbridge.extensionbundle - + eclipse-plugin @@ -762,7 +801,7 @@ p2-installable-unit org.slf4j.api - + @@ -801,19 +840,19 @@ - - org.eclipse.tycho - tycho-p2-publisher-plugin - ${tycho.version} - - true - - - - org.eclipse.tycho - tycho-versions-plugin - ${tycho.version} - + + + + + + + + + + + + + org.jacoco jacoco-maven-plugin @@ -859,30 +898,30 @@ ${tycho.version} false - - - + + + false - - org.eclipse.tycho - tycho-packaging-plugin - ${tycho.version} - - - org.eclipse.tycho.extras - tycho-buildtimestamp-jgit - ${tycho-extras.version} - - - - jgit - - pom.xml - - - + + + + + + + + + + + + + + + + + + org.eclipse.tycho tycho-p2-repository-plugin @@ -896,6 +935,34 @@ maven-assembly-plugin 2.3 + + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0-M1 + + + + + + + + + + + + + + + + + + + + + + + + From 9fad2f71cfc259102397ee430afa2b98becd7dd7 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Mon, 3 Feb 2020 16:09:49 +0000 Subject: [PATCH 071/111] CHR-1066 --- pom.xml | 62 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/pom.xml b/pom.xml index 8fab7139056..729173df313 100644 --- a/pom.xml +++ b/pom.xml @@ -645,14 +645,14 @@ ${tycho.version} true - - - - - - - - + + org.eclipse.tycho + tycho-packaging-plugin + + false + false + + @@ -940,29 +940,29 @@ maven-deploy-plugin 3.0.0-M1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + From d2610ac23fe1ee1499d2877adbedf800befc902c Mon Sep 17 00:00:00 2001 From: mattecasu Date: Mon, 3 Feb 2020 16:21:32 +0000 Subject: [PATCH 072/111] CHR-1066 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 383f73fb9e8..66e3ae64727 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,7 +40,7 @@ jobs: - maven-repo-v1- - run: name: Build - command: ./mvnw --projects commons,core,snomed clean package + command: ./mvnw --projects commons,core,snomed clean package -DskipTests - save_cache: paths: - ~/.m2 From e667f249bc34a412d1e965527e455c81a4be29f3 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Mon, 3 Feb 2020 16:31:32 +0000 Subject: [PATCH 073/111] CHR-1066 --- .../pom.xml | 540 +++++++++--------- 1 file changed, 270 insertions(+), 270 deletions(-) diff --git a/core/com.b2international.snowowl.core.rest/pom.xml b/core/com.b2international.snowowl.core.rest/pom.xml index 1d276818581..a249ed4eb7e 100644 --- a/core/com.b2international.snowowl.core.rest/pom.xml +++ b/core/com.b2international.snowowl.core.rest/pom.xml @@ -1,273 +1,273 @@ - - 4.0.0 - - com.b2international.snowowl - core-parent - 7.3.0-SNAPSHOT - + + 4.0.0 + + com.b2international.snowowl + core-parent + 7.3.0-SNAPSHOT + - com.b2international.snowowl.core.rest - eclipse-plugin - - - 5.1.9.RELEASE - 5.1.6.RELEASE - 2.9.2 - - v12.13.0 - + com.b2international.snowowl.core.rest + eclipse-plugin - - - - io.springfox - springfox-swagger2 - ${springfox.version} - provided - - - org.reflections - reflections - - - - - org.springframework - spring-webmvc - ${spring.version} - provided - - - org.springframework.security - spring-security-config - ${spring.security.version} - provided - - - org.springframework.security - spring-security-web - ${spring.security.version} - provided - - - - - - - org.apache.maven.plugins - maven-clean-plugin - 3.1.0 - - - clean-folders - generate-sources - - clean - - - - - WEB-INF/lib - - .gitignore - - - - site - - .gitignore - - - - snow-owl-api-docs/node_modules - - - snow-owl-api-docs/build - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 3.1.1 - - - copy-runtime-dependencies - generate-sources - - copy-dependencies - - - - - spring-aop, - spring-beans, - spring-context, - spring-core, - spring-expression, - spring-plugin-core, - spring-plugin-metadata, - spring-security-config, - spring-security-core, - spring-security-web, - spring-web, - spring-webmvc, - springfox-core, - springfox-schema, - springfox-spi, - springfox-spring-web, - springfox-swagger-common, - springfox-swagger2, - - WEB-INF/lib - - - - - - com.github.eirslett - frontend-maven-plugin - 1.8.0 - - - install node and npm - - install-node-and-npm - - generate-resources - - - npm install - - npm - - generate-resources - - install - - - - npm build - - npm - - generate-resources - - ${basedir}/snow-owl-api-docs - run build - - - - - ${project.build.directory}/node - ${basedir}/snow-owl-api-docs - ${node.version} - - - - org.apache.maven.plugins - maven-resources-plugin - 3.1.0 - - - copy-static-resources - generate-resources - - copy-resources - - - ${basedir}/site - true - - - ${basedir}/snow-owl-api-docs/build - - - - - - - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.apache.maven.plugins - maven-dependency-plugin - [3.0.2,) - - copy-dependencies - - - - - false - - - - - - org.apache.maven.plugins - maven-clean-plugin - [3.1.0,) - - clean - - - - - - - - - com.github.eirslett - frontend-maven-plugin - [1.8.0,) - - install-node-and-npm - npm - - - - - false - - - - - - org.apache.maven.plugins - maven-resources-plugin - [3.1.0,) - - copy-resources - - - - - false - - - - - - - - - - + + 5.1.9.RELEASE + 5.1.6.RELEASE + 2.9.2 + + v12.13.0 + + + + + + io.springfox + springfox-swagger2 + ${springfox.version} + provided + + + org.reflections + reflections + + + + + org.springframework + spring-webmvc + ${spring.version} + provided + + + org.springframework.security + spring-security-config + ${spring.security.version} + provided + + + org.springframework.security + spring-security-web + ${spring.security.version} + provided + + + + + + + org.apache.maven.plugins + maven-clean-plugin + 3.1.0 + + + clean-folders + generate-sources + + clean + + + + + WEB-INF/lib + + .gitignore + + + + site + + .gitignore + + + + snow-owl-api-docs/node_modules + + + snow-owl-api-docs/build + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 3.1.1 + + + copy-runtime-dependencies + generate-sources + + copy-dependencies + + + + + spring-aop, + spring-beans, + spring-context, + spring-core, + spring-expression, + spring-plugin-core, + spring-plugin-metadata, + spring-security-config, + spring-security-core, + spring-security-web, + spring-web, + spring-webmvc, + springfox-core, + springfox-schema, + springfox-spi, + springfox-spring-web, + springfox-swagger-common, + springfox-swagger2, + + WEB-INF/lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + org.apache.maven.plugins + maven-resources-plugin + 3.1.0 + + + copy-static-resources + generate-resources + + copy-resources + + + ${basedir}/site + true + + + ${basedir}/snow-owl-api-docs/build + + + + + + + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.apache.maven.plugins + maven-dependency-plugin + [3.0.2,) + + copy-dependencies + + + + + false + + + + + + org.apache.maven.plugins + maven-clean-plugin + [3.1.0,) + + clean + + + + + + + + + com.github.eirslett + frontend-maven-plugin + [1.8.0,) + + install-node-and-npm + npm + + + + + false + + + + + + org.apache.maven.plugins + maven-resources-plugin + [3.1.0,) + + copy-resources + + + + + false + + + + + + + + + + From 51ab364cc680d09079238140ae427dea0fb25c6b Mon Sep 17 00:00:00 2001 From: mattecasu Date: Mon, 3 Feb 2020 16:37:17 +0000 Subject: [PATCH 074/111] CHR-1066 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 66e3ae64727..f5f944773ca 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -47,4 +47,4 @@ jobs: key: maven-repo-v1-{{ .Branch }}-{{ checksum "pom.xml" }} - deploy: name: Deploy - command: ./mvnw -s .circleci/settings.xml deploy + command: ./mvnw -s .circleci/settings.xml deploy -DskipTests From 7324cd4496dfce75f8438a7a3d9bae38690155eb Mon Sep 17 00:00:00 2001 From: mattecasu Date: Mon, 3 Feb 2020 16:39:42 +0000 Subject: [PATCH 075/111] CHR-1066 --- pom.xml | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/pom.xml b/pom.xml index 729173df313..b007200c7cf 100644 --- a/pom.xml +++ b/pom.xml @@ -904,24 +904,24 @@ false - - - - - - - - - - - - - - - - - - + + org.eclipse.tycho + tycho-packaging-plugin + ${tycho.version} + + + org.eclipse.tycho.extras + tycho-buildtimestamp-jgit + ${tycho-extras.version} + + + + jgit + + pom.xml + + + org.eclipse.tycho tycho-p2-repository-plugin From 0a2a3d94a0451510f6e8cef18cc6bd6d890a7f07 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Mon, 3 Feb 2020 17:13:46 +0000 Subject: [PATCH 076/111] CHR-1066 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f5f944773ca..9582e13489d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,7 +40,7 @@ jobs: - maven-repo-v1- - run: name: Build - command: ./mvnw --projects commons,core,snomed clean package -DskipTests + command: ./mvnw --projects commons,core,snomed clean install -DskipTests - save_cache: paths: - ~/.m2 From ffb7ab4c74763204237ab5d353bbd242ec7f0cb7 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Mon, 3 Feb 2020 17:28:17 +0000 Subject: [PATCH 077/111] CHR-1066 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9582e13489d..cdc1a07ae77 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -47,4 +47,4 @@ jobs: key: maven-repo-v1-{{ .Branch }}-{{ checksum "pom.xml" }} - deploy: name: Deploy - command: ./mvnw -s .circleci/settings.xml deploy -DskipTests + command: ./mvnw -s .circleci/settings.xml deploy:deploy -DskipTests From ec8c60402625f8607b603295bab6732dea355ab6 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Mon, 3 Feb 2020 17:32:45 +0000 Subject: [PATCH 078/111] CHR-1066 --- .circleci/config.yml | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index cdc1a07ae77..bc604c335ae 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -32,19 +32,7 @@ jobs: docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" quay.io apk add --no-cache make=4.2.1-r0 nodejs openjdk11 --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community npm install -g npm - - restore_cache: - keys: - # when lock file changes, use increasingly general patterns to restore cache - - maven-repo-v1-{{ .Branch }}-{{ checksum "pom.xml" }} - - maven-repo-v1-{{ .Branch }}- - - maven-repo-v1- - run: - name: Build - command: ./mvnw --projects commons,core,snomed clean install -DskipTests - - save_cache: - paths: - - ~/.m2 - key: maven-repo-v1-{{ .Branch }}-{{ checksum "pom.xml" }} - - deploy: - name: Deploy - command: ./mvnw -s .circleci/settings.xml deploy:deploy -DskipTests + name: Build and deploy + command: ./mvnw -s .circleci/settings.xml / + --projects commons,core,snomed clean install deploy:deploy -DskipTests From 1eb89e797b5b708861834772aa3b3d590af37257 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Mon, 3 Feb 2020 17:36:44 +0000 Subject: [PATCH 079/111] CHR-1066 --- .circleci/config.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bc604c335ae..b56c2bbf10f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -34,5 +34,9 @@ jobs: npm install -g npm - run: name: Build and deploy - command: ./mvnw -s .circleci/settings.xml / - --projects commons,core,snomed clean install deploy:deploy -DskipTests + command: > + ./mvnw -s .circleci/settings.xml + --projects commons,core,snomed + clean install + deploy:deploy + -DskipTests From 99cc7201be6a9bf3e5b713ee86a58f926ee031ec Mon Sep 17 00:00:00 2001 From: mattecasu Date: Mon, 3 Feb 2020 17:54:19 +0000 Subject: [PATCH 080/111] CHR-1066 --- .circleci/config.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b56c2bbf10f..92c7e7b962c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -37,6 +37,5 @@ jobs: command: > ./mvnw -s .circleci/settings.xml --projects commons,core,snomed - clean install - deploy:deploy + clean deploy -DskipTests From ea9a1f9e72a11a69ec582fe9fbe6a771a135ba68 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Mon, 3 Feb 2020 17:56:54 +0000 Subject: [PATCH 081/111] CHR-1066 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 92c7e7b962c..520175f5b87 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -37,5 +37,5 @@ jobs: command: > ./mvnw -s .circleci/settings.xml --projects commons,core,snomed - clean deploy + --also-make install deploy:deploy -DskipTests From 90661f4ce636603d31c5226e6e97e4e288ba25a0 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Mon, 3 Feb 2020 17:59:18 +0000 Subject: [PATCH 082/111] CHR-1066 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 520175f5b87..d04a67e1aad 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -37,5 +37,5 @@ jobs: command: > ./mvnw -s .circleci/settings.xml --projects commons,core,snomed - --also-make install deploy:deploy + --also-make --also-make-dependents install deploy:deploy -DskipTests From 7c45a3c2e3885cb5e41fc4870925edfcdd9f1041 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Mon, 3 Feb 2020 18:02:35 +0000 Subject: [PATCH 083/111] CHR-1066 --- pom.xml | 49 +++++++++++++------------------------------------ 1 file changed, 13 insertions(+), 36 deletions(-) diff --git a/pom.xml b/pom.xml index b007200c7cf..b230897a06c 100644 --- a/pom.xml +++ b/pom.xml @@ -840,19 +840,19 @@ - - - - - - - - - - - - - + + org.eclipse.tycho + tycho-p2-publisher-plugin + ${tycho.version} + + true + + + + org.eclipse.tycho + tycho-versions-plugin + ${tycho.version} + org.jacoco jacoco-maven-plugin @@ -940,29 +940,6 @@ maven-deploy-plugin 3.0.0-M1 - - - - - - - - - - - - - - - - - - - - - - - From b8fa7ce7c4122067b40853a32621ae79944824d7 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Mon, 3 Feb 2020 18:03:48 +0000 Subject: [PATCH 084/111] CHR-1066 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d04a67e1aad..c61c5194fe8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -37,5 +37,5 @@ jobs: command: > ./mvnw -s .circleci/settings.xml --projects commons,core,snomed - --also-make --also-make-dependents install deploy:deploy + --also-make-dependents install deploy:deploy -DskipTests From 64d9b8530f1305dfbe3cdc6abdac179bc2a94d63 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Mon, 3 Feb 2020 18:05:57 +0000 Subject: [PATCH 085/111] CHR-1066 --- .circleci/config.yml | 2 +- pom.xml | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c61c5194fe8..d04a67e1aad 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -37,5 +37,5 @@ jobs: command: > ./mvnw -s .circleci/settings.xml --projects commons,core,snomed - --also-make-dependents install deploy:deploy + --also-make --also-make-dependents install deploy:deploy -DskipTests diff --git a/pom.xml b/pom.xml index b230897a06c..6b23d231318 100644 --- a/pom.xml +++ b/pom.xml @@ -653,19 +653,19 @@ false - - - - - - - - - - - - - + + org.eclipse.tycho + tycho-source-plugin + ${tycho.version} + + + plugin-source + + plugin-source + + + + org.eclipse.tycho target-platform-configuration From 5019ac89c81e95b761ca91c2d2ac2fa29eda42b6 Mon Sep 17 00:00:00 2001 From: mattecasu Date: Mon, 3 Feb 2020 18:09:53 +0000 Subject: [PATCH 086/111] CHR-1066 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d04a67e1aad..4473c28c770 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -36,6 +36,6 @@ jobs: name: Build and deploy command: > ./mvnw -s .circleci/settings.xml - --projects commons,core,snomed + --projects commons,core,snomed,releng --also-make --also-make-dependents install deploy:deploy -DskipTests From fab25ae33c6e3ed39becf87957c2833fb3981e9d Mon Sep 17 00:00:00 2001 From: mattecasu Date: Mon, 3 Feb 2020 18:12:13 +0000 Subject: [PATCH 087/111] CHR-1066 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4473c28c770..38c70695105 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -36,6 +36,6 @@ jobs: name: Build and deploy command: > ./mvnw -s .circleci/settings.xml - --projects commons,core,snomed,releng + --projects commons,core,snomed,releng,tests --also-make --also-make-dependents install deploy:deploy -DskipTests From 606b06cc2f59a2823247c08cb64541d8ac9e1ffd Mon Sep 17 00:00:00 2001 From: mattecasu Date: Mon, 3 Feb 2020 18:14:59 +0000 Subject: [PATCH 088/111] CHR-1066 --- .circleci/config.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 38c70695105..ad3a8d536a8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -36,6 +36,5 @@ jobs: name: Build and deploy command: > ./mvnw -s .circleci/settings.xml - --projects commons,core,snomed,releng,tests - --also-make --also-make-dependents install deploy:deploy + --also-make --also-make-dependents deploy -DskipTests From 93891203b3af1f68d4e121c53124c6b9b749ab9e Mon Sep 17 00:00:00 2001 From: mattecasu Date: Mon, 3 Feb 2020 18:30:27 +0000 Subject: [PATCH 089/111] CHR-1066 --- .circleci/config.yml | 4 +--- pom.xml | 10 +++++----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ad3a8d536a8..3919628f880 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -35,6 +35,4 @@ jobs: - run: name: Build and deploy command: > - ./mvnw -s .circleci/settings.xml - --also-make --also-make-dependents deploy - -DskipTests + ./mvnw -s .circleci/settings.xml deploy -DskipTests diff --git a/pom.xml b/pom.xml index 6b23d231318..2671543edca 100644 --- a/pom.xml +++ b/pom.xml @@ -935,11 +935,11 @@ maven-assembly-plugin 2.3 - - org.apache.maven.plugins - maven-deploy-plugin - 3.0.0-M1 - + + + + + From 7666256d05952f577fda3beff890b72cf9699a2b Mon Sep 17 00:00:00 2001 From: mattecasu Date: Mon, 3 Feb 2020 18:49:58 +0000 Subject: [PATCH 090/111] CHR-1066 --- .circleci/config.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3919628f880..e96d5adafa2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -35,4 +35,7 @@ jobs: - run: name: Build and deploy command: > - ./mvnw -s .circleci/settings.xml deploy -DskipTests + ./mvnw -s .circleci/settings.xml deploy + -DskipTests + -Dtycho.localArtifacts=ignore + From 62822f0e7a9006a2cc1a753a8f853ef2e8b8c034 Mon Sep 17 00:00:00 2001 From: "ivelina.yordanova" Date: Fri, 7 Feb 2020 16:24:39 +0000 Subject: [PATCH 091/111] chr-1066 - add cache and test if javadoc in path --- .circleci/config.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index e96d5adafa2..4e5c3fc05b7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -21,9 +21,19 @@ jobs: steps: - checkout - setup_remote_docker + - restore_cache: + keys: + - project-{{ checksum "pom.xml" }} + paths: + - "~/.gradle" + - "~/.m2" + - "/root/.gradle" - run: name: Build prerequisites command: | + echo $PATH + echo $JAVA_HOME + echo ls $JAVA_HOME/bin echo "${ARTIFACTORY_URL}" | sha512sum echo "${ARTIFACTORY_USER_RW}" | sha512sum echo "${ARTIFACTORY_PWD_RW}" | sha512sum @@ -32,6 +42,12 @@ jobs: docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" quay.io apk add --no-cache make=4.2.1-r0 nodejs openjdk11 --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community npm install -g npm + - save_cache: + key: project-{{ checksum "pom.xml" }} + paths: + - "~/.gradle" + - "~/.m2" + - "/root/.gradle" - run: name: Build and deploy command: > From b803663f0618e82a0d38eb7136a9e0411d431351 Mon Sep 17 00:00:00 2001 From: "ivelina.yordanova" Date: Fri, 7 Feb 2020 16:29:54 +0000 Subject: [PATCH 092/111] chr-1066 - print out some debug info --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4e5c3fc05b7..d5bb764138d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -31,9 +31,6 @@ jobs: - run: name: Build prerequisites command: | - echo $PATH - echo $JAVA_HOME - echo ls $JAVA_HOME/bin echo "${ARTIFACTORY_URL}" | sha512sum echo "${ARTIFACTORY_USER_RW}" | sha512sum echo "${ARTIFACTORY_PWD_RW}" | sha512sum @@ -42,6 +39,9 @@ jobs: docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" quay.io apk add --no-cache make=4.2.1-r0 nodejs openjdk11 --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community npm install -g npm + echo $PATH + echo $JAVA_HOME + echo ls $JAVA_HOME/bin - save_cache: key: project-{{ checksum "pom.xml" }} paths: From 85eb3fd74f38f3fac863374caeb92653bb8bb893 Mon Sep 17 00:00:00 2001 From: "ivelina.yordanova" Date: Fri, 7 Feb 2020 17:50:50 +0000 Subject: [PATCH 093/111] chr-1066 -fix copy/paste mistake --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d5bb764138d..3599fd5ff4d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -41,7 +41,7 @@ jobs: npm install -g npm echo $PATH echo $JAVA_HOME - echo ls $JAVA_HOME/bin + ls $JAVA_HOME/bin - save_cache: key: project-{{ checksum "pom.xml" }} paths: From c525d1060421f4f6a19039f48ad76219bfa80775 Mon Sep 17 00:00:00 2001 From: "ivelina.yordanova" Date: Fri, 7 Feb 2020 17:55:18 +0000 Subject: [PATCH 094/111] chr-1066 - print debug info --- .circleci/config.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3599fd5ff4d..354c9721e50 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -39,9 +39,7 @@ jobs: docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" quay.io apk add --no-cache make=4.2.1-r0 nodejs openjdk11 --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community npm install -g npm - echo $PATH - echo $JAVA_HOME - ls $JAVA_HOME/bin + which javadoc - save_cache: key: project-{{ checksum "pom.xml" }} paths: From a68ba74c1a47b179d9b4e32645e1dc243e6a4f7f Mon Sep 17 00:00:00 2001 From: "ivelina.yordanova" Date: Fri, 7 Feb 2020 17:56:42 +0000 Subject: [PATCH 095/111] chr-1066 - print debug info --- .circleci/config.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 354c9721e50..c5689d65a97 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -25,9 +25,8 @@ jobs: keys: - project-{{ checksum "pom.xml" }} paths: - - "~/.gradle" - "~/.m2" - - "/root/.gradle" + - "/root/.m2" - run: name: Build prerequisites command: | @@ -43,9 +42,8 @@ jobs: - save_cache: key: project-{{ checksum "pom.xml" }} paths: - - "~/.gradle" - "~/.m2" - - "/root/.gradle" + - "/root/.m2" - run: name: Build and deploy command: > From b2ee982ffc3fbdb0a3666c44495671cf65bb218c Mon Sep 17 00:00:00 2001 From: "ivelina.yordanova" Date: Mon, 10 Feb 2020 08:58:26 +0000 Subject: [PATCH 096/111] chr-1066 - yet another print debug info --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c5689d65a97..34e69b91a94 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -36,9 +36,10 @@ jobs: echo "$CIRCLE_SHA1" > .commit-keyId docker --version docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" quay.io + apk add --upgrade apk-tools@edge apk add --no-cache make=4.2.1-r0 nodejs openjdk11 --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community npm install -g npm - which javadoc + which java - save_cache: key: project-{{ checksum "pom.xml" }} paths: From 0a1a407e29f10a5a9a550e0fb7886a6113087c6f Mon Sep 17 00:00:00 2001 From: "ivelina.yordanova" Date: Mon, 10 Feb 2020 09:01:17 +0000 Subject: [PATCH 097/111] chr-1066 - yet another print debug info --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 34e69b91a94..5b0037f270d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -36,7 +36,6 @@ jobs: echo "$CIRCLE_SHA1" > .commit-keyId docker --version docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" quay.io - apk add --upgrade apk-tools@edge apk add --no-cache make=4.2.1-r0 nodejs openjdk11 --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community npm install -g npm which java From f18c9f992cf3acfa2200a5241dde802953571d6e Mon Sep 17 00:00:00 2001 From: "ivelina.yordanova" Date: Mon, 10 Feb 2020 09:24:53 +0000 Subject: [PATCH 098/111] chr-1066 - extract var to control use of local artifacts --- .circleci/config.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5b0037f270d..e6ccef35f38 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -38,7 +38,10 @@ jobs: docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" quay.io apk add --no-cache make=4.2.1-r0 nodejs openjdk11 --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community npm install -g npm - which java + ls /opt + ls /opt/openjdk-11 + export JAVA_HOME=/opt/openjdk-11 + export PATH=$JAVA_HOME/bin:$PATH - save_cache: key: project-{{ checksum "pom.xml" }} paths: @@ -49,5 +52,5 @@ jobs: command: > ./mvnw -s .circleci/settings.xml deploy -DskipTests - -Dtycho.localArtifacts=ignore + -Dtycho.localArtifacts="${LOCAL_ARTIFACTS}" From 5f5bf230027143b4b7034cd4e06a1d9bb9f90a79 Mon Sep 17 00:00:00 2001 From: "ivelina.yordanova" Date: Mon, 10 Feb 2020 09:28:36 +0000 Subject: [PATCH 099/111] chr-1066 - extract var to control use of local artifacts --- .circleci/config.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e6ccef35f38..050a6bbd392 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -38,10 +38,7 @@ jobs: docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" quay.io apk add --no-cache make=4.2.1-r0 nodejs openjdk11 --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community npm install -g npm - ls /opt - ls /opt/openjdk-11 - export JAVA_HOME=/opt/openjdk-11 - export PATH=$JAVA_HOME/bin:$PATH + ls /usr/lib/jvm/ - save_cache: key: project-{{ checksum "pom.xml" }} paths: From 42c6818c46d2b938bd0002cffc59769bd5b31c07 Mon Sep 17 00:00:00 2001 From: "ivelina.yordanova" Date: Mon, 10 Feb 2020 09:33:51 +0000 Subject: [PATCH 100/111] chr-1066 - extract var to control use of local artifacts --- .circleci/config.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 050a6bbd392..90aa2361e87 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -38,7 +38,9 @@ jobs: docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" quay.io apk add --no-cache make=4.2.1-r0 nodejs openjdk11 --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community npm install -g npm - ls /usr/lib/jvm/ + export JAVA_HOME=/usr/lib/jvm/java-11-openjdk + export PATH="$JAVA_HOME/bin:${PATH}" + java --version - save_cache: key: project-{{ checksum "pom.xml" }} paths: From 26d19be1ae6dbbf70fc8876c9009256292e6f7fa Mon Sep 17 00:00:00 2001 From: "ivelina.yordanova" Date: Mon, 10 Feb 2020 10:50:59 +0000 Subject: [PATCH 101/111] chr-1066 - print stuff --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 90aa2361e87..b4973822a3c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -38,9 +38,9 @@ jobs: docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" quay.io apk add --no-cache make=4.2.1-r0 nodejs openjdk11 --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community npm install -g npm + ls /usr/lib/jvm/ export JAVA_HOME=/usr/lib/jvm/java-11-openjdk export PATH="$JAVA_HOME/bin:${PATH}" - java --version - save_cache: key: project-{{ checksum "pom.xml" }} paths: From 94ceb569fcdb300b6aa17deef8fbdb3770ec48d1 Mon Sep 17 00:00:00 2001 From: "ivelina.yordanova" Date: Mon, 10 Feb 2020 10:54:31 +0000 Subject: [PATCH 102/111] chr-1066 - change npm config, errors and skips next lines --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index b4973822a3c..90ff33e24ca 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -37,6 +37,7 @@ jobs: docker --version docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" quay.io apk add --no-cache make=4.2.1-r0 nodejs openjdk11 --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community + npm config set unsafe-perm true npm install -g npm ls /usr/lib/jvm/ export JAVA_HOME=/usr/lib/jvm/java-11-openjdk From de1f21edc190b53f1099a91f0611c662c64af91b Mon Sep 17 00:00:00 2001 From: "ivelina.yordanova" Date: Mon, 10 Feb 2020 11:05:49 +0000 Subject: [PATCH 103/111] chr-1066 - nes --- .circleci/config.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 90ff33e24ca..3d79e229669 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -23,7 +23,8 @@ jobs: - setup_remote_docker - restore_cache: keys: - - project-{{ checksum "pom.xml" }} + - snow-owl-mvn-cache-{{ checksum "pom.xml" }} + - snow-owl-mvn-cache- paths: - "~/.m2" - "/root/.m2" @@ -39,11 +40,14 @@ jobs: apk add --no-cache make=4.2.1-r0 nodejs openjdk11 --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community npm config set unsafe-perm true npm install -g npm - ls /usr/lib/jvm/ + echo "--------------------" + ls /usr + ls /usr/bin + find / -name javadoc export JAVA_HOME=/usr/lib/jvm/java-11-openjdk export PATH="$JAVA_HOME/bin:${PATH}" - save_cache: - key: project-{{ checksum "pom.xml" }} + key: snow-owl-mvn-cache-{{ checksum "pom.xml" }} paths: - "~/.m2" - "/root/.m2" From 115fa0f4ddc9219d5a6d46360900e3c2fc6409dc Mon Sep 17 00:00:00 2001 From: "ivelina.yordanova" Date: Mon, 10 Feb 2020 11:08:55 +0000 Subject: [PATCH 104/111] chr-1066 - .. --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3d79e229669..20b4e4d997b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -38,14 +38,14 @@ jobs: docker --version docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" quay.io apk add --no-cache make=4.2.1-r0 nodejs openjdk11 --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community - npm config set unsafe-perm true - npm install -g npm echo "--------------------" ls /usr ls /usr/bin find / -name javadoc export JAVA_HOME=/usr/lib/jvm/java-11-openjdk export PATH="$JAVA_HOME/bin:${PATH}" + npm config set unsafe-perm true + npm install -g npm - save_cache: key: snow-owl-mvn-cache-{{ checksum "pom.xml" }} paths: From cba036d58eefd2be0df31e0007b8310fbc4308a7 Mon Sep 17 00:00:00 2001 From: "ivelina.yordanova" Date: Mon, 10 Feb 2020 11:11:02 +0000 Subject: [PATCH 105/111] chr-1066 - remove debug --- .circleci/config.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 20b4e4d997b..bb640f17409 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -38,10 +38,6 @@ jobs: docker --version docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" quay.io apk add --no-cache make=4.2.1-r0 nodejs openjdk11 --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community - echo "--------------------" - ls /usr - ls /usr/bin - find / -name javadoc export JAVA_HOME=/usr/lib/jvm/java-11-openjdk export PATH="$JAVA_HOME/bin:${PATH}" npm config set unsafe-perm true From 12c847e9f12d6fe141795857025dfd61729ce812 Mon Sep 17 00:00:00 2001 From: "ivelina.yordanova" Date: Mon, 10 Feb 2020 11:43:57 +0000 Subject: [PATCH 106/111] chr-1066 - put env vars in docker and in the bash env --- .circleci/config.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bb640f17409..0a5fe5ece8d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,6 +14,9 @@ env: &env resource_class: large docker: - image: docker:17.03.0-ce-git + environment: + JAVA_HOME: /usr/lib/jvm/java-11-openjdk + PATH: $JAVA_HOME/bin:$PATH jobs: deploy: @@ -38,8 +41,9 @@ jobs: docker --version docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" quay.io apk add --no-cache make=4.2.1-r0 nodejs openjdk11 --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community - export JAVA_HOME=/usr/lib/jvm/java-11-openjdk - export PATH="$JAVA_HOME/bin:${PATH}" + echo 'export JAVA_HOME=/usr/lib/jvm/java-11-openjdk' >> $BASH_ENV + echo 'export PATH="$JAVA_HOME/bin:${PATH}"' >> $BASH_ENV + source /home/circleci/.bashrc npm config set unsafe-perm true npm install -g npm - save_cache: From 728385f478a4f267d5948395a6a4e515e22b8509 Mon Sep 17 00:00:00 2001 From: "ivelina.yordanova" Date: Mon, 10 Feb 2020 11:53:43 +0000 Subject: [PATCH 107/111] chr-1066 - put env vars in job as well, print debug --- .circleci/config.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0a5fe5ece8d..4f08ae2984c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -17,6 +17,9 @@ env: &env environment: JAVA_HOME: /usr/lib/jvm/java-11-openjdk PATH: $JAVA_HOME/bin:$PATH + environment: + JAVA_HOME: /usr/lib/jvm/java-11-openjdk + PATH: $JAVA_HOME/bin:$PATH jobs: deploy: @@ -34,6 +37,7 @@ jobs: - run: name: Build prerequisites command: | + echo $PATH echo "${ARTIFACTORY_URL}" | sha512sum echo "${ARTIFACTORY_USER_RW}" | sha512sum echo "${ARTIFACTORY_PWD_RW}" | sha512sum @@ -41,9 +45,6 @@ jobs: docker --version docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" quay.io apk add --no-cache make=4.2.1-r0 nodejs openjdk11 --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community - echo 'export JAVA_HOME=/usr/lib/jvm/java-11-openjdk' >> $BASH_ENV - echo 'export PATH="$JAVA_HOME/bin:${PATH}"' >> $BASH_ENV - source /home/circleci/.bashrc npm config set unsafe-perm true npm install -g npm - save_cache: @@ -53,8 +54,7 @@ jobs: - "/root/.m2" - run: name: Build and deploy - command: > - ./mvnw -s .circleci/settings.xml deploy - -DskipTests - -Dtycho.localArtifacts="${LOCAL_ARTIFACTS}" + command: | + echo $PATH + ./mvnw -s .circleci/settings.xml deploy -DskipTests -Dtycho.localArtifacts="${LOCAL_ARTIFACTS}" From 7f44959960e9703a6635612346bfcd13c6bec935 Mon Sep 17 00:00:00 2001 From: "ivelina.yordanova" Date: Mon, 10 Feb 2020 11:58:39 +0000 Subject: [PATCH 108/111] chr-1066 - yet another try to change path.. print debug --- .circleci/config.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4f08ae2984c..613b73dedca 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,12 +14,6 @@ env: &env resource_class: large docker: - image: docker:17.03.0-ce-git - environment: - JAVA_HOME: /usr/lib/jvm/java-11-openjdk - PATH: $JAVA_HOME/bin:$PATH - environment: - JAVA_HOME: /usr/lib/jvm/java-11-openjdk - PATH: $JAVA_HOME/bin:$PATH jobs: deploy: @@ -45,6 +39,9 @@ jobs: docker --version docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" quay.io apk add --no-cache make=4.2.1-r0 nodejs openjdk11 --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community + echo 'export /usr/lib/jvm/java-11-openjdk' >> $BASH_ENV + echo 'export $JAVA_HOME/bin:$PATH' >> $BASH_ENV + source $BASH_ENV npm config set unsafe-perm true npm install -g npm - save_cache: From 554544a478cb45fea30470702465ef67e6f4060b Mon Sep 17 00:00:00 2001 From: "ivelina.yordanova" Date: Mon, 10 Feb 2020 11:59:57 +0000 Subject: [PATCH 109/111] chr-1066 - yet another try to change path.. print debug --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 613b73dedca..2d440fe4424 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -39,8 +39,8 @@ jobs: docker --version docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" quay.io apk add --no-cache make=4.2.1-r0 nodejs openjdk11 --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community - echo 'export /usr/lib/jvm/java-11-openjdk' >> $BASH_ENV - echo 'export $JAVA_HOME/bin:$PATH' >> $BASH_ENV + echo 'export $JAVA_HOME=/usr/lib/jvm/java-11-openjdk' >> $BASH_ENV + echo 'export PATH=$JAVA_HOME/bin:$PATH' >> $BASH_ENV source $BASH_ENV npm config set unsafe-perm true npm install -g npm From a51ace6e5d8d37c77e8528d56845f028c19cb552 Mon Sep 17 00:00:00 2001 From: "ivelina.yordanova" Date: Mon, 10 Feb 2020 12:03:41 +0000 Subject: [PATCH 110/111] chr-1066 - I am doing stupid things now...fixing copy/paste error --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2d440fe4424..cb5aee7d093 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -39,7 +39,7 @@ jobs: docker --version docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" quay.io apk add --no-cache make=4.2.1-r0 nodejs openjdk11 --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community - echo 'export $JAVA_HOME=/usr/lib/jvm/java-11-openjdk' >> $BASH_ENV + echo 'export JAVA_HOME=/usr/lib/jvm/java-11-openjdk' >> $BASH_ENV echo 'export PATH=$JAVA_HOME/bin:$PATH' >> $BASH_ENV source $BASH_ENV npm config set unsafe-perm true From a0fd8ea94b42815c2c67f20b514c5bf40f78d5f7 Mon Sep 17 00:00:00 2001 From: "ivelina.yordanova" Date: Mon, 10 Feb 2020 12:08:12 +0000 Subject: [PATCH 111/111] chr-1066 - still not set...their documentation lies ... --- .circleci/config.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index cb5aee7d093..1967d6abe26 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,6 +14,10 @@ env: &env resource_class: large docker: - image: docker:17.03.0-ce-git + environment: + JAVA_HOME: /usr/lib/jvm/java-11-openjdk + environment: + JAVA_HOME: /usr/lib/jvm/java-11-openjdk jobs: deploy: @@ -31,6 +35,7 @@ jobs: - run: name: Build prerequisites command: | + echo $JAVA_HOME echo $PATH echo "${ARTIFACTORY_URL}" | sha512sum echo "${ARTIFACTORY_USER_RW}" | sha512sum @@ -42,6 +47,8 @@ jobs: echo 'export JAVA_HOME=/usr/lib/jvm/java-11-openjdk' >> $BASH_ENV echo 'export PATH=$JAVA_HOME/bin:$PATH' >> $BASH_ENV source $BASH_ENV + echo $JAVA_HOME + echo $PATH npm config set unsafe-perm true npm install -g npm - save_cache: @@ -52,6 +59,7 @@ jobs: - run: name: Build and deploy command: | + echo $JAVA_HOME echo $PATH ./mvnw -s .circleci/settings.xml deploy -DskipTests -Dtycho.localArtifacts="${LOCAL_ARTIFACTS}"