Merge branch 'master' into dependabot/maven/org.eclipse.jetty-jetty-b…

…om-11.0.15
navikt · Jul 5, 2023 · 3197ff4 · 3197ff4
2 parents e590951 + df86248
commit 3197ff4
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 22 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -21,14 +21,18 @@ on:
 jobs:
   build-feature:
     name: Build
+    permissions:
+      contents: read
     uses: navikt/fp-gha-workflows/.github/workflows/build-feature-postgres.yml@main
     with:
       postgres-user: unittest
-      sonar-scan: true # default: false
     secrets: inherit
 
   release-drafter:
     name: Update
+    permissions:
+      contents: write
+      pull-requests: read
     if: github.ref_name == 'master'
     needs: build-feature
     uses: navikt/fp-gha-workflows/.github/workflows/release-drafter.yml@main

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -6,6 +6,8 @@ on:
 jobs:
   release:
     name: Feature
+    permissions:
+      packages: write
     uses: navikt/fp-gha-workflows/.github/workflows/release-feature.yml@main
     with:
       release-version: ${{ github.event.release.tag_name }}

diff --git a/README.md b/README.md
@@ -1,8 +1,12 @@
 [![Bygg og deploy](https://github.com/navikt/fp-prosesstask/actions/workflows/build.yml/badge.svg)](https://github.com/navikt/fp-prosesstask/actions/workflows/build.yml)
-[![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=navikt_fp-prosesstask&metric=alert_status)](https://sonarcloud.io/dashboard?id=navikt_fp-prosesstask) 
+
+[![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=navikt_fp-prosesstask&metric=alert_status)](https://sonarcloud.io/dashboard?id=navikt_fp-prosesstask)
+[![Lines of Code](https://sonarcloud.io/api/project_badges/measure?project=navikt_fp-prosesstask&metric=ncloc)](https://sonarcloud.io/summary/new_code?id=navikt_fp-prosesstask)
 [![SonarCloud Coverage](https://sonarcloud.io/api/project_badges/measure?project=navikt_fp-prosesstask&metric=coverage)](https://sonarcloud.io/component_measures/metric/coverage/list?id=navikt_fp-prosesstask)
 [![SonarCloud Bugs](https://sonarcloud.io/api/project_badges/measure?project=navikt_fp-prosesstask&metric=bugs)](https://sonarcloud.io/component_measures/metric/reliability_rating/list?id=navikt_fp-prosesstask)
-[![SonarCloud Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=navikt_fp-prosesstask&metric=vulnerabilities)](https://sonarcloud.io/component_measures/metric/security_rating/list?id=navikt_fp-prosesstask) 
+[![SonarCloud Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=navikt_fp-prosesstask&metric=vulnerabilities)](https://sonarcloud.io/component_measures/metric/security_rating/list?id=navikt_fp-prosesstask)
+[![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=navikt_fp-prosesstask&metric=security_rating)](https://sonarcloud.io/summary/new_code?id=navikt_fp-prosesstask)
+
 ![GitHub release (latest by date)](https://img.shields.io/github/v/release/navikt/fp-prosesstask)
 ![GitHub](https://img.shields.io/github/license/navikt/fp-prosesstask)
 

diff --git a/kontekst/pom.xml b/kontekst/pom.xml
@@ -9,14 +9,12 @@
         <version>0.0.0-SNAPSHOT</version>
     </parent>
 
-
     <artifactId>prosesstask-kontekst</artifactId>
 
     <name>Prosesstask :: Bridge mot felles/trådkontekst</name>
     <packaging>jar</packaging>
 
     <dependencies>
-
         <dependency>
             <!-- Trengs for implementasjon av TaskManager -->
             <groupId>no.nav.vedtak.prosesstask</groupId>
@@ -40,4 +38,4 @@
 
     </dependencies>
 
-</project>
+</project>
diff --git a/pom.xml b/pom.xml
@@ -53,10 +53,16 @@
 		<sonar.projectName>fp-prosesstask</sonar.projectName>
 		<sonar.projectKey>navikt_fp-prosesstask</sonar.projectKey>
 
-		<felles.version>4.2.47</felles.version>
+		<felles.version>4.4.0</felles.version>
 
         <jakarta.persistence.version>2.2.3</jakarta.persistence.version>
-	</properties>
+
+        <maven.deploy.skip>false</maven.deploy.skip>
+
+        <jakarta.jakartaee-bom.version>8.0.0</jakarta.jakartaee-bom.version>
+
+        <hibernate-core.version>5.6.15.Final</hibernate-core.version>
+    </properties>
 
 	<repositories>
 		<repository>
@@ -88,7 +94,7 @@
             <dependency>
                 <groupId>jakarta.platform</groupId>
                 <artifactId>jakarta.jakartaee-bom</artifactId>
-                <version>8.0.0</version>
+                <version>${jakarta.jakartaee-bom.version}</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -155,6 +161,17 @@
                 <type>pom</type>
             </dependency>
 
+            <dependency>
+                <groupId>org.hibernate</groupId>
+                <artifactId>hibernate-core</artifactId>
+                <version>${hibernate-core.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.hibernate</groupId>
+                <artifactId>hibernate-micrometer</artifactId>
+                <version>${hibernate-core.version}</version>
+            </dependency>
+
             <!-- JAXB BOM-->
             <dependency>
                 <groupId>org.glassfish.jaxb</groupId>
@@ -242,7 +259,7 @@
             <dependency>
                 <groupId>ch.qos.logback</groupId>
                 <artifactId>logback-classic</artifactId>
-                <version>1.3.8</version>
+                <version>1.4.8</version>
             </dependency>
         </dependencies>
 	</dependencyManagement>
@@ -411,9 +428,9 @@
                 </plugin>
 
                 <plugin>
-                    <groupId>org.jboss.jandex</groupId>
+                    <groupId>io.smallrye</groupId>
                     <artifactId>jandex-maven-plugin</artifactId>
-                    <version>1.2.3</version>
+                    <version>3.0.5</version>
                     <executions>
                         <execution>
                             <id>make-index</id>
@@ -433,10 +450,10 @@
         </pluginManagement>
 
 		<plugins>
-            <plugin>
-                <groupId>org.jboss.jandex</groupId>
-                <artifactId>jandex-maven-plugin</artifactId>
-            </plugin>
+<!--            <plugin>-->
+<!--                <groupId>io.smallrye</groupId>-->
+<!--                <artifactId>jandex-maven-plugin</artifactId>-->
+<!--            </plugin>-->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
@@ -495,7 +512,7 @@
                     <dependency>
                         <groupId>no.nav.k9.dev</groupId>
                         <artifactId>dev-jakarta-transform</artifactId>
-                        <version>0.6.6</version>
+                        <version>0.6.11</version>
                     </dependency>
                     <dependency>
                         <groupId>ant-contrib</groupId>
@@ -585,7 +602,6 @@
                                     <goal>run</goal>
                                 </goals>
                             </execution>
-
                         </executions>
                     </plugin>
                     <plugin>
@@ -621,6 +637,7 @@
                                     <url>${project.distributionManagement.repository.url}</url>
                                     <file>${project.build.directory}/${project.artifactId}-jakarta-${project.version}-TOBEDEPLOYED.jar</file>
                                     <sources>${project.build.directory}/${project.artifactId}-jakarta-${project.version}-sources-TOBEDEPLOYED.jar</sources>
+                                    <skip>${maven.deploy.skip}</skip>
                                 </configuration>
                             </execution>
                         </executions>
@@ -644,6 +661,4 @@
 		</repository>
 	</distributionManagement>
 
-
-
 </project>
diff --git a/task/pom.xml b/task/pom.xml
@@ -13,7 +13,7 @@
 	<name>Prosesstask :: Task</name>
 	<packaging>jar</packaging>
 
-	<dependencies>
+    <dependencies>
 		<dependency>
 			<groupId>no.nav.foreldrepenger.felles</groupId>
 			<artifactId>felles-log</artifactId>
@@ -36,7 +36,18 @@
 			<scope>provided</scope>
 		</dependency>
 
-		<dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-micrometer</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-annotations</artifactId>
 		</dependency>