Skip to content
Snippets Groups Projects
Commit 6911ae7c authored by Tor-Einar Skog's avatar Tor-Einar Skog
Browse files

Merge branch 'main' into feature/utilgetPointFromLonLat

parents a7601109 c37b4849
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.gitignore
+ 1
− 0
View file @ 6911ae7c
...@@ -4,3 +4,4 @@ jbossmodule/ ...@@ -4,3 +4,4 @@ jbossmodule/
/nbproject/ /nbproject/
*~ *~
.idea/ .idea/
/VIPSCommon.iml
.gitlab-ci.yml
+ 409
− 167
View file @ 6911ae7c
image: openjdk:11-jdk include:
- project: 'VIPS/vips-common-config'
file: '/gitlab-ci-vips-libraries.yml'
ref: main
stages: stages:
- build - build
- test - test
...@@ -13,10 +17,6 @@ stages: ...@@ -13,10 +17,6 @@ stages:
- models-8 - models-8
variables: variables:
MAVEN_CLI_OPTS: "-s ci_settings.xml --batch-mode"
MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository -Dmaven.artifact.threads=10"
MAIN_BRANCH: "main"
RELEASE_BRANCH: "release"
ALTERNARIA_PROJECT_ID: "173" ALTERNARIA_PROJECT_ID: "173"
APPLESCABM_PROJECT_ID: "20" APPLESCABM_PROJECT_ID: "20"
BARLEYNETB_PROJECT_ID: "21" BARLEYNETB_PROJECT_ID: "21"
...@@ -40,365 +40,607 @@ variables: ...@@ -40,365 +40,607 @@ variables:
SEPAPIICOL_PROJECT_ID: "39" SEPAPIICOL_PROJECT_ID: "39"
SEPTORIAHU_PROJECT_ID: "65" SEPTORIAHU_PROJECT_ID: "65"
SEPTREFHUM_PROJECT_ID: "135" SEPTREFHUM_PROJECT_ID: "135"
cache:
paths:
- .m2/repository/
build:
stage: build
script:
- ./mvnw $MAVEN_CLI_OPTS $MAVEN_OPTS package
tags:
- vips-java
test:
stage: test
script:
- ./mvnw $MAVEN_CLI_OPTS $MAVEN_OPTS test
tags:
- vips-java
deploy-snapshot:
stage: deploy
script:
- export VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
- if ! [[ $VERSION =~ .*SNAPSHOT ]]; then exit 1; fi
- ./mvnw $MAVEN_CLI_OPTS $MAVEN_OPTS deploy -DskipTests
tags:
- vips-java
rules:
- if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH'
# Runs after new SNAPSHOT is deployed to package registry. Triggers job on release branch in model repo, # Runs after new SNAPSHOT is deployed to package registry. Triggers job on main branch in model repo,
# which builds model with the new version of VIPSCommon. This pipeline fails if model build fails. # which builds model with the new version of VIPSCommon. This pipeline fails if model build fails.
verify_model_ALTERNARIA: verify_model_ALTERNARIA:
stage: models-1
image: registry.gitlab.com/finestructure/pipeline-trigger image: registry.gitlab.com/finestructure/pipeline-trigger
stage: models-1
before_script: []
script: script:
- apk add --no-cache openjdk11 - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_ALTERNARIA" -t $MAIN_BRANCH $ALTERNARIA_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
- export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_ALTERNARIA" -t $RELEASE_BRANCH $ALTERNARIA_PROJECT_ID -e VERSION=$PROJECT_VERSION
tags: tags:
- vips-java - vips-java
dependencies:
- deploy-snapshot
rules: rules:
- if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH'
verify_model_APPLESCABM: verify_model_APPLESCABM:
stage: models-1
image: registry.gitlab.com/finestructure/pipeline-trigger image: registry.gitlab.com/finestructure/pipeline-trigger
stage: models-1
before_script: []
script: script:
- apk add --no-cache openjdk11 - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_APPLESCABM" -t $MAIN_BRANCH $APPLESCABM_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
- export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_APPLESCABM" -t $RELEASE_BRANCH $APPLESCABM_PROJECT_ID -e VERSION=$PROJECT_VERSION
tags: tags:
- vips-java - vips-java
dependencies:
- deploy-snapshot
rules: rules:
- if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH'
verify_model_BARLEYNETB: verify_model_BARLEYNETB:
stage: models-1
image: registry.gitlab.com/finestructure/pipeline-trigger image: registry.gitlab.com/finestructure/pipeline-trigger
stage: models-1
before_script: []
script: script:
- apk add --no-cache openjdk11 - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_BARLEYNETB" -t $MAIN_BRANCH $BARLEYNETB_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
- export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_BARLEYNETB" -t $RELEASE_BRANCH $BARLEYNETB_PROJECT_ID -e VERSION=$PROJECT_VERSION
tags: tags:
- vips-java - vips-java
dependencies:
- deploy-snapshot
rules: rules:
- if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH'
verify_model_BREMIALACT: verify_model_BREMIALACT:
stage: models-2
image: registry.gitlab.com/finestructure/pipeline-trigger image: registry.gitlab.com/finestructure/pipeline-trigger
stage: models-2
before_script: []
script: script:
- apk add --no-cache openjdk11 - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_BREMIALACT" -t $MAIN_BRANCH $BREMIALACT_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
- export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_BREMIALACT" -t $RELEASE_BRANCH $BREMIALACT_PROJECT_ID -e VERSION=$PROJECT_VERSION
tags: tags:
- vips-java - vips-java
dependencies:
- deploy-snapshot
rules: rules:
- if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH'
verify_model_DELIARADIC: verify_model_DELIARADIC:
stage: models-2
image: registry.gitlab.com/finestructure/pipeline-trigger image: registry.gitlab.com/finestructure/pipeline-trigger
stage: models-2
before_script: []
script: script:
- apk add --no-cache openjdk11 - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_DELIARADIC" -t $MAIN_BRANCH $DELIARADIC_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
- export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_DELIARADIC" -t $RELEASE_BRANCH $DELIARADIC_PROJECT_ID -e VERSION=$PROJECT_VERSION
tags: tags:
- vips-java - vips-java
dependencies:
- deploy-snapshot
rules: rules:
- if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH'
verify_model_DELIARFOBS: verify_model_DELIARFOBS:
stage: models-2
image: registry.gitlab.com/finestructure/pipeline-trigger image: registry.gitlab.com/finestructure/pipeline-trigger
stage: models-2
before_script: []
script: script:
- apk add --no-cache openjdk11 - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_DELIARFOBS" -t $MAIN_BRANCH $DELIARFOBS_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
- export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_DELIARFOBS" -t $RELEASE_BRANCH $DELIARFOBS_PROJECT_ID -e VERSION=$PROJECT_VERSION
tags: tags:
- vips-java - vips-java
dependencies:
- deploy-snapshot
rules: rules:
- if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH'
verify_model_DOWNCASTMO: verify_model_DOWNCASTMO:
stage: models-3
image: registry.gitlab.com/finestructure/pipeline-trigger image: registry.gitlab.com/finestructure/pipeline-trigger
stage: models-3
before_script: []
script: script:
- apk add --no-cache openjdk11 - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_DOWNCASTMO" -t $MAIN_BRANCH $DOWNCASTMO_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
- export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_DOWNCASTMO" -t $RELEASE_BRANCH $DOWNCASTMO_PROJECT_ID -e VERSION=$PROJECT_VERSION
tags: tags:
- vips-java - vips-java
dependencies:
- deploy-snapshot
rules: rules:
- if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH'
verify_model_FAWMODEL01: verify_model_FAWMODEL01:
stage: models-3
image: registry.gitlab.com/finestructure/pipeline-trigger image: registry.gitlab.com/finestructure/pipeline-trigger
stage: models-3
before_script: []
script: script:
- apk add --no-cache openjdk11 - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_FAWMODEL01" -t $MAIN_BRANCH $FAWMODEL01_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
- export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_FAWMODEL01" -t $RELEASE_BRANCH $FAWMODEL01_PROJECT_ID -e VERSION=$PROJECT_VERSION
tags: tags:
- vips-java - vips-java
dependencies:
- deploy-snapshot
rules: rules:
- if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH'
verify_model_FINNCEREAL: verify_model_FINNCEREAL:
stage: models-3
image: registry.gitlab.com/finestructure/pipeline-trigger image: registry.gitlab.com/finestructure/pipeline-trigger
stage: models-3
before_script: []
script: script:
- apk add --no-cache openjdk11 - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_FINNCEREAL" -t $MAIN_BRANCH $FINNCEREAL_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
- export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_FINNCEREAL" -t $RELEASE_BRANCH $FINNCEREAL_PROJECT_ID -e VERSION=$PROJECT_VERSION
tags: tags:
- vips-java - vips-java
dependencies:
- deploy-snapshot
rules: rules:
- if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH'
verify_model_GRASSDRYMO: verify_model_GRASSDRYMO:
stage: models-4
image: registry.gitlab.com/finestructure/pipeline-trigger image: registry.gitlab.com/finestructure/pipeline-trigger
stage: models-4
before_script: []
script: script:
- apk add --no-cache openjdk11 - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_GRASSDRYMO" -t $MAIN_BRANCH $GRASSDRYMO_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
- export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_GRASSDRYMO" -t $RELEASE_BRANCH $GRASSDRYMO_PROJECT_ID -e VERSION=$PROJECT_VERSION
tags: tags:
- vips-java - vips-java
dependencies:
- deploy-snapshot
rules: rules:
- if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH'
verify_model_LEAFBLOTCH: verify_model_LEAFBLOTCH:
stage: models-4
image: registry.gitlab.com/finestructure/pipeline-trigger image: registry.gitlab.com/finestructure/pipeline-trigger
stage: models-4
before_script: []
script: script:
- apk add --no-cache openjdk11 - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_LEAFBLOTCH" -t $MAIN_BRANCH $LEAFBLOTCH_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
- export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_LEAFBLOTCH" -t $RELEASE_BRANCH $LEAFBLOTCH_PROJECT_ID -e VERSION=$PROJECT_VERSION
tags: tags:
- vips-java - vips-java
dependencies:
- deploy-snapshot
rules: rules:
- if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH'
verify_model_LYGUSRUGUL: verify_model_LYGUSRUGUL:
stage: models-4
image: registry.gitlab.com/finestructure/pipeline-trigger image: registry.gitlab.com/finestructure/pipeline-trigger
stage: models-4
before_script: []
script: script:
- apk add --no-cache openjdk11 - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_LYGUSRUGUL" -t $MAIN_BRANCH $LYGUSRUGUL_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
- export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_LYGUSRUGUL" -t $RELEASE_BRANCH $LYGUSRUGUL_PROJECT_ID -e VERSION=$PROJECT_VERSION
tags: tags:
- vips-java - vips-java
dependencies:
- deploy-snapshot
rules: rules:
- if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH'
verify_model_MAIZEPHENO: verify_model_MAIZEPHENO:
stage: models-5
image: registry.gitlab.com/finestructure/pipeline-trigger image: registry.gitlab.com/finestructure/pipeline-trigger
stage: models-5
before_script: []
script: script:
- apk add --no-cache openjdk11 - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_MAIZEPHENO" -t $MAIN_BRANCH $MAIZEPHENO_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
- export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_MAIZEPHENO" -t $RELEASE_BRANCH $MAIZEPHENO_PROJECT_ID -e VERSION=$PROJECT_VERSION
tags: tags:
- vips-java - vips-java
dependencies:
- deploy-snapshot
rules: rules:
- if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH'
verify_model_MAMESTRABR: verify_model_MAMESTRABR:
stage: models-5
image: registry.gitlab.com/finestructure/pipeline-trigger image: registry.gitlab.com/finestructure/pipeline-trigger
stage: models-5
before_script: []
script: script:
- apk add --no-cache openjdk11 - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_MAMESTRABR" -t $MAIN_BRANCH $MAMESTRABR_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
- export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_MAMESTRABR" -t $RELEASE_BRANCH $MAMESTRABR_PROJECT_ID -e VERSION=$PROJECT_VERSION
tags: tags:
- vips-java - vips-java
dependencies:
- deploy-snapshot
rules: rules:
- if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH'
verify_model_NAERSTADMO: verify_model_NAERSTADMO:
stage: models-5
image: registry.gitlab.com/finestructure/pipeline-trigger image: registry.gitlab.com/finestructure/pipeline-trigger
stage: models-5
before_script: []
script: script:
- apk add --no-cache openjdk11 - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_NAERSTADMO" -t $MAIN_BRANCH $NAERSTADMO_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
- export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_NAERSTADMO" -t $RELEASE_BRANCH $NAERSTADMO_PROJECT_ID -e VERSION=$PROJECT_VERSION
tags: tags:
- vips-java - vips-java
dependencies:
- deploy-snapshot
rules: rules:
- if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH'
verify_model_NEGPROGMOD: verify_model_NEGPROGMOD:
stage: models-6
image: registry.gitlab.com/finestructure/pipeline-trigger image: registry.gitlab.com/finestructure/pipeline-trigger
stage: models-6
before_script: []
script: script:
- apk add --no-cache openjdk11 - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_NEGPROGMOD" -t $MAIN_BRANCH $NEGPROGMOD_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
- export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_NEGPROGMOD" -t $RELEASE_BRANCH $NEGPROGMOD_PROJECT_ID -e VERSION=$PROJECT_VERSION
tags: tags:
- vips-java - vips-java
dependencies:
- deploy-snapshot
rules: rules:
- if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH'
verify_model_OATFLOWERM: verify_model_OATFLOWERM:
stage: models-6
image: registry.gitlab.com/finestructure/pipeline-trigger image: registry.gitlab.com/finestructure/pipeline-trigger
stage: models-6
before_script: []
script: script:
- apk add --no-cache openjdk11 - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_OATFLOWERM" -t $MAIN_BRANCH $OATFLOWERM_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
- export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_OATFLOWERM" -t $RELEASE_BRANCH $OATFLOWERM_PROJECT_ID -e VERSION=$PROJECT_VERSION
tags: tags:
- vips-java - vips-java
dependencies:
- deploy-snapshot
rules: rules:
- if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH'
verify_model_PSILAROBSE: verify_model_PSILAROBSE:
stage: models-6
image: registry.gitlab.com/finestructure/pipeline-trigger image: registry.gitlab.com/finestructure/pipeline-trigger
stage: models-6
before_script: []
script: script:
- apk add --no-cache openjdk11 - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_PSILAROBSE" -t $MAIN_BRANCH $PSILAROBSE_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
- export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_PSILAROBSE" -t $RELEASE_BRANCH $PSILAROBSE_PROJECT_ID -e VERSION=$PROJECT_VERSION
tags: tags:
- vips-java - vips-java
dependencies:
- deploy-snapshot
rules: rules:
- if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH'
verify_model_PSILARTEMP: verify_model_PSILARTEMP:
stage: models-7
image: registry.gitlab.com/finestructure/pipeline-trigger image: registry.gitlab.com/finestructure/pipeline-trigger
stage: models-7
before_script: []
script: script:
- apk add --no-cache openjdk11 - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_PSILARTEMP" -t $MAIN_BRANCH $PSILARTEMP_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
- export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_PSILARTEMP" -t $RELEASE_BRANCH $PSILARTEMP_PROJECT_ID -e VERSION=$PROJECT_VERSION
tags: tags:
- vips-java - vips-java
dependencies:
- deploy-snapshot
rules: rules:
- if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH'
verify_model_ROUGHAGENU: verify_model_ROUGHAGENU:
stage: models-7
image: registry.gitlab.com/finestructure/pipeline-trigger image: registry.gitlab.com/finestructure/pipeline-trigger
stage: models-7
before_script: []
script: script:
- apk add --no-cache openjdk11 - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_ROUGHAGENU" -t $MAIN_BRANCH $ROUGHAGENU_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
- export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_ROUGHAGENU" -t $RELEASE_BRANCH $ROUGHAGENU_PROJECT_ID -e VERSION=$PROJECT_VERSION
tags: tags:
- vips-java - vips-java
dependencies:
- deploy-snapshot
rules: rules:
- if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH'
verify_model_SEPAPIICOL: verify_model_SEPAPIICOL:
stage: models-7
image: registry.gitlab.com/finestructure/pipeline-trigger image: registry.gitlab.com/finestructure/pipeline-trigger
stage: models-7
before_script: []
script: script:
- apk add --no-cache openjdk11 - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_SEPAPIICOL" -t $MAIN_BRANCH $SEPAPIICOL_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
- export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_SEPAPIICOL" -t $RELEASE_BRANCH $SEPAPIICOL_PROJECT_ID -e VERSION=$PROJECT_VERSION
tags: tags:
- vips-java - vips-java
dependencies:
- deploy-snapshot
rules: rules:
- if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH'
verify_model_SEPTORIAHU: verify_model_SEPTORIAHU:
stage: models-8
image: registry.gitlab.com/finestructure/pipeline-trigger image: registry.gitlab.com/finestructure/pipeline-trigger
stage: models-8
before_script: []
script: script:
- apk add --no-cache openjdk11 - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_SEPTORIAHU" -t $MAIN_BRANCH $SEPTORIAHU_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
- export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_SEPTORIAHU" -t $RELEASE_BRANCH $SEPTORIAHU_PROJECT_ID -e VERSION=$PROJECT_VERSION
tags: tags:
- vips-java - vips-java
dependencies:
- deploy-snapshot
rules: rules:
- if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH'
verify_model_SEPTREFHUM: verify_model_SEPTREFHUM:
stage: models-8
image: registry.gitlab.com/finestructure/pipeline-trigger image: registry.gitlab.com/finestructure/pipeline-trigger
stage: models-8
before_script: []
script: script:
- apk add --no-cache openjdk11 - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_SEPTREFHUM" -t $MAIN_BRANCH $SEPTREFHUM_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
- export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_SEPTREFHUM" -t $RELEASE_BRANCH $SEPTREFHUM_PROJECT_ID -e VERSION=$PROJECT_VERSION
tags: tags:
- vips-java - vips-java
dependencies:
- deploy-snapshot
rules: rules:
- if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH'
deploy-release: # Runs after new release is deployed to package registry. Triggers job on main branch in model repo,
stage: deploy # which builds model with the new version of VIPSCommon, and releases a new snapshot version of the model.
script:
# For debugging git interaction update_model_ALTERNARIA:
#- export GIT_TRACING=2 image: registry.gitlab.com/finestructure/pipeline-trigger
#- export GIT_CURL_VERBOSE=1 stage: models-1
- git config --global user.name "${GITLAB_USER_NAME}" before_script: []
- git config --global user.email "${GITLAB_USER_EMAIL}" script:
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_ALTERNARIA" -t $MAIN_BRANCH $ALTERNARIA_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
# Use access token given by CI/CD variable ACCESS_TOKEN to authenticate
- export NEW_REPO_URL=https://root:$ACCESS_TOKEN@$CI_SERVER_HOST/$CI_PROJECT_PATH.git
- git remote set-url --push origin $NEW_REPO_URL
- git fetch origin --prune --prune-tags
# Checkout release branch, set release version and deploy. Commit, tag and push.
- git checkout $RELEASE_BRANCH
- git status
- git reset --hard origin/$RELEASE_BRANCH
- ./mvnw $MAVEN_CLI_OPTS $MAVEN_OPTS validate -DremoveSnapshot
- ./mvnw $MAVEN_CLI_OPTS $MAVEN_OPTS deploy -DskipTests
- export RELEASE_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
- if [[ $RELEASE_VERSION =~ .*SNAPSHOT ]]; then exit 1; fi
- export RELEASE_TAG="v${RELEASE_VERSION}"
- git add pom.xml
- git commit -m "[ci skip] Set release version ${RELEASE_VERSION}"
- git tag -a $RELEASE_TAG -m "Tag release ${RELEASE_TAG}"
- git push origin $RELEASE_TAG
- git push origin $RELEASE_BRANCH
# Checkout main branch, merge release branch. Push commit.
- git fetch
- git checkout $MAIN_BRANCH
- git reset --hard origin/$MAIN_BRANCH
- git merge -m "[ci skip] Merge ${RELEASE_BRANCH}" --no-ff $RELEASE_BRANCH
- git push origin $MAIN_BRANCH
tags: tags:
- vips-java - vips-java
dependencies:
- deploy-release
rules: rules:
- if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH' - if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH'
# Runs after new release is deployed to package registry. Triggers job on main branch in model repo, update_model_APPLESCABM:
# which builds model with the new version of VIPSCommon, and release a new snapshot version of the model. image: registry.gitlab.com/finestructure/pipeline-trigger
stage: models-1
before_script: []
script:
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_APPLESCABM" -t $MAIN_BRANCH $APPLESCABM_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
tags:
- vips-java
dependencies:
- deploy-release
rules:
- if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH'
update_model_ALTERNARIA: update_model_BARLEYNETB:
image: registry.gitlab.com/finestructure/pipeline-trigger
stage: models-1 stage: models-1
before_script: []
script:
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_BARLEYNETB" -t $MAIN_BRANCH $BARLEYNETB_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
tags:
- vips-java
dependencies:
- deploy-release
rules:
- if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH'
update_model_BREMIALACT:
image: registry.gitlab.com/finestructure/pipeline-trigger image: registry.gitlab.com/finestructure/pipeline-trigger
stage: models-2
before_script: []
script: script:
- apk add --no-cache openjdk11 - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_BREMIALACT" -t $MAIN_BRANCH $BREMIALACT_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
- export RELEASE_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_ALTERNARIA" -t $MAIN_BRANCH $ALTERNARIA_PROJECT_ID -e VERSION=$RELEASE_VERSION -e PURPOSE="update"
tags: tags:
- vips-java - vips-java
dependencies:
- deploy-release
rules: rules:
- if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH' - if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH'
update_model_DELIARADIC:
image: registry.gitlab.com/finestructure/pipeline-trigger
stage: models-2
before_script: []
script:
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_DELIARADIC" -t $MAIN_BRANCH $DELIARADIC_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
tags:
- vips-java
dependencies:
- deploy-release
rules:
- if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH'
update_model_DELIARFOBS:
image: registry.gitlab.com/finestructure/pipeline-trigger
stage: models-2
before_script: []
script:
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_DELIARFOBS" -t $MAIN_BRANCH $DELIARFOBS_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
tags:
- vips-java
dependencies:
- deploy-release
rules:
- if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH'
update_model_DOWNCASTMO:
image: registry.gitlab.com/finestructure/pipeline-trigger
stage: models-3
before_script: []
script:
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_DOWNCASTMO" -t $MAIN_BRANCH $DOWNCASTMO_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
tags:
- vips-java
dependencies:
- deploy-release
rules:
- if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH'
update_model_FAWMODEL01:
image: registry.gitlab.com/finestructure/pipeline-trigger
stage: models-3
before_script: []
script:
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_FAWMODEL01" -t $MAIN_BRANCH $FAWMODEL01_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
tags:
- vips-java
dependencies:
- deploy-release
rules:
- if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH'
update_model_FINNCEREAL:
image: registry.gitlab.com/finestructure/pipeline-trigger
stage: models-3
before_script: []
script:
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_FINNCEREAL" -t $MAIN_BRANCH $FINNCEREAL_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
tags:
- vips-java
dependencies:
- deploy-release
rules:
- if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH'
update_model_GRASSDRYMO:
image: registry.gitlab.com/finestructure/pipeline-trigger
stage: models-4
before_script: []
script:
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_GRASSDRYMO" -t $MAIN_BRANCH $GRASSDRYMO_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
tags:
- vips-java
dependencies:
- deploy-release
rules:
- if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH'
update_model_LEAFBLOTCH:
image: registry.gitlab.com/finestructure/pipeline-trigger
stage: models-4
before_script: []
script:
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_LEAFBLOTCH" -t $MAIN_BRANCH $LEAFBLOTCH_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
tags:
- vips-java
dependencies:
- deploy-release
rules:
- if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH'
update_model_LYGUSRUGUL:
image: registry.gitlab.com/finestructure/pipeline-trigger
stage: models-4
before_script: []
script:
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_LYGUSRUGUL" -t $MAIN_BRANCH $LYGUSRUGUL_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
tags:
- vips-java
dependencies:
- deploy-release
rules:
- if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH'
update_model_MAIZEPHENO:
image: registry.gitlab.com/finestructure/pipeline-trigger
stage: models-5
before_script: []
script:
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_MAIZEPHENO" -t $MAIN_BRANCH $MAIZEPHENO_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
tags:
- vips-java
dependencies:
- deploy-release
rules:
- if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH'
update_model_MAMESTRABR:
image: registry.gitlab.com/finestructure/pipeline-trigger
stage: models-5
before_script: []
script:
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_MAMESTRABR" -t $MAIN_BRANCH $MAMESTRABR_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
tags:
- vips-java
dependencies:
- deploy-release
rules:
- if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH'
update_model_NAERSTADMO:
image: registry.gitlab.com/finestructure/pipeline-trigger
stage: models-5
before_script: []
script:
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_NAERSTADMO" -t $MAIN_BRANCH $NAERSTADMO_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
tags:
- vips-java
dependencies:
- deploy-release
rules:
- if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH'
update_model_NEGPROGMOD:
image: registry.gitlab.com/finestructure/pipeline-trigger
stage: models-6
before_script: []
script:
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_NEGPROGMOD" -t $MAIN_BRANCH $NEGPROGMOD_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
tags:
- vips-java
dependencies:
- deploy-release
rules:
- if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH'
update_model_OATFLOWERM:
image: registry.gitlab.com/finestructure/pipeline-trigger
stage: models-6
before_script: []
script:
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_OATFLOWERM" -t $MAIN_BRANCH $OATFLOWERM_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
tags:
- vips-java
dependencies:
- deploy-release
rules:
- if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH'
update_model_PSILAROBSE:
image: registry.gitlab.com/finestructure/pipeline-trigger
stage: models-6
before_script: []
script:
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_PSILAROBSE" -t $MAIN_BRANCH $PSILAROBSE_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
tags:
- vips-java
dependencies:
- deploy-release
rules:
- if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH'
update_model_PSILARTEMP:
image: registry.gitlab.com/finestructure/pipeline-trigger
stage: models-7
before_script: []
script:
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_PSILARTEMP" -t $MAIN_BRANCH $PSILARTEMP_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
tags:
- vips-java
dependencies:
- deploy-release
rules:
- if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH'
update_model_ROUGHAGENU:
image: registry.gitlab.com/finestructure/pipeline-trigger
stage: models-7
before_script: []
script:
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_ROUGHAGENU" -t $MAIN_BRANCH $ROUGHAGENU_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
tags:
- vips-java
dependencies:
- deploy-release
rules:
- if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH'
update_model_SEPAPIICOL:
image: registry.gitlab.com/finestructure/pipeline-trigger
stage: models-7
before_script: []
script:
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_SEPAPIICOL" -t $MAIN_BRANCH $SEPAPIICOL_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
tags:
- vips-java
dependencies:
- deploy-release
rules:
- if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH'
update_model_SEPTORIAHU:
image: registry.gitlab.com/finestructure/pipeline-trigger
stage: models-8
before_script: []
script:
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_SEPTORIAHU" -t $MAIN_BRANCH $SEPTORIAHU_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
tags:
- vips-java
dependencies:
- deploy-release
rules:
- if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH'
update_model_SEPTREFHUM:
image: registry.gitlab.com/finestructure/pipeline-trigger
stage: models-8
before_script: []
script:
- trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_SEPTREFHUM" -t $MAIN_BRANCH $SEPTREFHUM_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
tags:
- vips-java
dependencies:
- deploy-release
rules:
- if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH'
\ No newline at end of file
README.md
+ 2
− 1
View file @ 6911ae7c
...@@ -3,7 +3,8 @@ ...@@ -3,7 +3,8 @@
This is a jar file that contains the entities and util classes that are used throughout the VIPS system This is a jar file that contains the entities and util classes that are used throughout the VIPS system
## Requirements ## Requirements
* Java >= 14 * Java >= 14
## Development ## Development
ci_settings.xml deleted 100644 → 0
+ 0
− 16
View file @ a7601109
<settings xmlns="http://maven.apache.org/SETTINGS/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.1.0 http://maven.apache.org/xsd/settings-1.1.0.xsd">
<servers>
<server>
<id>gitlab-maven</id>
<configuration>
<httpHeaders>
<property>
<name>Job-Token</name>
<value>${CI_JOB_TOKEN}</value>
</property>
</httpHeaders>
</configuration>
</server>
</servers>
</settings>
\ No newline at end of file
pom.xml
+ 2
− 13
View file @ 6911ae7c
...@@ -5,22 +5,16 @@ ...@@ -5,22 +5,16 @@
<parent> <parent>
<groupId>no.nibio.vips</groupId> <groupId>no.nibio.vips</groupId>
<artifactId>vips-parent-pom</artifactId> <artifactId>vips-parent-pom</artifactId>
<version>1.0.2</version> <version>1.0.0</version>
</parent> </parent>
<groupId>no.nibio.vips</groupId>
<artifactId>VIPSCommon</artifactId> <artifactId>VIPSCommon</artifactId>
<version>2.0.8-SNAPSHOT</version> <version>2.0.1-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>VIPSCommon</name> <name>VIPSCommon</name>
<url>https://gitlab.nibio.no/VIPS/VIPSCommon</url> <url>https://gitlab.nibio.no/VIPS/VIPSCommon</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
...@@ -153,10 +147,6 @@ ...@@ -153,10 +147,6 @@
</dependency> </dependency>
</dependencies> </dependencies>
<repositories> <repositories>
<repository>
<id>gitlab-maven</id>
<url>https://gitlab.nibio.no/api/v4/projects/401/packages/maven</url>
</repository>
<repository> <repository>
<id>bedatadriven</id> <id>bedatadriven</id>
<name>bedatadriven public repo</name> <name>bedatadriven public repo</name>
...@@ -238,7 +228,6 @@ ...@@ -238,7 +228,6 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment