Merge branch 'prerelease-v1.1.2' into 'release-v1.1.2'

Prerelease v1.1.2

See merge request !2

.gitlab-ci.yml

-image: openjdk:8-jdk
-
 variables:
+    GIT_STRATEGY: fetch
+    GIT_DEPTH: 0
     SAREF_DEV_KEY: <my_private_key>
     SAREF_PORTAL_KEY: <my_private_key>
 
-before_script:
-  - eval $(ssh-agent -s)
-  - ssh-add <(echo "$SAREF_DEV_KEY")
-  - mkdir -p ~/.ssh
-  - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
-
 stages:
   - test
   - build
   - deploy
 
+
 test-develop:
   stage: test
+  image: openjdk:11-jre
   script:
-    - curl -L -o saref-pipeline.jar "https://labs.etsi.org/rep/saref/saref-pipeline/-/jobs/artifacts/master/raw/target/saref-pipeline.jar?job=build"
+    - curl -L -o saref-pipeline.jar "https://labs.etsi.org/rep/saref/saref-pipeline/-/releases/permalink/latest/downloads/saref-pipeline.jar"
     - java -jar saref-pipeline.jar develop -s && touch target/success
   allow_failure: true
   except:
@@ -34,8 +30,9 @@ test-develop:
 
 test-prerelease:
   stage: test
+  image: openjdk:11-jre
   script:
-    - curl -L -o saref-pipeline.jar "https://labs.etsi.org/rep/saref/saref-pipeline/-/jobs/artifacts/master/raw/target/saref-pipeline.jar?job=build"
+    - curl -L -o saref-pipeline.jar "https://labs.etsi.org/rep/saref/saref-pipeline/-/releases/permalink/latest/downloads/saref-pipeline.jar"
     - java -jar saref-pipeline.jar release -t && touch target/success
   allow_failure: true
   only:
@@ -48,19 +45,27 @@ test-prerelease:
     reports:
       junit: target/report_output.xml
 
-deploy-report:
-  stage: deploy
-  script:
-    - scp -pr target/site saref-dev@saref.etsi.org:~/snapshot/$CI_PIPELINE_ID
-    - echo "SAREF pipeline report  https://saref.etsi.org/snapshot/$CI_PIPELINE_ID/report.html" 
-    - exit $(test -f target/success) $?
-  except:
-    - /^release-v/
+# deploy-report:
+#   stage: deploy
+#   image: alpine:latest
+#   script:
+#     - apk update
+#     - apk add openssh
+#     - eval $(ssh-agent -s)
+#     - ssh-add <(echo "$SAREF_DEV_KEY")
+#     - mkdir -p ~/.ssh
+#     - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
+#     - scp -P 29419 -pr target/site saref-dev@saref.etsi.org:~/snapshot/$CI_PIPELINE_ID
+#     - echo "SAREF pipeline report  https://saref.etsi.org/snapshot/$CI_PIPELINE_ID/report.html" 
+#     - exit $(test -f target/success) $?
+#   except:
+#     - /^release-v/
 
 test-release:
   stage: test
+  image: openjdk:11-jre
   script:
-    - curl -L -o saref-pipeline.jar "https://labs.etsi.org/rep/saref/saref-pipeline/-/jobs/artifacts/master/raw/target/saref-pipeline.jar?job=build"
+    - curl -L -o saref-pipeline.jar "https://labs.etsi.org/rep/saref/saref-pipeline/-/releases/permalink/latest/downloads/saref-pipeline.jar"
     - java -jar saref-pipeline.jar release -t
   only:
     - /^release-v/

examples/saref4agri-ex1.ttl

@@ -19,7 +19,7 @@
   dcterms:license <https://forge.etsi.org/etsi-software-license> ;
   dcterms:conformsTo <https://saref.etsi.org/core/v3.1.1/> ;
   dcterms:conformsTo <https://saref.etsi.org/saref4agri/v1.1.2/> ;
-  dcterms:conformsTo obo:TAXRANK_0000017, obo:TAXRANK_0000004 , obo:TAXRANK_0000006 , obo:TAXRANK_0000016 , obo:TAXRANK_0000003 ;
+  # dcterms:conformsTo obo:TAXRANK_0000017, obo:TAXRANK_0000004 , obo:TAXRANK_0000006 , obo:TAXRANK_0000016 , obo:TAXRANK_0000003 ;
   dcterms:title "SAREF4AGRI example"@en ;
   dcterms:description "SAREF4AGRI example"@en .