Merge branch 'develop' into ELTER-25_SITESlogo

.gitignore

@@ -36,3 +36,4 @@ org.eclipse.*
 DevStartupController.java
 docker-compose.override.yml
 *.private.env.json
+/sparql.http

.gitlab-ci.yml

@@ -16,7 +16,7 @@ default:
 
 test_java:
   stage: test
-  image: gradle:7.2.0-jdk16
+  image: gradle:8.2-jdk17-alpine
   script: gradle test --no-daemon
   artifacts:
     when: always

.run/Run all tests.run.xml

@@ -9,4 +9,4 @@
       <option name="Make" enabled="true" />
     </method>
   </configuration>
-</component>
+</component>

Dockerfile

@@ -8,7 +8,7 @@ RUN npm install -g grunt-cli
 RUN node_modules/.bin/grunt
 
 # Build Java
-FROM gradle:7.2-jdk16 AS build-java
+FROM gradle:8.2-jdk17-alpine AS build-java
 WORKDIR /app
 COPY --chown=gradle:gradle java/src src/
 COPY --chown=gradle:gradle java/build.gradle .
@@ -18,7 +18,7 @@ WORKDIR build/libs
 RUN java -Djarmode=layertools -jar app.jar extract
 
 # Create production image
-FROM openjdk:16-alpine AS prod
+FROM eclipse-temurin:17-alpine AS prod
 LABEL maintainer="[email protected]"
 RUN apk --no-cache add curl
 RUN addgroup -g 1001 -S spring && adduser -u 1001 -S spring -G spring

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

java/build.gradle

@@ -1,8 +1,8 @@
 //file:noinspection GradlePackageUpdate
 plugins {
-    id 'org.springframework.boot' version '2.6.1'
-    id 'io.freefair.lombok' version '5.3.3.3'
-    id 'io.spring.dependency-management' version '1.0.11.RELEASE'
+    id 'org.springframework.boot' version '2.7.14'
+    id 'io.freefair.lombok' version '8.1.0'
+    id 'io.spring.dependency-management' version '1.1.2'
     id 'java'
 }
 
@@ -25,7 +25,7 @@ compileJava {
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(16))
+        languageVersion.set(JavaLanguageVersion.of(17))
     }
 }
 

java/src/main/java/uk/ac/ceh/gateway/catalogue/config/DevelopmentUserStoreConfig.java

@@ -189,6 +189,16 @@ public CatalogueUser sitesMetadataImport() throws UsernameAlreadyTakenException
         return user;
     }
 
+    @Bean
+    public CatalogueUser b2shareMetadataImport() throws UsernameAlreadyTakenException {
+        val user = new CatalogueUser()
+            .setUsername("B2SHARE metadata import")
+            .setEmail("[email protected]");
+        addUserToGroup(user, ELTER_EDITOR, ELTER_PUBLISHER);
+        userStore().addUser(user, "password");
+        return user;
+    }
+
     @Bean
     public CatalogueUser erammpEditor() throws UsernameAlreadyTakenException {
         val user = new CatalogueUser()