Search improvements

.github/workflows/ci-build.yml

@@ -0,0 +1,64 @@
+name: CI Build
+on:
+  workflow_dispatch:
+  pull_request:
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.experimental }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - version: 8
+            experimental: false
+          - version: 11
+            experimental: true
+
+    steps:
+      - name: Checkout ICAT Client
+        uses: actions/checkout@v2
+
+      - name: Set up JDK
+        uses: actions/setup-java@v2
+        with:
+          java-version: ${{ matrix.version }}
+          distribution: 'temurin'
+
+      - name: Installation
+        run: |
+          sudo pip install wheel ansible pycrypto
+          sudo add-apt-repository universe
+          sudo apt-get update
+
+      - name: Setup python2
+        run: |
+          sudo apt install python2
+          curl https://bootstrap.pypa.io/pip/2.7/get-pip.py --output get-pip.py
+          sudo python2 get-pip.py
+          sudo python2 -m pip install requests requests_toolbelt
+
+      - name: Checkout ICAT Ansible
+        uses: actions/checkout@v2
+        with:
+          repository: icatproject-contrib/icat-ansible
+          path: icat-ansible
+
+      - name: Setup Ansible
+        run: |
+          cd icat-ansible
+          echo -e "[icat-client-dev-hosts]\nlocalhost ansible_connection=local" > hosts
+          echo -e "icattravispw" > vault_pass.txt
+          mv ../vault.yml ./group_vars/all
+          mv ../icat-client-dev-hosts.yml .
+          sed -i -e "s/^payara_user: \"glassfish\"/payara_user: \"runner\"/" ./group_vars/all/vars.yml
+          sed -i -e "s/python-pip/python3-pip/" ./roles/dev-common/tasks/main.yml
+          ansible-playbook --vault-password-file ./vault_pass.txt --inventory ./hosts ./icat-client-dev-hosts.yml
+          cd ..
+
+      - name: Test with Maven
+        run: mvn -DserverUrl=https://$(hostname -f):8181 test -B

README.md

@@ -1,6 +1,6 @@
 # icat.client: Clients for ICAT
 
-[![Build Status](https://travis-ci.org/icatproject/icat.client.svg?branch=master)](https://travis-ci.org/icatproject/icat.client)
+[![Build Status](https://github.com/icatproject/icat.client/workflows/CI%20Build/badge.svg?branch=master)](https://github.com/icatproject/icat.client/actions?query=workflow%3A%22CI+Build%22)
 
 General installation instructions are at https://icatproject.org/installation/component
 

pom.xml

@@ -3,7 +3,7 @@
 
 	<groupId>org.icatproject</groupId>
 	<artifactId>icat.client</artifactId>
-	<version>6.0.1-SNAPSHOT</version>
+	<version>6.1.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>ICAT Clients</name>
 	<description>Provides facilities to login to an ICAT instance after which one can create, read, update or delete entities according to your permissions. This includes a Java client using SOAP access and a Java client using the REST interface of the icat.server.</description>
@@ -14,7 +14,6 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<project.scm.id>github</project.scm.id>
 		<repoUrl>https://repo.icatproject.org/repo/</repoUrl>
-		<luceneVersion>5.3.0</luceneVersion>
 	</properties>
 
 	<repositories>
@@ -62,12 +61,6 @@
 
 	<dependencies>
 
-		<dependency>
-			<groupId>org.apache.lucene</groupId>
-			<artifactId>lucene-core</artifactId>
-			<version>${luceneVersion}</version>
-		</dependency>
-
 		<dependency>
 			<groupId>jakarta.platform</groupId>
 			<artifactId>jakarta.jakartaee-api</artifactId>
@@ -298,4 +291,3 @@
 	</reporting>
 
 </project>
-