[TASK] Apache Solr 9.6 compatibility

Adjusts the tests to test against Apache Solr 9.6 and ensures the test implementation ist compatible. This commit also updates the dependencies and sets the version to 6.1 Resolves: #29
TYPO3-Solr · May 16, 2024 · 21caefc · 21caefc
1 parent a5393e3
commit 21caefc
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 31 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,10 +14,10 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
-    - name: Set up JDK 11 for x64
+    - name: Set up JDK 17 for x64
       uses: actions/setup-java@v4
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'temurin'
         architecture: x64
 

diff --git a/README.md b/README.md
@@ -1,10 +1,10 @@
 
-[![Travis Build Status](https://travis-ci.org/TYPO3-Solr/solr-typo3-plugin.svg?branch=master)](https://travis-ci.org/TYPO3-Solr/solr-typo3-plugin/builds)
+[![GitHub Build Status](https://github.com/TYPO3-Solr/solr-typo3-plugin/actions/workflows/ci.yml/badge.svg)
 
 # Solr TYPO3 Plugin
 
-The Solr TYPO3 plugin provides the AccessFilterQParserPlugin, which is a 
-org.apache.solr.search.QParserPlugin that allows to restrict access to Solr 
+The Solr TYPO3 plugin provides the AccessFilterQParserPlugin, which is a
+org.apache.solr.search.QParserPlugin that allows to restrict access to Solr
 documents indexed by TYPO3 on a document level.
 
 It filters the documents returned from a query by performing set operations
@@ -40,7 +40,7 @@ In your schema.xml add a field like this:
 <field name="access" type="string" indexed="false" stored="true" docValues="true" default="c:0" />
 ```
 
-It is important to turn on DocValues. The field does not need to be stored, 
+It is important to turn on DocValues. The field does not need to be stored,
 but it helps with debugging.
 
 

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.typo3.solr</groupId>
     <artifactId>solr-typo3-plugin</artifactId>
-    <version>6.0.0</version>
+    <version>6.1.0</version>
     <packaging>jar</packaging>
     <name>Solr TYPO3 Plugin</name>
     <description>A plugin for Solr to implement TYPO3 support functionality.</description>
@@ -56,30 +56,30 @@
     </organization>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <solr.version>9.3.0</solr.version>
+        <solr.version>9.6.0</solr.version>
         <timestamp>${maven.build.timestamp}</timestamp>
-        <java.compat.version>11</java.compat.version>
+        <java.compat.version>17</java.compat.version>
     </properties>
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.11.0</version>
+                <version>3.13.0</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>1.17</source>
+                    <target>1.17</target>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.surefire</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.0</version>
+                <version>3.2</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.4.1</version>
+                <version>3.5.3</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -123,17 +123,17 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>3.2</version>
+                <version>3.3</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
-                <version>3.20</version>
+                <version>3.22</version>
                 <configuration>
                     <linkXRef>true</linkXRef>
                     <sourceEncoding>utf-8</sourceEncoding>
                     <minimumTokens>100</minimumTokens>
-                    <targetJdk>1.8</targetJdk>
+                    <targetJdk>1.17</targetJdk>
                 </configuration>
             </plugin>
             <plugin>
@@ -144,25 +144,25 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>findbugs-maven-plugin</artifactId>
-                <version>3.0.3</version>
+                <version>3.0.6</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.5.0</version>
+                <version>3.6.3</version>
             </plugin>
             <plugin>
                 <groupId>com.github.spotbugs</groupId>
                 <artifactId>spotbugs/spotbugs-maven-plugin</artifactId>
-                <version>4.7</version>
+                <version>4.8</version>
             </plugin>
         </plugins>
     </reporting>
     <dependencies>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-jdk14</artifactId>
-            <version>1.6.1</version>
+            <version>2.0.13</version>
             <type>jar</type>
             <scope>test</scope>
         </dependency>
@@ -180,12 +180,12 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.3.2</version>
+            <version>3.14.0</version>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
-            <version>1.2</version>
+            <version>1.3.1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/src/test/java/org/typo3/solr/search/AccessFilterQParserPluginTest.java b/src/test/java/org/typo3/solr/search/AccessFilterQParserPluginTest.java
@@ -38,13 +38,9 @@ public class AccessFilterQParserPluginTest extends RestTestBase {
 
     public static final Logger log = LoggerFactory.getLogger(AccessFilterQParserPluginTest.class);
 
-    private static final String collection = "collection1";
-    private static final String confDir = collection + "/conf";
-
     @Before
     public void before() throws Exception {
         File tmpSolrHome = createTempDir().toFile();
-        File tmpConfDir = new File(tmpSolrHome, confDir);
         FileUtils.copyDirectory(new File(TEST_HOME()), tmpSolrHome.getAbsoluteFile());
 
         createJettyAndHarness(
@@ -59,11 +55,9 @@ public void before() throws Exception {
 
     @After
     public void after() throws Exception {
-        if (jetty != null) {
-            jetty.stop();
-            jetty = null;
+        if (getJetty().isRunning()) {
+            getJetty().stop();
         }
-        client = null;
         if (restTestHarness != null) {
             restTestHarness.close();
         }