EE10 - mindre justeringer

navikt · Dec 8, 2023 · 7c6f55d · 7c6f55d
1 parent 7b37942
commit 7c6f55d
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 13 deletions.
diff --git a/domenetjenester/iay/src/test/resources/META-INF/persistence.xml b/domenetjenester/iay/src/test/resources/META-INF/persistence.xml
@@ -9,7 +9,6 @@
         <non-jta-data-source>jdbc/defaultDS</non-jta-data-source>
 
         <properties>
-            <property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQLDialect"/>
             <property name="hibernate.connection.autocommit" value="false"/>
             <property name="hibernate.jdbc.use_get_generated_keys" value="true"/>
             <property name="org.hibernate.flushMode" value="COMMIT"/>

diff --git a/domenetjenester/lonnskomp/src/test/resources/META-INF/persistence.xml b/domenetjenester/lonnskomp/src/test/resources/META-INF/persistence.xml
@@ -10,7 +10,6 @@
         <non-jta-data-source>jdbc/defaultDS</non-jta-data-source>
 
         <properties>
-            <property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQLDialect"/>
             <property name="hibernate.connection.autocommit" value="false"/>
             <property name="hibernate.jdbc.use_get_generated_keys" value="true"/>
             <property name="org.hibernate.flushMode" value="COMMIT"/>

diff --git a/domenetjenester/vedtak/src/test/resources/META-INF/persistence.xml b/domenetjenester/vedtak/src/test/resources/META-INF/persistence.xml
@@ -10,7 +10,6 @@
         <non-jta-data-source>jdbc/defaultDS</non-jta-data-source>
 
         <properties>
-            <property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQLDialect"/>
             <property name="hibernate.connection.autocommit" value="false"/>
             <property name="hibernate.jdbc.use_get_generated_keys" value="true"/>
             <property name="org.hibernate.flushMode" value="COMMIT"/>

diff --git a/migreringer/src/main/resources/META-INF/persistence.xml b/migreringer/src/main/resources/META-INF/persistence.xml
@@ -10,7 +10,6 @@
         <non-jta-data-source>jdbc/defaultDS</non-jta-data-source>
 
         <properties>
-            <property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQLDialect"/>
             <property name="hibernate.jdbc.use_get_generated_keys" value="true"/>
 
             <!-- Utsetter flush av statements til db til commit eller manuelt istedet for hibernate heuristisk flush. -->

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>no.nav.foreldrepenger.felles</groupId>
         <artifactId>fp-bom</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.1</version>
     </parent>
 
 	<groupId>no.nav.foreldrepenger.abakus</groupId>
@@ -35,9 +35,9 @@
 
         <kontrakt.java.version>17</kontrakt.java.version> <!-- Behold til K9 er på J21. -->
 
-		<felles.version>7.0.0</felles.version>
-		<prosesstask.version>5.0.0</prosesstask.version>
-		<kontrakter.version>9.0.1</kontrakter.version>
+		<felles.version>7.0.1</felles.version>
+		<prosesstask.version>5.0.1</prosesstask.version>
+		<kontrakter.version>9.0.2</kontrakter.version>
         <tidsserie.version>2.7.1</tidsserie.version>
 
         <!-- Forteller til maven-deploy-plugin at artefaktet ikke skal deployes.
@@ -54,7 +54,7 @@
             <dependency>
                 <groupId>no.nav.foreldrepenger.felles</groupId>
                 <artifactId>fp-bom</artifactId>
-                <version>3.0.0</version>
+                <version>3.0.1</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

diff --git a/web/pom.xml b/web/pom.xml
@@ -217,7 +217,7 @@
             <artifactId>swagger-jaxrs2-jakarta</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.jboss</groupId>
+            <groupId>io.smallrye</groupId>
             <artifactId>jandex</artifactId>
         </dependency>
 

diff --git a/web/src/main/java/no/nav/foreldrepenger/abakus/jetty/JettyServer.java b/web/src/main/java/no/nav/foreldrepenger/abakus/jetty/JettyServer.java
@@ -30,7 +30,6 @@
 import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.handler.ContextHandler;
 import org.eclipse.jetty.util.Callback;
-import org.eclipse.jetty.util.resource.PathResourceFactory;
 import org.eclipse.jetty.util.resource.ResourceFactory;
 import org.flywaydb.core.Flyway;
 import org.flywaydb.core.api.FlywayException;
@@ -89,8 +88,11 @@ private ContextHandler 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;
+        try (var factory = ResourceFactory.closeable()) {
+            var resource = factory.newClassLoaderResource("/WEB-INF/web.xml", false);
+            descriptor = resource.getURI().toURL().toExternalForm();
+        }
         ctx.setDescriptor(descriptor);
 
         ctx.setContextPath(CONTEXT_PATH);