From 2bed0f86ea84a319e566b8a9ea3058705bc4a2b0 Mon Sep 17 00:00:00 2001
From: Ugur Cenar <cenar93@gmail.com>
Date: Tue, 9 Jan 2024 15:32:26 +0100
Subject: [PATCH] Oppdater github workflow

---
 .../workflows/build-deploy-bidrag-domene.yml  |  6 +--
 .../build-deploy-bidrag-transport.yml         |  6 +--
 .../workflows/build_and_release_package.yml   |  2 +-
 .github/workflows/release_package.yml         | 16 +++---
 bidrag-domene/pom.xml                         | 50 ++++++++-----------
 bidrag-transport/README.md                    |  2 +-
 bidrag-transport/pom.xml                      |  2 +-
 7 files changed, 35 insertions(+), 49 deletions(-)

diff --git a/.github/workflows/build-deploy-bidrag-domene.yml b/.github/workflows/build-deploy-bidrag-domene.yml
index b5a050a..71673ed 100644
--- a/.github/workflows/build-deploy-bidrag-domene.yml
+++ b/.github/workflows/build-deploy-bidrag-domene.yml
@@ -1,13 +1,11 @@
-name: Build-Deploy
+name: Bidrag-domene
 on:
   push:
     paths:
       - "bidrag-domene/**"
-  pull_request:
-    types: [closed]
 
 permissions:
-  contents: "read"
+  contents: "write"
   id-token: "write"
   packages: "write"
 
diff --git a/.github/workflows/build-deploy-bidrag-transport.yml b/.github/workflows/build-deploy-bidrag-transport.yml
index 263251e..a07617a 100644
--- a/.github/workflows/build-deploy-bidrag-transport.yml
+++ b/.github/workflows/build-deploy-bidrag-transport.yml
@@ -1,13 +1,11 @@
-name: Build-Deploy
+name: Bidrag-transport
 on:
   push:
     paths:
       - "bidrag-transport/**"
-  pull_request:
-    types: [closed]
 
 permissions:
-  contents: "read"
+  contents: "write"
   id-token: "write"
   packages: "write"
 
diff --git a/.github/workflows/build_and_release_package.yml b/.github/workflows/build_and_release_package.yml
index 846b50c..aab0ae2 100644
--- a/.github/workflows/build_and_release_package.yml
+++ b/.github/workflows/build_and_release_package.yml
@@ -34,7 +34,7 @@ jobs:
   release:
     name: Release package
     needs: build-artifact
-    if: github.base_ref == 'main'
+    if: github.base_ref == 'main' || github.ref == 'refs/heads/main'
     uses: ./.github/workflows/release_package.yml
     with:
       package-name: ${{inputs.package-name}}
diff --git a/.github/workflows/release_package.yml b/.github/workflows/release_package.yml
index f121dbd..5898dae 100644
--- a/.github/workflows/release_package.yml
+++ b/.github/workflows/release_package.yml
@@ -23,16 +23,14 @@ jobs:
             export VERSION=${GIT_COMMIT_DATE}
             echo "VERSION=${GIT_COMMIT_DATE}" >> $GITHUB_ENV
             echo "Setting version $VERSION"
-            mvn --settings versions:set -DnewVersion="$VERSION" --pl ${{inputs.package-name}} --am
-            mvn --settings versions:commit --pl ${{inputs.package-name}} --am
-            git tag -a "${VERSION}" -m "Version ${VERSION}"
-            git push origin "${VERSION}"
+            mvn versions:set -DnewVersion="$VERSION" --pl ${{inputs.package-name}} --am
+            mvn versions:commit --pl ${{inputs.package-name}} --am
         - name: Deploy to Github Package
           run: |
              echo "Release package ${{inputs.package-name}} with version ${{ env.VERSION }}"
 #            mvn --settings source:jar-no-fork deploy -DskipTests=true -Dmaven.wagon.http.pool=false --pl ${{inputs.package-name}} --am
