Skip to content

Commit

Permalink
Merge pull request #421 from bcgov/feature/vulnerabilitiyFixes
Browse files Browse the repository at this point in the history 
use bom for all modules
  • Loading branch information
@KFloodBCGov
KFloodBCGov committed May 23, 2023
2 parents c435597 + 97adcc9 commit c262b70
Show file tree
Hide file tree
Showing 26 changed files with 489 additions and 450 deletions.
40 changes: 15 additions & 25 deletions src/dps-email-poller/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@

<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.7.3</version>
<relativePath/> <!-- lookup parent from repository -->
<artifactId>dps</artifactId>
<groupId>ca.bc.gov.open</groupId>
<version>0.4.1-SNAPSHOT</version>
</parent>

<groupId>ca.bc.gov.pssg.rsbc.dps</groupId>
Expand All @@ -17,17 +16,6 @@
<name>dps-email-poller</name>
<description>DPS Email Poller module</description>

<properties>
<log4j2.version>2.17.1</log4j2.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<spring-boot.version>2.2.2.RELEASE</spring-boot.version>
<springfox-swagger-version>2.6.1</springfox-swagger-version>
<swagger-annotations-version>1.5.8</swagger-annotations-version>
<snakeyaml.version>1.32</snakeyaml.version>
</properties>

<repositories>
<repository>
<id>central</id>
Expand Down Expand Up @@ -99,37 +87,31 @@
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
<version>0.1.55</version>
</dependency>

<dependency>
<groupId>commons-io</groupId>
<groupId>org.apache.commons</groupId>
<artifactId>commons-io</artifactId>
<version>2.6</version>
</dependency>

<dependency>
<groupId>com.microsoft.ews-java-api</groupId>
<artifactId>ews-java-api</artifactId>
<version>2.0</version>
</dependency>

<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>1.15.3</version>
</dependency>

