You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2024/10/16 17:37:37 UTC
(tika) 01/01: TIKA-4321 -- rm solr 6 and 7 unit tests and turn logging to error.
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch TIKA-4321
in repository https://gitbox.apache.org/repos/asf/tika.git
commit d18a39d7ec53dda735064a7e89f9194e334da46f
Author: tallison <ta...@apache.org>
AuthorDate: Wed Oct 16 13:37:23 2024 -0400
TIKA-4321 -- rm solr 6 and 7 unit tests and turn logging to error.
---
.../tika/pipes/solr/tests/TikaPipesSolr6Test.java | 49 ----------------------
.../pipes/solr/tests/TikaPipesSolr6ZkTest.java | 41 ------------------
.../tika/pipes/solr/tests/TikaPipesSolr7Test.java | 33 ---------------
.../pipes/solr/tests/TikaPipesSolr7ZkTest.java | 42 -------------------
.../tika/pipes/solr/tests/TikaPipesSolr8Test.java | 2 +-
.../tika/pipes/solr/tests/TikaPipesSolr9Test.java | 2 +-
.../src/test/resources/log4j2.xml | 4 +-
tika-parent/pom.xml | 2 +-
8 files changed, 5 insertions(+), 170 deletions(-)
diff --git a/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr6Test.java b/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr6Test.java
deleted file mode 100644
index 3cb6a6d20..000000000
--- a/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr6Test.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.tika.pipes.solr.tests;
-
-import static org.junit.jupiter.api.Assumptions.assumeTrue;
-
-import org.junit.jupiter.api.BeforeAll;
-import org.testcontainers.junit.jupiter.Testcontainers;
-
-import org.apache.tika.utils.SystemUtils;
-
-@Testcontainers(disabledWithoutDocker = true)
-public class TikaPipesSolr6Test extends TikaPipesSolrTestBase {
- @BeforeAll
- public static void setUp() {
- assumeTrue(!SystemUtils.IS_OS_MAC_OSX && !SystemUtils.OS_VERSION.equals("12.6.1"),
- "This stopped working on macos x ... TIKA-3932");
- }
- @Override
- public boolean useZk() {
- return false;
- }
-
- @Override
- public String getSolrImageName() {
- return "solr:6";
- }
-
- @Override
- public boolean handlesParentChild() {
- //Solr 6 didn't automatically set _root_ with the parent-child indexing,
- //apparently
- return false;
- }
-}
diff --git a/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr6ZkTest.java b/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr6ZkTest.java
deleted file mode 100644
index 221d1e277..000000000
--- a/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr6ZkTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.tika.pipes.solr.tests;
-
-import static org.junit.jupiter.api.Assumptions.assumeTrue;
-
-import org.junit.jupiter.api.BeforeAll;
-import org.testcontainers.junit.jupiter.Testcontainers;
-
-import org.apache.tika.utils.SystemUtils;
-
-@Testcontainers(disabledWithoutDocker = true)
-public class TikaPipesSolr6ZkTest extends TikaPipesSolr6Test {
-
- @BeforeAll
- public static void setUp() {
- assumeTrue(
- SystemUtils.IS_OS_UNIX && !SystemUtils.IS_OS_MAC_OSX,
- "zk test only works on linux (and not mac os x)");
- }
-
- @Override
- public boolean useZk() {
- return true;
- }
-
-}
diff --git a/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr7Test.java b/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr7Test.java
deleted file mode 100644
index efefedf44..000000000
--- a/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr7Test.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.tika.pipes.solr.tests;
-
-import org.testcontainers.junit.jupiter.Testcontainers;
-
-@Testcontainers(disabledWithoutDocker = true)
-public class TikaPipesSolr7Test extends TikaPipesSolrTestBase {
-
- @Override
- public boolean useZk() {
- return false;
- }
-
- @Override
- public String getSolrImageName() {
- return "solr:7";
- }
-}
diff --git a/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr7ZkTest.java b/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr7ZkTest.java
deleted file mode 100644
index 875afe223..000000000
--- a/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr7ZkTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.tika.pipes.solr.tests;
-
-import static org.junit.jupiter.api.Assumptions.assumeTrue;
-
-import org.junit.jupiter.api.BeforeAll;
-import org.testcontainers.junit.jupiter.Testcontainers;
-
-import org.apache.tika.utils.SystemUtils;
-
-@Testcontainers(disabledWithoutDocker = true)
-public class TikaPipesSolr7ZkTest extends TikaPipesSolr7Test {
-
- @BeforeAll
- public static void setUp() {
- assumeTrue(
- SystemUtils.IS_OS_UNIX && !SystemUtils.IS_OS_MAC_OSX,
- "zk test only works on linux (and not mac os x)");
- }
-
-
- @Override
- public boolean useZk() {
- return true;
- }
-
-}
diff --git a/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr8Test.java b/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr8Test.java
index e04dc59fb..8b87db6a1 100644
--- a/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr8Test.java
+++ b/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr8Test.java
@@ -23,7 +23,7 @@ public class TikaPipesSolr8Test extends TikaPipesSolrTestBase {
@Override
public String getSolrImageName() {
- return "solr:8.11.2";
+ return "solr:8.11.4";
}
@Override
diff --git a/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr9Test.java b/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr9Test.java
index d4f7b7382..f60cdd696 100644
--- a/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr9Test.java
+++ b/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr9Test.java
@@ -23,7 +23,7 @@ public class TikaPipesSolr9Test extends TikaPipesSolrTestBase {
@Override
public String getSolrImageName() {
- return "solr:9.3";
+ return "solr:9.7.0";
}
@Override
diff --git a/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/resources/log4j2.xml b/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/resources/log4j2.xml
index c88e66e99..4b85ea2fe 100644
--- a/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/resources/log4j2.xml
+++ b/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/resources/log4j2.xml
@@ -18,14 +18,14 @@
specific language governing permissions and limitations
under the License.
-->
-<Configuration status="WARN">
+<Configuration>
<Appenders>
<Console name="Console" target="SYSTEM_ERR">
<PatternLayout pattern="%-5p [%t] %d{HH:mm:ss,SSS} %c %m%n"/>
</Console>
</Appenders>
<Loggers>
- <Root level="info">
+ <Root level="error">
<AppenderRef ref="Console"/>
</Root>
</Loggers>
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index 6abd0bc79..d553c3be5 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -426,7 +426,7 @@
<slf4j.version>2.0.16</slf4j.version>
<sis.version>1.4</sis.version>
<snappy.version>1.1.10.7</snappy.version>
- <solrj.version>8.11.4</solrj.version>
+ <solrj.version>9.7.0</solrj.version>
<!-- NOTE: Spring 6 requires jdk17 -->
<spring.version>5.3.39</spring.version>
<sqlite.version>3.46.1.3</sqlite.version>