-        - name: Tag release
-          run: |
-            echo "Tag release with version ${{ env.VERSION }}"
-            git tag -a "${{ env.VERSION }} " -m "Version ${{ env.VERSION }} 
-            git push origin "${{ env.VERSION }}"
\ No newline at end of file
+        - name: Create a GitHub release
+          uses: ncipollo/release-action@v1
+          with:
+            tag: ${{inputs.package-name}}:${{env.VERSION}}
+            name: Release ${{inputs.package-name}}:${{env.VERSION}}
\ No newline at end of file
diff --git a/bidrag-domene/pom.xml b/bidrag-domene/pom.xml
index 68402d8..c740db6 100644
--- a/bidrag-domene/pom.xml
+++ b/bidrag-domene/pom.xml
@@ -21,6 +21,8 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
     <swagger.version>2.2.19</swagger.version>
+    <spring-core.version>6.1.2</spring-core.version>
+    <jakarta.version>3.1.0</jakarta.version>
   </properties>
 
   <distributionManagement>
@@ -31,37 +33,19 @@
   </distributionManagement>
 
   <dependencies>
-    <dependency>
-      <groupId>org.jetbrains.kotlin</groupId>
-      <artifactId>kotlin-test-junit5</artifactId>
-      <version>${kotlin.version}</version>
-      <scope>test</scope>
-    </dependency>
+
     <dependency>
       <groupId>org.jetbrains.kotlin</groupId>
       <artifactId>kotlin-reflect</artifactId>
-      <version>${kotlin.version}</version>
     </dependency>
     <dependency>
       <groupId>org.jetbrains.kotlin</groupId>
       <artifactId>kotlin-stdlib-jdk8</artifactId>
-      <version>${kotlin.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>io.kotest</groupId>
-      <artifactId>kotest-assertions-core-jvm</artifactId>
-      <version>${kotest.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.datatype</groupId>
-      <artifactId>jackson-datatype-jsr310</artifactId>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.module</groupId>
       <artifactId>jackson-module-kotlin</artifactId>
-      <scope>test</scope>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
@@ -78,25 +62,33 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
-      <version>6.1.2</version>
+      <version>${spring-core.version}</version>
     </dependency>
     <dependency>
       <groupId>jakarta.persistence</groupId>
       <artifactId>jakarta.persistence-api</artifactId>
-      <version>3.1.0</version>
+      <version>${jakarta.version}</version>
     </dependency>
     <dependency>
       <groupId>io.swagger.core.v3</groupId>
       <artifactId>swagger-annotations</artifactId>
-      <version>${swagger.version}</version>
     </dependency>
-      <dependency>
-          <groupId>com.fasterxml.jackson.module</groupId>
-          <artifactId>jackson-module-kotlin</artifactId>
-          <version>2.16.0</version>
-          <scope>compile</scope>
-      </dependency>
 
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-test-junit5</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.kotest</groupId>
+      <artifactId>kotest-assertions-core-jvm</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.datatype</groupId>
+      <artifactId>jackson-datatype-jsr310</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <profiles>
diff --git a/bidrag-transport/README.md b/bidrag-transport/README.md
index 3e55670..5811c46 100644
--- a/bidrag-transport/README.md
+++ b/bidrag-transport/README.md
@@ -1,3 +1,3 @@
 # bidrag-tranport
 Transportobjekter for team bidrag
-test
\ No newline at end of file
+test2
\ No newline at end of file
diff --git a/bidrag-transport/pom.xml b/bidrag-transport/pom.xml
index 2d096b3..fb92da3 100644
--- a/bidrag-transport/pom.xml
+++ b/bidrag-transport/pom.xml
@@ -19,7 +19,7 @@
     <sha1/>
     <changelist>-SNAPSHOT</changelist>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <spring.version>6.1.0</spring.version>
+    <spring.version>6.1.2</spring.version>
     <jakarta.version>3.0.2</jakarta.version>
   </properties>