Merge pull request #765 from catenax-ng/main

feature: #606 - enrich notification with error, #709 - fix code scanning alert
eclipse-tractusx · Mar 19, 2024 · c73c29e · c73c29e
2 parents 6aba16a + 5ffb7a6
commit c73c29e
Show file tree

Hide file tree

Showing 71 changed files with 2,255 additions and 2,513 deletions.
diff --git a/.github/codeql/codeql-config.yml b/.github/codeql/codeql-config.yml
@@ -31,3 +31,5 @@ paths-ignore:
   - '**/*.spec.ts'
   - frontend/src/mockServiceWorker.js
   - tx-backend/src/main/resources/application-integration-spring-boot.yml
+  - docs/src/post-processing
+  - tx-backend/target/generated-sources/jsonschema2pojo
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,18 @@ _**For better traceability add the corresponding GitHub issue number in each cha
 
 ## [UNRELEASED - DD.MM.YYYY]
 
+### Added
+- #606 Added error message into notifications on failure
+
+### Changed
+
+- #709 Bumped spring-core from 6.0.17 to 6.1.5
+- #606 cucumber tests retry on error
+- #606 refactored response model to only be used by common model package tx-models
+
+
+### Removed
+
 ## [10.7.0 - 18.03.2024]
 
 ### Added

diff --git a/pom.xml b/pom.xml
@@ -38,33 +38,33 @@ SPDX-License-Identifier: Apache-2.0
 
     <properties>
         <springboot.version>3.1.9</springboot.version>
-        <spring-core.version>6.0.17</spring-core.version>
+        <spring-core.version>6.1.5</spring-core.version>
         <java.version>17</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <start-class>org.eclipse.tractusx.traceability.TraceabilityApplication</start-class>
         <!-- versions for Maven plugin -->
+        <spring-boot-maven-plugin.version>3.1.9</spring-boot-maven-plugin.version>
+        <compiler-plugin.version>3.11.0</compiler-plugin.version>
         <openapi-generator-maven-plugin.version>7.0.1</openapi-generator-maven-plugin.version>
         <maven-jxr-plugin.version>3.3.2</maven-jxr-plugin.version>
         <ascii-doctor.maven.plugin.version>2.2.4</ascii-doctor.maven.plugin.version>
         <checkstyle-plugin.version>3.3.1</checkstyle-plugin.version>
-        <compiler-plugin.version>3.11.0</compiler-plugin.version>
         <findsecbugs-plugin.version>1.12.0</findsecbugs-plugin.version>
         <install-plugin.version>3.1.1</install-plugin.version>
         <jacoco-plugin.version>0.8.11</jacoco-plugin.version>
         <jar-plugin.version>3.3.0</jar-plugin.version>
         <owasp-plugin.version>9.0.9</owasp-plugin.version>
         <spotbugs-plugin.version>4.8.3.0</spotbugs-plugin.version>
-        <spring-boot-maven-plugin.version>3.1.3</spring-boot-maven-plugin.version>
         <maven-project-info-reports-plugin.version>3.4.5</maven-project-info-reports-plugin.version>
         <sonar-maven-plugin.version>3.10.0.2594</sonar-maven-plugin.version>
         <maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
         <maven-failsafe-plugin.version>3.2.5</maven-failsafe-plugin.version>
         <maven-site-plugin.version>4.0.0-M11</maven-site-plugin.version>
         <edc-library.version>0.2.1</edc-library.version>
         <!-- versions for 3rd party dependecies -->
-        <eclipse-dash-ip.version>1.0.2</eclipse-dash-ip.version>
+        <eclipse-dash-ip.version>1.1.0</eclipse-dash-ip.version>
         <nimbus-jose-jwt.version>9.37.3</nimbus-jose-jwt.version>
         <ascii-doctor-j-diagram.version>2.2.13</ascii-doctor-j-diagram.version>
         <ascii-dcotor-j.version>2.5.8</ascii-dcotor-j.version>
@@ -180,14 +180,15 @@ SPDX-License-Identifier: Apache-2.0
 
     <pluginRepositories>
         <pluginRepository>
-            <id>dash-licenses-snapshots</id>
-            <url>https://repo.eclipse.org/content/repositories/dash-licenses-snapshots/</url>
+            <id>dash-licenses-releases</id>
+            <url>https://repo.eclipse.org/content/repositories/dash-licenses-releases/</url>
             <snapshots>
-                <enabled>true</enabled>
+                <enabled>false</enabled>
             </snapshots>
         </pluginRepository>
     </pluginRepositories>
 
+
     <build>
         <plugins>
             <plugin>
@@ -285,6 +286,9 @@ SPDX-License-Identifier: Apache-2.0
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>${compiler-plugin.version}</version>
+                    <configuration>
+                        <parameters>true</parameters>
+                    </configuration>
                 </plugin>
                 <plugin>
                     <groupId>org.jacoco</groupId>