Merge pull request #3051 from dzhw/release

Release v1.0.117
dzhw · Dec 14, 2021 · 6858c39 · 6858c39
2 parents 1add52a + 6b66de9
commit 6858c39
Show file tree

Hide file tree

Showing 205 changed files with 10,210 additions and 777 deletions.
diff --git a/.github/workflows/nightly-e2e-tests.yml b/.github/workflows/nightly-e2e-tests.yml
@@ -1,7 +1,7 @@
 name: Nightly E2E Tests
 on:
   schedule:
-   - cron: "0 0 * * *"
+   - cron: "0 2 * * *"
   workflow_dispatch:
 jobs:
     chrome-public-user:
@@ -38,23 +38,6 @@ jobs:
           env:
             SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }}
             SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}
-    ie11-public-user:
-      runs-on: ubuntu-18.04
-      steps:
-        - uses: actions/checkout@v1
-          with:
-            ref: development
-        - name: Setup Python 3.8.0
-          uses: actions/setup-python@v2
-          with:
-            python-version: '3.8.0'
-        - name: Install robotframework dependencies
-          run: ./src/test/robotframework/setup.sh
-        - name: Nightly Internet Explorer Tests (Public User)
-          run: robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/ie11 -v USE_SAUCELABS:TRUE -v BROWSER:ie --include publicuserNOTfirefoxonlyNOTchromeonlyNOTnoslowpokeNOTlocalonly ./src/test/robotframework
-          env:
-            SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }}
-            SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}
     edge-public-user:
       runs-on: ubuntu-18.04
       steps:
@@ -94,7 +77,6 @@ jobs:
       needs:
         - chrome-public-user
         - firefox-public-user
-        - ie11-public-user
         - edge-public-user
         - safari-public-user
       steps:
@@ -117,7 +99,6 @@ jobs:
       needs:
         - chrome-public-user
         - firefox-public-user
-        - ie11-public-user
         - edge-public-user
         - safari-public-user
       steps:
@@ -135,35 +116,11 @@ jobs:
           env:
             SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }}
             SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}
-    ie11-dataprovider:
-      runs-on: ubuntu-18.04
-      needs:
-        - chrome-public-user
-        - firefox-public-user
-        - ie11-public-user
-        - edge-public-user
-        - safari-public-user
-      steps:
-        - uses: actions/checkout@v1
-          with:
-            ref: development
-        - name: Setup Python 3.8.0
-          uses: actions/setup-python@v2
-          with:
-            python-version: '3.8.0'
-        - name: Install robotframework dependencies
-          run: ./src/test/robotframework/setup.sh
-        - name: Nightly Internet Explorer Tests (Dataprovider)
-          run: robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/ie11 -v USE_SAUCELABS:TRUE -v BROWSER:ie --include dataproviderNOTfirefoxonlyNOTchromeonlyNOTnoslowpokeNOTlocalonly ./src/test/robotframework
-          env:
-            SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }}
-            SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}
     edge-dataprovider:
       runs-on: ubuntu-18.04
       needs:
         - chrome-public-user
         - firefox-public-user
-        - ie11-public-user
         - edge-public-user
         - safari-public-user
       steps:
@@ -186,7 +143,6 @@ jobs:
       needs:
         - chrome-public-user
         - firefox-public-user
-        - ie11-public-user
         - edge-public-user
         - safari-public-user
       steps:
@@ -209,7 +165,6 @@ jobs:
       needs:
         - chrome-dataprovider
         - firefox-dataprovider
-        - ie11-dataprovider
         - edge-dataprovider
         - safari-dataprovider
       steps:
@@ -232,7 +187,6 @@ jobs:
       needs:
         - chrome-dataprovider
         - firefox-dataprovider
-        - ie11-dataprovider
         - edge-dataprovider
         - safari-dataprovider
       steps:
@@ -250,35 +204,11 @@ jobs:
           env:
             SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }}
             SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}
-    ie11-publisher:
-      runs-on: ubuntu-18.04
-      needs:
-        - chrome-dataprovider
-        - firefox-dataprovider
-        - ie11-dataprovider
-        - edge-dataprovider
-        - safari-dataprovider
-      steps:
-        - uses: actions/checkout@v1
-          with:
-            ref: development
-        - name: Setup Python 3.8.0
-          uses: actions/setup-python@v2
-          with:
-            python-version: '3.8.0'
-        - name: Install robotframework dependencies
-          run: ./src/test/robotframework/setup.sh
-        - name: Nightly Internet Explorer Tests (Publisher)
-          run: robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/ie11 -v USE_SAUCELABS:TRUE -v BROWSER:ie --include publisherNOTfirefoxonlyNOTchromeonlyNOTnoslowpokeNOTlocalonly ./src/test/robotframework
-          env:
-            SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }}
-            SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}
     edge-publisher:
       runs-on: ubuntu-18.04
       needs:
         - chrome-dataprovider
         - firefox-dataprovider
