Merge branch 'release/c4.1'

Ericsson · Oct 12, 2023 · ccdc87f · ccdc87f
2 parents cba7946 + b393940
commit ccdc87f
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 2 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -54,6 +54,32 @@ jobs:
           flags: unit-tests
           fail_ci_if_error: true
           verbose: true
+  unit-tests-java-target:
+    runs-on: ubuntu-latest
+    name: Java 17 target 17 unit test
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Set up JDK 17
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'adopt'
+          java-version: '17'
+      - name: Cache Maven packages
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-m2-ut-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-m2-ut-
+      - name: Unit Tests
+        run: mvn --batch-mode --activate-profiles github test jacoco:report -Dmaven.compiler.target=17 -Dmaven.compiler.source=17
+      - name: Upload test coverage report
+        uses: codecov/codecov-action@v2
+        with:
+          files: ./ecaudit/target/site/jacoco/jacoco.xml,./common/target/site/jacoco/jacoco.xml,./eclog/target/site/jacoco/jacoco.xml
+          flags: unit-tests
+          fail_ci_if_error: true
+          verbose: true
   integration-tests:
     runs-on: ubuntu-latest
     strategy:
@@ -76,3 +102,22 @@ jobs:
           restore-keys: ${{ runner.os }}-m2-it-
       - name: Integration Tests
         run: mvn --batch-mode --activate-profiles github test-compile failsafe:integration-test failsafe:verify
+  integration-tests-java-target:
+    runs-on: ubuntu-latest
+    name: Java 17 target 17 integration tests
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Set up JDK 17
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'adopt'
+          java-version: '17'
+      - name: Cache Maven packages
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-m2-it-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-m2-it-
+      - name: Integration Tests
+        run: mvn --batch-mode --activate-profiles github test-compile failsafe:integration-test failsafe:verify -Dmaven.compiler.target=17 -Dmaven.compiler.source=17
diff --git a/pom.xml b/pom.xml
@@ -185,8 +185,8 @@
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>${org.apache.maven.plugins.maven-compiler-plugin.version}</version>
                     <configuration>
-                        <source>11</source>
-                        <target>11</target>
+                        <source>${maven.compiler.source}</source>
+                        <target>${maven.compiler.target}</target>
                     </configuration>
                 </plugin>
                 <plugin>