Merge pull request #51 from virtualidentityag/develop

merge to tsys-release
virtualidentityag · Feb 17, 2025 · a7dff24 · a7dff24
2 parents 12fdc9e + c8f40bf
commit a7dff24
Show file tree

Hide file tree

Showing 147 changed files with 1,881 additions and 1,779 deletions.
diff --git a/.github/workflows/dockerImage.yml b/.github/workflows/dockerImage.yml
@@ -6,7 +6,7 @@ on:
       - 'release'
       - 'staging'
       - 'develop'
-      - "tsys-release"
+      - 'tsys-release'
     tags:
       - "dockerImage.v.*"
       - "v*"
@@ -28,12 +28,11 @@ jobs:
       - name: Setup JVM
         uses: actions/setup-java@v1
         with:
-          java-version: 11.0.10
+          java-version: 17
           java-package: jdk
           architecture: x64
-
       - name: Caching maven dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         env:
           cache-name: cache-maven-dependencies
         with:
@@ -43,7 +42,7 @@ jobs:
         run: mvn -B -Pprod  clean package -DskipTests
       - name: Maven Verify
         run: mvn -B -Pprod clean verify
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: targetfiles
           path: target/*.jar
@@ -74,7 +73,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Download buildfiles artifact
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: targetfiles
       - name: Get current time
@@ -190,3 +189,11 @@ jobs:
           custom-actions: |
             - text: View CI
               url: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+      - name: Publish to T-sys if T-sys release
+        if: ${{ (github.ref == 'refs/heads/tsys-release') && (matrix.registry == 'ghcr.io') }}
+        uses: fjogeleit/http-request-action@v1
+        with:
+          url: 'https://git.mms-support.de/api/v4/projects/${{ secrets.TSYS_SERVICE_ID }}/repository/tags?ref=master&tag_name=${{ env.DOCKER_IMAGE_TAG }}'
+          method: 'POST'
+          customHeaders: '{"PRIVATE-TOKEN": "${{ secrets.TSYS_ACCESS_TOKEN }}"}'
+
diff --git a/.github/workflows/feature-branch.yml b/.github/workflows/feature-branch.yml
@@ -18,12 +18,12 @@ jobs:
       - name: Setup JVM
         uses: actions/setup-java@v1
         with:
-          java-version: 11.0.10
+          java-version: 17
           java-package: jdk
           architecture: x64
 
       - name: Caching maven dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         env:
           cache-name: cache-maven-dependencies
         with:

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM adoptopenjdk/openjdk11
+FROM openjdk:17-oracle
 VOLUME ["/tmp","/log"]
 EXPOSE 8080
 ARG JAR_FILE

diff --git a/google_checks_light.xml b/google_checks_light.xml
@@ -19,6 +19,7 @@
   <property name="severity" value="warning"/>
 
   <property name="fileExtensions" value="java, properties, xml"/>
+
   <!-- Excludes all 'module-info.java' files              -->
   <!-- See https://checkstyle.org/config_filefilters.html -->
   <module name="BeforeExecutionExclusionFileFilter">
@@ -47,6 +48,10 @@
   -->
 
   <module name="TreeWalker">
+    <module name="AbbreviationAsWordInName">
+      <property name="allowedAbbreviationLength" value="4"/>
+      <property name="ignoreFinal" value="true"/>
+    </module>
     <module name="OuterTypeFilename"/>
     <module name="IllegalTokenText">
       <property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/>
@@ -301,7 +306,7 @@
     </module>
     -->
     <module name="JavadocMethod">
-      <property name="scope" value="public"/>
+      <property name="accessModifiers" value="public"/>
       <property name="allowMissingParamTags" value="true"/>
       <property name="allowMissingReturnTag" value="true"/>
       <property name="allowedAnnotations" value="Override, Test"/>