Merge pull request #316 from borisrizov-zf/feature/multi-module-support

feat: multi module support

.dockerignore

@@ -18,4 +18,4 @@
 # ********************************************************************************/
 
 **/.git
-build/test-results
+miw/build/test-results

.github/workflows/app-test-coverage-pr.yml

@@ -55,14 +55,14 @@ jobs:
         if: always()
         with:
           name: test-results
-          path: ${{ github.workspace }}/build/
+          path: ${{ github.workspace }}/miw/build/
 
       - name: Publish code coverage report as PR comment
         uses: madrapps/jacoco-report@v1.6.1
         if: always()
         with:
           paths: |
-            ${{ github.workspace }}/build/reports/xml/jacoco.xml
+            ${{ github.workspace }}/miw/build/reports/xml/jacoco.xml
           token: ${{ secrets.GITHUB_TOKEN }}
           min-coverage-overall: 80
           min-coverage-changed-files: 80

.github/workflows/chart-verification.yml

@@ -86,8 +86,8 @@ jobs:
         uses: addnab/docker-run-action@v3
         with:
           image: jnorwood/helm-docs:v1.11.3
-          options: -v ${{ github.workspace }}/charts:/helm-docs
-          run: helm-docs -i managed-identity-wallet/.helmdocsignore
+          options: -v ${{ github.workspace }}/charts:/helm-docs -v ${{ github.workspace }}/.helmdocsignore:/helm-docs/.helmdocsignore
+          run: helm-docs
 
       - name: Verify that no changes are required
         run: |

.github/workflows/release.yml

@@ -98,7 +98,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: build
-          path: ./build
+          path: ./miw/build
           if-no-files-found: error
           retention-days: 1
 
@@ -122,7 +122,7 @@ jobs:
           RELEASE_VERSION: ${{ steps.semantic-release.outputs.next_release }}
         run: |
           echo "::notice::Uploading jar to GitHub release"
-          gh release upload "v$RELEASE_VERSION" ./build/libs/miw-latest.jar
+          gh release upload "v$RELEASE_VERSION" ./miw/build/libs/miw-latest.jar
 
   docker:
     name: Docker Release
@@ -135,7 +135,7 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: build
-          path: ./build
+          path: ./miw/build
 
       - name: Download Helm chart artifact
         uses: actions/download-artifact@v4

.github/workflows/veracode.yaml

@@ -74,6 +74,6 @@ jobs:
         with:
           appname: 'project-managed-identity-wallet'
           createprofile: false
-          filepath: 'build/libs/miw-latest.jar' # add filepath for upload
+          filepath: 'miw/build/libs/miw-latest.jar' # add filepath for upload
           vid: '${{ secrets.ORG_VERACODE_API_ID }}' # reference to API ID, which is set as github org. secret
           vkey: '${{ secrets.ORG_VERACODE_API_KEY }}' #reference to API Key in github, which is set as github or. secret

.releaserc

@@ -41,7 +41,7 @@
     [
       "@semantic-release/exec",
       {
-        "prepareCmd": "cd charts/managed-identity-wallet && helm-docs -i .helmdocsignore ."
+        "prepareCmd": "cd charts/managed-identity-wallet && helm-docs ."
       }
     ],
     "@semantic-release/release-notes-generator",
@@ -56,7 +56,7 @@
       {
         "assets": [
           "CHANGELOG.md",
-          "DEPENDENCIES",
+          "miw/DEPENDENCIES",
           "gradle.properties",
           "./charts/managed-identity-wallet/Chart.yaml",
           "./charts/managed-identity-wallet/README.md"

Dockerfile

@@ -27,7 +27,7 @@ RUN apk add curl
 
 USER miw
 
-COPY LICENSE NOTICE.md DEPENDENCIES SECURITY.md /build/libs/miw-latest.jar /app/
+COPY LICENSE NOTICE.md miw/DEPENDENCIES SECURITY.md miw/build/libs/miw-latest.jar /app/
 
 WORKDIR /app
 

build.gradle → miw/build.gradle

@@ -131,7 +131,7 @@ tasks.register('dashDownload', Download) {
     description = 'Download the Dash License Tool standalone jar'
     group = 'License'
     src 'https://repo.eclipse.org/service/local/artifact/maven/redirect?r=dash-licenses&g=org.eclipse.dash&a=org.eclipse.dash.licenses&v=LATEST'
-    dest layout.projectDirectory.file('dash.jar')
+    dest rootProject.file('dash.jar')
     // will not replace an existing file. If you know you need a new version
     // then manually delete the file yourself, or run `dashClean`
     overwrite false
@@ -142,7 +142,7 @@ tasks.register('dashClean') {
     description = "Clean all files used by the 'License' group"
     group = 'License'
     logger.lifecycle("Removing 'dash.jar'")
-    file('dash.jar').delete()
+    rootProject.file('dash.jar').delete()
     logger.lifecycle("Removing 'deps.txt'")
     file('deps.txt').delete()
 }
@@ -183,7 +183,7 @@ tasks.register('dashLicenseCheck', JavaExec) { dashLicenseCheck ->
     dashLicenseCheck.dependsOn('dashDownload')
     dashLicenseCheck.dependsOn('dashDependencies')
     doFirst {
-        classpath = files('dash.jar')
+        classpath = rootProject.files('dash.jar')
         // docs: https://eclipse-tractusx.github.io/docs/release/trg-7/trg-7-04
         args('-project', 'automotive.tractusx',  '-summary', 'DEPENDENCIES', 'deps.txt')
     }
@@ -215,9 +215,9 @@ build {
 bootJar {
     metaInf {
         from 'DEPENDENCIES'
-        from 'SECURITY.md'
-        from 'NOTICE.md'
-        from 'LICENSE'
+        from '../SECURITY.md'
+        from '../NOTICE.md'
+        from '../LICENSE'
     }
 }
 

settings.gradle

@@ -1 +1,6 @@
 rootProject.name = 'managedidentitywallets'
+// docs: https://docs.gradle.org/current/userguide/multi_project_builds.html
+// add sub-projects here, the path on disk and the name can be the same
+// for example:
+// include '<sub-project-name>'
+include 'miw'