Gitlab Community Edition Instance

Commit fe9c87b6 authored by mhellka's avatar mhellka
Browse files

Upgrading dependencies to current versions.

parent 37ba47e9
Pipeline #216959 failed with stages
in 2 minutes and 51 seconds
......@@ -31,7 +31,7 @@
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
<version>2.9.0</version>
<version>3.0.3</version>
</dependency>
<dependency>
<groupId>de.gwdg.cdstar</groupId>
......
......@@ -3,8 +3,6 @@ package de.gwdg.cdstar.cli;
import java.nio.file.Paths;
import java.util.ServiceLoader;
import javax.servlet.ServletContainerInitializer;
import de.gwdg.cdstar.Utils;
import de.gwdg.cdstar.rest.servlet.CDStarServletInitializer;
import de.gwdg.cdstar.runtime.CDStarRuntime;
......@@ -13,6 +11,7 @@ import de.gwdg.cdstar.runtime.RuntimeContext;
import de.gwdg.cdstar.runtime.listener.RuntimeListener;
import de.gwdg.cdstar.runtime.services.PluginLoader;
import de.gwdg.cdstar.server.jetty.JettyServer;
import jakarta.servlet.ServletContainerInitializer;
import picocli.CommandLine.Command;
import picocli.CommandLine.Option;
......
......@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
<version>4.5.6</version>
<version>4.5.13</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
......
......@@ -11,7 +11,7 @@
<name>CDStar: Elasticsearch ingest service</name>
<description>Sandalone service appliction to integrate cdstar with elasticsearch.</description>
<properties>
<tika.version>1.20</tika.version>
<tika.version>2.0.0</tika.version>
</properties>
......@@ -70,7 +70,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
<version>1.7.30</version>
<version>1.7.32</version>
</dependency>
<dependency>
......@@ -94,19 +94,31 @@
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parsers</artifactId>
<artifactId>tika-parsers-standard-package</artifactId>
<version>${tika.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
</exclusion>
<exclusion>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
<version>5.16.1</version>
<version>5.16.2</version>
</dependency>
<dependency>
<groupId>com.github.sbtourist</groupId>
......@@ -137,7 +149,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-broker</artifactId>
<version>5.16.1</version>
<version>5.16.2</version>
<scope>test</scope>
</dependency>
<dependency>
......@@ -179,7 +191,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.3</version>
<version>1.2.5</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
......@@ -4,7 +4,7 @@ import java.io.InputStream;
import org.apache.tika.metadata.HttpHeaders;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.TikaMetadataKeys;
import org.apache.tika.metadata.TikaCoreProperties;
import org.apache.tika.parser.AutoDetectParser;
import org.apache.tika.sax.ContentHandlerDecorator;
import org.xml.sax.SAXException;
......@@ -108,7 +108,7 @@ public class TikaHelper {
final AutoDetectParser parser = new AutoDetectParser();
final Metadata metadata = new Metadata();
if (fileName != null)
metadata.add(TikaMetadataKeys.RESOURCE_NAME_KEY, fileName);
metadata.add(TikaCoreProperties.RESOURCE_NAME_KEY, fileName);
if (mediaType != null)
metadata.add(HttpHeaders.CONTENT_TYPE, mediaType);
......
......@@ -8,7 +8,7 @@
<artifactId>cdstar-jetty</artifactId>
<properties>
<jetty.version>9.4.38.v20210224</jetty.version>
<jetty.version>11.0.6</jetty.version>
</properties>
<dependencies>
......
......@@ -10,8 +10,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import javax.servlet.ServletContainerInitializer;
import org.eclipse.jetty.alpn.server.ALPNServerConnectionFactory;
import org.eclipse.jetty.http.HttpVersion;
import org.eclipse.jetty.http2.HTTP2Cipher;
......@@ -34,6 +32,8 @@ import org.eclipse.jetty.util.thread.QueuedThreadPool;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import jakarta.servlet.ServletContainerInitializer;
public class JettyServer {
private static final Logger log = LoggerFactory.getLogger(JettyServer.class);
......@@ -56,7 +56,7 @@ public class JettyServer {
server.setStopAtShutdown(true);
final ServletContextHandler context = new ServletContextHandler(server, "/");
context.addLifeCycleListener(new AbstractLifeCycle.AbstractLifeCycleListener() {
context.addEventListener(new AbstractLifeCycle.AbstractLifeCycleListener() {
Context ctx = context.getServletContext();
@Override
......
......@@ -10,7 +10,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-broker</artifactId>
<version>5.16.1</version>
<version>5.16.2</version>
<exclusions>
<exclusion>
<groupId>org.checkerframework</groupId>
......@@ -25,17 +25,17 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-kahadb-store</artifactId>
<version>5.16.1</version>
<version>5.16.2</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-amqp</artifactId>
<version>5.16.1</version>
<version>5.16.2</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-mqtt</artifactId>
<version>5.16.1</version>
<version>5.16.2</version>
</dependency>
</dependencies>
<name>CDStar: Embedded ActiveMQ Broker</name>
......
......@@ -11,22 +11,22 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
<version>5.16.1</version>
<version>5.16.2</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-amqp</artifactId>
<version>5.16.1</version>
<version>5.16.2</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-mqtt</artifactId>
<version>5.16.1</version>
<version>5.16.2</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-broker</artifactId>
<version>5.16.1</version>
<version>5.16.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
......
......@@ -10,7 +10,7 @@
<dependency>
<groupId>com.auth0</groupId>
<artifactId>java-jwt</artifactId>
<version>3.14.0</version>
<version>3.18.1</version>
<exclusions>
<exclusion>
<!-- Provided by parent pom and cdstar-runtime -->
......
......@@ -9,14 +9,6 @@ import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Predicate;
import javax.servlet.ServletContainerInitializer;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.ServletRegistration.Dynamic;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.junit.After;
import org.junit.Rule;
import org.junit.Test;
......@@ -39,6 +31,13 @@ import de.gwdg.cdstar.runtime.client.exc.VaultNotFound;
import de.gwdg.cdstar.server.jetty.JettyServer;
import de.gwdg.cdstar.ta.exc.TARollbackException;
import de.gwdg.cdstar.utils.test.TestLogger;
import jakarta.servlet.ServletContainerInitializer;
import jakarta.servlet.ServletContext;
import jakarta.servlet.ServletException;
import jakarta.servlet.ServletRegistration.Dynamic;
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
public class PushFilterTest {
private static final String TEST_VAULT = "test";
......
......@@ -16,12 +16,12 @@
<dependency>
<groupId>com.rabbitmq</groupId>
<artifactId>amqp-client</artifactId>
<version>5.11.0</version>
<version>5.13.0</version>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.19.0</version>
<version>3.20.2</version>
<scope>test</scope>
</dependency>
</dependencies>
......
......@@ -10,7 +10,7 @@
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
<version>3.5.2</version>
<version>3.6.3</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
......@@ -9,14 +9,15 @@
</parent>
<artifactId>cdstar-rest</artifactId>
<properties>
<jersey.version>2.33</jersey.version>
<jersey.version>3.0.2</jersey.version>
</properties>
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>5.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>de.gwdg.cdstar</groupId>
......@@ -29,7 +30,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.20</version>
<version>1.21</version>
</dependency>
<dependency>
<groupId>org.synchronoss.cloud</groupId>
......@@ -42,9 +43,15 @@
<version>2.3.31</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
<artifactId>jackson-jakarta-rs-json-provider</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<!-- Java 9+ does not bundle these. Required by jackson-jaxrs-json-provider/jackson-module-jaxb-annotations -->
......
......@@ -2,11 +2,6 @@ package de.gwdg.cdstar.rest.servlet;
import java.io.IOException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......@@ -20,6 +15,10 @@ import de.gwdg.cdstar.rest.RequestDispatcher;
import de.gwdg.cdstar.rest.RestConfigImpl;
import de.gwdg.cdstar.runtime.CDStarRuntime;
import de.gwdg.cdstar.runtime.RuntimeContext;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
public class ApiRootServlet extends HttpServlet {
private static final long serialVersionUID = 5564539332278878726L;
......
......@@ -13,13 +13,6 @@ import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import javax.servlet.AsyncEvent;
import javax.servlet.ReadListener;
import javax.servlet.ServletInputStream;
import javax.servlet.ServletOutputStream;
import javax.servlet.WriteListener;
import javax.servlet.http.HttpServletRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......@@ -30,6 +23,12 @@ import de.gwdg.cdstar.rest.api.AsyncCloseListener;
import de.gwdg.cdstar.rest.api.AsyncContext;
import de.gwdg.cdstar.rest.api.AsyncResultCallback;
import de.gwdg.cdstar.rest.api.RestContext;
import jakarta.servlet.AsyncEvent;
import jakarta.servlet.ReadListener;
import jakarta.servlet.ServletInputStream;
import jakarta.servlet.ServletOutputStream;
import jakarta.servlet.WriteListener;
import jakarta.servlet.http.HttpServletRequest;
public class AsyncContextImpl implements AsyncContext, WriteListener, ReadListener {
private static final Logger log = LoggerFactory.getLogger(AsyncContextImpl.class);
......@@ -63,7 +62,7 @@ public class AsyncContextImpl implements AsyncContext, WriteListener, ReadListen
}
private final RestContext ctx;
private final javax.servlet.AsyncContext servletContext;
private final jakarta.servlet.AsyncContext servletContext;
private ServletInputStream input;
private ServletOutputStream output;
......@@ -166,7 +165,7 @@ public class AsyncContextImpl implements AsyncContext, WriteListener, ReadListen
// If a handler forgets to call close() or abort(), then this listener
// does it and issues a warning.
servletContext.addListener(new javax.servlet.AsyncListener() {
servletContext.addListener(new jakarta.servlet.AsyncListener() {
void ensureClose() {
asyncRequests.remove(AsyncContextImpl.this);
......
......@@ -5,17 +5,16 @@ import java.util.EnumSet;
import java.util.HashSet;
import java.util.Set;
import javax.servlet.DispatcherType;
import javax.servlet.FilterRegistration;
import javax.servlet.ServletContainerInitializer;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.ServletRegistration;
import javax.servlet.annotation.WebListener;
import de.gwdg.cdstar.Utils;
import de.gwdg.cdstar.rest.utils.SessionHelper;
import de.gwdg.cdstar.runtime.RuntimeContext;
import jakarta.servlet.DispatcherType;
import jakarta.servlet.FilterRegistration;
import jakarta.servlet.ServletContainerInitializer;
import jakarta.servlet.ServletContext;
import jakarta.servlet.ServletException;
import jakarta.servlet.ServletRegistration;
import jakarta.servlet.annotation.WebListener;
@WebListener
public class CDStarServletInitializer implements ServletContainerInitializer {
......
......@@ -11,19 +11,19 @@ import java.util.Objects;
import java.util.Set;
import java.util.regex.Pattern;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.ServletException;
import javax.servlet.ServletOutputStream;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import jakarta.servlet.Filter;
import jakarta.servlet.FilterChain;
import jakarta.servlet.FilterConfig;
import jakarta.servlet.ServletException;
import jakarta.servlet.ServletOutputStream;
import jakarta.servlet.ServletRequest;
import jakarta.servlet.ServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
public class CORSFilter implements Filter {
private static final Logger log = LoggerFactory.getLogger(CORSFilter.class);
......
......@@ -2,19 +2,18 @@ package de.gwdg.cdstar.rest.servlet;
import java.io.IOException;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import de.gwdg.cdstar.Utils;
import jakarta.servlet.Filter;
import jakarta.servlet.FilterChain;
import jakarta.servlet.FilterConfig;
import jakarta.servlet.ServletException;
import jakarta.servlet.ServletRequest;
import jakarta.servlet.ServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequestWrapper;
/**
* Filter to honor X-HTTP-Method-Override headers for POST requests.
......
......@@ -3,12 +3,11 @@ package de.gwdg.cdstar.rest.servlet;
import java.io.IOException;
import java.net.URI;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import de.gwdg.cdstar.rest.RestContextBase;
import de.gwdg.cdstar.rest.api.AsyncContext;
import de.gwdg.cdstar.rest.api.RestContext;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
public class ServletRestContext extends RestContextBase {
private final HttpServletRequest rq;
......
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