EE10-rydding og oppsett som virker for k9 (#2735)

* EE10-rydding og oppsett som virker for k9 * Siste felles
navikt · Dec 10, 2023 · bdf7aed · bdf7aed
1 parent bc5b244
commit bdf7aed
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 28 deletions.
diff --git a/behandlingslager/domene/src/main/resources/META-INF/persistence.xml b/behandlingslager/domene/src/main/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.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"/>

diff --git a/integrasjontjenester/pdfgen/pom.xml b/integrasjontjenester/pdfgen/pom.xml
@@ -33,11 +33,6 @@
             <groupId>com.openhtmltopdf</groupId>
             <artifactId>openhtmltopdf-pdfbox</artifactId>
             <exclusions>
-                <exclusion>
-                    <!-- openhtmltopdf-pdfbox er ikke enig med seg selv hvilken versjon av pdfbox som skal brukes, se under -->
-                    <groupId>org.apache.pdfbox</groupId>
-                    <artifactId>pdfbox</artifactId>
-                </exclusion>
                 <exclusion>
                     <!-- unngår commons-logging siden den forkludrer logging -->
                     <groupId>commons-logging</groupId>
@@ -51,17 +46,6 @@
             <artifactId>openhtmltopdf-slf4j</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.pdfbox</groupId>
-            <artifactId>pdfbox</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
         <dependency>
             <groupId>com.openhtmltopdf</groupId>
             <artifactId>openhtmltopdf-svg-support</artifactId>

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.tilbakekreving</groupId>
@@ -35,8 +35,8 @@
         <sonar.projectKey>navikt_fptilbake</sonar.projectKey>
 
         <!-- Jakarta deps -->
-        <felles.version>7.0.0</felles.version>
-        <prosesstask.version>5.0.0</prosesstask.version>
+        <felles.version>7.0.2</felles.version>
+        <prosesstask.version>5.0.2</prosesstask.version>
         <fpkontrakter.version>9.0.2</fpkontrakter.version>
         <abakus-kontrakt.version>2.0.1</abakus-kontrakt.version>
         <verapdf-validation-model.version>1.24.1</verapdf-validation-model.version>
@@ -82,7 +82,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>
@@ -377,11 +377,6 @@
                 <artifactId>openhtmltopdf-slf4j</artifactId>
                 <version>${openhtmltopdf.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.pdfbox</groupId>
-                <artifactId>pdfbox</artifactId>
-                <version>2.0.24</version>
-            </dependency>
             <dependency>
                 <groupId>xml-apis</groupId>
                 <artifactId>xml-apis</artifactId>

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

diff --git a/web/src/main/java/no/nav/foreldrepenger/tilbakekreving/web/server/jetty/JettyServer.java b/web/src/main/java/no/nav/foreldrepenger/tilbakekreving/web/server/jetty/JettyServer.java
@@ -182,9 +182,11 @@ private static ContextHandler createContext() throws IOException {
         ctx.setParentLoaderPriority(true);
         // må hoppe litt bukk for å hente web.xml fra classpath i stedet for fra filsystem.
         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);
 
@@ -194,7 +196,7 @@ private static ContextHandler createContext() throws IOException {
         if (Fagsystem.K9TILBAKE.equals(appname)) {
             ctx.setBaseResource(createResourceCollection(ctx));
         } else {
-            ctx.setBaseResourceAsString(".");
+            ctx.setBaseResourceAsString(baseResource);
         }
 
         ctx.setInitParameter("org.eclipse.jetty.servlet.Default.dirAllowed", "false");