Skip to content

Commit

Permalink
Merge pull request #802 from catenax-ng/main
Browse files Browse the repository at this point in the history
chore: fix security issues
  • Loading branch information
ds-mwesener authored Mar 28, 2024
2 parents 0163c86 + d41b85f commit 7eb9057
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 7 deletions.
2 changes: 1 addition & 1 deletion DEPENDENCIES_BACKEND
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ maven/mavencentral/net.minidev/json-smart/2.5.0, Apache-2.0, approved, clearlyde
maven/mavencentral/net.sf.jopt-simple/jopt-simple/5.0.4, MIT, approved, CQ13174
maven/mavencentral/org.antlr/antlr4-runtime/4.13.0, BSD-3-Clause, approved, #10767
maven/mavencentral/org.apache.commons/commons-collections4/4.4, Apache-2.0, approved, clearlydefined
maven/mavencentral/org.apache.commons/commons-compress/1.24.0, Apache-2.0 AND BSD-3-Clause AND bzip2-1.0.6 AND LicenseRef-Public-Domain, approved, #10368
maven/mavencentral/org.apache.commons/commons-compress/1.26.0, Apache-2.0 AND (Apache-2.0 AND BSD-3-Clause), approved, #13288
maven/mavencentral/org.apache.commons/commons-lang3/3.11, Apache-2.0, approved, CQ22642
maven/mavencentral/org.apache.commons/commons-lang3/3.12.0, Apache-2.0, approved, clearlydefined
maven/mavencentral/org.apache.commons/commons-lang3/3.13.0, Apache-2.0, approved, #9820
Expand Down
2 changes: 1 addition & 1 deletion DEPENDENCIES_FRONTEND
Original file line number Diff line number Diff line change
Expand Up @@ -1634,7 +1634,7 @@ npm/npmjs/@types/node/18.16.0, MIT, approved, #9385
npm/npmjs/@types/node/20.2.3, MIT, approved, clearlydefined
npm/npmjs/@types/normalize-package-data/2.4.1, MIT, approved, #10792
npm/npmjs/@types/parse-json/4.0.0, MIT, approved, clearlydefined
npm/npmjs/@types/qs/6.9.7, MIT, approved, #13990
npm/npmjs/@types/qs/6.9.7, MIT, approved, #13991
npm/npmjs/@types/range-parser/1.2.4, MIT, approved, #10795
npm/npmjs/@types/retry/0.12.0, MIT, approved, clearlydefined
npm/npmjs/@types/semver/7.3.13, MIT, approved, #4668
Expand Down
14 changes: 10 additions & 4 deletions tx-backend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ SPDX-License-Identifier: Apache-2.0
<artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
</dependency>

<!-- Fixes CVE-2023-34035 -->

<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
Expand All @@ -173,6 +173,10 @@ SPDX-License-Identifier: Apache-2.0
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-oauth2-client</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
Expand Down Expand Up @@ -225,12 +229,13 @@ SPDX-License-Identifier: Apache-2.0

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
<artifactId>commons-compress</artifactId>
<version>1.26.0</version>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-oauth2-client</artifactId>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
</dependency>

<!-- test dependencies spring boot managed -->
Expand Down Expand Up @@ -320,6 +325,7 @@ SPDX-License-Identifier: Apache-2.0
<targetPackage>org.eclipse.tractusx.traceability.generated</targetPackage>
<sourceType>JSONSCHEMA</sourceType>
<refFragmentPathDelimiters>#/</refFragmentPathDelimiters>
<includeHashcodeAndEquals>false</includeHashcodeAndEquals>
</configuration>
<executions>
<execution>
Expand Down
1 change: 0 additions & 1 deletion tx-models/src/main/java/common/PageResult.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@

@ArraySchema(arraySchema = @Schema(description = "PageResults", additionalProperties = Schema.AdditionalPropertiesValue.FALSE), maxItems = Integer.MAX_VALUE)
public record PageResult<T>(
@ArraySchema(arraySchema = @Schema(description = "Content of PageResults"), maxItems = Integer.MAX_VALUE)
List<T> content,
Integer page,
Integer pageCount,
Expand Down

0 comments on commit 7eb9057

Please sign in to comment.