Commit 9348843d authored by mhellka's avatar mhellka
Browse files

Dependency version upgrades

parent 015aeaf5
Pipeline #127760 passed with stages
in 9 minutes and 5 seconds
......@@ -32,7 +32,7 @@
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
<version>2.7.0</version>
<version>2.8.1</version>
</dependency>
<dependency>
<groupId>de.gwdg.cdstar</groupId>
......
......@@ -129,17 +129,17 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>2.12.1</version>
<version>2.13.1</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.12.1</version>
<version>2.13.1</version>
</dependency>
<dependency>
<groupId>info.picocli</groupId>
<artifactId>picocli</artifactId>
<version>4.0.1</version>
<version>4.2.0</version>
</dependency>
</dependencies>
<name>CDStar: Commandline Interface</name>
......
......@@ -75,7 +75,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
<version>1.7.26</version>
<version>1.7.30</version>
</dependency>
<dependency>
......@@ -120,7 +120,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
<version>5.15.9</version>
<version>5.15.11</version>
</dependency>
<dependency>
<groupId>com.github.sbtourist</groupId>
......@@ -147,13 +147,20 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-broker</artifactId>
<version>5.15.9</version>
<version>5.15.11</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>de.gwdg.cdstar</groupId>
<artifactId>cdstar-rest</artifactId>
<scope>test</scope>
<exclusions>
<!-- too new for tika -->
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>de.gwdg.cdstar.plugins</groupId>
......@@ -168,7 +175,7 @@
<dependency>
<groupId>info.picocli</groupId>
<artifactId>picocli</artifactId>
<version>4.0.1</version>
<version>4.2.0</version>
</dependency>
<dependency>
<groupId>de.gwdg.cdstar</groupId>
......
......@@ -10,7 +10,7 @@
<artifactId>cdstar-jetty</artifactId>
<properties>
<jetty.version>9.4.20.v20190813</jetty.version>
<jetty.version>9.4.27.v20200227</jetty.version>
</properties>
<dependencies>
......
......@@ -12,22 +12,32 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-broker</artifactId>
<version>5.15.9</version>
<version>5.15.11</version>
<exclusions>
<exclusion>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-kahadb-store</artifactId>
<version>5.15.9</version>
<version>5.15.11</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-amqp</artifactId>
<version>5.15.9</version>
<version>5.15.11</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-mqtt</artifactId>
<version>5.15.9</version>
<version>5.15.11</version>
</dependency>
</dependencies>
<name>CDStar: Embedded ActiveMQ Broker</name>
......
......@@ -13,29 +13,53 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
<version>5.15.9</version>
<version>5.15.11</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-amqp</artifactId>
<version>5.15.9</version>
<version>5.15.11</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-mqtt</artifactId>
<version>5.15.9</version>
<version>5.15.11</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-broker</artifactId>
<version>5.15.9</version>
<version>5.15.11</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>de.gwdg.cdstar</groupId>
<artifactId>cdstar-runtime</artifactId>
<exclusions>
<exclusion>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
<name>CDStar Plugin: ActiveMQ Event Sink</name>
......
......@@ -12,7 +12,7 @@
<dependency>
<groupId>com.auth0</groupId>
<artifactId>java-jwt</artifactId>
<version>3.8.1</version>
<version>3.10.0</version>
<exclusions>
<exclusion>
<!-- Provided by parent pom and cdstar-runtime -->
......
......@@ -18,12 +18,12 @@
<dependency>
<groupId>com.rabbitmq</groupId>
<artifactId>amqp-client</artifactId>
<version>5.7.2</version>
<version>5.8.0</version>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.12.2</version>
<version>3.15.0</version>
<scope>test</scope>
</dependency>
</dependencies>
......
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>de.gwdg.cdstar.plugins</groupId>
<artifactId>cdstar-plugins-pom</artifactId>
<version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>cdstar-redis-sink</artifactId>
<dependencies>
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
<version>2.9.0</version>
</dependency>
</dependencies>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>de.gwdg.cdstar.plugins</groupId>
<artifactId>cdstar-plugins-pom</artifactId>
<version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>cdstar-redis-sink</artifactId>
<dependencies>
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
<version>3.2.0</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
package de.gwdg.cdstar.ext.elastic;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import org.junit.Test;
......@@ -52,7 +51,8 @@ public class SearchProviderTest {
assertEquals(q.getQuery(), terms_query.path("query").asText());
final JsonNode access_query = dsl.path("query").path("bool").path("filter").path("terms").path("__read_access");
assertThat(toList(access_query), containsInAnyOrder("test@test", "@testGroup", "@group2", "$any"));
List<String> accessList = toList(access_query);
assertEquals(new HashSet<>(accessList), new HashSet<>(Arrays.asList("test@test", "@testGroup", "@group2", "$any")));
}
List<String> toList(JsonNode node) {
......
......@@ -12,7 +12,7 @@
<dependency>
<groupId>io.sentry</groupId>
<artifactId>sentry-log4j2</artifactId>
<version>1.7.9</version>
<version>1.7.30</version>
<exclusions>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
......
......@@ -13,17 +13,17 @@
<dependency>
<groupId>org.webjars</groupId>
<artifactId>bootstrap</artifactId>
<version>4.3.1</version>
<version>4.4.1-1</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>font-awesome</artifactId>
<version>5.9.0</version>
<version>5.12.0</version>
</dependency>
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
<version>2.3.28</version>
<version>2.3.30</version>
</dependency>
<dependency>
<groupId>de.gwdg.cdstar</groupId>
......
......@@ -8,12 +8,12 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href="${uibase}_assets/bootstrap/4.3.1/css/bootstrap.min.css" rel="stylesheet">
<link href="${uibase}_assets/font-awesome/5.9.0/css/all.min.css" rel="stylesheet">
<link href="${uibase}_assets/bootstrap/4.4.1-1/css/bootstrap.min.css" rel="stylesheet">
<link href="${uibase}_assets/font-awesome/5.12.0/css/all.min.css" rel="stylesheet">
<link rel="shortcut icon" href="${uibase}_assets/favicon.ico" type="image/x-icon">
<script src="${uibase}_assets/jquery/3.0.0/jquery.min.js"></script>
<script src="${uibase}_assets/bootstrap/4.3.1/js/bootstrap.min.js"></script>
<script src="${uibase}_assets/jquery/3.4.0/jquery.min.js"></script>
<script src="${uibase}_assets/bootstrap/4.4.1-1/js/bootstrap.min.js"></script>
</head>
<body>
......
......@@ -26,7 +26,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.18</version>
<version>1.20</version>
</dependency>
<dependency>
<groupId>org.synchronoss.cloud</groupId>
......@@ -36,7 +36,7 @@
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
<version>2.3.28</version>
<version>2.3.30</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
......@@ -53,7 +53,7 @@
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-multipart</artifactId>
<version>2.29</version>
<version>2.30.1</version>
<scope>test</scope>
</dependency>
<dependency>
......@@ -64,13 +64,13 @@
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
<version>2.29</version>
<version>2.30.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
<version>2.29</version>
<version>2.30.1</version>
<scope>test</scope>
</dependency>
<dependency>
......
package de.gwdg.cdstar.rest.v3;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
......@@ -9,6 +8,7 @@ import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.net.URISyntaxException;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
......@@ -23,7 +23,6 @@ import javax.ws.rs.core.Response.Status;
import org.glassfish.jersey.media.multipart.FormDataMultiPart;
import org.glassfish.jersey.media.multipart.file.StreamDataBodyPart;
import org.hamcrest.collection.IsIn;
import org.junit.Before;
import org.junit.Test;
......@@ -161,7 +160,7 @@ public class ArchiveUpdateTest extends BaseRestTest {
load(id);
assertEquals("zip-cold", getJsonString("profile"));
final String state = getJsonString("state");
assertThat(state, IsIn.isOneOf("archived", "pending-archive"));
assertTrue(Arrays.asList("archived", "pending-archive").contains(state));
}
@Test
......@@ -183,7 +182,7 @@ public class ArchiveUpdateTest extends BaseRestTest {
assertEquals(modified, getJsonDate("modified"));
assertEquals("zip-cold", getJsonString("profile"));
assertThat(getJsonString("state"), IsIn.isOneOf("archived", "pending-archive"));
assertTrue(Arrays.asList("archived", "pending-archive").contains(getJsonString("state")));
assertTrueEventually(() -> {
load(id);
......
......@@ -49,18 +49,18 @@
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet</artifactId>
<version>2.29</version>
<version>2.30.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.github.classgraph</groupId>
<artifactId>classgraph</artifactId>
<version>4.8.43</version>
<version>4.8.65</version>
</dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-core</artifactId>
<version>4.1.0</version>
<version>4.1.5</version>
</dependency>
<dependency>
<groupId>de.gwdg.cdstar</groupId>
......
......@@ -17,16 +17,11 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
<version>1.7.26</version>
<version>1.7.30</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<version>1.3</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
......@@ -429,7 +429,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.12</version>
<version>1.14</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
......@@ -439,27 +439,27 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.26</version>
<version>1.7.30</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.26</version>
<version>1.7.30</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.26</version>
<version>1.7.30</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.9.7</version>
<version>2.10.3</version>
<scope>import</scope>
<type>pom</type>
</dependency>
......@@ -477,7 +477,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.0.0</version>
<version>3.3.0</version>
</dependency>
</dependencies>
</dependencyManagement>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment