Slår sammen maven moduler (#2039)

navikt · Dec 12, 2023 · 096a44a · 096a44a
1 parent c45d26c
commit 096a44a
Show file tree

Hide file tree

Showing 271 changed files with 546 additions and 888 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,2 +1,2 @@
 *
-!web/target
+!target
diff --git a/Dockerfile b/Dockerfile
@@ -13,8 +13,8 @@ ENV JAVA_OPTS="-XX:MaxRAMPercentage=75 \
                 -Dlogback.configurationFile=conf/logback.xml"
 
 # Config
-COPY web/target/classes/logback*.xml ./conf/
+COPY target/classes/logback*.xml ./conf/
 
 # Application Container (Jetty)
-COPY web/target/lib/*.jar ./lib/
-COPY web/target/app.jar .
+COPY target/lib/*.jar ./lib/
+COPY target/app.jar .
diff --git a/domene/pom.xml b/domene/pom.xml
diff --git a/domene/src/main/resources/META-INF/beans.xml b/domene/src/main/resources/META-INF/beans.xml
diff --git a/domene/src/test/resources/logback-test.xml b/domene/src/test/resources/logback-test.xml
diff --git a/migreringer/pom.xml b/migreringer/pom.xml
diff --git a/migreringer/src/test/java/no/nav/foreldrepenger/extensions/JpaExtension.java b/migreringer/src/test/java/no/nav/foreldrepenger/extensions/JpaExtension.java
diff --git a/migreringer/src/test/resources/logback-test.xml b/migreringer/src/test/resources/logback-test.xml