From e91dca11c5687907e453a6b6383e0af25d72a1c4 Mon Sep 17 00:00:00 2001
From: "Michal J. Sladek" <michal.sladek@nav.no>
Date: Thu, 2 Jun 2022 11:19:51 +0200
Subject: [PATCH] Fiks release

---
 .github/workflows/release.yml | 6 +++---
 pom.xml                       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index cca8a1c..6337ea3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Setup maven
         uses: whelk-io/maven-settings-xml-action@v20
         with:
-          repositories: '[{ "id": "github", "name": "github", "url": "https://maven.pkg.github.com/navikt/fp-felles", "releases": { "enabled": "true" }, "snapshots": { "enabled": "false" } }]'
+          repositories: '[{ "id": "github", "name": "github", "url": "https://maven.pkg.github.com/${{ github.repository }}", "releases": { "enabled": "true" }, "snapshots": { "enabled": "false" } }]'
           servers: '[{ "id": "github", "username": "${{ github.actor }}", "password": "${{ secrets.GITHUB_TOKEN }}" }]'
           output_file: settings.xml
 
@@ -34,6 +34,6 @@ jobs:
           REPO_NAME: ${{ github.repository }}
         run: |
           echo "-- Setting new release version ${NEW_VERSION} for ${REPO_NAME} --"
-          mvn -B versions:set -DnewVersion="${NEW_VERSION}" -DgenerateBackupPoms=false
+          mvn versions:set -B -s settings.xml -DnewVersion="${NEW_VERSION}" -DprocessAllModules -DgenerateBackupPoms=false
           echo "-- Build, test and deploy release to GPR --"
-          mvn -B -s settings.xml clean deploy -Dmaven.wagon.http.pool=false
+          mvn clean deploy -B -s settings.xml -DskipTests
diff --git a/pom.xml b/pom.xml
index 39171a4..6efa0fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,7 @@
         <repository>
             <id>github</id>
             <name>Github navikt Maven Packages</name>
-            <url>https://maven.pkg.github.com/navikt/fp-nare/</url>
+            <url>https://maven.pkg.github.com/navikt/fp-nare</url>
         </repository>
     </distributionManagement>