Skip to content

ENG-4152 Updating vulnerability config #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zonia3000 merged 3 commits into from
Dec 5, 2022
Merged

ENG-4152 Updating vulnerability config #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
71a680c
ENG-4152 Updating parent data
BrenoQVDS Nov 22, 2022
833ed56
ENG-4152 Removing hardcoded version from webapp app
BrenoQVDS Nov 22, 2022
30e0453
ENG-4152 Moving apache.cxf dependencies to main pom
BrenoQVDS Nov 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1067,6 +1067,16 @@
<artifactId>cxf-rt-rs-client</artifactId>
<version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-policy</artifactId>
<version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-wsdl</artifactId>
<version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion scan-prj/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
<parent>
<groupId>org.entando</groupId>
<artifactId>entando-core-parent</artifactId>
<artifactId>app-engine</artifactId>
<relativePath>../pom.xml</relativePath>
<version>7.2.0-SNAPSHOT</version>
</parent>
Expand Down
2 changes: 1 addition & 1 deletion scan-prj/pom.xml.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
<parent>
<groupId>org.entando</groupId>
<artifactId>entando-core-parent</artifactId>
<artifactId>app-engine</artifactId>
<relativePath>../pom.xml</relativePath>
<version>7.2.0-SNAPSHOT</version>
</parent>
Expand Down
20 changes: 8 additions & 12 deletions webapp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,14 @@
<artifactId>log4j-web</artifactId>
<version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-policy</artifactId>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-wsdl</artifactId>
</dependency>
<!--test dependencies -->
<dependency>
<groupId>org.junit.jupiter</groupId>
Expand Down Expand Up @@ -195,18 +203,6 @@
<artifactId>commons-dbcp2</artifactId>
<scope>test</scope>
</dependency>

<!-- TODO: move this to entando-core-parent in next release -->
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-policy</artifactId>
<version>3.4.4</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-wsdl</artifactId>
<version>3.4.4</version>
</dependency>
</dependencies>

<profiles>
Expand Down