-        - ie11-dataprovider
         - edge-dataprovider
         - safari-dataprovider
       steps:
@@ -301,7 +231,6 @@ jobs:
     #  needs:
     #    - chrome-publisher
     #    - firefox-publisher
-    #    - ie11-publisher
     #    - edge-publisher
     #  steps:
     #    - uses: actions/checkout@v1
@@ -323,17 +252,14 @@ jobs:
       needs:
         - chrome-public-user
         - firefox-public-user
-        - ie11-public-user
         - edge-public-user
         - safari-public-user
         - chrome-dataprovider
         - firefox-dataprovider
-        - ie11-dataprovider
         - edge-dataprovider
         - safari-dataprovider
         - chrome-publisher
         - firefox-publisher
-        - ie11-publisher
         - edge-publisher
       #  - safari-publisher
       if: always()

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Metadatamanagement",
-  "version": "1.0.116-SNAPSHOT",
+  "version": "1.0.117",
   "description": "Data Search for Higher Education Research and Science Studies",
   "private": true,
   "dependencies": {
@@ -29,13 +29,14 @@
     "angular-translate-storage-cookie": "2.19.0",
     "angular-ui-bootstrap": "https://github.com/angular-ui/bootstrap-bower/archive/2.5.0.tar.gz",
     "angular-ui-router": "1.0.29",
+    "angular-uuid": "^0.0.4",
     "angulartics-piwik": "^1.0.6",
     "blob-polyfill": "https://github.com/bjornstar/blob-polyfill/archive/1.0.20150320.tar.gz",
     "bootstrap-sass": "3.4.1",
     "bowser": "https://github.com/lancedikson/bowser/archive/1.9.4.tar.gz",
     "cheet.js": "0.3.3",
     "citation-js": "0.5.1",
-    "clientjs": "0.2.0",
+    "clientjs": "0.2.1",
     "elasticsearch-browser": "https://github.com/elastic/bower-elasticsearch-js/archive/v16.7.1.tar.gz",
     "es5-shim": "4.6.2",
     "es6-shim": "0.35.6",

diff --git a/pom.xml b/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.5.6</version>
+        <version>2.5.7</version>
         <relativePath />
     </parent>
 
     <groupId>eu.dzhw.fdz</groupId>
     <artifactId>metadatamanagement</artifactId>
-    <version>1.0.116-SNAPSHOT</version>
+    <version>1.0.117</version>
     <packaging>war</packaging>
     <name>metadatamanagement</name>
 
@@ -24,9 +24,10 @@
     </distributionManagement>
 
     <properties>
-        <elasticsearch.version>7.14.0</elasticsearch.version>
+        <elasticsearch.version>7.15.2</elasticsearch.version>
         <jacoco-maven-plugin.version>0.8.6</jacoco-maven-plugin.version>
         <java.version>15</java.version>
+        <log4j2.version>2.16.0</log4j2.version>
         <maven-sortpom-plugin.version>2.12.0</maven-sortpom-plugin.version>
         <maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
         <maven.compiler.source>${java.version}</maven.compiler.source>
@@ -175,7 +176,7 @@
         <dependency>
             <groupId>org.javers</groupId>
             <artifactId>javers-spring-boot-starter-mongo</artifactId>
-            <version>6.5.0</version>
+            <version>6.5.1</version>
         </dependency>
         <dependency>
             <groupId>org.jsoup</groupId>
@@ -190,17 +191,12 @@
         <dependency>
             <groupId>org.springdoc</groupId>
             <artifactId>springdoc-openapi-ui</artifactId>
-            <version>1.5.12</version>
+            <version>1.6.0</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-configuration-processor</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-devtools</artifactId>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-loader-tools</artifactId>
@@ -297,7 +293,7 @@
         <dependency>
             <groupId>org.springframework.security.oauth.boot</groupId>
             <artifactId>spring-security-oauth2-autoconfigure</artifactId>
-            <version>2.5.5</version>
+            <version>2.5.6</version>
         </dependency>
         <dependency>
             <groupId>org.zalando</groupId>

diff --git a/.../fdz/metadatamanagement/analysispackagemanagement/domain/AbstractAnalysisDataPackage.java b/.../fdz/metadatamanagement/analysispackagemanagement/domain/AbstractAnalysisDataPackage.java
@@ -18,7 +18,8 @@
 @NoArgsConstructor
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
 @JsonSubTypes({@Type(value = DataPackage.class, name = "dataPackage"),
-    @Type(value = ExternalDataPackage.class, name = "externalData")})
+    @Type(value = ExternalDataPackage.class, name = "externalDataPackage"),
+    @Type(value = CustomDataPackage.class, name = "customDataPackage")})
 public abstract class AbstractAnalysisDataPackage implements Serializable {
 
   private static final long serialVersionUID = -2179924716031946800L;

diff --git a/...java/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/domain/AnalysisPackage.java b/...java/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/domain/AnalysisPackage.java
@@ -154,10 +154,10 @@ public class AnalysisPackage extends AbstractShadowableRdcDomainObject
    */
   @Valid
   private List<@I18nStringSize(max = StringLengths.MEDIUM,
-      message = "analysis-package-management.error.analysis-package.institution.i18n-string-size") 
+      message = "analysis-package-management.error.analysis-package.institution.i18n-string-size")
       @I18nStringEntireNotEmpty(
-      message = "analysis-package-management.error.analysis-package.institution"
-          + ".i18n-string-entire-not-empty") I18nString> institutions;
+          message = "analysis-package-management.error.analysis-package.institution"
+              + ".i18n-string-entire-not-empty") I18nString> institutions;
 
   /**
    * The names of the sponsors which have sponsored the study or project from which this analysis
@@ -170,8 +170,8 @@ public class AnalysisPackage extends AbstractShadowableRdcDomainObject
   private List<@I18nStringSize(max = StringLengths.MEDIUM,
       message = "analysis-package-management.error.analysis-package.sponsor.i18n-string-size") 
       @I18nStringEntireNotEmpty(
-      message = "analysis-package-management.error.sponsor.institution"
-          + ".i18n-string-entire-not-empty") I18nString> sponsors;
+          message = "analysis-package-management.error.sponsor.institution"
+              + ".i18n-string-entire-not-empty") I18nString> sponsors;
 
   /**
    * The license of this analysis package. Markdown is supported.
@@ -204,8 +204,7 @@ public class AnalysisPackage extends AbstractShadowableRdcDomainObject
    * At least one {@link Script} must be specified.
    */
   @Valid
