diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 08c10a114a1364278d275b774fb2590d5ad2c094..676984625ec10bb33cf925abccd44873b3e4a473 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: maven:3.8-openjdk-17
+image: possommi/work:multiarch-debian-bookworm-jdk17-gecko-0.34.0-mvn
variables:
MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository"
@@ -11,7 +11,7 @@ cache:
build:
stage: build
script:
- - mvn clean install -Dmaven.javadoc.skip=true
+ - mvn clean install
# uncomment to deploy to gitlab
#deploy:
diff --git a/pom.xml b/pom.xml
index fdf6ad713774f4dad1888a4261eb9aa1f02b8dc0..b4e001a14490c8e10500a8072669ad7f29c9f6e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,26 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.mycore</groupId>
<artifactId>mycore-parent</artifactId>
- <version>51</version>
+ <version>53</version>
</parent>
<groupId>org.mycore.sru</groupId>
<artifactId>sru-pica-import</artifactId>
- <version>1.1</version>
+ <version>1.2</version>
<packaging>jar</packaging>
<name>SRU PICA Import</name>
<description>Library allows to import opac records from the sru interface provided by the gbv. It comes with classes
modelling pica records. Furthermore, some useful target objects are provided as well such as maps, prints,
- manuscripts, persons and corporations. You may create your own by extending the ObjectProducer class.
- </description>
+ manuscripts, persons and corporations. You may create your own by extending the ObjectProducer class.</description>
- <url>http://svn.thulb.uni-jena.de/repos/maven-projects/sru-pica-import</url>
+ <url>https://git.uni-jena.de/thulb/sru-pica-import</url>
<scm>
<connection>scm:git:https://git.rz.uni-jena.de/thulb/sru-pica-import.git</connection>
@@ -29,43 +27,67 @@
</scm>
<properties>
- <mycore.version>2022.06.1</mycore.version>
+ <jdom2.version>2.0.6.1</jdom2.version>
+ <log4j-api.version>2.21.1</log4j-api.version>
+ <mycore.version>2023.06.0</mycore.version>
+ <solr-solrj.version>8.11.2</solr-solrj.version>
+ <sru-adapter.version>1.1.1</sru-adapter.version>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>17</source>
- <release>17</release>
- </configuration>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-javadoc</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <!-- do not die on broken javadocs -->
+ <additionalJOption>-Xdoclint:none</additionalJOption>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
+ <artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
- <id>attach-sources</id>
+ <id>analyze</id>
<goals>
- <goal>jar</goal>
+ <goal>analyze-only</goal>
</goals>
+ <inherited>true</inherited>
+ <configuration>
+ <failOnWarning>true</failOnWarning>
+ <ignoreNonCompile>true</ignoreNonCompile>
+ <outputXML>true</outputXML>
+ </configuration>
</execution>
</executions>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
+ <groupId>com.github.ekryd.sortpom</groupId>
+ <artifactId>sortpom-maven-plugin</artifactId>
<executions>
<execution>
- <id>attach-javadoc</id>
+ <id>verify-sort-pom</id>
<goals>
- <goal>jar</goal>
+ <goal>sort</goal>
</goals>
+ <phase>validate</phase>
<configuration>
- <!-- do not die on broken javadocs -->
- <additionalJOption>-Xdoclint:none</additionalJOption>
+ <createBackupFile>false</createBackupFile>
+ <expandEmptyElements>false</expandEmptyElements>
+ <spaceBeforeCloseEmptyElement>true</spaceBeforeCloseEmptyElement>
+ <keepBlankLines>true</keepBlankLines>
+ <sortDependencies>${sortpom.sortDeps}</sortDependencies>
+ <sortOrderFile>${sortpom.sortFile}</sortOrderFile>
+ <sortProperties>true</sortProperties>
</configuration>
</execution>
</executions>
@@ -154,17 +176,17 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
- <version>2.19.0</version>
+ <version>${log4j-api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-solrj</artifactId>
- <version>8.11.2</version>
+ <version>${solr-solrj.version}</version>
</dependency>
<dependency>
<groupId>org.jdom</groupId>
<artifactId>jdom2</artifactId>
- <version>2.0.6.1</version>
+ <version>${jdom2.version}</version>
</dependency>
<dependency>
<groupId>org.mycore</groupId>
@@ -179,7 +201,32 @@
<dependency>
<groupId>org.mycore.sru</groupId>
<artifactId>sru-adapter</artifactId>
- <version>1.0</version>
+ <version>${sru-adapter.version}</version>
</dependency>
</dependencies>
+
+ <developers>
+ <developer>
+ <id>shermann</id>
+ <name>Silvio Hermann</name>
+ <email>s.hermann [at] uni-jena.de</email>
+ <organization>Thüringer Universitäts- und Landesbibliothek Jena</organization>
+ <organizationUrl>https://www.thulb.uni-jena.de</organizationUrl>
+ <roles>
+ <role>developer</role>
+ </roles>
+ <timezone>+1</timezone>
+ </developer>
+ <developer>
+ <id>eckstueck</id>
+ <name>Michel Büchner</name>
+ <email>michel.buechner [at] uni-jena.de</email>
+ <organization>Thüringer Universitäts- und Landesbibliothek Jena</organization>
+ <organizationUrl>https://www.thulb.uni-jena.de</organizationUrl>
+ <roles>
+ <role>developer</role>
+ </roles>
+ <timezone>+1</timezone>
+ </developer>
+ </developers>
</project>
diff --git a/src/main/java/fsu/archiv/mycore/sru/impex/pica/producer/CbuProducer.java b/src/main/java/fsu/archiv/mycore/sru/impex/pica/producer/CbuProducer.java
index 3f8095d3a21d6a2c61d660230ea4df5d455dc609..66675774c1c9a14b4d9fe551f6d618927762a5b2 100644
--- a/src/main/java/fsu/archiv/mycore/sru/impex/pica/producer/CbuProducer.java
+++ b/src/main/java/fsu/archiv/mycore/sru/impex/pica/producer/CbuProducer.java
@@ -382,7 +382,7 @@ public class CbuProducer extends ObjectProducer {
"de", humanReadable);
/* categ exists, then return existing categid */
if (categoriesByLabel.size() > 0) {
- return categoriesByLabel.get(0).getId().getID();
+ return categoriesByLabel.get(0).getId().getId();
}
/* categ is new, add new categid to classification */
diff --git a/src/main/java/fsu/archiv/mycore/sru/impex/pica/producer/ObjectProducer.java b/src/main/java/fsu/archiv/mycore/sru/impex/pica/producer/ObjectProducer.java
index 8784d955444984e0284c111e099f53ed0ca441d0..9b8bf973a05eea5dc02b9ea6f2cbeb70a0f3fd9f 100644
--- a/src/main/java/fsu/archiv/mycore/sru/impex/pica/producer/ObjectProducer.java
+++ b/src/main/java/fsu/archiv/mycore/sru/impex/pica/producer/ObjectProducer.java
@@ -25,6 +25,7 @@ import org.mycore.datamodel.common.MCRISO8601Date;
import org.mycore.datamodel.metadata.MCRMetaISO8601Date;
import org.mycore.datamodel.metadata.MCRMetaInterface;
import org.mycore.datamodel.metadata.MCRMetaLangText;
+import org.mycore.datamodel.metadata.MCRMetadataManager;
import org.mycore.datamodel.metadata.MCRObject;
import org.mycore.datamodel.metadata.MCRObjectID;
@@ -570,8 +571,7 @@ public abstract class ObjectProducer implements IObjectProducer {
.or(() -> MCRConfiguration2.getString(swfProp))
.or(() -> MCRConfiguration2.getString(mdProjectProp))
.orElseThrow(() -> new RuntimeException(errMsg));
-
- return MCRObjectID.getNextFreeId(project, type);
+ return MCRMetadataManager.getMCRObjectIDGenerator().getNextFreeId(project, type);
}
/**