Demo fix

gentics · Sep 10, 2024 · afb1b59 · afb1b59
1 parent 6073be5
commit afb1b59
Show file tree

Hide file tree

Showing 7 changed files with 68 additions and 40 deletions.
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -34,6 +34,7 @@
 		<aws.sdk.version>2.16.83</aws.sdk.version>
 		<snakeyaml.version>1.30</snakeyaml.version>
 		<testcontainers.version>1.19.4</testcontainers.version>
+		<log4j.version>2.17.1</log4j.version>
 	</properties>
 
 	<!-- IMPORTANT: Always keep dependencies in-sync with mesh-plugin-parent pom in order to avoid duplicate libraries in shaded plugin jars -->
@@ -157,16 +158,31 @@
 				<groupId>org.apache.tika</groupId>
 				<artifactId>tika-parsers-standard-package</artifactId>
 				<version>${tika.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>org.slf4j</groupId>
+  						<artifactId>slf4j-api</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>org.slf4j</groupId>
+  						<artifactId>jcl-over-slf4j</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.tika</groupId>
 				<artifactId>tika-core</artifactId>
 				<version>${tika.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.tika</groupId>
-				<artifactId>tika-parser-scientific-package</artifactId>
-				<version>${tika.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>org.slf4j</groupId>
+  						<artifactId>slf4j-api</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>org.slf4j</groupId>
+  						<artifactId>jcl-over-slf4j</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 
 			<!-- Spring - bcrypt -->

diff --git a/core/pom.xml b/core/pom.xml
@@ -105,6 +105,14 @@
 					<groupId>com.zaxxer</groupId>
 					<artifactId>HikariCP-java7</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-api</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>jcl-over-slf4j</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
@@ -115,15 +123,13 @@
 					<groupId>com.zaxxer</groupId>
 					<artifactId>HikariCP-java7</artifactId>
 				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tika</groupId>
-			<artifactId>tika-parser-scientific-package</artifactId>
-			<exclusions>
 				<exclusion>
-					<groupId>com.zaxxer</groupId>
-					<artifactId>HikariCP-java7</artifactId>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-api</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>jcl-over-slf4j</artifactId>
 				</exclusion>
 			</exclusions>
 		</dependency>

diff --git a/doc/src/main/java/com/gentics/mesh/generator/DatabaseRevisionTableGenerator.java b/doc/src/main/java/com/gentics/mesh/generator/DatabaseRevisionTableGenerator.java
@@ -8,8 +8,9 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
-import org.apache.cxf.helpers.IOUtils;
+import org.apache.commons.io.IOUtils;
 
 import com.gentics.mesh.Mesh;
 import com.gentics.mesh.graphdb.OrientDBDatabase;
@@ -61,7 +62,7 @@ public void run() throws MalformedURLException, Exception {
 			VersionNumber parsedVersion = VersionNumber.parse(version);
 			if (parsedVersion != null && parsedVersion.compareTo(VersionNumber.parse("0.16.1")) >= 0) {
 				URL revisionFileUrl = new URL(BASE_PATH + version + "/" + "mesh-orientdb-" + version + "-revision.txt");
-				String hash = IOUtils.readStringFromStream(revisionFileUrl.openStream());
+				String hash = IOUtils.readLines(revisionFileUrl.openStream(), "UTF-8").stream().collect(Collectors.joining());
 				System.out.println("Found version {" + version + "} with hash {" + hash + "}");
 				Map<String, String> map = new HashMap<>();
 				map.put("version", version);

diff --git a/plugin-parent/pom.xml b/plugin-parent/pom.xml
@@ -132,6 +132,14 @@
 					<groupId>com.zaxxer</groupId>
 					<artifactId>HikariCP-java7</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-api</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>jcl-over-slf4j</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
@@ -143,16 +151,13 @@
 					<groupId>com.zaxxer</groupId>
 					<artifactId>HikariCP-java7</artifactId>
 				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tika</groupId>
-			<artifactId>tika-parser-scientific-package</artifactId>
-			<scope>provided</scope>
-			<exclusions>
 				<exclusion>
-					<groupId>com.zaxxer</groupId>
-					<artifactId>HikariCP-java7</artifactId>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-api</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>jcl-over-slf4j</artifactId>
 				</exclusion>
 			</exclusions>
 		</dependency>

diff --git a/services/image-imgscalr/pom.xml b/services/image-imgscalr/pom.xml
@@ -44,6 +44,14 @@
 					<groupId>com.zaxxer</groupId>
 					<artifactId>HikariCP-java7</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-api</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>jcl-over-slf4j</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
@@ -54,15 +62,13 @@
 					<groupId>com.zaxxer</groupId>
 					<artifactId>HikariCP-java7</artifactId>
 				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tika</groupId>
-			<artifactId>tika-parser-scientific-package</artifactId>
-			<exclusions>
 				<exclusion>
-					<groupId>com.zaxxer</groupId>
-					<artifactId>HikariCP-java7</artifactId>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-api</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>jcl-over-slf4j</artifactId>
 				</exclusion>
 			</exclusions>
 		</dependency>

diff --git a/tests/tests-core/src/main/java/com/gentics/mesh/core/user/AuthenticationEndpointTest.java b/tests/tests-core/src/main/java/com/gentics/mesh/core/user/AuthenticationEndpointTest.java
@@ -3,7 +3,6 @@
 import static com.gentics.mesh.test.ClientHelper.call;
 import static com.gentics.mesh.test.TestSize.FULL;
 import static io.netty.handler.codec.http.HttpResponseStatus.UNAUTHORIZED;
-import static org.apache.http.HttpHeaders.AUTHORIZATION;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
@@ -129,7 +128,7 @@ public void testBasicAuth() throws IOException {
 		Response response = client.newCall(new Request.Builder()
 			.get()
 			.url(String.format("http://%s:%s/api/v2/auth/login", "localhost", port()))
-			.header(AUTHORIZATION, "Basic " + base64("admin:admin"))
+			.header("Authorization", "Basic " + base64("admin:admin"))
 			.build()).execute();
 
 		assertThat(response.code()).isEqualTo(200);

diff --git a/tests/tests-core/src/main/java/com/gentics/mesh/search/ElasticSearchProviderTimeoutTest.java b/tests/tests-core/src/main/java/com/gentics/mesh/search/ElasticSearchProviderTimeoutTest.java
@@ -10,24 +10,19 @@
 import java.net.URL;
 import java.time.Duration;
 import java.util.Optional;
-import java.util.concurrent.TimeoutException;
 import java.util.stream.IntStream;
 
-import org.apache.http.HttpStatus;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import com.gentics.mesh.core.db.Tx;
-import com.gentics.mesh.core.rest.MeshEvent;
 import com.gentics.mesh.core.rest.user.UserListResponse;
 import com.gentics.mesh.etc.config.search.ElasticSearchOptions;
 import com.gentics.mesh.test.MeshTestSetting;
 import com.gentics.mesh.test.TestSize;
 import com.gentics.mesh.test.context.AbstractMeshTest;
-import com.gentics.mesh.test.helper.ExpectedEvent;
 
 import io.vertx.core.http.HttpMethod;
 import io.vertx.core.http.HttpServerOptions;
@@ -149,7 +144,7 @@ public void testResumeQueriesAfterBlackout() throws IOException, InterruptedExce
 	@Test
 	public void testResumeQueriesAfterGatewayTimeout() throws IOException, InterruptedException {
 		timeout = false;
-		maybeCustomStatus = Optional.of(HttpStatus.SC_GATEWAY_TIMEOUT);
+		maybeCustomStatus = Optional.of(504 /*SC_GATEWAY_TIMEOUT*/);
 		String json = getESText("userWildcard.es");
 		call(() -> client().searchUsers(json), INTERNAL_SERVER_ERROR);
 		// reset