Gitlab Community Edition Instance

Skip to content

GitLab

Commit 2391ddbc authored by mhellka's avatar mhellka
Browse files

Updated dependencies and prepared soruce for Java 17

parent c1d1b675
Pipeline #279769 failed with stages
in 3 minutes and 12 seconds
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
View file @ 2391ddbc
......@@ -22,6 +22,14 @@ test-java-11:
- chown -R notroot:notroot .
- su notroot -c "$MVN clean test verify"
test-java-17:
stage: test
image: maven:3-jdk-17
script:
- useradd -m notroot
- chown -R notroot:notroot .
- su notroot -c "$MVN clean test verify"
deploy-docker-release:
stage: deploy
image: maven:3-jdk-11
......
cdstar-backend-nio/pom.xml
View file @ 2391ddbc
......@@ -31,7 +31,6 @@
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
<version>3.0.3</version>
</dependency>
<dependency>
<groupId>de.gwdg.cdstar</groupId>
......
cdstar-cli/pom.xml
View file @ 2391ddbc
......@@ -76,7 +76,7 @@
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
<version>1.7.0</version>
<version>3.2.0</version>
<configuration>
<from><image>gcr.io/distroless/java:11</image></from>
<container>
......@@ -125,17 +125,17 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>2.16.0</version>
<version>2.17.2</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.16.0</version>
<version>2.17.2</version>
</dependency>
<dependency>
<groupId>info.picocli</groupId>
<artifactId>picocli</artifactId>
<version>4.6.1</version>
<version>4.6.3</version>
</dependency>
</dependencies>
<name>CDStar: Commandline Interface</name>
......
cdstar-common/pom.xml
View file @ 2391ddbc
......@@ -23,7 +23,7 @@
<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
<version>4.0.0</version>
<version>4.9.10</version>
<executions>
<execution>
<id>get-the-git-infos</id>
......@@ -64,7 +64,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<id>add-resource</id>
......
cdstar-elastic-ingest/pom.xml
View file @ 2391ddbc
<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">
<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>
......@@ -11,7 +13,7 @@
<name>CDStar: Elasticsearch ingest service</name>
<description>Sandalone service appliction to integrate cdstar with elasticsearch.</description>
<properties>
<tika.version>2.0.0</tika.version>
<tika.version>2.3.0</tika.version>
</properties>
......@@ -43,12 +45,15 @@
</filter>
</filters>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<transformer
implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<!-- apache cxf may break in shaded jars without this -->
<resource>META-INF/cxf/bus-extensions.txt</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<transformer
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<manifestEntries>
<X-Compile-Source-JDK>${maven.compile.source}</X-Compile-Source-JDK>
<X-Compile-Target-JDK>${maven.compile.target}</X-Compile-Target-JDK>
......@@ -66,11 +71,27 @@
</profile>
</profiles>
<!-- Fix (traversiv) depdendency conflicts -->
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.12.0</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<version>1.70</version>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
<version>1.7.32</version>
<version>1.7.36</version>
</dependency>
<dependency>
......@@ -97,28 +118,21 @@
<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>
<!-- Part of Java, produces errors in 9+ compilers if present twice -->
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
<version>5.16.2</version>
<version>5.16.4</version>
</dependency>
<dependency>
<groupId>com.github.sbtourist</groupId>
......@@ -144,12 +158,16 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-broker</artifactId>
<version>5.16.2</version>
<version>5.16.4</version>
<scope>test</scope>
</dependency>
<dependency>
......@@ -177,7 +195,7 @@
<dependency>
<groupId>info.picocli</groupId>
<artifactId>picocli</artifactId>
<version>4.6.1</version>
<version>4.6.3</version>
</dependency>
<dependency>
<groupId>de.gwdg.cdstar</groupId>
......@@ -191,7 +209,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.7</version>
<version>1.2.10</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
cdstar-jetty/pom.xml
View file @ 2391ddbc
......@@ -8,7 +8,7 @@
<artifactId>cdstar-jetty</artifactId>
<properties>
<jetty.version>11.0.6</jetty.version>
<jetty.version>11.0.8</jetty.version>
</properties>
<dependencies>
......
cdstar-plugins-pom/cdstar-activemq-embedded/pom.xml
View file @ 2391ddbc
......@@ -6,11 +6,16 @@
<version>3.1.0-SNAPSHOT</version>
</parent>
<artifactId>cdstar-activemq-embedded</artifactId>
<properties>
<activemq.version>5.16.4</activemq.version>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-broker</artifactId>
<version>5.16.2</version>
<version>${activemq.version}</version>
<exclusions>
<exclusion>
<groupId>org.checkerframework</groupId>
......@@ -25,17 +30,17 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-kahadb-store</artifactId>
<version>5.16.2</version>
<version>${activemq.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-amqp</artifactId>
<version>5.16.2</version>
<version>${activemq.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-mqtt</artifactId>
<version>5.16.2</version>
<version>${activemq.version}</version>
</dependency>
</dependencies>
<name>CDStar: Embedded ActiveMQ Broker</name>
......
cdstar-plugins-pom/cdstar-activemq-sink/pom.xml
View file @ 2391ddbc
......@@ -6,27 +6,30 @@
<version>3.1.0-SNAPSHOT</version>
</parent>
<artifactId>cdstar-activemq-sink</artifactId>
<properties>
<activemq.version>5.16.4</activemq.version>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
<version>5.16.2</version>
<version>${activemq.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-amqp</artifactId>
<version>5.16.2</version>
<version>${activemq.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-mqtt</artifactId>
<version>5.16.2</version>
<version>${activemq.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-broker</artifactId>
<version>5.16.2</version>
<version>${activemq.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
......
cdstar-plugins-pom/cdstar-auth-jwt/pom.xml
View file @ 2391ddbc
......@@ -10,7 +10,7 @@
<dependency>
<groupId>com.auth0</groupId>
<artifactId>java-jwt</artifactId>
<version>3.18.1</version>
<version>3.18.3</version>
<exclusions>
<exclusion>
<!-- Provided by parent pom and cdstar-runtime -->
......
cdstar-rest/pom.xml
View file @ 2391ddbc
......@@ -9,7 +9,7 @@
</parent>
<artifactId>cdstar-rest</artifactId>
<properties>
<jersey.version>3.0.2</jersey.version>
<jersey.version>3.0.4</jersey.version>
</properties>
<dependencies>
......@@ -53,13 +53,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<!-- Java 9+ does not bundle these. Required by jackson-jaxrs-json-provider/jackson-module-jaxb-annotations -->
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.4.0-b180830.0359</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-multipart</artifactId>
......
cdstar-rest/src/test/java/de/gwdg/cdstar/rest/v3/PartialUploadTest.java
View file @ 2391ddbc
......@@ -14,15 +14,14 @@ import java.net.Socket;
import java.net.UnknownHostException;
import java.nio.charset.StandardCharsets;
import jakarta.ws.rs.client.Entity;
import jakarta.ws.rs.core.Response.Status;
import org.junit.Before;
import org.junit.Test;
import de.gwdg.cdstar.Utils;
import de.gwdg.cdstar.rest.BaseRestTest;
import de.gwdg.cdstar.rest.TestDataStream;
import jakarta.ws.rs.client.Entity;
import jakarta.ws.rs.core.Response.Status;
public class PartialUploadTest extends BaseRestTest {
......@@ -127,9 +126,9 @@ public class PartialUploadTest extends BaseRestTest {
target(fileUrl).request()
.header("X-Transaction", tx)
.header("Range", "bytes=" + currentSize + "-")
.build("PATCH",
Entity.entity("0123456789", "application/vnd.cdstar.resume"))
.invoke();
.header("X-HTTP-Method-Override", "PATCH")
.post(Entity.entity("0123456789", "application/vnd.cdstar.resume"));
// Java 17+ broke PATCH requests with the default client connector, so we work around this here.
// We added 10 bytes
assertEquals(currentSize + 10, getActualSize());
......
cdstar-runtime/pom.xml
View file @ 2391ddbc
......@@ -47,18 +47,18 @@
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet</artifactId>
<version>3.0.2</version>
<version>3.0.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.github.classgraph</groupId>
<artifactId>classgraph</artifactId>
<version>4.8.110</version>
<version>4.8.141</version>
</dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-core</artifactId>
<version>4.2.3</version>
<version>4.2.8</version>
</dependency>
<dependency>
<groupId>de.gwdg.cdstar</groupId>
......
cdstar-test-utils/pom.xml
View file @ 2391ddbc
......@@ -10,12 +10,12 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.7</version>
<version>1.2.10</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
<version>1.7.32</version>
<version>1.7.36</version>
</dependency>
<dependency>
<groupId>junit</groupId>
......
cdstar-tm-disk/pom.xml
View file @ 2391ddbc
<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</groupId>
<artifactId>cdstar-pom</artifactId>
<version>3.1.0-SNAPSHOT</version>
</parent>
<artifactId>cdstar-tm-disk</artifactId>
<dependencies>
<dependency>
<groupId>de.gwdg.cdstar</groupId>
<artifactId>cdstar-api</artifactId>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
<groupId>de.gwdg.cdstar</groupId>
<artifactId>cdstar-common</artifactId>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>2.0.2-beta</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>de.gwdg.cdstar</groupId>
<artifactId>cdstar-config</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>de.gwdg.cdstar</groupId>
<artifactId>cdstar-test-utils</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<name>CDStar Transaction Manager: File based</name>
<description>File based implementation of the transaction manager interface</description>
<?xml version="1.0" encoding="UTF-8"?>
<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</groupId>
<artifactId>cdstar-pom</artifactId>
<version>3.1.0-SNAPSHOT</version>
</parent>
<artifactId>cdstar-tm-disk</artifactId>
<dependencies>
<dependency>
<groupId>de.gwdg.cdstar</groupId>
<artifactId>cdstar-api</artifactId>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
<groupId>de.gwdg.cdstar</groupId>
<artifactId>cdstar-common</artifactId>
</dependency>
<dependency>
<groupId>de.gwdg.cdstar</groupId>
<artifactId>cdstar-config</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>de.gwdg.cdstar</groupId>
<artifactId>cdstar-test-utils</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<name>CDStar Transaction Manager: File based</name>
<description>File based implementation of the transaction manager interface</description>
</project>
\ No newline at end of file
cdstar-tm-disk/src/test/java/de/gwdg/cdstar/tm/DiskTransactionTests.java
View file @ 2391ddbc
......@@ -12,8 +12,8 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import org.mockito.ArgumentMatchers;
import org.mockito.InOrder;
import org.mockito.Matchers;
import org.mockito.Mockito;
import de.gwdg.cdstar.config.MapConfig;
......@@ -82,7 +82,7 @@ public class DiskTransactionTests {
@Test
public void testFailedPrepareLifecycle() throws Exception {
final TAResource mocked = Mockito.mock(TAResource.class);
Mockito.doThrow(new RuntimeException("I'm just a test")).when(mocked).prepare(Matchers.any());
Mockito.doThrow(new RuntimeException("I'm just a test")).when(mocked).prepare(ArgumentMatchers.any());
final UserTransaction ut = tm.begin();
ut.bind(mocked);
......@@ -166,11 +166,11 @@ public class DiskTransactionTests {
public void testRecoveryBehaviour() throws Exception {
final TAResource mocked = Mockito.mock(TAResource.class);
final TestRecoveryHandler mRecover = new TestRecoveryHandler();
Mockito.doThrow(new RuntimeException("I'm just a test")).when(mocked).commit(Matchers.any());
Mockito.doThrow(new RuntimeException("I'm just a test")).when(mocked).commit(ArgumentMatchers.any());
Mockito.doAnswer(invocation -> {
invocation.getArgumentAt(0, TransactionHandle.class).bindRecoveryHandler(mRecover);
invocation.getArgument(0, TransactionHandle.class).bindRecoveryHandler(mRecover);
return null;
}).when(mocked).bind(Matchers.any());
}).when(mocked).bind(ArgumentMatchers.any());
// No jump head-first into a disaster!
final UserTransaction ut = tm.begin();
......
pom.xml
View file @ 2391ddbc
......@@ -23,8 +23,8 @@
<developerConnection>scm:git:ssh://git@gitlab.gwdg.de/~/cdstar/cdstar.git</developerConnection>
<connection>scm:git:https://gitlab.gwdg.de/cdstar/cdstar.git</connection>
<url>https://gitlab.gwdg.de/cdstar/cdstar.git</url>
<tag>HEAD</tag>
</scm>
<tag>HEAD</tag>
</scm>
<issueManagement>
<system>GitLab</system>
......@@ -114,12 +114,12 @@
<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>3.0.0</version>
<version>3.2.2</version>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.0</version>
<version>3.2.2</version>
</plugin>
<plugin>
......@@ -139,12 +139,12 @@
<plugin>
<artifactId>maven-war-plugin</artifactId>
<version>3.3.1</version>
<version>3.3.2</version>
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>3.9.1</version>
<version>3.11.0</version>
</plugin>
<plugin>
......@@ -164,17 +164,17 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<version>3.10.0</version>
</plugin>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M2</version>
<version>3.0.0-M3</version>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>3.1.0</version>
<version>3.2.0</version>
</plugin>
<plugin>
......@@ -184,12 +184,12 @@
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.1.2</version>
<version>3.2.0</version>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.3.0</version>
<version>3.3.2</version>
</plugin>
<plugin>
......@@ -200,7 +200,13 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.8.1</version>
<version>2.9.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.3.0</version>
</plugin>
</plugins>
......@@ -272,9 +278,9 @@
<configuration>
<rules>
<requireMavenVersion>
<version>3.0.5</version>
<version>3.2.5</version>
</requireMavenVersion>
<DependencyConvergence />
<dependencyConvergence></dependencyConvergence>
<bannedDependencies>
<excludes>
<exclude>org.slf4j:slf4j-log4j12</exclude>
......@@ -441,17 +447,17 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.32</version>
<version>1.7.36</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.32</version>
<version>1.7.36</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.32</version>
<version>1.7.36</version>
</dependency>
<dependency>
<groupId>junit</groupId>
......@@ -461,7 +467,7 @@