Skip to content

Commit

Permalink
Merge branch 'development' into snyk-fix-a41973c0029994a8eb7066dbaf05…
Browse files Browse the repository at this point in the history
…266c
  • Loading branch information
hmiguim authored Nov 27, 2024
2 parents 5eca9cc + 300a8fd commit 9addd65
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
10 changes: 5 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
<jersey.version>3.1.7</jersey.version>
<swagger.version>2.2.22</swagger.version>
<jackson.version>2.17.1</jackson.version>
<spring.version>6.1.8</spring.version>
<spring.version>6.1.14</spring.version>
<solr.version>9.6.1</solr.version>
<pekko.version>1.0.2</pekko.version>
<httpcomponents.version>4.5.14</httpcomponents.version>
Expand Down Expand Up @@ -590,7 +590,7 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>7.10.1</version>
<version>7.10.2</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand Down Expand Up @@ -756,7 +756,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.11.0</version>
<version>5.12.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -787,7 +787,7 @@
<dependency>
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>jersey-spring6</artifactId>
<version>3.1.6</version>
<version>3.1.7</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
Expand Down Expand Up @@ -946,7 +946,7 @@
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-java</artifactId>
<version>4.19.1</version>
<version>4.21.0</version>
</dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
Expand Down
2 changes: 1 addition & 1 deletion roda-core/roda-core-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<version>1.19.7</version>
<version>1.19.8</version>
</dependency>
</dependencies>
</project>
2 changes: 1 addition & 1 deletion roda-core/roda-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<version>3.9.2</version>
<version>3.9.3</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.solr/solr-solrj-zookeeper -->
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ genericTitle:Titel
processTitle:Prozess
reportTitle:Report zur Verarbeitung von Informationspaketen
ingestAppraisalTitle:Ingest Bewertung
riskHistoryTitle:Risikohistorie
riskHistoryTitle:Risiko-Verlauf
editIncidenceTitle:Risikoinzidenz bearbeiten
editIncidencesTitle:Risikoinzidenzen bearbeiten
showRiskIncidenceTitle:Risikoinzidenz
Expand Down Expand Up @@ -1671,8 +1671,8 @@ editAccessKeyTitle:Zugangstoken bearbeiten
accessKeyLabel:Zugangstoken
accessKeyNameLabel:Name
accessKeyIDLabel:ID
accessKeyLastUsageDateLabel:Letzte Nutzung
accessKeyExpirationDateLabel:Ablaufsdatum
accessKeyLastUsageDateLabel:Letzte Verwendung
accessKeyExpirationDateLabel:Ablaufdatum
accessKeyStatusLabel:Status
accessKeyStatusValue:{0}
accessKeyStatusValue[CREATED]:Erstellt
Expand All @@ -1685,7 +1685,7 @@ accessKeyUpdateButton:Zugangstoken aktualisieren
accessKeyDeleteButton:Zugangstoken löschen
accessKeyRegenerateButton:Zugangstoken generieren
accessKeyRevokeButton:Zugangstoken rückgängig machen
accessKeyNeverUsedLabel:Nie benutzt
accessKeyNeverUsedLabel:Nie verwendet
accessKeyNotFoundLabel:Nicht Gefunden
accessKeySuccessfullyRegenerated:Zugangstoken wurde erfolgreich neu generiert
accessKeySuccessfullyRevoked:Zugangstoken wurde erfolgreich widerrufen
Expand Down

0 comments on commit 9addd65

Please sign in to comment.