From 2ef4b1dac23fddd2a84f7df88dfcfb967a4bc31c Mon Sep 17 00:00:00 2001
From: Jens-Otto Larsen <46576810+jolarsen@users.noreply.github.com>
Date: Tue, 12 Mar 2024 12:43:27 +0100
Subject: [PATCH] Fikse publisering (#473)

---
 .gitignore               | 37 +++++++++++++++++++++++++++++--------
 beregningsregler/pom.xml |  4 ++--
 kalkulator/pom.xml       |  8 ++++----
 kodeverk/pom.xml         |  4 ++--
 kontrakt/pom.xml         |  6 +++---
 pom.xml                  | 35 ++++++++++++++++++++++++++++++-----
 6 files changed, 70 insertions(+), 24 deletions(-)

diff --git a/.gitignore b/.gitignore
index b39a7a78..3bcad263 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,18 @@
+# Eclipse
+.project
+.classpath
+.settings/
+bin/
+
+# IntelliJ
+.idea
+*.ipr
+*.iml
+*.iws
+
+# Visual Studio Code
+.vscode
+
 # Compiled class file
 *.class
 
@@ -18,14 +33,20 @@
 *.zip
 *.tar.gz
 *.rar
-*.iml
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
-/target/
-/.classpath
-/.project
-/.flattened
-/.settings
-/.flattened*
-/.idea
+target/
+.flattened
+.settings
+.flattened*
+
+
+# Maven
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+release.properties
+maven-eclipse.xml
+.mvn/maven.config
+.mvn/jvm.config
diff --git a/beregningsregler/pom.xml b/beregningsregler/pom.xml
index d702a290..c78f6e51 100644
--- a/beregningsregler/pom.xml
+++ b/beregningsregler/pom.xml
@@ -9,8 +9,8 @@
         <version>3.0-SNAPSHOT</version>
     </parent>
 
-    <name>Kalkulus :: Regelmodell</name>
-    <artifactId>kalkulus-beregningsregler</artifactId>
+    <name>Regelmodell</name>
+    <artifactId>beregningsregler</artifactId>
     <packaging>jar</packaging>
 
     <properties>
diff --git a/kalkulator/pom.xml b/kalkulator/pom.xml
index 81ae4e1b..8d3d3ec5 100644
--- a/kalkulator/pom.xml
+++ b/kalkulator/pom.xml
@@ -9,9 +9,9 @@
         <version>3.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>kalkulus-kalkulator</artifactId>
+    <artifactId>kalkulator</artifactId>
     <packaging>jar</packaging>
-    <name>Kalkulus :: Kalkulator</name>
+    <name>Kalkulator</name>
 
     <properties>
         <maven.deploy.skip>false</maven.deploy.skip>
@@ -21,13 +21,13 @@
         <!-- Interne avhengigheter  -->
         <dependency>
             <groupId>no.nav.folketrygdloven.kalkulus</groupId>
-            <artifactId>kalkulus-kontrakt</artifactId>
+            <artifactId>kontrakt</artifactId>
         </dependency>
 
         <!-- Eksterne avhengigheter til andre NAV-prosjekter-->
         <dependency>
             <groupId>no.nav.folketrygdloven.kalkulus</groupId>
-            <artifactId>kalkulus-beregningsregler</artifactId>
+            <artifactId>beregningsregler</artifactId>
         </dependency>
 
         <dependency>
diff --git a/kodeverk/pom.xml b/kodeverk/pom.xml
index 727771d3..af1c14d9 100644
--- a/kodeverk/pom.xml
+++ b/kodeverk/pom.xml
@@ -11,9 +11,9 @@
         <version>3.0-SNAPSHOT</version>
     </parent>
 
-    <name>Kalkulus :: Kodeverk</name>
+    <name>Kodeverk</name>
     <packaging>jar</packaging>
-    <artifactId>kalkulus-kodeverk</artifactId>
+    <artifactId>kodeverk</artifactId>
 
     <properties>
         <maven.deploy.skip>false</maven.deploy.skip>
diff --git a/kontrakt/pom.xml b/kontrakt/pom.xml
index 7ff08e1d..fd3819c4 100644
--- a/kontrakt/pom.xml
+++ b/kontrakt/pom.xml
@@ -10,9 +10,9 @@
         <version>3.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>kalkulus-kontrakt</artifactId>
+    <artifactId>kontrakt</artifactId>
     <packaging>jar</packaging>
-    <name>Kalkulus :: Kontrakt</name>
+    <name>Kontrakt</name>
 
     <properties>
         <maven.deploy.skip>false</maven.deploy.skip>
@@ -22,7 +22,7 @@
         <!-- Interne avhengigheter -->
         <dependency>
             <groupId>no.nav.folketrygdloven.kalkulus</groupId>
-            <artifactId>kalkulus-kodeverk</artifactId>
+            <artifactId>kodeverk</artifactId>
         </dependency>
 
         <!-- Eksterne avhengigheter til andre prosjekter -->
diff --git a/pom.xml b/pom.xml
index e4529599..5e2b8f8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,17 +61,17 @@
         <dependencies>
             <dependency>
                 <groupId>no.nav.folketrygdloven.kalkulus</groupId>
-                <artifactId>kalkulus-beregningsregler</artifactId>
+                <artifactId>beregningsregler</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>no.nav.folketrygdloven.kalkulus</groupId>
-                <artifactId>kalkulus-kodeverk</artifactId>
+                <artifactId>kodeverk</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>no.nav.folketrygdloven.kalkulus</groupId>
-                <artifactId>kalkulus-kontrakt</artifactId>
+                <artifactId>kontrakt</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
@@ -88,7 +88,7 @@
             <dependency>
                 <groupId>org.glassfish</groupId>
                 <artifactId>jakarta.el</artifactId>
-                <version>4.0.2</version>
+                <version>4.0.1</version>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
@@ -121,7 +121,7 @@
             <dependency>
                 <groupId>com.fasterxml.jackson</groupId>
                 <artifactId>jackson-bom</artifactId>
-                <version>2.16.2</version>
+                <version>2.16.1</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -294,6 +294,31 @@
 
     </build>
 
+    <profiles>
+        <profile>
+            <id>sonar</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.jacoco</groupId>
+                        <artifactId>jacoco-maven-plugin</artifactId>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>deploy</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>flatten-maven-plugin</artifactId>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
     <scm>
         <connection>scm:git:ssh://git@github.com:navikt/ft-beregning.git</connection>
         <developerConnection>scm:git:ssh://git@github.com:navikt/ft-beregning.git