Merge pull request #5 from Boehringer-Ingelheim/revert-4-master

Revert "Integrate GraalVM for Native Image Compilation"

Author: garcanam

.github/workflows/build.yml

@@ -60,11 +60,6 @@ jobs:
         with:
           distribution: 'adopt'
           java-version: '17'
-      - name: Setup GraalVM
-        uses: graalvm/setup-graalvm@v1
-        with:
-          graalvm-version: '22.1.0'
-          java-version: '17'
       - name: Grant execute permission for gradlew
         run: cd client && chmod +x gradlew
       - name: Build
@@ -73,27 +68,25 @@ jobs:
         run: cd client && ./gradlew test
       - name: Package
         run: cd client && ./gradlew bootJar
-      - name: Build Native Image
+      - name: Build toscactl-linux-amd64
         run: cd client && make build_linux VERSION=${{ needs.precheck.outputs.version }} COMMIT=$(git rev-parse HEAD)
       - name: List build directory
         run: |
           ls -la client/build/
           ls -la client/build/libs/
-          ls -la client/build/native/nativeCompile/
-      - name: Archive files
+      - name: Archive JAR
         uses: actions/upload-artifact@v4
         with:
           name: app-${{ needs.precheck.outputs.full_version }}
           path: |
-            client/build/*.jar
             client/build/libs/*.jar
-            client/build/native/nativeCompile/toscactl-linux-amd64
+            client/build/*.jar
       - name: Release Asset Upload
         uses: svenstaro/upload-release-action@v2
         if: github.event_name == 'release' || github.event_name == 'prerelease'
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: client/build/native/nativeCompile/toscactl-linux-amd64
+          file: client/build/*.jar
           tag: ${{ needs.precheck.outputs.branchTag }}
           overwrite: true
           file_glob: true

.gitignore

@@ -14,8 +14,8 @@ build_jar: build_prepare
 	./gradlew build
 
 build_linux: build_prepare
-	cd $(ROOT_DIR) && ./gradlew nativeBuild
-	cp $(ROOT_DIR)/build/native/nativeCompile/toscactl-linux-amd64 $(BUILD_DIR)/toscactl-linux-amd64
+	cd $(ROOT_DIR) && ./gradlew bootJar
+	cp $(ROOT_DIR)/build/libs/*.jar $(BUILD_DIR)/toscactl-linux-amd64.jar
 
 test:
 	cd $(ROOT_DIR)

client/Makefile

@@ -7,10 +7,9 @@ buildscript {
 plugins {
     id 'jacoco'
     id 'maven-publish'
-    id 'java'
-    id 'org.springframework.boot' version '2.7.6'
-    id 'io.spring.dependency-management' version '1.0.13.RELEASE'
-    id 'org.graalvm.buildtools.native' version '0.9.28'
+	id 'java'
+	id 'org.springframework.boot' version '2.7.1'
+	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 }
 
 group = 'edptoscaqs'
@@ -24,14 +23,14 @@ repositories {
 ext['log4j2.version'] = '2.17.0'
 
 ext {
-    set('snippetsDir', file("build/generated-snippets"))
+	set('snippetsDir', file("build/generated-snippets"))
 }
 
 dependencies {
-    implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
-    implementation 'org.springframework.boot:spring-boot-starter-data-rest'
-    implementation 'org.springframework.boot:spring-boot-starter-security'
-    implementation 'org.springframework.boot:spring-boot-starter-web'
+	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+	implementation 'org.springframework.boot:spring-boot-starter-data-rest'
+	implementation 'org.springframework.boot:spring-boot-starter-security'
+	implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'javax.validation:validation-api:2.0.1.Final'
     implementation 'org.apache.commons:commons-text:1.10.0'
     implementation 'org.hibernate.validator:hibernate-validator:7.0.1.Final'
@@ -42,10 +41,12 @@ dependencies {
     runtimeOnly 'com.h2database:h2'
     testImplementation group: 'org.mockito', name: 'mockito-all', version: '1.10.19'
     testImplementation 'org.springframework.restdocs:spring-restdocs-mockmvc'
+    testImplementation 'org.springframework.restdocs:spring-restdocs-mockmvc'
     testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.24.2'
     testImplementation 'org.springframework.security:spring-security-test'
 }
 
+
 bootJar {
     archiveFileName = "app.jar"
     destinationDirectory = file("$buildDir/../docker")
@@ -66,13 +67,4 @@ publishing {
             from components.java
         }
     }
-}
-
-graalvmNative {
-    binaries {
-        main {
-            imageName = 'toscactl-linux-amd64'
-            mainClass = 'com.edptoscaqs.toscaservice.ToscaCLI'
-        }
-    }
 }

client/build.gradle

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists