Merge branch 'master' of https://github.com/statisticsnorway/kostra-k…

…ontrollprogram
statisticsnorway · Dec 7, 2022 · 23b096c · 23b096c
2 parents ef71818 + 8c97b21
commit 23b096c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -18,14 +18,11 @@ jobs:
           java-version: '17'
           distribution: 'adopt'
 
-      - name: Output tag name
-        run: echo "github.ref_name = ${{github.ref_name}}"
-
       - name: Set version with Maven
-        run: mvn --batch-mode --update-snapshots versions:set -DnewVersion=${{github.ref_name}}
+        run: mvn --batch-mode -U versions:set -DnewVersion=${{github.ref_name}}
 
       - name: Build with Maven
-        run: mvn --batch-mode --update-snapshots -P github -Drevision=${{github.ref_name}} package
+        run: mvn --batch-mode -P github -Drevision=${{github.ref_name}} package
 
       - name: Release
         uses: softprops/action-gh-release@v1

diff --git a/.github/workflows/run_on_prerelease.yml b/.github/workflows/run_on_prerelease.yml
@@ -18,17 +18,15 @@ jobs:
           java-version: '17'
           distribution: 'adopt'
 
-      - name: Output tag name
-        run: echo "github.ref_name = ${{github.ref_name}}"
-
       - name: Set version with Maven
-        run: mvn --batch-mode --update-snapshots versions:set -DnewVersion=${{github.ref_name}}
+        run: mvn --batch-mode -U versions:set -DnewVersion=${{github.ref_name}}
 
       - name: Build with Maven
-        run: mvn --batch-mode package
+        run: mvn --batch-mode -P github -Drevision=${{github.ref_name}} package
 
       - name: Release
         uses: softprops/action-gh-release@v1
         with:
           files: |
             ./konsoll/target/jar/kostra-kontrollprogram-${{github.ref_name}}.jar
+            ./web/target/jar/kostra-kontrollprogram-web-${{github.ref_name}}.jar
diff --git a/kontroller/src/main/kotlin/no/ssb/kostra/barn/xsd/KostraMelderType.kt b/kontroller/src/main/kotlin/no/ssb/kostra/barn/xsd/KostraMelderType.kt
@@ -7,8 +7,8 @@ import javax.xml.bind.annotation.*
 data class KostraMelderType(
 
     @field:XmlAttribute(name = "Kode", required = true)
-    val kode: String = "0",
+    val kode: String = "0", /** workaround for data that is missing this field due to previous bug in XSD */
 
     @field:XmlElement(name = "Presisering")
     val presisering: String? = null,
-)
+)