From c701c8764e8da7dbc70ba90836a00f6b4cf1abda Mon Sep 17 00:00:00 2001
From: Eduard Frankford <e.frankford@student.uibk.ac.at>
Date: Sun, 22 May 2022 13:42:20 +0200
Subject: [PATCH] testing

---
 .gitlab-ci.yml                                | 63 ++++++++++---------
 .../datapolicy/datapolicy.component.html      |  2 +-
 2 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a6847f11f..cbe5c2e62 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,11 +6,11 @@ cache:
     - .maven/
 stages:
   # - lint
-  # - build
+  - build
   # - test
   # - analyze
-  # - package
-  # - release
+  - package
+  - release
   - deploy
 
 before_script:
@@ -46,16 +46,16 @@ before_script:
 #     paths:
 #       - pmd.log
 
-# maven-compile:
-#   stage: build
-#   script:
-#     - ./mvnw -ntp compile -P-webapp -Dmaven.repo.local=$MAVEN_USER_HOME
-#   artifacts:
-#     paths:
-#       - target/classes/
-#       - target/generated-sources/
-#     expire_in: 10 days
-#   needs: []
+maven-compile:
+  stage: build
+  script:
+    - ./mvnw -ntp compile -P-webapp -Dmaven.repo.local=$MAVEN_USER_HOME
+  artifacts:
+    paths:
+      - target/classes/
+      - target/generated-sources/
+    expire_in: 10 days
+  needs: []
 
 # maven-test:
 #   # DinD service is required for Testcontainers
@@ -108,28 +108,29 @@ before_script:
 #   #    - ./mvnw -ntp org.jacoco:jacoco-maven-plugin:prepare-agent initialize sonar:sonar -Dsonar.organization=codeAbility -Dsonar.host.url=https://server.arctis.at/sonar/ -Dsonar.login=${SONAR_TOKEN} -Dmaven.repo.local=$MAVEN_USER_HOME
 #   allow_failure: true
 
-# maven-package:
-#   stage: package
-#   script:
-#     - ./mvnw -ntp verify -Pprod -DskipTests -Dmaven.repo.local=$MAVEN_USER_HOME
+maven-package:
+  stage: package
+  script:
+    - ./mvnw -ntp verify -Pprod -DskipTests -Dmaven.repo.local=$MAVEN_USER_HOME
 
 # Uncomment the following line to use gitlabs container registry. You need to adapt the REGISTRY_URL in case you are not using gitlab.com
-# docker-push:
-#   stage: release
-# only:
-#   refs:
-#     - development
-# variables:
-#   REGISTRY_URL: sharing-codeability.uibk.ac.at:5051
-#   IMAGE_TAG: sharing-codeability.uibk.ac.at:5051/sharing/codeability-sharing-platform
-# script:
-#   - ./mvnw -ntp verify -Pprod -DskipTests -Dmaven.repo.local=$MAVEN_USER_HOME
-#   - ./mvnw -ntp jib:build -Pprod -Djib.to.image=$IMAGE_TAG -Djib.to.auth.username=gitlab-ci-token  -Djib.to.auth.password=$CI_BUILD_TOKEN -Dmaven.repo.local=$MAVEN_USER_HOME
-# when: always
+docker-push:
+  stage: release
+  # only:
+  #   refs:
+  #     - development
+  variables:
+    REGISTRY_URL: sharing-codeability.uibk.ac.at:5051
+    IMAGE_TAG: sharing-codeability.uibk.ac.at:5051/sharing/codeability-sharing-platform
+  script:
+    - ./mvnw -ntp verify -Pprod -DskipTests -Dmaven.repo.local=$MAVEN_USER_HOME
+    - ./mvnw -ntp jib:build -Pprod -Djib.to.image=$IMAGE_TAG -Djib.to.auth.username=gitlab-ci-token  -Djib.to.auth.password=$CI_BUILD_TOKEN -Dmaven.repo.local=$MAVEN_USER_HOME
+  when: always
+
 deploy:
   stage: deploy
-  # dependencies:
-  #   - 'docker-push'
+  dependencies:
+    - 'docker-push'
   image: ubuntu:20.04
   before_script:
     - apt-get update -qy
diff --git a/src/main/webapp/app/layouts/datapolicy/datapolicy.component.html b/src/main/webapp/app/layouts/datapolicy/datapolicy.component.html
index 4cebf2fac..c9628f398 100755
--- a/src/main/webapp/app/layouts/datapolicy/datapolicy.component.html
+++ b/src/main/webapp/app/layouts/datapolicy/datapolicy.component.html
@@ -1,4 +1,4 @@
-<h3 jhitranslate="legal.privacy.title">Privacy Statement</h3>
+<h3 jhitranslate="legal.privacy.title">Privacy Statement2</h3>
 <div>
   <p>
     Das Institut der Informatik der Universität Insbruck nimmt den Schutz von personenbezogenen Daten sehr ernst um die Privatssphäre der
-- 
GitLab