Migrate to 2022.06 (#33)

* start migration to 2022 and update stylesheets * java 17 migration * Filter jar signing files and set jars present from mycore-lod to provided --------- Co-authored-by: Sebastian Hofmann <[email protected]>
gbv · Mar 12, 2024 · 20c1427 · 20c1427
1 parent c5c21ff
commit 20c1427
Show file tree

Hide file tree

Showing 6 changed files with 75 additions and 191 deletions.
diff --git a/pom.xml b/pom.xml
@@ -21,15 +21,15 @@
   <parent>
     <groupId>de.gbv.reposis</groupId>
     <artifactId>reposis_mir_parent</artifactId>
-    <version>2021.06-SNAPSHOT</version>
+    <version>2022.06-SNAPSHOT</version>
   </parent>
 
   <artifactId>reposis_digibib</artifactId>
-  <version>2021.06-SNAPSHOT</version>
+  <version>2022.06-SNAPSHOT</version>
   <properties>
     <MCR.AppName>digibib</MCR.AppName>
     <!-- we can use single files from main version -->
-    <Mycore.Main.Version>2022.06.2-SNAPSHOT</Mycore.Main.Version>
+    <Mycore.Main.Version>2023.06.0-SNAPSHOT</Mycore.Main.Version>
     <node.version>v14.19.3</node.version>
     <yarn.version>v1.22.18</yarn.version>
   </properties>
@@ -50,6 +50,16 @@
               <exclude>com.sun.*:*</exclude>
             </excludes>
           </artifactSet>
+          <filters>
+            <filter>
+              <artifact>*:*</artifact>
+              <excludes>
+                <exclude>META-INF/*.SF</exclude>
+                <exclude>META-INF/*.DSA</exclude>
+                <exclude>META-INF/*.RSA</exclude>
+              </excludes>
+            </filter>
+          </filters>
         </configuration>
         <executions>
           <execution>
@@ -191,6 +201,10 @@
       <groupId>jakarta.servlet</groupId>
       <artifactId>jakarta.servlet-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.rdf4j</groupId>
       <artifactId>rdf4j-model</artifactId>
@@ -204,17 +218,17 @@
     <dependency>
       <groupId>org.eclipse.rdf4j</groupId>
       <artifactId>rdf4j-rio-api</artifactId>
-      <scope>compile</scope>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.rdf4j</groupId>
       <artifactId>rdf4j-rio-jsonld</artifactId>
-      <scope>compile</scope>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.rdf4j</groupId>
       <artifactId>rdf4j-rio-rdfxml</artifactId>
-      <scope>compile</scope>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.mycore</groupId>
@@ -267,15 +281,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.eclipse.rdf4j</groupId>
-        <artifactId>rdf4j-bom</artifactId>
-        <version>3.7.6</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
 </project>
diff --git a/src/main/java/de/vzg/reposis/digibib/CORSFilterStarter.java b/src/main/java/de/vzg/reposis/digibib/CORSFilterStarter.java
@@ -2,9 +2,9 @@
 
 import org.mycore.common.events.MCRStartupHandler;
 
-import javax.servlet.*;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.*;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 /**

diff --git a/src/main/java/org/mycore/vue/MCRVueRootServlet.java b/src/main/java/org/mycore/vue/MCRVueRootServlet.java
@@ -15,8 +15,8 @@
 import org.mycore.frontend.servlets.MCRContentServlet;
 import org.xml.sax.SAXException;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import javax.xml.transform.TransformerException;
 import java.io.IOException;
 import java.io.InputStream;

diff --git a/src/main/resources/xsl/metadata/mir-abstract.xsl b/src/main/resources/xsl/metadata/mir-abstract.xsl
@@ -15,6 +15,7 @@
 
   <xsl:variable name="objectID" select="/mycoreobject/@ID" />
   <xsl:variable name="modsPart" select="concat('mods.part.', $objectID)" />
+  <xsl:variable name="nbsp" select="'&#xa0;'"/>
 
   <xsl:template match="/">
 
@@ -234,7 +235,7 @@
         <xsl:choose>
           <xsl:when test="count($abstracts/mods:abstract) &gt; 1">
             <div id="mir-abstract-tabs">
-              <ul class="nav nav-tabs" role="tablist">
+              <ul class="nav nav-tabs justify-content-end" role="tablist">
                 <xsl:for-each select="$abstracts/mods:abstract">
                   <xsl:variable name="tabName">
                     <xsl:choose>
@@ -248,7 +249,7 @@
                       </xsl:otherwise>
                     </xsl:choose>
                   </xsl:variable>
-                  <li class="float-right nav-item">
+                  <li class="nav-item">
                     <a class="nav-link" href="#tab{position()}" role="tab" data-toggle="tab">
                       <xsl:if test="position()=1">
                         <xsl:attribute name="class">active nav-link</xsl:attribute>
@@ -463,7 +464,10 @@
         <xsl:copy-of select="$alternateContent/title/node()" />
         <xsl:if test="$withSubtitle and $alternateContent/subTitle">
           <span class="subtitle">
+            <span class="delimiter">
+              <xsl:value-of select="$nbsp" />
             <xsl:text> : </xsl:text>
+            </span>
             <xsl:copy-of select="$alternateContent/subTitle/node()" />
           </span>
         </xsl:if>
@@ -475,7 +479,10 @@
         <xsl:value-of select="mods:title" />
         <xsl:if test="$withSubtitle and mods:subTitle">
           <span class="subtitle">
+            <span class="delimiter">
+              <xsl:value-of select="$nbsp" />
             <xsl:text> : </xsl:text>
+            </span>
             <xsl:value-of select="mods:subTitle" />
           </span>
         </xsl:if>

diff --git a/src/main/resources/xsl/mets/mets-amd.xsl b/src/main/resources/xsl/mets/mets-amd.xsl