<dependency>
<groupId>io.krakens</groupId>
<artifactId>java-grok</artifactId>
<version>0.1.9</version>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>${spring-boot.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand All @@ -142,14 +124,12 @@
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<version>${springfox-swagger-version}</version>
<scope>compile</scope>
</dependency>

<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
<version>${springfox-swagger-version}</version>
<scope>compile</scope>
</dependency>

Expand All @@ -171,10 +151,20 @@
<dependency>
<groupId>net.rakugakibox.spring.boot</groupId>
<artifactId>logback-access-spring-boot-starter</artifactId>
<version>2.7.1</version>
</dependency>
</dependencies>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>ca.bc.gov.open.pssg.rsbc</groupId>
<artifactId>dps-bom</artifactId>
<version>0.5.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<profiles>
<profile>
Expand Down
38 changes: 15 additions & 23 deletions src/dps-email-worker/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.7.3</version>
<relativePath/>
<artifactId>dps</artifactId>
<groupId>ca.bc.gov.open</groupId>
<version>0.4.1-SNAPSHOT</version>
</parent>

<groupId>ca.bc.gov.pssg.rsbc.dps</groupId>
Expand All @@ -16,14 +14,6 @@
<name>dps-email-worker</name>
<description>DPS Email Worker subscribes to queue and gets messages.</description>

<properties>
<java.version>1.8</java.version>
<log4j2.version>2.17.1</log4j2.version>
<jersey-version>2.27</jersey-version>
<jodatime-version>2.7</jodatime-version>
<snakeyaml.version>1.32</snakeyaml.version>
</properties>

<repositories>
<repository>
<id>central</id>
Expand Down Expand Up @@ -87,35 +77,29 @@
<artifactId>commons-lang3</artifactId>
</dependency>


<!-- HTTP client: jersey-client -->
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
<version>${jersey-version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-multipart</artifactId>
<version>${jersey-version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId>
<version>${jersey-version}</version>
</dependency>

<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
<version>${jersey-version}</version>
</dependency>

<!-- @Nullable annotation -->
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>3.0.2</version>
</dependency>

<!-- JSON processing: jackson -->
Expand All @@ -142,7 +126,6 @@
<dependency>
<groupId>org.openapitools</groupId>
<artifactId>jackson-databind-nullable</artifactId>
<version>0.2.0</version>
</dependency>

<!-- Joda time: if you use it -->
Expand All @@ -153,14 +136,12 @@
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>${jodatime-version}</version>
</dependency>

<!-- Base64 encoding that works in both JVM and Android -->
<dependency>
<groupId>com.brsanthu</groupId>
<artifactId>migbase64</artifactId>
<version>2.2</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -241,10 +222,21 @@
<dependency>
<groupId>net.rakugakibox.spring.boot</groupId>
<artifactId>logback-access-spring-boot-starter</artifactId>
<version>2.7.1</version>
</dependency>
</dependencies>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>ca.bc.gov.open.pssg.rsbc</groupId>
<artifactId>dps-bom</artifactId>
<version>0.5.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<build>

<plugins>
Expand Down
21 changes: 5 additions & 16 deletions src/dps-notification-service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.7.3</version>
<relativePath/>
<artifactId>dps</artifactId>
<groupId>ca.bc.gov.open</groupId>
<version>0.4.1-SNAPSHOT</version>
</parent>

<groupId>ca.bc.gov.open</groupId>
Expand All @@ -16,13 +14,6 @@
<name>dps-notification-service</name>
<description>DPS Notification Service dispatch messages to notification worker</description>

<properties>
<java.version>1.8</java.version>
<log4j2.version>2.17.1</log4j2.version>
<cxf.version>3.5.3</cxf.version>
<snakeyaml.version>1.32</snakeyaml.version>
</properties>

<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down Expand Up @@ -76,13 +67,11 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-spring-boot-starter-jaxws</artifactId>
<version>${cxf.version}</version>
</dependency>

<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-features-logging</artifactId>
<version>${cxf.version}</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -123,7 +112,7 @@
<dependency>
<groupId>ca.bc.gov.open.pssg.rsbc</groupId>
<artifactId>dps-bom</artifactId>
<version>0.4.1-SNAPSHOT</version>
<version>0.5.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -166,7 +155,7 @@
<plugin>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-codegen-plugin</artifactId>
<version>${cxf.version}</version>
<version>3.5.3</version>
<executions>
<execution>
<id>generate-sources</id>
Expand Down
35 changes: 16 additions & 19 deletions src/dps-payment-service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.5.14</version>
<relativePath/>
<artifactId>dps</artifactId>
<groupId>ca.bc.gov.open</groupId>
<version>0.4.1-SNAPSHOT</version>
</parent>

<groupId>ca.bc.gov.open</groupId>
Expand All @@ -16,21 +15,12 @@
<name>dps-payment-service</name>
<description>DPS Payment Service module</description>

<properties>
<java.version>1.8</java.version>
<log4j2.version>2.17.1</log4j2.version>
<springfox-swagger-version>2.6.1</springfox-swagger-version>
<snakeyaml.version>1.32</snakeyaml.version>
</properties>

<dependencies>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>


<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
Expand All @@ -51,17 +41,13 @@
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<version>${springfox-swagger-version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
<version>${springfox-swagger-version}</version>
<scope>compile</scope>
</dependency>


<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
Expand Down Expand Up @@ -97,9 +83,20 @@
<dependency>
<groupId>net.rakugakibox.spring.boot</groupId>
<artifactId>logback-access-spring-boot-starter</artifactId>
<version>2.7.1</version>
</dependency>
</dependencies>
</dependencies>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>ca.bc.gov.open.pssg.rsbc</groupId>
<artifactId>dps-bom</artifactId>
<version>0.5.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<profiles>
<profile>
Expand Down
Loading

0 comments on commit c262b70

Please sign in to comment.