Rydde etter EE10-overgang

domene/src/main/resources/META-INF/persistence.xml

@@ -10,7 +10,6 @@
 
         <properties>
             <property name="hibernate.generate_statistics" value="true" />
-            <property name="hibernate.dialect" value="org.hibernate.dialect.OracleDialect" />
             <property name="hibernate.connection.autocommit" value="false" />
             <property name="hibernate.jdbc.use_get_generated_keys" value="true" />
             <property name="org.hibernate.flushMode" value="COMMIT" />

pom.xml

@@ -27,8 +27,8 @@
         <sonar.projectKey>navikt_fplos</sonar.projectKey>
 
         <fp-kontrakter.version>9.0.2</fp-kontrakter.version>
-        <felles.version>7.0.0</felles.version>
-        <prosesstask.version>5.0.0</prosesstask.version>
+        <felles.version>7.0.1</felles.version>
+        <prosesstask.version>5.0.1</prosesstask.version>
     </properties>
 
     <dependencies>

web/pom.xml

@@ -100,7 +100,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.jboss</groupId>
+            <groupId>io.smallrye</groupId>
             <artifactId>jandex</artifactId>
         </dependency>
 

web/src/main/java/no/nav/foreldrepenger/los/web/server/jetty/JettyServer.java

@@ -154,12 +154,17 @@ private static WebAppContext createContext() throws IOException {
         ctx.setParentLoaderPriority(true);
 
         // må hoppe litt bukk for å hente web.xml fra classpath i stedet for fra filsystem.
-        var resource = ResourceFactory.of(ctx).newClassLoaderResource("/WEB-INF/web.xml", false);
-        var descriptor = resource.getURI().toURL().toExternalForm();
+        String descriptor;
+        String baseResource;
+        try (var factory = ResourceFactory.closeable()) {
+            var resource = factory.newClassLoaderResource("/WEB-INF/web.xml", false);
+            descriptor = resource.getURI().toURL().toExternalForm();
+            baseResource = factory.newResource(".").getRealURI().toURL().toExternalForm();
+        }
         ctx.setDescriptor(descriptor);
 
         ctx.setContextPath(CONTEXT_PATH);
-        ctx.setBaseResourceAsString(".");
+        ctx.setBaseResourceAsString(baseResource);
         ctx.setInitParameter("org.eclipse.jetty.servlet.Default.dirAllowed", "false");
 
         // Scanns the CLASSPATH for classes and jars.