-  @Size(min = 1,
-      message = "analysis-package-management.error.analysis-package." + "scripts.at-leat-one")
+  @NotEmpty(message = "analysis-package-management.error.analysis-package.scripts.at-leat-one")
   private List<Script> scripts;
 
   /**

diff --git a/...va/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/domain/CustomDataPackage.java b/...va/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/domain/CustomDataPackage.java
@@ -11,7 +11,6 @@
 
 import eu.dzhw.fdz.metadatamanagement.analysispackagemanagement.domain.validation.ValidCustomDataPackageAccessWay;
 import eu.dzhw.fdz.metadatamanagement.analysispackagemanagement.domain.validation.ValidCustomDataPackageAvailabilityType;
-import eu.dzhw.fdz.metadatamanagement.common.domain.I18nLink;
 import eu.dzhw.fdz.metadatamanagement.common.domain.I18nString;
 import eu.dzhw.fdz.metadatamanagement.common.domain.ImmutableI18nString;
 import eu.dzhw.fdz.metadatamanagement.common.domain.validation.I18nStringEntireNotEmpty;
@@ -39,7 +38,7 @@
 public class CustomDataPackage extends AbstractAnalysisDataPackage {
   private static final long serialVersionUID = -513926799487045749L;
   private static final String DOWNLOAD = "Download";
-  private static final String REMOTE = "Remote";
+  private static final String REMOTE = "Remote-Desktop";
   private static final String ONSITE = "Onsite";
 
   public static final List<String> AVAILABLE_ACCESS_WAYS =
@@ -94,10 +93,10 @@ public class CustomDataPackage extends AbstractAnalysisDataPackage {
    * May be empty.
    */
   @Valid
-  private List<I18nLink> dataSources;
+  private List<DataSource> dataSources;
 
   /**
-   * Must be one of AVAILABLE_ACCESS_WAYS.
+   * Must be one of AVAILABLE_ACCESS_WAYS. May be empty.
    */
   @ValidCustomDataPackageAccessWay(
       message = "analysis-package-management.error.custom-data-package.access-way.not-valid")