upgrade

goafabric · May 25, 2024 · 22712cc · 22712cc
1 parent 87916fa
commit 22712cc
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 17 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -17,11 +17,17 @@ jobs:
           distribution: 'temurin'
           java-version: '21'
 
-      - name: Test
-        uses: gradle/gradle-build-action@v3
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
         with:
           gradle-version: 8.7
-          arguments: build test
+
+      - name: Test
+        run: gradle build test
+
+      - name: Sonar
+        continue-on-error: true
+        run: gradle sonar -Dsonar.plugins.downloadOnlyRequired=true -Dsonar.host.url=http://v2202402203466256255.megasrv.de/sonar -Dsonar.token=${{ secrets.SONAR_USER_TOKEN }}
 
   snapshot:
     runs-on: ubuntu-latest
@@ -40,12 +46,14 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: '21'
-          
-      - name: Container Images
-        uses: gradle/gradle-build-action@v3
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
         with:
           gradle-version: 8.7
-          arguments: jib
+
+      - name: Container Images
+        run: gradle jib #dockerImageNative
 
   release:
     runs-on: ubuntu-latest
@@ -67,13 +75,26 @@ jobs:
           distribution: 'temurin'
           java-version: '21'
 
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
+        with:
+          gradle-version: 8.7
+
       - name: Setup git config
         run: |
           git config user.name "GitHub Actions Bot"
           git config user.email "<>"
 
       - name: Release
-        uses: gradle/gradle-build-action@v3
+        run: gradle release -Prelease.useAutomaticVersion=true
+
+      - name: Get Latest Tag
+        id: latest_tag
+        run: echo "tag=$(git describe --abbrev=0 --tags)" >> $GITHUB_OUTPUT
+
+      - name: Github Release
+        uses: ncipollo/release-action@v1
         with:
-          gradle-version: 8.7
-          arguments: release -Prelease.useAutomaticVersion=true
+          tag: ${{ steps.latest_tag.outputs.tag }}
+          body: |
+            [Release Notes](doc/release-notes.md)
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -5,15 +5,16 @@ val version: String by project
 java.sourceCompatibility = JavaVersion.VERSION_21
 
 val dockerRegistry = "goafabric"
-val nativeBuilder = "dashaun/builder:20240205"
+val nativeBuilder = "dashaun/builder:20240403"
 val baseImage = "ibm-semeru-runtimes:open-21.0.1_12-jre-focal@sha256:24d43669156684f7bc28536b22537a7533ab100bf0a5a89702b987ebb53215be"
 
 plugins {
 	java
 	jacoco
-	id("org.springframework.boot") version "3.2.4"
-	id("io.spring.dependency-management") version "1.1.4"
-	//id("org.graalvm.buildtools.native") version "0.9.28"
+	id("org.springframework.boot") version "3.3.0"
+	id("io.spring.dependency-management") version "1.1.5"
+	//id("org.graalvm.buildtools.native") version "0.10.2"
+
 	id("com.google.cloud.tools.jib") version "3.4.2"
 	id("net.researchgate.release") version "3.0.2"
 }
@@ -32,7 +33,7 @@ dependencies {
 	}
 }
 
-val hapiFhirVersion = "7.0.2"
+val hapiFhirVersion = "7.2.0"
 
 dependencies {
 	//web
@@ -80,8 +81,7 @@ jib {
 tasks.withType<JavaCompile> {
 	options.compilerArgs.add("-parameters")
 }
-
- */
+*/
 
 configure<net.researchgate.release.ReleaseExtension> {
 	buildTasks.set(listOf("build", "test", "jib"))

diff --git a/gradle.properties b/gradle.properties
@@ -0,0 +1,2 @@
+group=org.goafabric
+version=3.3.1-SNAPSHOT