Merge branch 'develop' into 'master'

Develop

See merge request !1

.gitlab-ci.yml

 variables:
-  DOCKER_USER: javicorvi
-  DOCKER_BUILD: $DOCKER_USER/$CI_PROJECT_NAME:$CI_COMMIT_REF_NAME
+  DOCKER_REGISTRY: registry.gitlab.bsc.es
+  IMAGE_FULL_PATH: $DOCKER_REGISTRY/$CI_PROJECT_PATH:$CI_COMMIT_REF_NAME
 stages:
   - build
 build_docker_image:
   stage: build
-  only:
-    - tags
   script:
-    - docker login -u javicorvi -p $DOCKER_PASS
-    - docker build -t $DOCKER_BUILD .
-    - docker push $DOCKER_BUILD
+     - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $DOCKER_REGISTRY
+     - docker build -t $IMAGE_FULL_PATH .
+     - docker push $IMAGE_FULL_PATH
   tags:
-    - build
\ No newline at end of file
+    - build

CHANGELOG

 # Change Log
 
+## Version 2.0, 2021-10-05
+New release of the component, docker registry in registry.gitlab.bsc.es
+
+
 ## Version 1.0, 2020-03-03
 
-First version of the component.
\ No newline at end of file
+First version of the component.

README.md

-ades-relation-extraction
+pretox-relation-extraction
 ========================
 
 <b>Relation Extraction for Preclinical Adverse Drug Effect text-mining Project. DEPRECATED.</b>   

docker-build.sh

@@ -30,13 +30,13 @@ fi
 mvn clean install -DskipTests
 
 #rename jar
-mv target/ades-relation-extraction-0.0.1-SNAPSHOT-jar-with-dependencies.jar ades-relation-extraction-${ADES_RELATION_VERSION}.jar
+mv target/pretox-relation-extraction-0.0.1-SNAPSHOT-jar-with-dependencies.jar pretox-relation-extraction-${ADES_RELATION_VERSION}.jar
 
-cat > /usr/local/bin/ades-relation-extraction <<EOF
+cat > /usr/local/bin/pretox-relation-extraction <<EOF
 #!/bin/sh
-exec java \$JAVA_OPTS -jar "${ADES_RELATION_HOME}/ades-relation-extraction-${ADES_RELATION_VERSION}.jar" -workdir "${ADES_RELATION_HOME}" "\$@"
+exec java \$JAVA_OPTS -jar "${ADES_RELATION_HOME}/pretox-relation-extraction-${ADES_RELATION_VERSION}.jar" -workdir "${ADES_RELATION_HOME}" "\$@"
 EOF
-chmod +x /usr/local/bin/ades-relation-extraction
+chmod +x /usr/local/bin/pretox-relation-extraction
 
 #delete target
 rm -R target src pom.xml

pom.xml

@@ -3,11 +3,11 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>es.bsc.inb.nlp</groupId>
-  <artifactId>ades-relation-extraction</artifactId>
+  <artifactId>pretox-relation-extraction</artifactId>
   <version>0.0.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
-  <name>ades-relation-extraction</name>
+  <name>pretox-relation-extraction</name>
   <url>http://maven.apache.org</url>
 
   <properties>